[arch-commits] Commit in xfprint/trunk (PKGBUILD xfprint-manager-fix.diff)
andyrtr at archlinux.org
andyrtr at archlinux.org
Thu Jul 15 21:39:23 UTC 2010
Date: Thursday, July 15, 2010 @ 17:39:23
Author: andyrtr
Revision: 85560
upgpkg: xfprint 4.6.1-4
fix printers not showing up in xfprint-manager, #19965
Added:
xfprint/trunk/xfprint-manager-fix.diff
Modified:
xfprint/trunk/PKGBUILD
--------------------------+
PKGBUILD | 21 +++++++++++++++------
xfprint-manager-fix.diff | 29 +++++++++++++++++++++++++++++
2 files changed, 44 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-07-15 21:26:03 UTC (rev 85559)
+++ PKGBUILD 2010-07-15 21:39:23 UTC (rev 85560)
@@ -3,7 +3,7 @@
pkgname=xfprint
pkgver=4.6.1
-pkgrel=3
+pkgrel=4
pkgdesc="A print dialog and a printer manager for Xfce"
arch=(i686 x86_64)
license=('GPL2')
@@ -14,13 +14,22 @@
makedepends=('pkgconfig' 'intltool')
options=('!libtool')
install=${pkgname}.install
-source=(http://www.xfce.org/archive/xfce-${pkgver}/src/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('d92fca97a42816085080baf07a99a62e')
+source=(http://www.xfce.org/archive/xfce-${pkgver}/src/${pkgname}-${pkgver}.tar.bz2
+ xfprint-manager-fix.diff)
+md5sums=('d92fca97a42816085080baf07a99a62e'
+ '69b3619a285e94d602a1d0ac08f4ca06')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
+ # fix xfprint-manager not showing cups printers
+ # see http://bugs.archlinux.org/task/19965, http://bugs.gentoo.org/278047, http://bugzilla.xfce.org/show_bug.cgi?id=6089
+ patch -Np0 -i ${srcdir}/xfprint-manager-fix.diff
./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
- --localstatedir=/var --disable-static || return 1
- make || return 1
- make DESTDIR=${pkgdir} install || return 1
+ --localstatedir=/var --disable-static
+ make
}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+}
Added: xfprint-manager-fix.diff
===================================================================
--- xfprint-manager-fix.diff (rev 0)
+++ xfprint-manager-fix.diff 2010-07-15 21:39:23 UTC (rev 85560)
@@ -0,0 +1,29 @@
+--- xfprint-manager/main.c 2009-02-24 21:34:16.000000000 +0000
++++ xfprint-manager/main.c.new 2010-07-15 21:30:51.098745852 +0000
+@@ -41,6 +41,7 @@
+ #include <libxfprint/printer-list-window.h>
+
+ #define CHANNEL "xfprint"
++#define PROP_PRINTING_SYSTEM "/printing-system"
+
+ extern void mainwin_setup (void);
+
+@@ -66,15 +67,15 @@
+ channel = xfconf_channel_new (CHANNEL);
+ if (channel) {
+
+- if (xfconf_channel_has_property (channel, "/XfPrint/system")) {
+- const gchar *system_name = xfconf_channel_get_string (channel, "/XfPrint/system", "none");
++ if (xfconf_channel_has_property (channel, PROP_PRINTING_SYSTEM)) {
++ const gchar *system_name = xfconf_channel_get_string (channel, PROP_PRINTING_SYSTEM, "none");
+ if (g_ascii_strcasecmp (system_name, "none") != 0) {
+ ps = printing_system_new (system_name);
+ if (ps == NULL);
+ g_warning ("Unable to load printing system module %s", system_name);
+ }
+ } else {
+- g_warning ("%s: XfPrint/system is not set", PACKAGE);
++ g_warning ("%s: XfPrint/printing-system is not set", PACKAGE);
+ }
+ }
+
More information about the arch-commits
mailing list