diff --git a/x11/gnome/libgnomeprint/Makefile b/x11/gnome/libgnomeprint/Makefile index e39c34ef886..20f0d7aac59 100644 --- a/x11/gnome/libgnomeprint/Makefile +++ b/x11/gnome/libgnomeprint/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.42 2011/09/12 12:04:17 jasper Exp $ +# $OpenBSD: Makefile,v 1.43 2011/09/12 13:44:45 ajacoutot Exp $ COMMENT= printing framework for GNOME GNOME_PROJECT= libgnomeprint GNOME_VERSION= 2.18.8 -REVISION= 2 +REVISION= 3 SHARED_LIBS += gnomeprint-2-2 2.1 # .1.0 @@ -18,12 +18,11 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -EXTRACT_SUFX= .tar.bz2 +WANTLIB += X11 art_lgpl_2 expat fontconfig freetype glib-2.0 gmodule-2.0 +WANTLIB += gobject-2.0 gthread-2.0 m pango-1.0 pangoft2-1.0 pcre +WANTLIB += xcb xml2 z -WANTLIB += X11 Xau Xdmcp asn1 crypto cups expat fontconfig freetype -WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gssapi gthread-2.0 -WANTLIB += krb5 m pcre pthread-stubs ssl xcb z pango-1.0 pangoft2-1.0 -WANTLIB += art_lgpl_2 xml2 gnomecups-1.0 +EXTRACT_SUFX= .tar.bz2 MODULES= devel/gettext \ x11/gnome @@ -31,12 +30,11 @@ MODULES= devel/gettext \ BUILD_DEPENDS= devel/bison LIB_DEPENDS= devel/pango \ graphics/libart \ - textproc/libxml \ - x11/gnome/libgnomecups + textproc/libxml CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ --disable-gtk-doc \ - --with-cups + --without-cups CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11/gnome/libgnomeprint/patches/patch-libgnomeprint_modules_cups_gnome-print-cups-transport_c b/x11/gnome/libgnomeprint/patches/patch-libgnomeprint_modules_cups_gnome-print-cups-transport_c deleted file mode 100644 index a1191c32f7b..00000000000 --- a/x11/gnome/libgnomeprint/patches/patch-libgnomeprint_modules_cups_gnome-print-cups-transport_c +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-libgnomeprint_modules_cups_gnome-print-cups-transport_c,v 1.1 2011/09/08 10:34:43 ajacoutot Exp $ - -Fix build fix cups >=1.5. - ---- libgnomeprint/modules/cups/gnome-print-cups-transport.c.orig Thu Sep 8 10:19:36 2011 -+++ libgnomeprint/modules/cups/gnome-print-cups-transport.c Thu Sep 8 10:19:45 2011 -@@ -38,6 +38,7 @@ - #include - - #include -+#include - #include - #include - #include diff --git a/x11/gnome/libgnomeprint/pkg/PFRAG.shared b/x11/gnome/libgnomeprint/pkg/PFRAG.shared index e01a6d304b3..90a4ceefa03 100644 --- a/x11/gnome/libgnomeprint/pkg/PFRAG.shared +++ b/x11/gnome/libgnomeprint/pkg/PFRAG.shared @@ -1,3 +1,2 @@ -@comment $OpenBSD: PFRAG.shared,v 1.7 2009/04/10 16:19:13 ajacoutot Exp $ +@comment $OpenBSD: PFRAG.shared,v 1.8 2011/09/12 13:44:46 ajacoutot Exp $ @lib lib/libgnomeprint-2-2.so.${LIBgnomeprint-2-2_VERSION} -lib/libgnomeprint/${VERSION}/modules/libgnomeprintcups.so diff --git a/x11/gnome/libgnomeprint/pkg/PLIST b/x11/gnome/libgnomeprint/pkg/PLIST index 89e2aecc27b..d37b95256b8 100644 --- a/x11/gnome/libgnomeprint/pkg/PLIST +++ b/x11/gnome/libgnomeprint/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.19 2011/07/29 20:42:26 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.20 2011/09/12 13:44:46 ajacoutot Exp $ %%SHARED%% include/libgnomeprint-2.2/ include/libgnomeprint-2.2/libgnomeprint/ @@ -75,8 +75,6 @@ lib/libgnomeprint/${VERSION}/modules/filters/libgnomeprint-select.so @comment lib/libgnomeprint/${VERSION}/modules/filters/libgnomeprint-zoom.a @comment lib/libgnomeprint/${VERSION}/modules/filters/libgnomeprint-zoom.la lib/libgnomeprint/${VERSION}/modules/filters/libgnomeprint-zoom.so -@comment lib/libgnomeprint/${VERSION}/modules/libgnomeprintcups.a -@comment lib/libgnomeprint/${VERSION}/modules/libgnomeprintcups.la @comment lib/libgnomeprint/${VERSION}/modules/libgnomeprintlpd.a @comment lib/libgnomeprint/${VERSION}/modules/libgnomeprintlpd.la lib/libgnomeprint/${VERSION}/modules/libgnomeprintlpd.so