diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile index 0e827621405..b8a028c6544 100644 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -1,19 +1,21 @@ -# $OpenBSD: Makefile,v 1.32 2009/08/17 09:57:44 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.33 2009/10/13 11:00:39 ajacoutot Exp $ SHARED_ONLY= Yes COMMENT-main= document viewer for multiple document formats COMMENT-djvu= evince document viewer backend for djvu documents COMMENT-dvi= evince document viewer backend for dvi documents +COMMENT-nautilus= evince plugin for nautilus GNOME_PROJECT= evince -GNOME_VERSION= 2.26.2 +GNOME_VERSION= 2.28.0 CATEGORIES= graphics print PKGNAME-main= ${DISTNAME} PKGNAME-djvu= evince-djvu-${GNOME_VERSION} PKGNAME-dvi= evince-dvi-${GNOME_VERSION} +PKGNAME-nautilus= nautilus-evince-${GNOME_VERSION} SHARED_LIBS += evdocument 0.0 # .1.0 SHARED_LIBS += evview 0.0 # .1.0 @@ -35,65 +37,72 @@ MODULES= devel/gettext \ BUILD_DEPENDS= ::x11/gnome/icon-theme -MULTI_PACKAGES= -main -djvu -dvi +MULTI_PACKAGES= -main -djvu -dvi -nautilus -WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ - Xi Xinerama Xrandr Xrender atk-1.0 cairo expat \ - fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 \ - glib-2.0 glitz gmodule-2.0 gobject-2.0 gtk-x11-2.0 \ - m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre \ - pixman-1 png pthread-stubs xcb z +WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes +WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig +WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 +WANTLIB += glitz gmodule-2.0 gobject-2.0 gtk-x11-2.0 m pango-1.0 +WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread-stubs +WANTLIB += xcb z -WANTLIB-main= ${WANTLIB} ICE ORBit-2 SM c dbus-1 dbus-glib-1 \ - gnome-keyring gs gthread-2.0 \ - jpeg pthread tiff xml2 -LIB_DEPENDS-main= poppler.>=3,poppler-glib.>=3::print/poppler \ - spectre::print/libspectre \ - gnome-keyring::x11/gnome/keyring \ - ${MODGCONF2_LIB_DEPENDS} \ - ${MODGETTEXT_LIB_DEPENDS} -RUN_DEPENDS-main= ${RUN_DEPENDS} \ - :shared-mime-info-*:misc/shared-mime-info \ - :ghostscript-*:print/ghostscript/gnu \ - ::x11/gnome/icon-theme +WANTLIB-main= ${WANTLIB} ICE ORBit-2 SM c dbus-1 dbus-glib-1 \ + gnome-keyring gs gthread-2.0 \ + jpeg pthread tiff xml2 lcms +LIB_DEPENDS-main= poppler.>=3,poppler-glib.>=3::print/poppler \ + spectre::print/libspectre \ + gnome-keyring::x11/gnome/keyring \ + ${MODGCONF2_LIB_DEPENDS} \ + ${MODGETTEXT_LIB_DEPENDS} +RUN_DEPENDS-main= ${RUN_DEPENDS} \ + :shared-mime-info-*:misc/shared-mime-info \ + :ghostscript-*:print/ghostscript/gnu \ + ::x11/gnome/icon-theme -WANTLIB-djvu= ${WANTLIB} jpeg +WANTLIB-djvu= ${WANTLIB} jpeg # port-lib-depends-check misses these ones because the depending lib # is under lib/evince/1/backends/ -LIB_DEPENDS-djvu= ${MODGETTEXT_LIB_DEPENDS} \ - evdocument::${BASE_PKGPATH} \ - djvulibre.>=21::graphics/djvulibre -RUN_DEPENDS-djvu= ${MODGCONF2_RUN_DEPENDS} +LIB_DEPENDS-djvu= ${MODGETTEXT_LIB_DEPENDS} \ + evdocument::${BASE_PKGPATH} \ + djvulibre.>=21::graphics/djvulibre +RUN_DEPENDS-djvu= ${MODGCONF2_RUN_DEPENDS} -WANTLIB-dvi= ${WANTLIB} gs +WANTLIB-dvi= ${WANTLIB} gs # port-lib-depends-check misses these ones because the depending lib # is under lib/evince/1/backends/ -LIB_DEPENDS-dvi= ${MODGETTEXT_LIB_DEPENDS} \ - evdocument::${BASE_PKGPATH} \ - kpathsea.>=1::print/texlive/base \ - spectre::print/libspectre -RUN_DEPENDS-dvi= ${MODGCONF2_RUN_DEPENDS} +LIB_DEPENDS-dvi= ${MODGETTEXT_LIB_DEPENDS} \ + evdocument::${BASE_PKGPATH} \ + kpathsea.>=1::print/texlive/base \ + spectre::print/libspectre +RUN_DEPENDS-dvi= ${MODGCONF2_RUN_DEPENDS} -USE_X11= Yes -MODGNOME_HELP_FILES= Yes -DESKTOP_FILES= Yes -MODGCONF2_SCHEMAS_DIR= evince -MODGCONF2_LIBDEP= No +WANTLIB-nautilus= ${WANTLIB} +LIB_DEPENDS-nautilus= evdocument::${BASE_PKGPATH} \ + nautilus-extension.>=2::x11/gnome/nautilus +RUN_DEPENDS-nautilus= -LIBTOOL_FLAGS= --tag=disable-static +USE_X11= Yes +MODGNOME_HELP_FILES= Yes +DESKTOP_FILES= Yes +MODGCONF2_SCHEMAS_DIR= evince +MODGCONF2_LIBDEP= No + +LIBTOOL_FLAGS= --tag=disable-static CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ +CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ --disable-static \ --disable-comics \ --disable-impress \ - --enable-nautilus=no \ - --disable-schemas-install \ + --enable-nautilus \ --disable-scrollkeeper \ --enable-djvu \ --enable-dvi \ --enable-pixbuf +# needs recent py-gobject +CONFIGURE_ARGS+= --enable-introspection=no + CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/graphics/evince/distinfo b/graphics/evince/distinfo index 3031fd97738..64a45fb3944 100644 --- a/graphics/evince/distinfo +++ b/graphics/evince/distinfo @@ -1,5 +1,5 @@ -MD5 (evince-2.26.2.tar.bz2) = 7YuftcXW/q/RnwEUtzbJ7w== -RMD160 (evince-2.26.2.tar.bz2) = AN09+gBtwBn4+VGjVtcmAoO/i6s= -SHA1 (evince-2.26.2.tar.bz2) = GnieB4tMlfPjOHpFCSri8iITUBM= -SHA256 (evince-2.26.2.tar.bz2) = UWWtt3r33TVcYAvB/OS8x94lOO0C0PhwKGYAlqYa9Ik= -SIZE (evince-2.26.2.tar.bz2) = 2033141 +MD5 (evince-2.28.0.tar.bz2) = ZlSL8UZ/kpJKcjCGkTmttQ== +RMD160 (evince-2.28.0.tar.bz2) = ulUeGKXh5Gj6Y+6oPsLGr3mM8m0= +SHA1 (evince-2.28.0.tar.bz2) = uw/kziKI2nUHdO2B2P0kjfJqN2g= +SHA256 (evince-2.28.0.tar.bz2) = kLNB1eS+HzfY93VZGpwgn4IWoMTDpCXcDx4OY3mA1oM= +SIZE (evince-2.28.0.tar.bz2) = 2030210 diff --git a/graphics/evince/patches/patch-shell_ev-window_c b/graphics/evince/patches/patch-shell_ev-window_c index 75bfed100f6..d0e2595e0a7 100644 --- a/graphics/evince/patches/patch-shell_ev-window_c +++ b/graphics/evince/patches/patch-shell_ev-window_c @@ -1,4 +1,4 @@ -$OpenBSD: patch-shell_ev-window_c,v 1.2 2009/08/17 09:57:44 ajacoutot Exp $ +$OpenBSD: patch-shell_ev-window_c,v 1.3 2009/10/13 11:00:39 ajacoutot Exp $ Taken from http://bugzilla.gnome.org/show_bug.cgi?id=571051 @@ -7,9 +7,9 @@ Evince reloads documents automatically when they are changed while being displayed. Very annoying while editing LaTeX files and rebuilding the corresponding PDF. ---- shell/ev-window.c.orig Mon May 18 22:23:19 2009 -+++ shell/ev-window.c Sun Aug 16 13:39:38 2009 -@@ -1027,6 +1027,11 @@ setup_size_from_metadata (EvWindow *window) +--- shell/ev-window.c.orig Mon Sep 21 15:12:27 2009 ++++ shell/ev-window.c Mon Oct 12 14:21:56 2009 +@@ -1015,6 +1015,11 @@ setup_size_from_metadata (EvWindow *window) GValue x = { 0, }; GValue y = { 0, }; diff --git a/graphics/evince/pkg/DESCR-nautilus b/graphics/evince/pkg/DESCR-nautilus new file mode 100644 index 00000000000..ce66932ee29 --- /dev/null +++ b/graphics/evince/pkg/DESCR-nautilus @@ -0,0 +1 @@ +Evince document viewer plugin for nautilus. diff --git a/graphics/evince/pkg/PLIST-main b/graphics/evince/pkg/PLIST-main index 40a6c44ad99..e45e32ed35d 100644 --- a/graphics/evince/pkg/PLIST-main +++ b/graphics/evince/pkg/PLIST-main @@ -1,15 +1,18 @@ -@comment $OpenBSD: PLIST-main,v 1.7 2009/08/17 09:57:44 ajacoutot Exp $ +@comment $OpenBSD: PLIST-main,v 1.8 2009/10/13 11:00:39 ajacoutot Exp $ @pkgpath graphics/evince @bin bin/evince +@bin bin/evince-previewer @bin bin/evince-thumbnailer include/evince/ include/evince/2.25/ include/evince/2.25/evince-document.h include/evince/2.25/evince-view.h include/evince/2.25/libdocument/ +include/evince/2.25/libdocument/ev-annotation.h include/evince/2.25/libdocument/ev-async-renderer.h include/evince/2.25/libdocument/ev-attachment.h include/evince/2.25/libdocument/ev-backends-manager.h +include/evince/2.25/libdocument/ev-document-annotations.h include/evince/2.25/libdocument/ev-document-factory.h include/evince/2.25/libdocument/ev-document-find.h include/evince/2.25/libdocument/ev-document-fonts.h @@ -19,6 +22,7 @@ include/evince/2.25/libdocument/ev-document-info.h include/evince/2.25/libdocument/ev-document-layers.h include/evince/2.25/libdocument/ev-document-links.h include/evince/2.25/libdocument/ev-document-misc.h +include/evince/2.25/libdocument/ev-document-print.h include/evince/2.25/libdocument/ev-document-security.h include/evince/2.25/libdocument/ev-document-thumbnails.h include/evince/2.25/libdocument/ev-document-transition.h @@ -33,6 +37,7 @@ include/evince/2.25/libdocument/ev-layer.h include/evince/2.25/libdocument/ev-link-action.h include/evince/2.25/libdocument/ev-link-dest.h include/evince/2.25/libdocument/ev-link.h +include/evince/2.25/libdocument/ev-mapping.h include/evince/2.25/libdocument/ev-page.h include/evince/2.25/libdocument/ev-render-context.h include/evince/2.25/libdocument/ev-selection.h @@ -42,6 +47,7 @@ include/evince/2.25/libview/ include/evince/2.25/libview/ev-job-scheduler.h include/evince/2.25/libview/ev-jobs.h include/evince/2.25/libview/ev-page-cache.h +include/evince/2.25/libview/ev-stock-icons.h include/evince/2.25/libview/ev-view-type-builtins.h include/evince/2.25/libview/ev-view.h lib/evince/ @@ -68,6 +74,7 @@ lib/pkgconfig/evince-view-2.25.pc @man man/man1/evince.1 share/applications/evince.desktop share/evince/ +share/evince/evince-previewer-ui.xml share/evince/evince-toolbar.xml share/evince/evince-ui.xml share/evince/hand-open.png @@ -101,6 +108,9 @@ share/evince/icons/hicolor/32x32/actions/view-page-continuous.png share/evince/icons/hicolor/32x32/actions/view-page-facing.png share/evince/icons/hicolor/48x48/ share/evince/icons/hicolor/48x48/actions/ +share/evince/icons/hicolor/48x48/actions/close.png +share/evince/icons/hicolor/48x48/actions/resize-se.png +share/evince/icons/hicolor/48x48/actions/resize-sw.png share/evince/icons/hicolor/48x48/actions/view-page-continuous.png share/evince/icons/hicolor/48x48/actions/view-page-facing.png share/gnome/help/evince/ @@ -185,6 +195,10 @@ share/gnome/help/evince/uk/ share/gnome/help/evince/uk/evince.xml share/gnome/help/evince/uk/figures/ share/gnome/help/evince/uk/figures/evince_start_window.png +share/gnome/help/evince/vi/ +share/gnome/help/evince/vi/evince.xml +share/gnome/help/evince/vi/figures/ +share/gnome/help/evince/vi/figures/evince_start_window.png share/gnome/help/evince/zh_CN/ share/gnome/help/evince/zh_CN/evince.xml share/gnome/help/evince/zh_CN/figures/ @@ -200,12 +214,11 @@ share/gtk-doc/html/evince/evince-EvPasswordView.html share/gtk-doc/html/evince/evince-EvSidebar.html share/gtk-doc/html/evince/evince-EvSidebarAttachments.html share/gtk-doc/html/evince/evince-EvSidebarLinks.html +share/gtk-doc/html/evince/evince-EvSidebarPage.html share/gtk-doc/html/evince/evince-EvSidebarThumbnails.html share/gtk-doc/html/evince/evince-ev-metadata-manager.html share/gtk-doc/html/evince/evince-ev-properties-dialog.html share/gtk-doc/html/evince/evince-ev-properties-fonts.html -share/gtk-doc/html/evince/evince-ev-sidebar-page.html -share/gtk-doc/html/evince/evince-ev-stock-icons.html share/gtk-doc/html/evince/evince-ev-utils.html share/gtk-doc/html/evince/evince-ev-window-title.html share/gtk-doc/html/evince/evince.devhelp @@ -220,12 +233,25 @@ share/gtk-doc/html/evince/right.png share/gtk-doc/html/evince/style.css share/gtk-doc/html/evince/up.png share/gtk-doc/html/libevdocument/ +share/gtk-doc/html/libevdocument/EvAsyncRenderer.html share/gtk-doc/html/libevdocument/EvAttachment.html +share/gtk-doc/html/libevdocument/EvDocument.html +share/gtk-doc/html/libevdocument/EvDocumentFind.html +share/gtk-doc/html/libevdocument/EvDocumentFonts.html +share/gtk-doc/html/libevdocument/EvDocumentForms.html +share/gtk-doc/html/libevdocument/EvDocumentImages.html +share/gtk-doc/html/libevdocument/EvDocumentLayers.html +share/gtk-doc/html/libevdocument/EvDocumentLinks.html +share/gtk-doc/html/libevdocument/EvDocumentSecurity.html +share/gtk-doc/html/libevdocument/EvDocumentThumbnails.html +share/gtk-doc/html/libevdocument/EvDocumentTransition.html +share/gtk-doc/html/libevdocument/EvFileExporter.html share/gtk-doc/html/libevdocument/EvFormFieldSignature.html share/gtk-doc/html/libevdocument/EvImage.html share/gtk-doc/html/libevdocument/EvLayer.html share/gtk-doc/html/libevdocument/EvPage.html share/gtk-doc/html/libevdocument/EvRenderContext.html +share/gtk-doc/html/libevdocument/EvSelection.html share/gtk-doc/html/libevdocument/data.html share/gtk-doc/html/libevdocument/helper.html share/gtk-doc/html/libevdocument/home.png @@ -233,28 +259,15 @@ share/gtk-doc/html/libevdocument/index.html share/gtk-doc/html/libevdocument/index.sgml share/gtk-doc/html/libevdocument/interfaces.html share/gtk-doc/html/libevdocument/left.png -share/gtk-doc/html/libevdocument/libevdocument-ev-async-renderer.html share/gtk-doc/html/libevdocument/libevdocument-ev-backends-manager.html share/gtk-doc/html/libevdocument/libevdocument-ev-document-factory.html -share/gtk-doc/html/libevdocument/libevdocument-ev-document-find.html -share/gtk-doc/html/libevdocument/libevdocument-ev-document-fonts.html -share/gtk-doc/html/libevdocument/libevdocument-ev-document-forms.html -share/gtk-doc/html/libevdocument/libevdocument-ev-document-images.html share/gtk-doc/html/libevdocument/libevdocument-ev-document-info.html -share/gtk-doc/html/libevdocument/libevdocument-ev-document-layers.html -share/gtk-doc/html/libevdocument/libevdocument-ev-document-links.html share/gtk-doc/html/libevdocument/libevdocument-ev-document-misc.html -share/gtk-doc/html/libevdocument/libevdocument-ev-document-security.html -share/gtk-doc/html/libevdocument/libevdocument-ev-document-thumbnails.html -share/gtk-doc/html/libevdocument/libevdocument-ev-document-transition.html -share/gtk-doc/html/libevdocument/libevdocument-ev-document.html -share/gtk-doc/html/libevdocument/libevdocument-ev-file-exporter.html share/gtk-doc/html/libevdocument/libevdocument-ev-file-helpers.html share/gtk-doc/html/libevdocument/libevdocument-ev-init.html share/gtk-doc/html/libevdocument/libevdocument-ev-link-action.html share/gtk-doc/html/libevdocument/libevdocument-ev-link-dest.html share/gtk-doc/html/libevdocument/libevdocument-ev-link.html -share/gtk-doc/html/libevdocument/libevdocument-ev-selection.html share/gtk-doc/html/libevdocument/libevdocument-ev-transition-effect.html share/gtk-doc/html/libevdocument/libevdocument.devhelp share/gtk-doc/html/libevdocument/libevdocument.devhelp2 @@ -262,14 +275,15 @@ share/gtk-doc/html/libevdocument/right.png share/gtk-doc/html/libevdocument/style.css share/gtk-doc/html/libevdocument/up.png share/gtk-doc/html/libevview/ -share/gtk-doc/html/libevview/EvJobExport.html share/gtk-doc/html/libevview/ch01.html share/gtk-doc/html/libevview/home.png share/gtk-doc/html/libevview/index.html share/gtk-doc/html/libevview/index.sgml share/gtk-doc/html/libevview/left.png +share/gtk-doc/html/libevview/libevview-EvJobPrint.html share/gtk-doc/html/libevview/libevview-ev-job-scheduler.html share/gtk-doc/html/libevview/libevview-ev-page-cache.html +share/gtk-doc/html/libevview/libevview-ev-stock-icons.html share/gtk-doc/html/libevview/libevview-ev-view.html share/gtk-doc/html/libevview/libevview.devhelp share/gtk-doc/html/libevview/libevview.devhelp2 @@ -292,6 +306,7 @@ share/locale/bn/LC_MESSAGES/evince.mo share/locale/bn_IN/LC_MESSAGES/evince.mo share/locale/br/LC_MESSAGES/evince.mo share/locale/ca/LC_MESSAGES/evince.mo +share/locale/ca@valencia/LC_MESSAGES/evince.mo share/locale/cs/LC_MESSAGES/evince.mo share/locale/cy/LC_MESSAGES/evince.mo share/locale/da/LC_MESSAGES/evince.mo @@ -379,6 +394,7 @@ share/omf/evince/evince-ru.omf share/omf/evince/evince-sr.omf share/omf/evince/evince-sv.omf share/omf/evince/evince-uk.omf +share/omf/evince/evince-vi.omf share/omf/evince/evince-zh_CN.omf @unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null ${SCHEMAS_INSTDIR}/ diff --git a/graphics/evince/pkg/PLIST-nautilus b/graphics/evince/pkg/PLIST-nautilus new file mode 100644 index 00000000000..066ba46dfe3 --- /dev/null +++ b/graphics/evince/pkg/PLIST-nautilus @@ -0,0 +1,5 @@ +@comment $OpenBSD: PLIST-nautilus,v 1.1 2009/10/13 11:00:39 ajacoutot Exp $ +lib/nautilus/ +lib/nautilus/extensions-2.0/ +lib/nautilus/extensions-2.0/libevince-properties-page.la +lib/nautilus/extensions-2.0/libevince-properties-page.so