SOURCES (AC-branch): poppler-gcc4.patch (NEW), poppler-qt_m4.patch...

[baggins]

Author: baggins                      Date: Tue May 16 11:19:44 2006 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- from HEAD

---- Files affected:
SOURCES:
   poppler-gcc4.patch (NONE -> 1.1.2.1)  (NEW), poppler-qt_m4.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/poppler-gcc4.patch
diff -u /dev/null SOURCES/poppler-gcc4.patch:1.1.2.1
--- /dev/null	Tue May 16 13:19:44 2006
+++ SOURCES/poppler-gcc4.patch	Tue May 16 13:19:39 2006
@@ -0,0 +1,25 @@
+--- poppler-0.5.1/qt4/src/poppler-qt4.h.orig	2006-01-23 15:43:39.000000000 +0100
++++ poppler-0.5.1/qt4/src/poppler-qt4.h	2006-03-01 17:19:44.145777250 +0100
+@@ -401,7 +401,7 @@
+ 	   \warning The application owns the pointer to Document, and this should
+ 	   be deleted when no longer required.
+ 	*/
+-	static Document *Document::load(const QString & filePath,
++	static Document*load(const QString & filePath,
+ 					const QByteArray &ownerPassword=QByteArray(),
+ 					const QByteArray &userPassword=QByteArray());
+   
+@@ -612,11 +612,11 @@
+ 	*/
+ 	bool hasEmbeddedFiles() const;
+ 
+-	Document::~Document();
++	~Document();
+   
+     private:
+ 	DocumentData *m_doc;
+-	Document::Document(DocumentData *dataA);
++	Document(DocumentData *dataA);
+     };
+ 
+     /**

================================================================
Index: SOURCES/poppler-qt_m4.patch
diff -u /dev/null SOURCES/poppler-qt_m4.patch:1.1.2.1
--- /dev/null	Tue May 16 13:19:44 2006
+++ SOURCES/poppler-qt_m4.patch	Tue May 16 13:19:39 2006
@@ -0,0 +1,35 @@
+--- poppler-0.5.1/m4/qt.m4.orig	2006-01-23 15:43:36.000000000 +0100
++++ poppler-0.5.1/m4/qt.m4	2006-03-01 14:34:41.000000000 +0100
+@@ -7,8 +7,8 @@
+ AC_DEFUN([POPPLER_FIND_QT],
+ [
+ dnl Search paths for Qt 
+-qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include"
+-qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib"
++qt_incdirs="/usr/include/qt"
++qt_libdirs="/usr/lib64 /usr/lib"
+ if test -n "$QTDIR" ; then
+     qt_incdirs="$QTDIR/include $qt_incdirs"
+     qt_libdirs="$QTDIR/lib $qt_libdirs"
+@@ -73,8 +73,8 @@
+ [
+ have_qt4=no
+ dnl Search paths for Qt4 - not much real experience with this yet.
+-qt4_incdirs="/usr/local/qt/include /usr/include/qt4 /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt/include"
+-qt4_libdirs="/usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt/lib"
++qt4_incdirs="/usr/include/qt4"
++qt4_libdirs="/usr/lib64 /usr/lib"
+ 
+ if test -n "$QTDIR" ; then
+     qt4_incdirs="$QTDIR/include $qt4_incdirs"
+@@ -153,8 +153,8 @@
+ [
+ have_qt4testlib=no
+ 
+-qt4_incdirs="/usr/local/qt/include /usr/include/qt4 /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt/include"
+-qt4_libdirs="/usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt/lib"
++qt4_incdirs="/usr/include/qt4"
++qt4_libdirs="/usr/lib64 /usr/lib"
+ 
+ if test -n "$QTDIR" ; then
+     qt4_incdirs="$QTDIR/include $qt4_incdirs"
================================================================