From b8b3716ee21e7ab32392e19a0a101da722405069 Mon Sep 17 00:00:00 2001 From: kwm Date: Wed, 7 Jul 2010 13:43:39 +0000 Subject: Reset to 2.30 version, and chase poppler[-glib] shlib dumps. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14303 df743ca5-7f9a-e211-a948-0013205c9059 --- graphics/evince/Makefile | 30 ++++++++++------------ graphics/evince/distinfo | 6 ++--- ...t-n-paste_toolbar-editor_egg-editable-toolbar.c | 17 ------------ graphics/evince/files/patch-shell_ev-window.c | 11 ++++++++ graphics/evince/pkg-plist | 1 - 5 files changed, 27 insertions(+), 38 deletions(-) delete mode 100644 graphics/evince/files/patch-cut-n-paste_toolbar-editor_egg-editable-toolbar.c create mode 100644 graphics/evince/files/patch-shell_ev-window.c (limited to 'graphics') diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile index 3eb0d812f..0a4f26bc4 100644 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -2,13 +2,13 @@ # Date created: 09 January 2005 # Whom: Adam Weinberger # -# $FreeBSD$ -# $MCom: ports/graphics/evince/Makefile,v 1.139 2010/06/08 09:26:39 kwm Exp $ +# $FreeBSD: ports/graphics/evince/Makefile,v 1.57 2010/07/06 00:37:53 marcus Exp $ +# $MCom: ports/graphics/evince/Makefile,v 1.137 2010/04/27 14:14:36 kwm Exp $ # PORTNAME= evince -PORTVERSION= 2.31.3 -PORTREVISION= 1 +PORTVERSION= 2.30.1 +PORTREVISION= 3 CATEGORIES= graphics print gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -17,7 +17,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 multi-format document viewer BUILD_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme -LIB_DEPENDS= poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk \ +LIB_DEPENDS= poppler-glib.5:${PORTSDIR}/graphics/poppler-gtk \ spectre.1:${PORTSDIR}/print/libspectre RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme @@ -32,8 +32,10 @@ USE_GNOME= gnomehack intlhack gnomeprefix desktopfileutils \ gnomedocutils ltasneededhack CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --without-gconf -GLIB_SCHEMAS= org.gnome.Evince.gschema.xml + +GCONF_SCHEMAS= evince.schemas \ + evince-thumbnailer.schemas \ + evince-thumbnailer-ps.schemas MAN1= evince.1 @@ -57,7 +59,7 @@ BUILD_DEPENDS+= tex:${PORTSDIR}/print/teTeX-base RUN_DEPENDS+= tex:${PORTSDIR}/print/teTeX-base CONFIGURE_ARGS+= --enable-dvi -#GCONF_SCHEMAS+= evince-thumbnailer-dvi.schemas +GCONF_SCHEMAS+= evince-thumbnailer-dvi.schemas PLIST_SUB+= DVI="" . if defined(WITH_T1LIB) LIB_DEPENDS+= t1.5:${PORTSDIR}/devel/t1lib @@ -76,7 +78,7 @@ PLIST_SUB+= NAUTILUS="" BUILD_DEPENDS+= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme RUN_DEPENDS+= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme .if !defined(WITHOUT_KEYRING) -LIB_DEPENDS+= gnome-keyring.0:${PORTSDIR}/security/gnome-keyring +LIB_DEPENDS+= gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring .else CONFIGURE_ARGS+= --without-keyring .endif @@ -95,7 +97,7 @@ PLIST_SUB+= IMPRESS="@comment " .if defined(WITH_DJVU) LIB_DEPENDS+= djvulibre.22:${PORTSDIR}/graphics/djvulibre-nox11 CONFIGURE_ARGS+= --enable-djvu -#GCONF_SCHEMAS+= evince-thumbnailer-djvu.schemas +GCONF_SCHEMAS+= evince-thumbnailer-djvu.schemas PLIST_SUB+= DJVU="" .else CONFIGURE_ARGS+= --disable-djvu @@ -109,7 +111,7 @@ LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib .if !defined(WITHOUT_COMICS) RUN_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip CONFIGURE_ARGS+= --enable-comics -#GCONF_SCHEMAS+= evince-thumbnailer-comics.schemas +GCONF_SCHEMAS+= evince-thumbnailer-comics.schemas PLIST_SUB+= COMICS="" .else CONFIGURE_ARGS+= --disable-comics @@ -123,12 +125,6 @@ post-patch: ${WRKSRC}/help/reference/libdocument/Makefile.in \ ${WRKSRC}/help/reference/libview/Makefile.in -pre-install: - @cd ${WRKSRC}/data && ${GMAKE} org.gnome.Evince.gschema.xml - @${MKDIR} ${PREFIX}/share/glib-2.0/schemas - @${INSTALL_DATA} ${WRKSRC}/data/org.gnome.Evince.gschema.xml \ - ${PREFIX}/share/glib-2.0/schemas/ - post-install: @-update-desktop-database diff --git a/graphics/evince/distinfo b/graphics/evince/distinfo index 0052120a2..48317462f 100644 --- a/graphics/evince/distinfo +++ b/graphics/evince/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/evince-2.31.3.tar.bz2) = b2c7ca89398e284c0439e22a944ef50d -SHA256 (gnome2/evince-2.31.3.tar.bz2) = 63a0bc4d7db88e48790ee289ce0813e26f860fab945712f9d8c600b89f1232f5 -SIZE (gnome2/evince-2.31.3.tar.bz2) = 2181964 +MD5 (gnome2/evince-2.30.1.tar.bz2) = 84eb6c8bb460edd382025fdd29c3bc64 +SHA256 (gnome2/evince-2.30.1.tar.bz2) = ab6b957ab422341f023baa8ee4061bc5719389f92d6745874d239cd1e737f225 +SIZE (gnome2/evince-2.30.1.tar.bz2) = 2177738 diff --git a/graphics/evince/files/patch-cut-n-paste_toolbar-editor_egg-editable-toolbar.c b/graphics/evince/files/patch-cut-n-paste_toolbar-editor_egg-editable-toolbar.c deleted file mode 100644 index 2d0688d75..000000000 --- a/graphics/evince/files/patch-cut-n-paste_toolbar-editor_egg-editable-toolbar.c +++ /dev/null @@ -1,17 +0,0 @@ ---- cut-n-paste/toolbar-editor/egg-editable-toolbar.c.orig 2010-06-10 17:54:30.000000000 +0200 -+++ cut-n-paste/toolbar-editor/egg-editable-toolbar.c 2010-06-10 17:55:15.000000000 +0200 -@@ -695,12 +695,12 @@ toolbar_drag_data_received_cb (GtkToolba - gint tpos = get_toolbar_position (etoolbar, GTK_WIDGET (toolbar)); - egg_toolbars_model_add_item (etoolbar->priv->model, tpos, ipos, name); - gtk_drag_finish (context, TRUE, -- gdk_drag_context_get_action (context) == GDK_ACTION_MOVE, time); -+ gdk_drag_context_get_selected_action (context) == GDK_ACTION_MOVE, time); - } - else - { - gtk_drag_finish (context, FALSE, -- gdk_drag_context_get_action (context) == GDK_ACTION_MOVE, time); -+ gdk_drag_context_get_selected_action (context) == GDK_ACTION_MOVE, time); - } - } - diff --git a/graphics/evince/files/patch-shell_ev-window.c b/graphics/evince/files/patch-shell_ev-window.c new file mode 100644 index 000000000..0e8ddac0b --- /dev/null +++ b/graphics/evince/files/patch-shell_ev-window.c @@ -0,0 +1,11 @@ +--- shell/ev-window.c.orig 2010-07-05 20:36:07.000000000 -0400 ++++ shell/ev-window.c 2010-07-05 20:36:10.000000000 -0400 +@@ -6107,7 +6107,7 @@ ev_window_create_last_settings_metadata + GFile *file; + gchar *path; + +- path = g_build_filename (ev_application_get_dot_dir (EV_APP, FALSE), "last_settings", NULL); ++ path = g_build_filename (ev_application_get_dot_dir (EV_APP, TRUE), "last_settings", NULL); + file = g_file_new_for_path (path); + g_free (path); + diff --git a/graphics/evince/pkg-plist b/graphics/evince/pkg-plist index 28589e4aa..c5fcd8580 100644 --- a/graphics/evince/pkg-plist +++ b/graphics/evince/pkg-plist @@ -90,7 +90,6 @@ libdata/pkgconfig/evince-document-2.30.pc libdata/pkgconfig/evince-view-2.30.pc libexec/evince-convert-metadata libexec/evinced -share/GConf/gsettings/evince.convert share/applications/evince.desktop share/dbus-1/services/org.gnome.evince.Daemon.service %%DOCSDIR%%/EggFindBar.html -- cgit v1.2.3