From 85ece8f6dfa0e1534af2dde2c028120f7bdab93a Mon Sep 17 00:00:00 2001
From: drochner <drochner>
Date: Thu, 31 Mar 2005 18:12:29 +0000
Subject: keep the printing widget / printer manager from crashing immediately,
 and make "lpr" printing basically work: - pass "-export-dynamic" to the
 programs which dynamically load the   printing system specific plugin (do
 this by adding the "gmodule"   linker flags) - set the printcap file to
 /etc/printcap

---
 print/xfce4-print/Makefile         |  4 +++-
 print/xfce4-print/distinfo         |  4 +++-
 print/xfce4-print/patches/patch-aa | 14 ++++++++++++++
 print/xfce4-print/patches/patch-ab | 14 ++++++++++++++
 4 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 print/xfce4-print/patches/patch-aa
 create mode 100644 print/xfce4-print/patches/patch-ab

(limited to 'print')

diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index a1567965778..b0ea35853ec 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/02/10 12:25:33 martti Exp $
+# $NetBSD: Makefile,v 1.10 2005/03/31 18:12:29 drochner Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -7,6 +7,8 @@ DISTNAME=	xfprint-${XFCE4_VERSION}
 CATEGORIES=	print
 COMMENT=	XFce4 print dialog
 
+CONFIGURE_ARGS+=	--with-printcap=/etc/printcap
+
 .include "../../print/a2ps/buildlink3.mk"
 
 .if defined(USE_CUPS)
diff --git a/print/xfce4-print/distinfo b/print/xfce4-print/distinfo
index a16ab62bebf..4b38042497b 100644
--- a/print/xfce4-print/distinfo
+++ b/print/xfce4-print/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.10 2005/03/18 07:59:09 martti Exp $
+$NetBSD: distinfo,v 1.11 2005/03/31 18:12:29 drochner Exp $
 
 SHA1 (xfprint-4.2.1.tar.gz) = 3b8e8c109fe0693a26738a0b279b57f52069a992
 RMD160 (xfprint-4.2.1.tar.gz) = e97a07e3b23322cdae7cf1ba68ee44a7076e3a7d
 Size (xfprint-4.2.1.tar.gz) = 687685 bytes
+SHA1 (patch-aa) = 09839619deef15afc2eee0a9e4e72109b6191398
+SHA1 (patch-ab) = dc426a6d42dabbef20b46c7d4d73744e5101570d
diff --git a/print/xfce4-print/patches/patch-aa b/print/xfce4-print/patches/patch-aa
new file mode 100644
index 00000000000..6cb52afeab3
--- /dev/null
+++ b/print/xfce4-print/patches/patch-aa
@@ -0,0 +1,14 @@
+$NetBSD: patch-aa,v 1.1 2005/03/31 18:12:29 drochner Exp $
+
+--- xfprint/Makefile.in.orig	2005-03-18 14:06:27.000000000 +0100
++++ xfprint/Makefile.in
+@@ -266,7 +266,8 @@ xfprint4_CFLAGS = \
+ xfprint4_LDADD = \
+ 	$(top_builddir)/common/libxfprint.la				\
+ 	@LIBXFCE4MCS_CLIENT_LIBS@                                       \
+-	@LIBXFCEGUI4_LIBS@
++	@LIBXFCEGUI4_LIBS@ \
++	@GMODULE_LIBS@
+ 
+ EXTRA_DIST = xfprint.desktop
+ appsdir = $(datadir)/applications
diff --git a/print/xfce4-print/patches/patch-ab b/print/xfce4-print/patches/patch-ab
new file mode 100644
index 00000000000..e3c69acec5e
--- /dev/null
+++ b/print/xfce4-print/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.1 2005/03/31 18:12:29 drochner Exp $
+
+--- xfprint-manager/Makefile.in.orig	2005-03-18 14:19:47.000000000 +0100
++++ xfprint-manager/Makefile.in
+@@ -261,7 +261,8 @@ xfprint_manager_CFLAGS = \
+ xfprint_manager_LDADD = \
+ 	$(top_builddir)/common/libxfprint.la				\
+ 	@LIBXFCE4MCS_CLIENT_LIBS@					\
+-	@LIBXFCEGUI4_LIBS@						
++	@LIBXFCEGUI4_LIBS@ \
++	@GMODULE_LIBS@						
+ 
+ EXTRA_DIST = xfprint-manager.desktop
+ appsdir = $(datadir)/applications
-- 
cgit v1.2.3