- updated for 0.5.16, added fix for libextractor_exiv2 linking

Changed files:
    libextractor-make.patch -> 1.2

diff --git a/libextractor-make.patch b/libextractor-make.patch
index f30c96814bcc7c0cfbdb44abcd94a5adf5991efb..a79a136578b49565720e5bfc34973d04695d1eb7 100644 (file)
--- a/libextractor-make.patch
+++ b/libextractor-make.patch
@@ -1,25 +1,27 @@
---- libextractor-0.5.15/src/plugins/Makefile.am.orig   2006-09-07 16:09:16.000000000 +0200
-+++ libextractor-0.5.15/src/plugins/Makefile.am        2006-09-15 23:54:56.488415250 +0200
-@@ -309,19 +309,14 @@
+--- libextractor-0.5.16/src/plugins/Makefile.am.orig   2006-11-11 03:45:43.000000000 +0100
++++ libextractor-0.5.16/src/plugins/Makefile.am        2006-11-19 12:06:59.851016250 +0100
+@@ -317,11 +317,11 @@
    $(PLUGINFLAGS) $(retaincommand) -lQtCore4 -lQtGui4 $(svgflags)
  
  install-exec-hook:
--      mkdir $(DESTDIR)$(plugindir) &> /dev/null
-+      install -d $(DESTDIR)$(plugindir) 2> /dev/null
+-      mkdir -p $(DESTDIR)$(plugindir) &> /dev/null || true
++      mkdir -p $(DESTDIR)$(plugindir) 2> /dev/null || true
        rm -f $(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \
        rm -f $(DESTDIR)$(plugindir)/libextractor_thumbnail.la; \
        if test "$(thumbdir)" != ""; then \
 -              if test "$(thumbqt)" != ""; then \
--                      $(LN_S) $(DESTDIR)$(plugindir)/libextractor_thumbnailqt$(LIBEXT) \
-+                      $(LN_S) $(plugindir)/libextractor_thumbnailgtk$(LIBEXT) \
++              if false; then \
+                       $(LN_S) $(plugindir)/libextractor_thumbnailqt$(LIBEXT) \
                                $(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \
--              else \
--                      $(LN_S) $(DESTDIR)$(plugindir)/libextractor_thumbnailgtk$(LIBEXT) \
--                              $(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \
--              fi; \
-       else \
--              $(LN_S) $(DESTDIR)$(plugindir)/libextractor_thumbnailqt$(LIBEXT) \
-+              $(LN_S) $(plugindir)/libextractor_thumbnailqt$(LIBEXT) \
-                       $(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \
-       fi;
+               else \
+--- libextractor-0.5.16/src/plugins/exiv2/Makefile.am.orig     2006-03-11 01:12:32.000000000 +0100
++++ libextractor-0.5.16/src/plugins/exiv2/Makefile.am  2006-11-19 12:45:14.022393000 +0100
+@@ -6,7 +6,7 @@
+  libextractor_exiv2.la
  
+ libextractor_exiv2_la_LINK = \
+-  /bin/sh ../../../libtool --mode=link $(CXXLD) -o libextractor_exiv2.la
++  /bin/sh ../../../libtool --mode=link $(CXXLD) $(LDFLAGS) $(libextractor_exiv2_la_LDFLAGS) -o libextractor_exiv2.la
+ libextractor_exiv2_la_LDFLAGS = \
+   $(XTRA_CPPLIBS) -lpthread \
+   $(PLUGINFLAGS) $(retaincommand)