diff --git a/x11/xfce4/xfprint/Makefile b/x11/xfce4/xfprint/Makefile index 2ee844cb2d8..b1731aed88f 100644 --- a/x11/xfce4/xfprint/Makefile +++ b/x11/xfce4/xfprint/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.20 2010/11/22 08:37:06 espie Exp $ +# $OpenBSD: Makefile,v 1.21 2011/01/03 13:11:49 landry Exp $ COMMENT= Xfce4 printing helper XFCE_PROJECT= xfprint XFCE_VERSION= 4.6.1 -REVISION= 6 +REVISION= 7 MASTER_SITES= http://archive.xfce.org/src/archive/${XFCE_PROJECT}/${XFCE_BRANCH}/ SHARED_LIBS= xfprint 0.1 diff --git a/x11/xfce4/xfprint/patches/patch-xfprint-manager_main_c b/x11/xfce4/xfprint/patches/patch-xfprint-manager_main_c new file mode 100644 index 00000000000..1e41dfd7a3d --- /dev/null +++ b/x11/xfce4/xfprint/patches/patch-xfprint-manager_main_c @@ -0,0 +1,32 @@ +$OpenBSD: patch-xfprint-manager_main_c,v 1.1 2011/01/03 13:11:49 landry Exp $ +http://bugzilla.xfce.org/show_bug.cgi?id=5160 +--- xfprint-manager/main.c.orig Tue Feb 24 22:34:16 2009 ++++ xfprint-manager/main.c Mon Jan 3 13:50:06 2011 +@@ -41,6 +41,7 @@ + #include + + #define CHANNEL "xfprint" ++#define PROP_PRINTING_SYSTEM "/printing-system" + + extern void mainwin_setup (void); + +@@ -66,15 +67,15 @@ main (int argc, char **argv) + 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); ++ 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: %s is not set", PACKAGE, PROP_PRINTING_SYSTEM); + } + } +