diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-04-08 21:41:16 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-04-08 21:41:16 +0000 |
| commit | 0768e7e18b25fb5387a82b807f5b1e7ed0030598 (patch) | |
| tree | 57fd001f77e30cb205ae4e903c80e2d655733e16 /app-text/poppler-bindings | |
| parent | stable on amd64 (diff) | |
| download | gentoo-2-0768e7e18b25fb5387a82b807f5b1e7ed0030598.tar.gz gentoo-2-0768e7e18b25fb5387a82b807f5b1e7ed0030598.tar.bz2 gentoo-2-0768e7e18b25fb5387a82b807f5b1e7ed0030598.zip | |
Update patch with the right version. More coffee for me in the morning.
(Portage version: 2.1_pre7-r4)
Diffstat (limited to 'app-text/poppler-bindings')
| -rw-r--r-- | app-text/poppler-bindings/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/poppler-bindings/files/poppler-0.5.1-qt-pthread.patch | 16 |
2 files changed, 16 insertions, 6 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/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 + |