pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
pkg/44541: add options to print/evince for dbus, gconf, gdk-pixbuf, gnome-keyring, and scrollkeeper
>Number: 44541
>Category: pkg
>Synopsis: add options to print/evince for dbus, gconf, gdk-pixbuf,
>gnome-keyring, and scrollkeeper
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Wed Feb 09 23:20:00 +0000 2011
>Originator: Taylor R Campbell <campbell+netbsd%mumble.net@localhost>
>Release: NetBSD 5.1_STABLE
>Organization:
>Environment:
System: NetBSD smalltalk.local 5.1_STABLE NetBSD 5.1_STABLE (RIADEBUG) #0: Tue
Feb 1 20:28:45 UTC 2011
root%smalltalk.local@localhost:/home/riastradh/netbsd/5/obj/sys/arch/i386/compile/RIADEBUG
i386
Architecture: i386
Machine: i386
>Description:
dbus, gconf, gnome-keyring, and scrollkeeper are all
unnecessary for normal operation of print/evince.
gdk-pixbuf is useful for print/evince because it enables
viewing many more types of documents, such as jpg, png, gif,
and so on.
>How-To-Repeat:
Install print/evince. Grumble at the superfluous dbus and
Gnome cruft that got installed as a consequence. Try to run
`evince foo.png'. Grumble at the failure.
>Fix:
Apply the following patch. I have lightly tested it with the
dbus, gconf, gnome-keyring, and scrollkeeper options disabled,
and the gdk-pixbuf option enabled. To preserve the current
behaviour, you should probably adjust the patch to turn on the
dbus, gconf, gnome-keyring, and scrollkeeper options by
default.
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/evince/Makefile,v
retrieving revision 1.70
diff -p -u -r1.70 Makefile
--- Makefile 31 Jan 2011 17:04:32 -0000 1.70
+++ Makefile 9 Feb 2011 23:14:19 -0000
@@ -8,24 +8,15 @@ PKGREVISION= 3
COMMENT= Document viewer
-GCONF_SCHEMAS+= evince-thumbnailer.schemas
-GCONF_SCHEMAS+= evince-thumbnailer-ps.schemas
-
.include "options.mk"
CONFIGURE_ARGS+= --enable-comics
CONFIGURE_ARGS+= --disable-nautilus
-GCONF_SCHEMAS+= evince-thumbnailer-comics.schemas
BUILD_DEPENDS+= gsed-[0-9]*:../../textproc/gsed
-.include "../../devel/GConf/schemas.mk"
.include "../../devel/glib2/schemas.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../security/libgnome-keyring/buildlink3.mk"
-.include "../../sysutils/dbus/buildlink3.mk"
-BUILDLINK_API_DEPENDS.dbus-glib+= dbus-glib>=0.70
-.include "../../sysutils/dbus-glib/buildlink3.mk"
BUILDLINK_DEPMETHOD.libXt?= build
.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/libSM/buildlink3.mk"
Index: Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/print/evince/Makefile.common,v
retrieving revision 1.35
diff -p -u -r1.35 Makefile.common
--- Makefile.common 11 Jan 2011 12:47:55 -0000 1.35
+++ Makefile.common 9 Feb 2011 23:14:19 -0000
@@ -39,6 +39,5 @@ BUILDLINK_API_DEPENDS.poppler-glib+= pop
.include "../../print/poppler-glib/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../mk/omf-scrollkeeper.mk"
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0
.include "../../x11/gtk2/buildlink3.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/print/evince/PLIST,v
retrieving revision 1.31
diff -p -u -r1.31 PLIST
--- PLIST 18 Jan 2011 10:08:44 -0000 1.31
+++ PLIST 9 Feb 2011 23:14:19 -0000
@@ -56,9 +56,11 @@ lib/evince/3/backends/libcomicsdocument.
${PLIST.djvu}lib/evince/3/backends/libdjvudocument.la
${PLIST.dvi}lib/evince/3/backends/libdvidocument.la
lib/evince/3/backends/libpdfdocument.la
+${PLIST.gdk-pixbuf}lib/evince/3/backends/libpixbufdocument.la
lib/evince/3/backends/libpsdocument.la
lib/evince/3/backends/libtiffdocument.la
lib/evince/3/backends/pdfdocument.evince-backend
+${PLIST.gdk-pixbuf}lib/evince/3/backends/pixbufdocument.evince-backend
lib/evince/3/backends/psdocument.evince-backend
lib/evince/3/backends/tiffdocument.evince-backend
lib/libevdocument.la
@@ -66,11 +68,11 @@ lib/libevview.la
lib/pkgconfig/evince-document-2.32.pc
lib/pkgconfig/evince-view-2.32.pc
libexec/evince-convert-metadata
-libexec/evinced
+${PLIST.dbus}libexec/evinced
man/man1/evince.1
share/GConf/gsettings/evince.convert
share/applications/evince.desktop
-share/dbus-1/services/org.gnome.evince.Daemon.service
+${PLIST.dbus}share/dbus-1/services/org.gnome.evince.Daemon.service
share/evince/evince-previewer-ui.xml
share/evince/evince-toolbar.xml
share/evince/evince-ui.xml
@@ -114,11 +116,11 @@ share/evince/icons/hicolor/48x48/actions
share/evince/icons/hicolor/scalable/actions/object-rotate-left.svg
share/evince/icons/hicolor/scalable/actions/object-rotate-right.svg
share/evince/icons/hicolor/scalable/mimetypes/x-office-presentation.svg
-share/gconf/schemas/evince-thumbnailer-comics.schemas
-${PLIST.djvu}share/gconf/schemas/evince-thumbnailer-djvu.schemas
-${PLIST.dvi}share/gconf/schemas/evince-thumbnailer-dvi.schemas
-share/gconf/schemas/evince-thumbnailer-ps.schemas
-share/gconf/schemas/evince-thumbnailer.schemas
+${PLIST.gconf}share/gconf/schemas/evince-thumbnailer-comics.schemas
+${PLIST.gconf}${PLIST.djvu}share/gconf/schemas/evince-thumbnailer-djvu.schemas
+${PLIST.gconf}${PLIST.dvi}share/gconf/schemas/evince-thumbnailer-dvi.schemas
+${PLIST.gconf}share/gconf/schemas/evince-thumbnailer-ps.schemas
+${PLIST.gconf}share/gconf/schemas/evince-thumbnailer.schemas
share/glib-2.0/schemas/org.gnome.Evince.gschema.xml
share/gnome/help/evince/C/evince.xml
share/gnome/help/evince/C/figures/evince_start_window.png
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/print/evince/options.mk,v
retrieving revision 1.5
diff -p -u -r1.5 options.mk
--- options.mk 21 Oct 2009 17:28:02 -0000 1.5
+++ options.mk 9 Feb 2011 23:14:19 -0000
@@ -1,12 +1,23 @@
# $NetBSD: options.mk,v 1.5 2009/10/21 17:28:02 drochner Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.evince
-PKG_SUPPORTED_OPTIONS= dvi djvu
+PKG_SUPPORTED_OPTIONS= dbus dvi djvu gconf gdk-pixbuf gnome-keyring
+PKG_SUPPORTED_OPTIONS+= scrollkeeper
.include "../../mk/bsd.options.mk"
PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS}
+.if !empty(PKG_OPTIONS:Mdbus)
+.include "../../sysutils/dbus/buildlink3.mk"
+BUILDLINK_API_DEPENDS.dbus-glib+= dbus-glib>=0.70
+.include "../../sysutils/dbus-glib/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-dbus
+PLIST.dbus= yes
+.else
+CONFIGURE_ARGS+= --disable-dbus
+.endif
+
.if !empty(PKG_OPTIONS:Mdvi)
CONFIGURE_ARGS+= --enable-dvi
PLIST.dvi= yes
@@ -20,3 +31,34 @@ PLIST.djvu= yes
GCONF_SCHEMAS+= evince-thumbnailer-djvu.schemas
.include "../../graphics/djvulibre-lib/buildlink3.mk"
.endif
+
+.if !empty(PKG_OPTIONS:Mgconf)
+.include "../../devel/GConf/schemas.mk"
+CONFIGURE_ARGS+= --with-gconf
+GCONF_SCHEMAS+= evince-thumbnailer.schemas
+GCONF_SCHEMAS+= evince-thumbnailer-ps.schemas
+GCONF_SCHEMAS+= evince-thumbnailer-comics.schemas
+PLIST.gconf= yes
+.else
+CONFIGURE_ARGS+= --without-gconf
+CONFIGURE_ARGS+= --disable-schemas-install
+.endif
+
+.if !empty(PKG_OPTIONS:Mgdk-pixbuf)
+CONFIGURE_ARGS+= --enable-pixbuf
+PLIST.gdk-pixbuf= yes
+.endif
+
+.if !empty(PKG_OPTIONS:Mgnome-keyring)
+.include "../../security/libgnome-keyring/buildlink3.mk"
+CONFIGURE_ARGS+= --with-keyring
+.else
+CONFIGURE_ARGS+= --without-keyring
+.endif
+
+.if !empty(PKG_OPTIONS:Mscrollkeeper)
+.include "../../mk/omf-scrollkeeper.mk"
+CONFIGURE_ARGS+= --enable-scrollkeeper
+.else
+CONFIGURE_ARGS+= --disable-scrollkeeper
+.endif
Home |
Main Index |
Thread Index |
Old Index