Fix building with >=glib-2.31 (bug #400789, thanks to Rolf S. Arvidson for reporting). Fix g_list_find_custom() argument order. Don't build static libraries and don't install .la files.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

5 files changed, 196 insertions, 9 deletions

diff --git a/net-print/libgnomecups/ChangeLog b/net-print/libgnomecups/ChangeLog
index f5c9891c1bf1..9a5059c8ee09 100644
--- a/net-print/libgnomecups/ChangeLog
+++ b/net-print/libgnomecups/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-print/libgnomecups
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/libgnomecups/ChangeLog,v 1.74 2011/10/05 17:02:45 xarthisius Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/libgnomecups/ChangeLog,v 1.75 2012/01/25 22:12:03 tetromino Exp $
+
+*libgnomecups-0.2.3-r2 (25 Jan 2012)
+
+  25 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +libgnomecups-0.2.3-r2.ebuild,
+  +files/libgnomecups-0.2.3-g_list_find_custom.patch,
+  +files/libgnomecups-0.2.3-glib.h.patch:
+  Fix building with >=glib-2.31 (bug #400789, thanks to Rolf S. Arvidson for
+  reporting). Fix g_list_find_custom() argument order. Don't build static
+  libraries and don't install .la files.
 
   05 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org>
   libgnomecups-0.2.3-r1.ebuild:
diff --git a/net-print/libgnomecups/Manifest b/net-print/libgnomecups/Manifest
index b2d6775f5ca8..cd47db37ed2c 100644
--- a/net-print/libgnomecups/Manifest
+++ b/net-print/libgnomecups/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX enablenet.patch 550 RMD160 5cdb35d70b2260e33bd13286bf8735bb880f990f SHA1 ab01fd24660c2cfb4d604a387b22206fc572d88e SHA256 14885c66f2367d6a9e21a2e542b844b5be4e52a8a7d0c400c4cc477cadcea3b1
+AUX libgnomecups-0.2.3-g_list_find_custom.patch 3300 RMD160 b307a706c20f911ceb97aa89976320cff614d131 SHA1 f18536edee13564341a3f1b6889623279f1aa535 SHA256 8242cca424d91560dbc78e85501632a8649a4fa53f137853599f67f35b07f40f
+AUX libgnomecups-0.2.3-glib.h.patch 1017 RMD160 a3302078c3f72eedc7c368602e04565e6664a38b SHA1 1302f16ac22864dbc193f87b0e202ab51bdbd015 SHA256 647f51deae54fbca376ad9febdb9047d4bc4f1f80be76abc671297e76176c3f5
 AUX libgnomecups-0.2.3-pkgconfig.patch 404 RMD160 aaed276bf99c34b49b855fed9ddb7fc580971b85 SHA1 8462a946185dcd3aaa381e9d9379fbc75d27e2ad SHA256 ac43b6c676659605911437a30c31bd30af869798dddae8f22ac6e485344cdff3
 DIST libgnomecups-0.2.3.tar.bz2 357129 RMD160 22b833359aae237067919e76c2345689e1d0505a SHA1 09d4dc4e4cf40baa1ced95a7a6b287db3cb5a47c SHA256 e130e80942b386de19a288a4c194ff3dbe9140315b31e982058c8bffbb6a1d29
 EBUILD libgnomecups-0.2.3-r1.ebuild 784 RMD160 d9945312106ddfd026d08b064b4ff4a240735def SHA1 14fc8ab4f3e0c56904be7929f1b15c99d80882e0 SHA256 91f6abd0e6bd1b21e71b8a7dc7809da589cc3f7204a67cb3f62efc381086bc02
+EBUILD libgnomecups-0.2.3-r2.ebuild 1125 RMD160 c0146b2d0d7968226cf6fc9dddc21e6f8f0d429f SHA1 fd39a729156d998775bff99d968a9e1dc98703b8 SHA256 423792229ccd230f742a2589aa86ffe866edff466a64b42ee8a37835442bf482
 EBUILD libgnomecups-0.2.3.ebuild 668 RMD160 26e571c1265603211b656c8288c12015f3d3e718 SHA1 0466a501812bb9b6ff7ddc914cc9c2c46e18e95c SHA256 a70c5c07a99124447a64dbeaa0ad61a375116111ea988f02faafe00fcc423d04
-MISC ChangeLog 8911 RMD160 f7b7cd5c65d4f0d47ebe89440ff250b5d94d1516 SHA1 41bc146b7114fd93d1a61b8d9a0788f5f6ccb9f6 SHA256 ac04377e9320cee5d50c43470a791749d335b08b1cfbe914fddc4ae47922dfb7
+MISC ChangeLog 9329 RMD160 1ad6bdc7f98d5d9c770c0e3e1e8fec6cb892bca2 SHA1 814326fb391fde13f71a86cad4a2a8e240cda794 SHA256 438c5077b6de030c3be175f73567c4c5b4b82ec36969a82c75f09f9b2ef97257
 MISC metadata.xml 180 RMD160 082aa46c6fe033d8548d5351c7073d98a11e952b SHA1 f006fd73fec1f95de0831e1d942d6078620fe43f SHA256 21576b6f9d195cfd7a7f38ef661ffad9e39e979c1c98c9af12ce85398fc133a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk6MjbsACgkQIiMqcbOVdxR6vQP5AY5Wk1a2Tsku9mEvj851rrq9
-OlxzOIak7nrNGbkotP6w0R2HT+6Hd9lmwhR16JCh6BCX49sydgJN++fmwSPFZ5od
-W7RjTj6Zk8lx28k6+rcn1lBm4cE/RiCIHlJjdrOqiF4kkX2L4Vbi4TM4kH29DsBO
-KyYbCGYm1LQ8eY0FDmQ=
-=1cIC
+iF4EAREIAAYFAk8gfjkACgkQdjK8w9WeBnCX0AEAoAqTF0qkI/WtcL4i+Ycooztx
+ZQgsE6RoTf9p44vMBzsA/0IH+WV4alsj1mXRWQEKdHXkm4Gf5pSm11u2nY/jaITc
+=dm/6
 -----END PGP SIGNATURE-----
diff --git a/net-print/libgnomecups/files/libgnomecups-0.2.3-g_list_find_custom.patch b/net-print/libgnomecups/files/libgnomecups-0.2.3-g_list_find_custom.patch
new file mode 100644
index 000000000000..3383cde16786
--- /dev/null
+++ b/net-print/libgnomecups/files/libgnomecups-0.2.3-g_list_find_custom.patch
@@ -0,0 +1,94 @@
+From 14979a2356fd751d82d037db65ce92072097bbf3 Mon Sep 17 00:00:00 2001
+From: Kjartan Maraas <kmaraas@gnome.org>
+Date: Wed, 30 Jan 2008 17:30:43 +0000
+Subject: [PATCH] Fix some warnings. Fix wrong order of arguments to
+ g_list_find_custom.
+
+2008-01-30  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* libgnomecups/gnome-cups-printer.c: (set_timeout),
+	(gnome_cups_printer_get_state_name),
+	(_gnome_cups_printer_get_host): Fix some warnings.
+	* libgnomecups/gnome-cups-queue.c: (gnome_cups_queue_get_job):
+	Fix wrong order of arguments to g_list_find_custom.
+
+svn path=/trunk/; revision=237
+---
+ ChangeLog                         |    8 ++++++++
+ libgnomecups/gnome-cups-printer.c |    7 +++----
+ libgnomecups/gnome-cups-queue.c   |    4 ++--
+ 3 files changed, 13 insertions(+), 6 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index b41ac9e..166c87a 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,11 @@
++2008-01-30  Kjartan Maraas  <kmaraas@gnome.org>
++
++	* libgnomecups/gnome-cups-printer.c: (set_timeout),
++	(gnome_cups_printer_get_state_name),
++	(_gnome_cups_printer_get_host): Fix some warnings.
++	* libgnomecups/gnome-cups-queue.c: (gnome_cups_queue_get_job):
++	Fix wrong order of arguments to g_list_find_custom.
++
+ 2008-01-18  Gil Forcada  <gforcada@gnome.org>
+ 
+ 	* configure.in: Added mk, tr and zh_HK to ALL_LINGUAS.
+diff --git a/libgnomecups/gnome-cups-printer.c b/libgnomecups/gnome-cups-printer.c
+index 9c5c7d3..704f205 100644
+--- a/libgnomecups/gnome-cups-printer.c
++++ b/libgnomecups/gnome-cups-printer.c
+@@ -791,7 +791,7 @@ set_timeout (void)
+ 
+ 	if (should_timeout && !update_timeout_id) {
+ 		update_timeout_id = g_timeout_add (UPDATE_TIMEOUT, 
+-						   update_printers_timeout,
++						   (GSourceFunc)update_printers_timeout,
+ 						   NULL);
+ 	} else if (!should_timeout && update_timeout_id) {
+ 		g_source_remove (update_timeout_id);
+@@ -1069,7 +1069,6 @@ gnome_cups_printer_get_state (GnomeCupsPrinter *printer)
+ const char *
+ gnome_cups_printer_get_state_name (GnomeCupsPrinter *printer)
+ {
+-	const char *state_str;
+ 	ipp_pstate_t state;
+ 
+ 	g_return_val_if_fail (GNOME_CUPS_IS_PRINTER (printer), NULL);
+@@ -1079,7 +1078,7 @@ gnome_cups_printer_get_state_name (GnomeCupsPrinter *printer)
+ 
+ 	state = printer->details->state;
+ 
+-	return state_str =  _(printer_state_strings[state - IPP_PRINTER_IDLE]);
++	return _(printer_state_strings[state - IPP_PRINTER_IDLE]);
+ }
+ 
+ const char *
+@@ -2001,7 +2000,7 @@ _gnome_cups_printer_get_host (GnomeCupsPrinter *printer)
+ {
+ 	gchar *host = NULL;
+ 
+-#warning this is broken for smb://user:pass@host/printer urls
++	/* warning this is broken for smb://user:pass@host/printer urls */
+ 	if (go_directly_to_printer_when_possible &&
+ 	    printer->details->printer_uri) {
+ 		gchar *x, *y;
+diff --git a/libgnomecups/gnome-cups-queue.c b/libgnomecups/gnome-cups-queue.c
+index d9b9a92..9f98ed9 100644
+--- a/libgnomecups/gnome-cups-queue.c
++++ b/libgnomecups/gnome-cups-queue.c
+@@ -413,8 +413,8 @@ gnome_cups_queue_get_job (GnomeCupsQueue *queue,
+ {
+ 	if (cache_ok) {
+ 		GList *link = g_list_find_custom (queue->details->jobs,
+-						  (GCompareFunc) find_job_by_id,
+-						  GINT_TO_POINTER (job_id));
++						  GINT_TO_POINTER (job_id),
++						  (GCompareFunc) find_job_by_id);
+ 		if (link)
+ 			return gnome_cups_job_dup (link->data);
+ 	}
+-- 
+1.7.8.4
+
diff --git a/net-print/libgnomecups/files/libgnomecups-0.2.3-glib.h.patch b/net-print/libgnomecups/files/libgnomecups-0.2.3-glib.h.patch
new file mode 100644
index 000000000000..3f73af861c04
--- /dev/null
+++ b/net-print/libgnomecups/files/libgnomecups-0.2.3-glib.h.patch
@@ -0,0 +1,38 @@
+From d84eee9450b3b6f6155074915efc61bedcc8d446 Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Sun, 27 Nov 2011 21:36:41 +0100
+Subject: [PATCH] Fix: Only glib.h can be included
+
+---
+ libgnomecups/gnome-cups-i18n.c |    2 +-
+ libgnomecups/gnome-cups-init.h |    3 +--
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/libgnomecups/gnome-cups-i18n.c b/libgnomecups/gnome-cups-i18n.c
+index 8987c5c..127756d 100644
+--- a/libgnomecups/gnome-cups-i18n.c
++++ b/libgnomecups/gnome-cups-i18n.c
+@@ -1,5 +1,5 @@
+ #include <config.h>
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include "gnome-cups-i18n.h"
+ 
+ #ifdef ENABLE_NLS
+diff --git a/libgnomecups/gnome-cups-init.h b/libgnomecups/gnome-cups-init.h
+index 22b682a..c4600fc 100644
+--- a/libgnomecups/gnome-cups-init.h
++++ b/libgnomecups/gnome-cups-init.h
+@@ -1,8 +1,7 @@
+ #ifndef GNOME_CUPS_INIT
+ #define GNOME_CUPS_INIT
+ 
+-#include <glib/gtypes.h>
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+-- 
+1.7.7
+
diff --git a/net-print/libgnomecups/libgnomecups-0.2.3-r2.ebuild b/net-print/libgnomecups/libgnomecups-0.2.3-r2.ebuild
new file mode 100644
index 000000000000..07942e51c1f6
--- /dev/null
+++ b/net-print/libgnomecups/libgnomecups-0.2.3-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/libgnomecups/libgnomecups-0.2.3-r2.ebuild,v 1.1 2012/01/25 22:12:03 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit eutils gnome2
+
+DESCRIPTION="GNOME cups library"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2:2
+	>=net-print/cups-1.3.8"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.28"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --disable-static"
+	DOCS="AUTHORS ChangeLog NEWS"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/enablenet.patch
+
+	# Fix .pc file per bug #235013
+	epatch "${FILESDIR}"/${P}-pkgconfig.patch
+
+	# Upstream fix for g_list_find_custom() argument order
+	epatch "${FILESDIR}/${P}-g_list_find_custom.patch"
+
+	# >=glib-2.31 compat, bug #400789, https://bugzilla.gnome.org/show_bug.cgi?id=664930
+	epatch "${FILESDIR}/${P}-glib.h.patch"
+
+	gnome2_src_prepare
+}