Revision bump to include a upstream patch, fixing segfault when no default printer is selected. Upstream bug report #3816.

Package-Manager: portage-2.1.4

5 files changed, 82 insertions, 6 deletions

diff --git a/xfce-base/xfprint/ChangeLog b/xfce-base/xfprint/ChangeLog
index fcdb7db6784c..2e16b54ba2f1 100644
--- a/xfce-base/xfprint/ChangeLog
+++ b/xfce-base/xfprint/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for xfce-base/xfprint
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfprint/ChangeLog,v 1.107 2007/12/17 18:45:45 jer Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfprint/ChangeLog,v 1.108 2008/01/25 07:37:23 drac Exp $
+
+*xfprint-4.4.2-r1 (25 Jan 2008)
+
+  25 Jan 2008; Samuli Suominen <drac@gentoo.org>
+  +files/xfprint-4.4.2-no-default-printer.patch, +xfprint-4.4.2-r1.ebuild:
+  Revision bump to include a upstream patch, fixing segfault when no default
+  printer is selected. Upstream bug report #3816.
 
   17 Dec 2007; Jeroen Roovers <jer@gentoo.org> xfprint-4.4.2.ebuild:
   Stable for HPPA (bug #201747).
diff --git a/xfce-base/xfprint/Manifest b/xfce-base/xfprint/Manifest
index 2b8b5508d68b..d6c56fdc8a3c 100644
--- a/xfce-base/xfprint/Manifest
+++ b/xfce-base/xfprint/Manifest
@@ -1,17 +1,25 @@
+AUX xfprint-4.4.2-no-default-printer.patch 685 RMD160 16ca14f039017f723cbff2e9df0111e7a0389103 SHA1 29574837766637b702418466d2e8bc641f6c0aff SHA256 ea666ee9f45788ebc004c20372e4102d760a6502c98a8d86c5b475bfacc272e0
+MD5 45e5cd20b2fc83bb4bd570abe33b2ab7 files/xfprint-4.4.2-no-default-printer.patch 685
+RMD160 16ca14f039017f723cbff2e9df0111e7a0389103 files/xfprint-4.4.2-no-default-printer.patch 685
+SHA256 ea666ee9f45788ebc004c20372e4102d760a6502c98a8d86c5b475bfacc272e0 files/xfprint-4.4.2-no-default-printer.patch 685
 DIST xfprint-4.4.1.tar.bz2 866136 RMD160 a81078ff815a39c1b97181727ab4572552276caa SHA1 28da63a9a47ae4ae528ab24b35a035f583efb1e4 SHA256 d7cc1e97df01f50eb6a0e93f5dd8935de7dffce93baf92cd6da3311bfc377935
 DIST xfprint-4.4.2.tar.bz2 827277 RMD160 70b3357250f585a58e982a4c2edfd6aaf0e1e0b5 SHA1 ad775ac77894e9d946711181e812fdc6edd725a7 SHA256 b9bb03820a8ba1995ffe3e5b96b6d5ebbbc0347ad1202172f13bba63b2984d54
 EBUILD xfprint-4.4.1.ebuild 1070 RMD160 3f25586a81821422a14de130004ee1f016c190d5 SHA1 fee0307e64ed389dd4bbf45e7e99114b846bdd0e SHA256 0391a9cb90d9e8233ca98c2ef64ba64270c04a96711b13bf26e2cea791aefef1
 MD5 070edafdb2049e319b7a18e7bfe5764d xfprint-4.4.1.ebuild 1070
 RMD160 3f25586a81821422a14de130004ee1f016c190d5 xfprint-4.4.1.ebuild 1070
 SHA256 0391a9cb90d9e8233ca98c2ef64ba64270c04a96711b13bf26e2cea791aefef1 xfprint-4.4.1.ebuild 1070
+EBUILD xfprint-4.4.2-r1.ebuild 1184 RMD160 6085d9859116e38e21c8973abd7a2dd7d9a764e0 SHA1 5cea7deeeb4e673a2dd5b1344330514affcaa4e1 SHA256 cc7a228d34f8787e4a0d562f2479b52d87f8f0f21aedc441684b97cd577befab
+MD5 a1ab587cd9d5238b468d64eae250866a xfprint-4.4.2-r1.ebuild 1184
+RMD160 6085d9859116e38e21c8973abd7a2dd7d9a764e0 xfprint-4.4.2-r1.ebuild 1184
+SHA256 cc7a228d34f8787e4a0d562f2479b52d87f8f0f21aedc441684b97cd577befab xfprint-4.4.2-r1.ebuild 1184
 EBUILD xfprint-4.4.2.ebuild 1070 RMD160 b212c5a6d54f8749234541951c2d77e8285b5048 SHA1 ed68834d90884b039a2c6d33c7fd00460947b946 SHA256 9469b1282f42184d272146d7860f1f71ac3ac05a0897c468867e0242984925d5
 MD5 8cc081b2b20442d81bc02e090d97ede5 xfprint-4.4.2.ebuild 1070
 RMD160 b212c5a6d54f8749234541951c2d77e8285b5048 xfprint-4.4.2.ebuild 1070
 SHA256 9469b1282f42184d272146d7860f1f71ac3ac05a0897c468867e0242984925d5 xfprint-4.4.2.ebuild 1070
-MISC ChangeLog 12709 RMD160 3b4db7a29f9457e054498e9d51c374dcce66bda1 SHA1 9f325cc3cb1b0ccb08fae05e713ee02aae91eb44 SHA256 fece7e9d75613898ddc37bf061e812b802b3b28e78b3eb3dd2b01d0588329ca9
-MD5 555034b994c29a3f457e5d29bb27ca37 ChangeLog 12709
-RMD160 3b4db7a29f9457e054498e9d51c374dcce66bda1 ChangeLog 12709
-SHA256 fece7e9d75613898ddc37bf061e812b802b3b28e78b3eb3dd2b01d0588329ca9 ChangeLog 12709
+MISC ChangeLog 12995 RMD160 f53645840a10c58f90771680f39e0a9e319ac707 SHA1 9d242fd978ed04adfbe988625d37f25c43909673 SHA256 ba6096bdf02b1854860067ea6bceb38c63e10e1efb0450c7d4b3c083fcf861fa
+MD5 f8e941ba766209b80a8dc72acb04514b ChangeLog 12995
+RMD160 f53645840a10c58f90771680f39e0a9e319ac707 ChangeLog 12995
+SHA256 ba6096bdf02b1854860067ea6bceb38c63e10e1efb0450c7d4b3c083fcf861fa ChangeLog 12995
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
@@ -22,3 +30,6 @@ SHA256 b9b8b5c1597168237f19a1ad127496ca3f9eace9fdaa6c071dd5a9a370bdd8f5 files/di
 MD5 80e0e9b51902a9dae1071d1b0f78e5c5 files/digest-xfprint-4.4.2 244
 RMD160 ad8944a2b614c192dbc8e57f2dfc298845f55044 files/digest-xfprint-4.4.2 244
 SHA256 def9fb8753f617ea165c51af40b04b92637c9954f7aafcb262f2a7f80219958a files/digest-xfprint-4.4.2 244
+MD5 80e0e9b51902a9dae1071d1b0f78e5c5 files/digest-xfprint-4.4.2-r1 244
+RMD160 ad8944a2b614c192dbc8e57f2dfc298845f55044 files/digest-xfprint-4.4.2-r1 244
+SHA256 def9fb8753f617ea165c51af40b04b92637c9954f7aafcb262f2a7f80219958a files/digest-xfprint-4.4.2-r1 244
diff --git a/xfce-base/xfprint/files/digest-xfprint-4.4.2-r1 b/xfce-base/xfprint/files/digest-xfprint-4.4.2-r1
new file mode 100644
index 000000000000..06903e8c50d6
--- /dev/null
+++ b/xfce-base/xfprint/files/digest-xfprint-4.4.2-r1
@@ -0,0 +1,3 @@
+MD5 be4802807e74dea30f4825102ceff5c5 xfprint-4.4.2.tar.bz2 827277
+RMD160 70b3357250f585a58e982a4c2edfd6aaf0e1e0b5 xfprint-4.4.2.tar.bz2 827277
+SHA256 b9bb03820a8ba1995ffe3e5b96b6d5ebbbc0347ad1202172f13bba63b2984d54 xfprint-4.4.2.tar.bz2 827277
diff --git a/xfce-base/xfprint/files/xfprint-4.4.2-no-default-printer.patch b/xfce-base/xfprint/files/xfprint-4.4.2-no-default-printer.patch
new file mode 100644
index 000000000000..448671cd0e10
--- /dev/null
+++ b/xfce-base/xfprint/files/xfprint-4.4.2-no-default-printer.patch
@@ -0,0 +1,11 @@
+--- xfprint/print_dialog.c.orig	2008-01-24 19:59:21.000000000 +0100
++++ xfprint/print_dialog.c	2008-01-24 19:59:53.000000000 +0100
+@@ -406,7 +406,7 @@
+                         PRINTER_NAME_COLUMN, printer_data->name, 
+                         PRINTER_ALIAS_COLUMN, printer_data->alias ? printer_data->alias : "", -1);
+     
+-    if (!default_printer_found && g_ascii_strcasecmp (default_printer->name, printer_data->name) == 0) {
++    if (default_printer && !default_printer_found && g_ascii_strcasecmp (default_printer->name, printer_data->name) == 0) {
+       default_printer_found = TRUE;
+       gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->combobox_printer), &iter);
+     }
diff --git a/xfce-base/xfprint/xfprint-4.4.2-r1.ebuild b/xfce-base/xfprint/xfprint-4.4.2-r1.ebuild
new file mode 100644
index 000000000000..efbdefcf33a7
--- /dev/null
+++ b/xfce-base/xfprint/xfprint-4.4.2-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfprint/xfprint-4.4.2-r1.ebuild,v 1.1 2008/01/25 07:37:23 drac Exp $
+
+inherit eutils xfce44
+
+XFCE_VERSION=4.4.2
+xfce44
+
+DESCRIPTION="Frontend for printing, management and job queue."
+HOMEPAGE="http://www.xfce.org/projects/xfprint"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="cups debug doc"
+
+RDEPEND="cups? ( net-print/cups )
+	!cups? ( net-print/lprng )
+	>=dev-libs/glib-2.6
+	>=x11-libs/gtk+-2.6
+	>=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION}
+	>=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
+	>=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
+	>=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}
+	app-text/a2ps"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	doc? ( dev-util/gtk-doc )"
+
+pkg_setup() {
+	if use cups; then
+		XFCE_CONFIG="${XFCE_CONFIG} --enable-bsdlpr --enable-cups"
+	else
+		XFCE_CONFIG="${XFCE_CONFIG} --enable-bsdlpr"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-no-default-printer.patch
+}
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+xfce44_core_package