Date: Wed, 15 Jul 2015 07:50:10 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r392123 - in head/graphics: . atril-lite atril/files Message-ID: <201507150750.t6F7oA0f034415@svnmir.geo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Wed Jul 15 07:50:09 2015 New Revision: 392123 URL: https://svnweb.freebsd.org/changeset/ports/392123 Log: Add a lite version of atril. PR: 197197 Submitted by: Matthieu Volat <mazhe@alkumuna.eu> Added: head/graphics/atril/files/ head/graphics/atril/files/patch-shell_ev-window.c (contents, props changed) Deleted: head/graphics/atril-lite/distinfo Modified: head/graphics/Makefile head/graphics/atril-lite/Makefile head/graphics/atril-lite/pkg-descr head/graphics/atril-lite/pkg-plist Modified: head/graphics/Makefile ============================================================================== --- head/graphics/Makefile Wed Jul 15 07:47:13 2015 (r392122) +++ head/graphics/Makefile Wed Jul 15 07:50:09 2015 (r392123) @@ -47,6 +47,7 @@ SUBDIR += argyllcms SUBDIR += asciio SUBDIR += atril + SUBDIR += atril-lite SUBDIR += autopano-sift-c SUBDIR += autoq3d SUBDIR += autotrace Modified: head/graphics/atril-lite/Makefile ============================================================================== --- head/graphics/atril-lite/Makefile Wed Jul 15 07:47:13 2015 (r392122) +++ head/graphics/atril-lite/Makefile Wed Jul 15 07:50:09 2015 (r392123) @@ -1,128 +1,16 @@ # Created by: Adam Weinberger <adamw@FreeBSD.org> # $FreeBSD$ -PORTNAME= atril -PORTVERSION= 1.8.1 -PORTREVISION?= 4 -CATEGORIES= graphics print mate -MASTER_SITES= MATE -DIST_SUBDIR= mate +PORTREVISION= 0 +PKGNAMESUFFIX= -lite -MAINTAINER= gnome@FreeBSD.org -COMMENT?= MATE multi-format document viewer +COMMENT= MATE multi-format document viewer -BUILD_DEPENDS= itstool:${PORTSDIR}/textproc/itstool +OPTIONS_EXCLUDE= CAJA -LIB_DEPENDS= libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \ - libspectre.so:${PORTSDIR}/print/libspectre +MASTERDIR= ${.CURDIR}/../../graphics/atril +SLAVEPORT= lite +DESCR= ${.CURDIR}/pkg-descr +PLIST= ${.CURDIR}/pkg-plist -RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \ - -PORTSCOUT= limitw:1,even -SLAVEPORT?= no - -USES= desktop-file-utils gettext gmake libtool pathfix \ - pkgconfig tar:xz -USE_MATE= icontheme -USE_XORG= sm -USE_GNOME= cairo gtk20 intlhack libxml2 -USE_LDCONFIG= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-gtk=2.0 \ - --disable-xps \ - --disable-static -INSTALLS_ICONS= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -INSTALL_TARGET= install-strip - -.if ${SLAVEPORT} == lite -CONFIGURE_ARGS+=--disable-introspection \ - --disable-thumbnailer \ - --disable-previewer -.else -USE_GNOME+= introspection:build -CONFIGURE_ARGS+= --enable-introspection -.endif - -GLIB_SCHEMAS= org.mate.Atril.gschema.xml - -OPTIONS_DEFINE= CAJA COMICS DJVU DVI KEYRING T1LIB XPS -OPTIONS_DEFAULT=CAJA COMICS KEYRING XPS -DVI_DESC= DVI viewer support -T1LIB_DESC= T1LIB for TYPE1 fonts to DVI (Enables DVI) -CAJA_DESC= Caja plugin -KEYRING_DESC= Keyring support -COMICS_DESC= Comic book archives support -DJVU_DESC= DJVU support -XPS_DESC= XPS support - -.include <bsd.port.options.mk> - -.if ${SLAVEPORT} == lite -CONFIGURE_ARGS+=--disable-dbus -.else -CONFIGURE_ARGS+=--enable-dbus -LIB_DEPENDS+= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib -.endif - -.if ${PORT_OPTIONS:MDVI} || ${PORT_OPTIONS:MT1LIB} - -USE_TEX= base -CONFIGURE_ARGS+=--enable-dvi -PLIST_SUB+= DVI="" - -. if ${PORT_OPTIONS:MT1LIB} -LIB_DEPENDS+= libt1.so:${PORTSDIR}/devel/t1lib -CONFIGURE_ARGS+=--enable-t1lib -.else -CONFIGURE_ARGS+=--disable-t1lib -. endif - -.else -CONFIGURE_ARGS+=--disable-dvi -PLIST_SUB+= DVI="@comment " -.endif - -.if ${PORT_OPTIONS:MKEYRING} -LIB_DEPENDS+= libsecret-1.so:${PORTSDIR}/security/libsecret -.else -CONFIGURE_ARGS+=--without-keyring -.endif - -.if ${PORT_OPTIONS:MCAJA} -USE_MATE+= caja -CONFIGURE_ARGS+=--enable-caja -PLIST_SUB+= CAJA="" -.else -CONFIGURE_ARGS+=--disable-caja -PLIST_SUB+= CAJA="@comment " -.endif - -.if ${PORT_OPTIONS:MXPS} -LIB_DEPENDS+= libgxps.so:${PORTSDIR}/graphics/libgxps -CONFIGURE_ARGS+= --enable-xps -PLIST_SUB+= XPS="" -.else -CONFIGURE_ARGS+= --disable-xps -PLIST_SUB+= XPS="@comment " -.endif - -.if ${PORT_OPTIONS:MDJVU} -LIB_DEPENDS+= libdjvulibre.so:${PORTSDIR}/graphics/djvulibre -CONFIGURE_ARGS+=--enable-djvu -PLIST_SUB+= DJVU="" -.else -CONFIGURE_ARGS+=--disable-djvu -PLIST_SUB+= DJVU="@comment " -.endif - -.if ${PORT_OPTIONS:MCOMICS} -CONFIGURE_ARGS+=--enable-comics -PLIST_SUB+= COMICS="" -.else -CONFIGURE_ARGS+=--disable-comics -PLIST_SUB+= COMICS="@comment " -.endif - -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" Modified: head/graphics/atril-lite/pkg-descr ============================================================================== --- head/graphics/atril-lite/pkg-descr Wed Jul 15 07:47:13 2015 (r392122) +++ head/graphics/atril-lite/pkg-descr Wed Jul 15 07:50:09 2015 (r392123) @@ -2,4 +2,6 @@ Atril is a document viewer for multiple Postscript. The goal of Atril is to replace document viewers such as ggv and gpdf with a single, simple application. +This lite version doesn't have depend on MATE libraries. Such as caja. + WWW: http://mate-desktop.org/ Modified: head/graphics/atril-lite/pkg-plist ============================================================================== --- head/graphics/atril-lite/pkg-plist Wed Jul 15 07:47:13 2015 (r392122) +++ head/graphics/atril-lite/pkg-plist Wed Jul 15 07:50:09 2015 (r392123) @@ -1,6 +1,4 @@ bin/atril -bin/atril-previewer -bin/atril-thumbnailer include/atril/1.5.0/atril-document.h include/atril/1.5.0/atril-view.h include/atril/1.5.0/libdocument/ev-annotation.h @@ -49,9 +47,9 @@ include/atril/1.5.0/libview/ev-view-pres include/atril/1.5.0/libview/ev-view-type-builtins.h include/atril/1.5.0/libview/ev-view.h %%COMICS%%lib/atril/3/backends/comicsdocument.atril-backend +%%COMICS%%lib/atril/3/backends/libcomicsdocument.so %%DJVU%%lib/atril/3/backends/djvudocument.atril-backend %%DVI%%lib/atril/3/backends/dvidocument.atril-backend -%%COMICS%%lib/atril/3/backends/libcomicsdocument.so %%DJVU%%lib/atril/3/backends/libdjvudocument.so %%DVI%%lib/atril/3/backends/libdvidocument.so lib/atril/3/backends/libpdfdocument.so @@ -62,9 +60,6 @@ lib/atril/3/backends/pdfdocument.atril-b lib/atril/3/backends/psdocument.atril-backend lib/atril/3/backends/tiffdocument.atril-backend %%XPS%%lib/atril/3/backends/xpsdocument.atril-backend -%%CAJA%%lib/caja/extensions-2.0/libatril-properties-page.so -lib/girepository-1.0/AtrilDocument-1.5.0.typelib -lib/girepository-1.0/AtrilView-1.5.0.typelib lib/libatrildocument.so lib/libatrildocument.so.3 lib/libatrildocument.so.%%GTK3_VERSION%% @@ -74,13 +69,9 @@ lib/libatrilview.so.%%GTK3_VERSION%% libdata/pkgconfig/atril-document-1.5.0.pc libdata/pkgconfig/atril-view-1.5.0.pc libexec/atril-convert-metadata -libexec/atrild -man/man1/atril-previewer.1.gz -man/man1/atril-thumbnailer.1.gz man/man1/atril.1.gz share/MateConf/gsettings/atril.convert share/applications/atril.desktop -%%DATADIR%%/atril-previewer-ui.xml %%DATADIR%%/atril-toolbar.xml %%DATADIR%%/atril-ui.xml %%DATADIR%%/hand-open.png @@ -123,9 +114,6 @@ share/applications/atril.desktop %%DATADIR%%/icons/hicolor/scalable/actions/object-rotate-left.svg %%DATADIR%%/icons/hicolor/scalable/actions/object-rotate-right.svg %%DATADIR%%/icons/hicolor/scalable/mimetypes/x-office-presentation.svg -share/dbus-1/services/org.mate.atril.Daemon.service -share/gir-1.0/AtrilDocument-1.5.0.gir -share/gir-1.0/AtrilView-1.5.0.gir share/gtk-doc/html/atril/EggFindBar.html share/gtk-doc/html/atril/EvFileMonitor.html share/gtk-doc/html/atril/EvHistory.html @@ -409,4 +397,3 @@ share/locale/wa/LC_MESSAGES/atril.mo share/locale/zh_CN/LC_MESSAGES/atril.mo share/locale/zh_HK/LC_MESSAGES/atril.mo share/locale/zh_TW/LC_MESSAGES/atril.mo -share/thumbnailers/atril.thumbnailer Added: head/graphics/atril/files/patch-shell_ev-window.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/atril/files/patch-shell_ev-window.c Wed Jul 15 07:50:09 2015 (r392123) @@ -0,0 +1,50 @@ +--- shell/ev-window.c.orig 2015-01-30 14:16:41 UTC ++++ shell/ev-window.c +@@ -422,12 +422,12 @@ ev_window_setup_action_sensitivity (EvWi + if (has_document && !ev_print_operation_exists_for_document(document)) + ok_to_print = FALSE; + +- if (has_document && ++ if (has_document && ev_window->priv->lockdown_settings && + g_settings_get_boolean (ev_window->priv->lockdown_settings, MATE_LOCKDOWN_SAVE)) { + ok_to_copy = FALSE; + } + +- if (has_document && ++ if (has_document && ev_window->priv->lockdown_settings && + g_settings_get_boolean (ev_window->priv->lockdown_settings, MATE_LOCKDOWN_PRINT)) { + ok_to_print = FALSE; + } +@@ -1375,12 +1375,14 @@ ev_window_setup_document (EvWindow *ev_w + ev_window); + } + +- if (!ev_window->priv->lockdown_settings) +- ev_window->priv->lockdown_settings = g_settings_new (MATE_LOCKDOWN_SCHEMA); +- g_signal_connect (ev_window->priv->lockdown_settings, +- "changed", +- G_CALLBACK (lockdown_changed), +- ev_window); ++ if (g_settings_schema_source_lookup(g_settings_schema_source_get_default(), MATE_LOCKDOWN_SCHEMA, FALSE) != NULL) { ++ if (!ev_window->priv->lockdown_settings) ++ ev_window->priv->lockdown_settings = g_settings_new (MATE_LOCKDOWN_SCHEMA); ++ g_signal_connect (ev_window->priv->lockdown_settings, ++ "changed", ++ G_CALLBACK (lockdown_changed), ++ ev_window); ++ } + + ev_window_setup_action_sensitivity (ev_window); + +@@ -3330,6 +3332,11 @@ ev_window_print_range (EvWindow *ev_wind + + ev_print_operation_set_embed_page_setup (op, !g_settings_get_boolean (ev_window->priv->lockdown_settings, + MATE_LOCKDOWN_PRINT_SETUP)); ++ if (ev_window->priv->lockdown_settings) ++ ev_print_operation_set_embed_page_setup (op, !g_settings_get_boolean (ev_window->priv->lockdown_settings, ++ MATE_LOCKDOWN_PRINT_SETUP)); ++ else ++ ev_print_operation_set_embed_page_setup (op, TRUE); + + g_object_unref (print_settings); + g_object_unref (print_page_setup);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507150750.t6F7oA0f034415>