Update patch with the right version. More coffee for me in the morning.

Package-Manager: portage-2.1_pre7-r4

3 files changed, 25 insertions, 15 deletions

diff --git a/app-text/poppler-bindings/ChangeLog b/app-text/poppler-bindings/ChangeLog
index 520631fa67f6..e7c13334ed16 100644
--- a/app-text/poppler-bindings/ChangeLog
+++ b/app-text/poppler-bindings/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/poppler-bindings
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/ChangeLog,v 1.26 2006/04/08 11:15:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/ChangeLog,v 1.27 2006/04/08 21:41:14 flameeyes Exp $
+
+  08 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  files/poppler-0.5.1-qt-pthread.patch:
+  Update patch with the right version. More coffee for me in the morning.
 
   08 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/poppler-0.5.1-qt-pthread.patch, poppler-bindings-0.5.1-r1.ebuild:
diff --git a/app-text/poppler-bindings/Manifest b/app-text/poppler-bindings/Manifest
index 864269a5706c..c3fda3b35d62 100644
--- a/app-text/poppler-bindings/Manifest
+++ b/app-text/poppler-bindings/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 cecd5cdb25fde8e817ae4ff2552d0639 ChangeLog 4161
-RMD160 b40ce4973493d4c65421578918b050902a65dbce ChangeLog 4161
-SHA256 803d92ddfc5b1f1a2f2b16aa7d7f6f396a96f2a701ed54af1f565464d07f7f13 ChangeLog 4161
+MD5 330d181c361eb8bc0ade699e13a5b82e ChangeLog 4329
+RMD160 97a9516876d3b1ca9923be619b516fe8cff511a4 ChangeLog 4329
+SHA256 d2a26af84bdcd280780fc355f14b50e2efcd805ba5fa0671fa3ed295ad0777f6 ChangeLog 4329
 MD5 e876193dfd11bf13602043abf0ecec21 files/digest-poppler-bindings-0.5.0 241
 RMD160 4ac5024c341597422cfd4e2a1625b6ff9f1b4e6f files/digest-poppler-bindings-0.5.0 241
 SHA256 51bb8ae71c9ac143ae67a7cecb81aa02fdf8798baf3bc90ebb499692ba5d3ea7 files/digest-poppler-bindings-0.5.0 241
@@ -22,9 +22,9 @@ SHA256 f25d0dda38ec392923c6de2835635b9a5dc9599cad5aad35e0e7fea2704cbd98 files/po
 MD5 446d870c27304d4bdef6fca86e9bb624 files/poppler-0.5.1-bindings.patch 3014
 RMD160 deab225ad3c9a0f719784f38e6f734e2825ec875 files/poppler-0.5.1-bindings.patch 3014
 SHA256 18a89c526341019d44ca0054b0b6f54a8c903b05d0bec69a94d2a72a2897d68f files/poppler-0.5.1-bindings.patch 3014
-MD5 e13f76927b7115aa9d342765cebe790a files/poppler-0.5.1-qt-pthread.patch 1050
-RMD160 271787c357c6c0346f6bd67cd623159ed38c373c files/poppler-0.5.1-qt-pthread.patch 1050
-SHA256 b302c8093e8de88745fdda9ad6acb4aaba486675b81d0b74766ce3adbd3b2d79 files/poppler-0.5.1-qt-pthread.patch 1050
+MD5 e83dc2fe447e9b661c680dc176ce1c01 files/poppler-0.5.1-qt-pthread.patch 1247
+RMD160 f5c2b8b25ba217f8f6596140a89446cd6a37c52f files/poppler-0.5.1-qt-pthread.patch 1247
+SHA256 99296e73696786df70809700d7019c5b0135ad2ec806e16658b77335b183daa7 files/poppler-0.5.1-qt-pthread.patch 1247
 MD5 dd9bbe42d7cb066d25d0bc67a019581f files/poppler-0.5.1-r1-bindings.patch 2982
 RMD160 07ee852dd5988822886be6bebf1431f9e69b66e2 files/poppler-0.5.1-r1-bindings.patch 2982
 SHA256 32dfeb415c242b67f67c4934b7d725f18296d56af90a84f4a3d6b3862298c175 files/poppler-0.5.1-r1-bindings.patch 2982
@@ -43,7 +43,7 @@ SHA256 59ffecc50fc855006d0d0ff6b0629b5f5a2734dd9b259d7378b040cd6eca526d poppler-
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEN5uMAiZjviIA2XgRAmQSAJ9B3Uq73T92zhm61dzNtpC8usUXuwCgk6un
-v+SGvolIUHJ0g/r3S1Dtg74=
-=L2Um
+iD8DBQFEOC4fAiZjviIA2XgRAjyqAKCj4+jx/O1i26wMM1gMty4IABCoQwCfcTiM
+x41vEfi5o1qA5Zl1WQ2gYOU=
+=/0Va
 -----END PGP SIGNATURE-----
diff --git a/app-text/poppler-bindings/files/poppler-0.5.1-qt-pthread.patch b/app-text/poppler-bindings/files/poppler-0.5.1-qt-pthread.patch
index 839bedc2e1c4..4589f4b634a1 100644
--- a/app-text/poppler-bindings/files/poppler-0.5.1-qt-pthread.patch
+++ b/app-text/poppler-bindings/files/poppler-0.5.1-qt-pthread.patch
@@ -2,7 +2,7 @@ Index: poppler-0.5.1/m4/qt.m4
 ===================================================================
 --- poppler-0.5.1.orig/m4/qt.m4
 +++ poppler-0.5.1/m4/qt.m4
-@@ -53,8 +53,28 @@ if test "x$qt_libdir" != "xno" ; then
+@@ -53,8 +53,34 @@ if test "x$qt_libdir" != "xno" ; then
  fi
  
  if test "x$have_qt" == "xyes"; then
@@ -10,19 +10,25 @@ Index: poppler-0.5.1/m4/qt.m4
 +    pthread_needed=no
 +
 +    save_LDFLAGS=$LDFLAGS
++    save_CXXFLAGS=$CXXFLAGS
++    save_LIBS=$LIBS
++    CXXFLAGS="$CXXFLAGS -I$qt_incdir"
++    LIBS="$LIBS $qt_libdir/$qt_test_library"
 +    AC_MSG_CHECKING([if Qt needs -pthread])
 +    AC_TRY_LINK([#include <qt.h>], [QString s;], [pthread_needed=no], [pthread_needed=yes])
-+    if "x$pthread_needed" = "xyes"; then
++    if test "x$pthread_needed" = "xyes"; then
 +        LDFLAGS="$LDFLAGS -pthread"
-+        AC_TRY_LINK([#include <qt.h>], [Qstring s;], [pthread_needed=yes], [pthread_needed=yes])
-+	LDFLAGS=$save_LDFLAGS
++        AC_TRY_LINK([#include <qt.h>], [QString s;], [pthread_needed=yes], [pthread_needed=no])
 +    fi
 +    AC_MSG_RESULT([$pthread_needed])
++    LDFLAGS=$save_LDFLAGS
++    CXXFLAGS=$save_CXXFLAGS
++    LIBS=$save_LIBS
 +
 +    AC_LANG_POP
 +
 +    qtpthread=''
-+    if "x$pthread_needed" = "xyes"; then
++    if test "x$pthread_needed" = "xyes"; then
 +        qtpthread="-pthread"
 +    fi
 +