Add backport patch for building without thread support, bug 401323

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64
RepoMan-Options: --force

5 files changed, 157 insertions, 17 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 31ddd659f1ed..d095770aa883 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.461 2012/04/21 08:20:35 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.462 2012/04/23 22:16:48 dilfridge Exp $
+
+  23 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.2-r3.ebuild,
+  +files/cups-1.5.2-threads.patch, +files/cups-1.5.2-threads2.patch:
+  Add backport patch for building without thread support, bug 401323
 
   21 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.2-r3.ebuild:
   Fix build with USE=-systemd, thanks Arfrever
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index f59b92e9e9ea..2f79ad9ffe06 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -15,6 +15,8 @@ AUX cups-1.4.8-largeimage.patch 572 RMD160 62e0a92fb1dc62adff43bcdc22f201da426d8
 AUX cups-1.5.0-systemd-socket.patch 12829 RMD160 d4ca24c299daf65f2621568443a339f82bd03a2a SHA1 f45e18ba92d3afbca6a26ac676f2f42738032c10 SHA256 350eb1bdb76618dd082e9cda26c5b1400f4f870ffd521186f4d74940d15b4cd5
 AUX cups-1.5.2-browsing.patch 513 RMD160 592b2a814f23beea82d61446989636a393ab34a7 SHA1 43f78e93f84a4da430cb2e1ced268ea00d5f00b3 SHA256 47a229fb7be6ada4e48806c24cdba70cd2b6161ac8fcf1290e07063e486b7bfe
 AUX cups-1.5.2-linkperl.patch 724 RMD160 5e94f21ab236a88ec2026e69aed58ce17dafaa5c SHA1 8556aea40a07176b0daa184bcce1b1abe3d81c48 SHA256 48891623d98a1767c11865d59c72146aa277f1bd0abda9871ae90540676b648e
+AUX cups-1.5.2-threads.patch 730 RMD160 e021b2d2f5293fb58f24279f2550488f90dc91e5 SHA1 bc1b1a8048d36393995f056493b57f5022e6d854 SHA256 adb76ff55cd6857e7bc6c36e9cb9d63201fe14b0f853f52271b45a54ad07a710
+AUX cups-1.5.2-threads2.patch 3192 RMD160 9736e8b03458be45fd1f427d3726368e81d51539 SHA1 2d87e9fe0267f3d6192cc81d1410b5eb534af39d SHA256 07a495e49b7646bfbb0d9f12841f3db8ccd4493c69c8a626b96e913bca384f5c
 AUX cupsd.init.d 402 RMD160 1b132354d01ad2ecebbe5238b09dfa3cb9391d43 SHA1 ea48170f3369486792ed9f98fe7d1c53487b455c SHA256 66b14dffc99900c0db04453765e5bf48cdf0c197c6f50dccf2a55dc66dd0cf95
 AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SHA1 6afb8a655b6ff013a2c8c8cbfb615ba1e561503b SHA256 ac5fa01ca776d75bd7cef62eef9f6b0c3945ee87e8950b40ca9f9f3ff46a16c1
 DIST cups-1.4.8-source.tar.bz2 4547162 RMD160 ee80e8d0b56dc0e2edf2a9aa9a43c4b92619f741 SHA1 9167f556e78e0bc075f1eb2f695d79cc1f334007 SHA256 6bd27e1213c139ed0bbadc5c29f97cf1e8f7f8f5b0bb29b227ecaff32aafa9a6
@@ -24,23 +26,23 @@ DIST cups-1.5.2-source.tar.bz2 9595665 RMD160 98181e2ee8c6e574fb6d405f688f52c9b6
 EBUILD cups-1.4.8-r1.ebuild 7242 RMD160 bf1997ca1d9b9b11066c2bb963cc8b54ea5c8f2a SHA1 a15340529eecbbc8a95392d2f1b508cfb4caa47e SHA256 77271eb2ea0dd120801a4b1e5381ea4859e80375d9587f83ec3f4c37ab8868c8
 EBUILD cups-1.4.8-r23.ebuild 8852 RMD160 c50b3b77403cf6c724fcfd05c8ef173808066629 SHA1 c4aa7016bb5a1279bf446f41c09b9a93d5b87ff2 SHA256 1798aed0e2760c6a92a7c4e3631170989d984ac36908b369c37c43bfdab3cd6d
 EBUILD cups-1.5.2-r2.ebuild 8175 RMD160 b8043f29843c75c2b55085417cfc21a1db9db503 SHA1 a196e7c91ff5ea81b2ea2dfb4d598ea6541a24a8 SHA256 7a9a31d4b3a48ca207f9292255d3601f08981fdb4c276db712ffe87e6b1dc5b0
