aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwm <kwm@FreeBSD.org>2015-12-28 05:39:45 +0800
committerkwm <kwm@FreeBSD.org>2015-12-28 05:39:45 +0800
commitb6554b12e9330b2c96142f26c3f6e8d56b05a1e2 (patch)
tree11855c2525ee383703e161cb773e52e0de1a23a4
parent325aa673ff678a3a15a307a98f004b9e0c5f635d (diff)
downloadfreebsd-ports-gnome-b6554b12e9330b2c96142f26c3f6e8d56b05a1e2.tar.gz
freebsd-ports-gnome-b6554b12e9330b2c96142f26c3f6e8d56b05a1e2.tar.zst
freebsd-ports-gnome-b6554b12e9330b2c96142f26c3f6e8d56b05a1e2.zip
Enable lpr printing agian.
While configure happily reported lpr is enabled and the module was installed. The print code wasn't configured to use lpr. The reason for this is that the configure of this code moved from the gtk/Makefile to configure. Remove the now obsolete sed line. Reported by: dinoex@ Tested by: dinoex@
-rw-r--r--x11-toolkits/gtk30/Makefile4
-rw-r--r--x11-toolkits/gtk30/files/patch-configure12
2 files changed, 13 insertions, 3 deletions
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index af790fc58074..3d404a7cf70e 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -5,7 +5,7 @@
PORTNAME= gtk
PORTVERSION= 3.16.7
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMESUFFIX= 3
@@ -84,8 +84,6 @@ TYPEAHEAD_EXTRA_PATCHES=${FILESDIR}/extra-gtk_gtkfilechooserwidget.c \
post-patch:
@${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \
${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|file,cups|file,cups,lpr|' \
- ${WRKSRC}/gtk/Makefile.in
pre-configure:
# .if !exists() evaluates too early before cairo has a chance to be installed
diff --git a/x11-toolkits/gtk30/files/patch-configure b/x11-toolkits/gtk30/files/patch-configure
new file mode 100644
index 000000000000..b25b411ac1c0
--- /dev/null
+++ b/x11-toolkits/gtk30/files/patch-configure
@@ -0,0 +1,12 @@
+--- configure.orig 2015-12-27 22:02:19.433821000 +0100
++++ configure 2015-12-27 22:02:39.743841000 +0100
+@@ -26046,9 +26046,7 @@
+ if test "$have_cups" = "yes"; then
+ GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,cups"
+ fi
+-if test "$have_papi" != "yes" -a "$have_cups" != "yes"; then
+ GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,lpr"
+-fi
+ if test "$have_cloudprint" = "yes"; then
+ GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,cloudprint"
+ fi