Author: qboosh Date: Sun Nov 19 12:37:27 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 0.5.16, added fix for libextractor_exiv2 linking
---- Files affected:
SOURCES:
libextractor-make.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/libextractor-make.patch
diff -u SOURCES/libextractor-make.patch:1.1 SOURCES/libextractor-make.patch:1.2
--- SOURCES/libextractor-make.patch:1.1 Sat Sep 16 01:34:43 2006
+++ SOURCES/libextractor-make.patch Sun Nov 19 13:37:22 2006
@@ -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)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/libextractor-make.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