-EBUILD cups-1.5.2-r3.ebuild 8485 RMD160 0547718832d52db84e55f029f71b466e557e0de9 SHA1 9442fdcc465b0dfd195b4bd40850cf861d0c0323 SHA256 0cb535b5412e78681ac31518687416c557ca071f4d9229eb1b16cbd646def8ca
-MISC ChangeLog 70220 RMD160 a878178e085ca35ca69c6509cf683701ec076815 SHA1 cf3f26025337f2c6be843e24f98ec2d221e48f2f SHA256 c315ef0ad4baac4d0adfd6f40821ffc6d39db5a5a01c873e021cf9c9c0e2c9da
+EBUILD cups-1.5.2-r3.ebuild 8582 RMD160 df1dd83f03d51d9aea267a5a0b153097febdd0ba SHA1 6ffb03f119afe631d5f91b0f15ba04e302ec23ba SHA256 0d1c5f9327882c58121230ae36cbb75a91b4d93b6a3e97813a5ea5a5c295ba2b
+MISC ChangeLog 70438 RMD160 f11b6ff42aad8a04c535725471de306cf3dabb82 SHA1 cf92a2aa5ff7d8d9545f992cafe0b7aafa4377f6 SHA256 e10b2608f1bfd8b90f41366c80cf1348c335ecbc9862527c24aefe18d07b0a10
 MISC metadata.xml 778 RMD160 39d95458b469079b683adf4f2e79eb0b803ce0b9 SHA1 62b298bb9c5435716ce81550213ccd086ec065aa SHA256 26a8d1221a4334579f98705c38f3e3a882c223df86181dcf7968eac2118188b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPkm3xAAoJENwGBM22xffelkoP/0uLTsUL92W2PCI2HET8AMDn
