Fixup after recent sh -e changes.

ok sthen@
This commit is contained in:
jca 2013-06-14 08:13:36 +00:00
parent 394728b041
commit 7701e72c56
2 changed files with 26 additions and 0 deletions

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-libkexiv2_libkexiv2_Makefile_in,v 1.1 2013/06/14 08:13:36 jca Exp $
Don't fail when egrep doesn't find the desired string.
--- libkexiv2/libkexiv2/Makefile.in.orig Thu Jun 13 13:46:23 2013
+++ libkexiv2/libkexiv2/Makefile.in Thu Jun 13 13:46:50 2013
@@ -740,7 +740,7 @@ libkexiv2_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcd
echo "#define KDE_USE_FINAL 1" >> libkexiv2_la.all_cpp.final; \
for file in kexiv2.cpp kexiv2private.cpp ; do \
echo "#include \"$$file\"" >> libkexiv2_la.all_cpp.files; \
- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkexiv2_la.all_cpp.final; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkexiv2_la.all_cpp.final || true; \
done; \
cat libkexiv2_la.all_cpp.final libkexiv2_la.all_cpp.files > libkexiv2_la.all_cpp.cpp; \
rm -f libkexiv2_la.all_cpp.final libkexiv2_la.all_cpp.files

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-yakuake_src_Makefile_in,v 1.1 2013/06/14 08:13:36 jca Exp $
Don't fail when egrep doesn't find the desired string.
--- yakuake/src/Makefile.in.orig Thu Jun 13 16:24:12 2013
+++ yakuake/src/Makefile.in Thu Jun 13 16:24:37 2013
@@ -934,7 +934,7 @@ yakuake.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/f
echo "#define KDE_USE_FINAL 1" >> yakuake.all_cpp.final; \
for file in first_run_dialog.cpp general_settings.cpp image_button.cpp main.cpp main_window.cpp session.cpp skin_list_item.cpp skin_settings.cpp tabbed_widget.cpp tab_bar.cpp terminal.cpp terminal_focus_watcher.cpp terminal_splitter.cpp title_bar.cpp translucent_widget.cpp dcop_interface_skel.cpp first_run_dialog_ui.cpp general_settings_ui.cpp skin_settings_ui.cpp settings.cpp ; do \
echo "#include \"$$file\"" >> yakuake.all_cpp.files; \
- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> yakuake.all_cpp.final; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> yakuake.all_cpp.final || true; \
done; \
cat yakuake.all_cpp.final yakuake.all_cpp.files > yakuake.all_cpp.cpp; \
rm -f yakuake.all_cpp.final yakuake.all_cpp.files