diff options
Diffstat (limited to 'community-testing/gmic/opencv-buildfix.patch')
-rw-r--r-- | community-testing/gmic/opencv-buildfix.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/community-testing/gmic/opencv-buildfix.patch b/community-testing/gmic/opencv-buildfix.patch new file mode 100644 index 000000000..b204cb721 --- /dev/null +++ b/community-testing/gmic/opencv-buildfix.patch @@ -0,0 +1,32 @@ +diff -wbBur gmic-1.5.1.7/src/Makefile gmic-1.5.1.7.q/src/Makefile +--- gmic-1.5.1.7/src/Makefile 2012-07-26 12:59:34.000000000 +0400 ++++ gmic-1.5.1.7.q/src/Makefile 2012-08-03 14:03:10.000000000 +0400 +@@ -296,7 +296,7 @@ + + zart: lib + ifneq ($(OS),Darwin) +- cd ../zart && qmake-qt4 zart.pro && $(MAKE) && strip zart ++ cd ../zart && qmake zart.pro && $(MAKE) && strip zart + else + cd ../zart && qmake zart.pro && $(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_MACOSX_LDFLAGS) $(OPT_LDFLAGS)" + endif +@@ -403,6 +403,7 @@ + mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/ + cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz + cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz ++ if test -d /usr/share/bash-completion/completions; then mkdir -p $(DESTDIR)/usr/share/bash-completion/completions/; cp -f gmic_bashcompletion.sh $(DESTDIR)/usr/share/bash-completion/completions/gmic; fi + if test -d /etc/bash_completion.d/; then mkdir -p $(DESTDIR)/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh $(DESTDIR)/etc/bash_completion.d/gmic; fi + if test -d /opt/local/etc/bash_completion.d/; then mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; fi + +diff -wbBur gmic-1.5.1.7/zart/zart.pro gmic-1.5.1.7.q/zart/zart.pro +--- gmic-1.5.1.7/zart/zart.pro 2012-07-26 12:59:33.000000000 +0400 ++++ gmic-1.5.1.7.q/zart/zart.pro 2012-08-03 12:32:27.000000000 +0400 +@@ -34,7 +34,7 @@ + FORMS = ui/MainWindow.ui ui/DialogAbout.ui ui/DialogLicence.ui + + !macx { +- LIBS += -lX11 ../src/libgmic.a -lcxcore -lcv -lml -lhighgui -lml -lfftw3 ++ LIBS += -lX11 ../src/libgmic.a `pkg-config --libs opencv` -lopencv_core -lopencv_ml -lopencv_highgui -lfftw3 + } else { + LIBS += -lX11 ../src/libgmic.a `pkg-config opencv --libs` -lfftw3 + } |