-XhN1z36Ix7L6zSUkUVc0Zp0MwhWNIn7prm+6IGpG3+/yZsHgYYN9jZsXtfROVEL7
-MO0bljNw4qzaNMTSnqYMkV4nNyKS/vAptwqlfy8DvWpc7k9xvI50PmTlL/EV/aVJ
-Thg91XftAkdyRStKvI0T0giIrrwY8H1HEl8UTrZ8+r53AGk5Y5oHI61o00nzaRxv
-QpNQV9VDMAk3q0wxxjTC6LFuYzTfLEvMHhmkJIV+rsxBtYAE0AZfFmbqJ78vx8mW
-THeMuqzYmgMaFdw4KYQW6G8ji7b3nrgLKK9S9SAF/vRd4p7kTKhxxwR32ZYVXmCq
-Uf4Oscl45qoEVIKG23DtghG4T1wgVsSjfE3eLSDfbZqrLZS22ouMXLzoTGV7VkGA
-NneqXSmKaKp5dpalsLVOosI66i9nmdDvtlx25OZencVpnKIQ2bXFkfjkdfFHmJHH
-2W4AbZ/T0zc9HitfqoLvFQ0OL8bAuyEtNhr3xtWwT/5jqhZ6N7R0Fxeg+8KKfYnR
-E6pnchtbPOK4HtiL8zgG3+zlr1Vla3dMNB3/TOJaCCgsu5Yo3VnoLex5hLlLrcQX
-ToBg7iq0VDqFEsZRyZd8cLKqmhagQKvqj+JG2Oh+l3J23Cm5A8j3lwHOcZ81tXKb
-GJbG7OR1c32VomDAk4iw
-=Y9Nz
+iQIcBAEBCgAGBQJPldTxAAoJENwGBM22xffe5N8P/iGlWrOyhhfZCfkiQagM8Npu
+Y1O0CmpdCAcKjKbaI96bLoS4uUopm4/jPvjyG7Xx8puywyv/ah3+RWTODYvHKEPp
+kqjXgO9N2YiVw4HjbPwPEpZsKaeCah0ZRLf0EwPEfzN5f1xPIeZZzMRe5nDhw+dA
+9P5tYb7+KvtlrcFtPGpkDOeT9+AyUhDrT1L4OGEQZqmoHufSXdGzwiMtsYIv4oeV
+EAlVPAX5TjCD4f8Gi4cOYngSgzKPsbvHi+TS89jKUNkjtiJd5FbtQqAGfw8HLcHV
+Doqg+tqEWvgYYPf2lSKnYwjHFGSA1m9QZg3ydSPn0FPDPOob/NgZSJw2gsqjEHgr
+elIA4JjCWb4OkeDe3X+BV7daCmuIu8nfJOx1PdccMGoARSuTcls0fq3KQLgSmIDE
+5HpgjaXnft39hKyxdy8zoSJZldiJ+Q4sFYSDf/AcvK066GYbZxo8kwYX36AKtEjO
+dFJf9MP5ibv/oIDeEFYAic09a8yQ3cVHd3rcuHGTJQiPPz0+sizDDnCq5TBrKF43
+2tGQtQhgz2rbv9BI5wcCMgCaCBCVekAzaKz26NTT8Q4PpvDyicM4m7nJIozJ+u09
+Nj5CViAsvcPcnnUkpPoWXKh/TtyV9znHxiU7LDdA5RGuLYgVLMlBz3hR2ifGUzzl
+iPLCvYFIgYOqZgpU7vQd
+=U340
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.5.2-r3.ebuild b/net-print/cups/cups-1.5.2-r3.ebuild
index 64fdacba5559..e652a60a576d 100644
--- a/net-print/cups/cups-1.5.2-r3.ebuild
+++ b/net-print/cups/cups-1.5.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r3.ebuild,v 1.2 2012/04/21 08:20:35 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r3.ebuild,v 1.3 2012/04/23 22:16:48 dilfridge Exp $
 
 EAPI=4
 
@@ -131,6 +131,8 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.4.4-php-destdir.patch"
 	epatch "${FILESDIR}/${PN}-1.4.4-perl-includes.patch"
 	epatch "${FILESDIR}/${PN}-1.5.2-linkperl.patch"
+	epatch "${FILESDIR}/${PN}-1.5.2-threads.patch"
+	epatch "${FILESDIR}/${PN}-1.5.2-threads2.patch"
 
 	# systemd support
 	epatch "${FILESDIR}/${PN}-1.5.0-systemd-socket.patch"
