SOURCES: libextractor-64bit.patch, libextractor-make.patch - updat...

[qboosh]

Author: qboosh                       Date: Tue Jan 22 22:20:30 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 0.5.19a

---- Files affected:
SOURCES:
   libextractor-64bit.patch (1.1 -> 1.2) , libextractor-make.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/libextractor-64bit.patch
diff -u SOURCES/libextractor-64bit.patch:1.1 SOURCES/libextractor-64bit.patch:1.2
--- SOURCES/libextractor-64bit.patch:1.1	Sun Feb 19 11:45:29 2006
+++ SOURCES/libextractor-64bit.patch	Tue Jan 22 23:20:25 2008
@@ -2,23 +2,23 @@
 pack.c:407: warning: left shift count >= width of type
 pack.c:423: warning: left shift count >= width of type
 
---- libextractor-0.5.9/src/plugins/pack.c.orig	2005-09-18 11:54:35.000000000 +0200
-+++ libextractor-0.5.9/src/plugins/pack.c	2006-02-19 11:44:07.330679750 +0100
-@@ -404,7 +404,7 @@
- 	*swordp |= *bp++ << 24;
- 	
- 	if ( (sizeof(swordp) > 4) && (*swordp & 0x80000000) )
--	  *swordp |= (~0) << ((sizeof(sword)-4) * 8);
-+	  *swordp |= (~0L) << ((sizeof(sword)-4) * 8);
- 	
- 	++swordp;
- 	npacked += 4;
-@@ -420,7 +420,7 @@
- 	*swordp |= *bp++;
- 	
- 	if ( (sizeof(swordp) > 4) && (*swordp & 0x80000000) )
--	  *swordp |= (~0) << ((sizeof(sword)-4) * 8);
-+	  *swordp |= (~0L) << ((sizeof(sword)-4) * 8);
- 	
- 	++swordp;
- 	npacked += 4;
+--- libextractor-0.5.19/src/plugins/pack.c.orig	2007-07-29 10:35:18.000000000 +0200
++++ libextractor-0.5.19/src/plugins/pack.c	2008-01-22 21:39:53.811402372 +0100
+@@ -447,7 +447,7 @@
+               *swordp |= *bp++ << 24;
+ 
+               if ((sizeof (swordp) > 4) && (*swordp & 0x80000000))
+-                *swordp |= (~0) << ((sizeof (sword) - 4) * 8);
++                *swordp |= (~0L) << ((sizeof (sword) - 4) * 8);
+ 
+               ++swordp;
+               npacked += 4;
+@@ -464,7 +464,7 @@
+               *swordp |= *bp++;
+ 
+               if ((sizeof (swordp) > 4) && (*swordp & 0x80000000))
+-                *swordp |= (~0) << ((sizeof (sword) - 4) * 8);
++                *swordp |= (~0L) << ((sizeof (sword) - 4) * 8);
+ 
+               ++swordp;
+               npacked += 4;

================================================================
Index: SOURCES/libextractor-make.patch
diff -u SOURCES/libextractor-make.patch:1.2 SOURCES/libextractor-make.patch:1.3
--- SOURCES/libextractor-make.patch:1.2	Sun Nov 19 13:37:22 2006
+++ SOURCES/libextractor-make.patch	Tue Jan 22 23:20:25 2008
@@ -1,27 +1,11 @@
---- 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)
+--- libextractor-0.5.19/src/plugins/Makefile.am.orig	2007-12-31 14:17:46.000000000 +0100
++++ libextractor-0.5.19/src/plugins/Makefile.am	2008-01-22 21:45:54.695968011 +0100
+@@ -373,7 +373,7 @@
+   $(QT_CFLAGS) $(QT_SVG_CFLAGS)
  
  install-exec-hook:
 -	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 \
-+		if false; then \
- 			$(LN_S) $(plugindir)/libextractor_thumbnailqt$(LIBEXT) \
- 				$(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \
- 		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)
+ 	rm -f $(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT)
+ 	rm -f $(DESTDIR)$(plugindir)/libextractor_thumbnail.la
+ 	if test "$(thumbgtk)" != ""; then \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/libextractor-64bit.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/libextractor-make.patch?r1=1.2&r2=1.3&f=u