Add as-needed patch thanks to TGL <degrenier@easyconnect.fr> in bug 132473

(Portage version: 2.1.2_pre3-r6)

3 files changed, 62 insertions, 3 deletions

diff --git a/app-text/djvu/ChangeLog b/app-text/djvu/ChangeLog
index bb2ef21a9b8c..f11801fa83eb 100644
--- a/app-text/djvu/ChangeLog
+++ b/app-text/djvu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/djvu
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.51 2006/10/19 15:52:17 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.52 2006/10/22 20:20:38 genstef Exp $
+
+  22 Oct 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/djvulibre-3.5.17-pthread-flag.patch, djvu-3.5.17.ebuild:
+  Add as-needed patch thanks to TGL <degrenier@easyconnect.fr> in bug 132473
 
   19 Oct 2006; Bryan Østergaard <kloeri@gentoo.org> djvu-3.5.17.ebuild:
   Stable on Alpha.
diff --git a/app-text/djvu/djvu-3.5.17.ebuild b/app-text/djvu/djvu-3.5.17.ebuild
index 5b2ce24582a8..6cb4d0a6486c 100644
--- a/app-text/djvu/djvu-3.5.17.ebuild
+++ b/app-text/djvu/djvu-3.5.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.17.ebuild,v 1.13 2006/10/19 15:52:17 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.17.ebuild,v 1.14 2006/10/22 20:20:38 genstef Exp $
 
 inherit nsplugins flag-o-matic fdo-mime eutils multilib toolchain-funcs
 
@@ -25,7 +25,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	epatch "${FILESDIR}/${P}-dont-prestrip-bins.patch" || die "patch failed"
+	epatch "${FILESDIR}/${P}-dont-prestrip-bins.patch"
+	epatch "${FILESDIR}/djvulibre-3.5.17-pthread-flag.patch"
 
 	# Replace autochecking acdesktop.m4 with a gentoo-specific one
 	cp "${FILESDIR}/gentoo-acdesktop.m4" "${S}/gui/desktop/acdesktop.m4"
diff --git a/app-text/djvu/files/djvulibre-3.5.17-pthread-flag.patch b/app-text/djvu/files/djvulibre-3.5.17-pthread-flag.patch
new file mode 100644
index 000000000000..58dfd8f764d4
--- /dev/null
+++ b/app-text/djvu/files/djvulibre-3.5.17-pthread-flag.patch
@@ -0,0 +1,54 @@
+--- config/acinclude.m4.orig	2006-05-08 15:05:41.000000000 +0200
++++ config/acinclude.m4	2006-05-08 15:22:15.000000000 +0200
+@@ -332,7 +332,9 @@
+ fi
+ # Create a list of thread flags to try.  Items starting with a "-" are
+ # C compiler flags, and other items are library names, except for "none"
+-# which indicates that we try without any flags at all.
++# which indicates that we try without any flags at all. Also, combinations
++# of items (for instance, both a compiler flag and a library name) can be 
++# specified using a colon separator.
+ acx_pthread_flags="pthreads none -Kthread -kthread lthread 
+                    -pthread -pthreads -mthreads pthread
+                    --thread-safe -mt"
+@@ -364,12 +366,40 @@
+         acx_pthread_flags="-pthread -pthreads pthread -mt $acx_pthread_flags"
+         ;;
+ esac
++case "${host_os}-${GCC}" in
++        *linux*-yes)
++        # On Linux/GCC, libtool uses -nostdlib for linking, which cancel part
++        # of the -pthread flag effect (libpthread is not automatically linked).
++        # So we'll try to link with both -pthread and -lpthread first:
++        acx_pthread_flags="-pthread:pthread $acx_pthread_flags"
++        ;;
++esac
+ if test x"$acx_pthread_ok" = xno; then
+ for flag in $acx_pthread_flags; do
+         case $flag in
+                 none)
+                 AC_MSG_CHECKING([whether pthreads work without any flags])
+                 ;;
++                *:*)
++                PTHREAD_CFLAGS=""
++                PTHREAD_LIBS=""
++                message="whether pthreads work with"
++                while test x"$flag" != x; do
++                        subflag=`echo $flag | cut -d: -f1`
++                        case $subflag in
++                                -*)
++                                PTHREAD_CFLAGS="$PTHREAD_CFLAGS $subflag"
++                                message="$message $subflag"
++                                ;;
++                                *)
++                                PTHREAD_LIBS="$PTHREAD_LIBS -l$subflag"
++                                message="$message -l$subflag"
++                                ;;
++                        esac
++                        flag=`echo $flag | cut -s -d: -f2-`
++                done
++                AC_MSG_CHECKING([$message])
++                ;;
+                 -*)
+                 AC_MSG_CHECKING([whether pthreads work with $flag])
+                 PTHREAD_CFLAGS="$flag"