Hi.
This diff adds a -cups subpackage to our gtk+2.
This allows easy printing to CUPS printers from applications using
gtkprint (lots of apps, like leafpad, eog..!).
Since more and more applications seem to migrate from gnomeprint to
gtkprint, this could be a really nice addition.
I'd really like this to go in.
Comments/OK?
--
Antoine
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/gtk+2/Makefile,v
retrieving revision 1.60
diff -u -r1.60 Makefile
--- Makefile 9 Feb 2008 17:55:39 -0000 1.60
+++ Makefile 28 Mar 2008 13:37:00 -0000
@@ -3,12 +3,14 @@
SHARED_ONLY= Yes
COMMENT-main= multi-platform graphical toolkit
-COMMENT-docs= gtk+-2 documentation
+COMMENT-docs= gtk+2 documentation
+COMMENT-cups= gtk+2 CUPS print backend
VERSION= 2.12.7
DISTNAME= gtk+-${VERSION}
-PKGNAME-main= gtk+2-${VERSION}
+PKGNAME-main= gtk+2-${VERSION}p0
PKGNAME-docs= gtk+2-docs-${VERSION}
+PKGNAME-cups= gtk+2-cups-${VERSION}
SHARED_LIBS += gdk_pixbuf-2.0 1200.7 # .1200.7
SHARED_LIBS += gdk-x11-2.0 1200.7 # .1200.7
SHARED_LIBS += gtk-x11-2.0 1200.7 # .1200.7
@@ -26,26 +28,37 @@
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/2.12/}
EXTRACT_SUFX= .tar.bz2
-MULTI_PACKAGES= -main -docs
+MULTI_PACKAGES= -main -docs -cups
-WANTLIB-main= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
- Xfixes Xi Xinerama Xrender Xrandr c cairo expat \
- fontconfig freetype glib-2.0 glitz m gmodule-2.0 \
- gobject-2.0 gthread-2.0 pcre pthread z
-
-MODULES= devel/gettext
-
-LIB_DEPENDS=
glib-2.0.>=1000.0,gmodule-2.0.>=1000.0,gobject-2.0.>=1000.0::devel/glib2 \
-
pango-1.0.>=1300.0,pangocairo-1.0.>=1300.0,pangoft2-1.0.>=1300.0::devel/pango \
- atk-1.0.>=1809.0::devel/atk \
- tiff.>=35::graphics/tiff \
- png.>=3::graphics/png \
- jpeg.>=62::graphics/jpeg
-RUN_DEPENDS= ::x11/hicolor-icon-theme
+WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
+ Xfixes Xi Xinerama Xrandr Xrender cairo expat \
+ fontconfig freetype glitz m pcre z
+
+MODULES= devel/gettext
+
+BUILD_DEPENDS= ::print/cups
+RUN_DEPENDS= ::x11/hicolor-icon-theme
+
+LIB_DEPENDS-main= ${LIB_DEPENDS} \
+
glib-2.0.>=1000.0,gmodule-2.0.>=1000.0,gobject-2.0.>=1000.0,gthread-2.0::devel/glib2
\
+
pango-1.0.>=1300.0,pangocairo-1.0.>=1300.0,pangoft2-1.0.>=1300.0::devel/pango \
+ atk-1.0.>=1809.0::devel/atk \
+ tiff.>=35::graphics/tiff \
+ png.>=3::graphics/png \
+ jpeg.>=62::graphics/jpeg
+WANTLIB-main= ${WANTLIB} c pthread
LIB_DEPENDS-docs=
RUN_DEPENDS-docs=
-PKG_ARCH-docs= *
+WANTLIB-docs=
+PKG_ARCH-docs= *
+
+LIB_DEPENDS-cups= ${LIB_DEPENDS} \
+ cups.>=3::print/cups \
+
gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::${BASE_PKGPATH},-main
+WANTLIB-cups= ${WANTLIB} atk-1.0 crypto glib-2.0 gmodule-2.0 \
+ gobject-2.0 pango-1.0 pangocairo-1.0 \
+ pangoft2-1.0 png ssl
USE_X11= Yes
USE_GMAKE= Yes
@@ -54,8 +67,7 @@
CONFIGURE_ARGS+= --disable-gtk-doc \
--with-xinput=yes
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include/freetype2/
-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- ENABLE_CUPS="no"
+ LDFLAGS="-L${LOCALBASE}/lib"
# The regression tests require a running instance of X.
# You will also need to set the XAUTHORITY environment variable to point
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 9 Feb 2008 17:55:39 -0000 1.19
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-configure,v 1.19 2008/02/09 17:55:39 jasper Exp $
---- configure.orig Wed Jan 30 04:13:49 2008
-+++ configure Fri Feb 1 14:23:41 2008
-@@ -32939,7 +32939,9 @@ fi
-
- fi
-
--
-+if test "x$ENABLE_CUPS" != "xyes"; then
-+ CUPS_CONFIG=no
-+fi
- if test "x$CUPS_CONFIG" != "xno"; then
- HAVE_CUPS_TRUE=
- HAVE_CUPS_FALSE='#'
Index: pkg/DESCR-cups
===================================================================
RCS file: pkg/DESCR-cups
diff -N pkg/DESCR-cups
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/DESCR-cups 28 Mar 2008 13:37:00 -0000
@@ -0,0 +1 @@
+CUPS print backend for gtk+2.
Index: pkg/PLIST-cups
===================================================================
RCS file: pkg/PLIST-cups
diff -N pkg/PLIST-cups
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PLIST-cups 28 Mar 2008 13:37:00 -0000
@@ -0,0 +1,4 @@
[EMAIL PROTECTED] $OpenBSD$
+lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.a
+lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.la
+lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.so