diff --git a/net-print/cups/files/cups-1.5.2-threads.patch b/net-print/cups/files/cups-1.5.2-threads.patch
new file mode 100644
index 000000000000..cb94221478ce
--- /dev/null
+++ b/net-print/cups/files/cups-1.5.2-threads.patch
@@ -0,0 +1,21 @@
+Index: cups/thread-private.h
+===================================================================
+--- cups/thread-private.h	(Revision 10432)
++++ cups/thread-private.h	(Revision 10433)
+@@ -49,7 +49,7 @@
+ typedef void *(__stdcall *_cups_thread_func_t)(void *arg);
+ typedef struct _cups_mutex_s
+ {
+-  int			m_init;		/* Flag for on-demand initialization */		
++  int			m_init;		/* Flag for on-demand initialization */
+   CRITICAL_SECTION	m_criticalSection;
+ 					/* Win32 Critical Section */
+ } _cups_mutex_t;
+@@ -62,6 +62,7 @@
+ #    define _cupsThreadSetData(k,p) TlsSetValue(k,p)
+ 
+ #  else
++typedef void	*(*_cups_thread_func_t)(void *arg);
+ typedef char	_cups_mutex_t;
+ typedef char	_cups_rwlock_t;
+ typedef void	*_cups_threadkey_t;
diff --git a/net-print/cups/files/cups-1.5.2-threads2.patch b/net-print/cups/files/cups-1.5.2-threads2.patch
new file mode 100644
index 000000000000..0dece1195a42
--- /dev/null
+++ b/net-print/cups/files/cups-1.5.2-threads2.patch
@@ -0,0 +1,111 @@
+Index: cups/thread-private.h
+===================================================================
+--- cups/thread-private.h	(Revision 10434)
++++ cups/thread-private.h	(Revision 10435)
+@@ -3,7 +3,7 @@
+  *
+  *   Private threading definitions for CUPS.
+  *
+- *   Copyright 2009-2010 by Apple Inc.
++ *   Copyright 2009-2012 by Apple Inc.
+  *
+  *   These coded instructions, statements, and computer programs are the
+  *   property of Apple Inc. and are protected by Federal copyright
+Index: cups/thread.c
+===================================================================
+--- cups/thread.c	(Revision 10434)
++++ cups/thread.c	(Revision 10435)
+@@ -3,7 +3,7 @@
+  *
+  *   Threading primitives for CUPS.
+  *
+- *   Copyright 2009-2010 by Apple Inc.
++ *   Copyright 2009-2012 by Apple Inc.
+  *
+  *   These coded instructions, statements, and computer programs are the
+  *   property of Apple Inc. and are protected by Federal copyright
+@@ -113,7 +113,7 @@
+  * '_cupsThreadCreate()' - Create a thread.
+  */
+ 
+-int					/* O - 0 on failure, 1 on success */	
++int					/* O - 0 on failure, 1 on success */
+ _cupsThreadCreate(
+     _cups_thread_func_t func,		/* I - Entry point */
+     void                *arg)		/* I - Entry point context */
+@@ -223,7 +223,7 @@
+  * '_cupsThreadCreate()' - Create a thread.
+  */
+ 
+-int					/* O - 0 on failure, 1 on success */	
++int					/* O - 0 on failure, 1 on success */
+ _cupsThreadCreate(
+     _cups_thread_func_t func,		/* I - Entry point */
+     void                *arg)		/* I - Entry point context */
+@@ -309,6 +309,25 @@
+ {
+   (void)rwlock;
+ }
++
++
++/*
++ * '_cupsThreadCreate()' - Create a thread.
++ */
++
++int					/* O - 0 on failure, 1 on success */
++_cupsThreadCreate(
++    _cups_thread_func_t func,		/* I - Entry point */
++    void                *arg)		/* I - Entry point context */
++{
++  fputs("DEBUG: CUPS was compiled without threading support, no thread "
++        "created.\n", stderr);
++
++  (void)func;
++  (void)arg;
++
++  return (0);
++}
+ #endif /* HAVE_PTHREAD_H */
+ 
+ 
+Index: cups/globals.c
+===================================================================
+--- cups/globals.c	(Revision 10434)
++++ cups/globals.c	(Revision 10435)
+@@ -44,8 +44,10 @@
+ static pthread_once_t	cups_globals_key_once = PTHREAD_ONCE_INIT;
+ 					/* One-time initialization object */
+ #endif /* HAVE_PTHREAD_H */
++#if defined(HAVE_PTHREAD_H) || defined(WIN32)
+ static _cups_mutex_t	cups_global_mutex = _CUPS_MUTEX_INITIALIZER;
+ 					/* Global critical section */
++#endif /* HAVE_PTHREAD_H || WIN32 */
+ 
+ 
+ /*
+@@ -56,7 +58,9 @@
+ static void		cups_fix_path(char *path);
+ #endif /* WIN32 */
+ static _cups_globals_t	*cups_globals_alloc(void);
++#if defined(HAVE_PTHREAD_H) || defined(WIN32)
+ static void		cups_globals_free(_cups_globals_t *g);
++#endif /* HAVE_PTHREAD_H || WIN32 */
+ #ifdef HAVE_PTHREAD_H
+ static void		cups_globals_init(void);
+ #endif /* HAVE_PTHREAD_H */
+@@ -322,6 +326,7 @@
+  * 'cups_globals_free()' - Free global data.
+  */
+ 
++#if defined(HAVE_PTHREAD_H) || defined(WIN32)
+ static void
+ cups_globals_free(_cups_globals_t *cg)	/* I - Pointer to global data */
+ {
+@@ -354,6 +359,7 @@
+ 
+   free(cg);
+ }
++#endif /* HAVE_PTHREAD_H || WIN32 */
+ 
+ 
+ #ifdef HAVE_PTHREAD_H