Attachment 152374 Details for Bug 197197 – New options, fix atril when no Mate desktop installed.

[patch] New options, fix atril when no Mate desktop installed.

atril_options_fixes.diff (text/plain), 3.57 KB, created by Matthieu Volat on 2015-01-30 14:38:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthieu Volat

Created: 2015-01-30 14:38:23 UTC

Size: 3.57 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 378143)
>+++ Makefile	(working copy)
>@@ -14,9 +14,7 @@
> BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
> 
> LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \
>-		libspectre.so:${PORTSDIR}/print/libspectre \
>-		libsecret-1.so:${PORTSDIR}/security/libsecret \
>-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
>+		libspectre.so:${PORTSDIR}/print/libspectre
> 
> RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
> 
>@@ -39,16 +37,20 @@
> 
> GLIB_SCHEMAS=	org.mate.Atril.gschema.xml
> 
>-OPTIONS_DEFINE=	DVI T1LIB CAJA COMICS DJVU
>-OPTIONS_DEFAULT=CAJA COMICS
>+OPTIONS_DEFINE=	DBUS DVI T1LIB CAJA COMICS DJVU KEYRING
>+OPTIONS_DEFAULT=DBUS CAJA COMICS KEYRING
> DVI_DESC=	DVI viewer support
> T1LIB_DESC=	T1LIB for TYPE1 fonts to DVI (Enables DVI)
> CAJA_DESC=	Caja plugin
> COMICS_DESC=	Comic book archives support
> DJVU_DESC=	DJVU support
>+KEYRING_DESC=	Keyring password manager support
> 
> .include <bsd.port.options.mk>
> 
>+DBUS_LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
>+DBUS_CONFIGURE_ENABLE= dbus
>+
> .if ${PORT_OPTIONS:MDVI} || ${PORT_OPTIONS:MT1LIB}
> 
> USE_TEX=	base
>@@ -93,4 +95,7 @@
> PLIST_SUB+=	COMICS="@comment "
> .endif
> 
>+KEYRING_LIB_DEPENDS= libsecret-1.so:${PORTSDIR}/security/libsecret
>+KEYRING_CONFIGURE_WITH= keyring
>+
> .include <bsd.port.mk>
>Index: files/patch-shell_ev-window.c
>===================================================================
>--- files/patch-shell_ev-window.c	(revision 0)
>+++ files/patch-shell_ev-window.c	(working copy)
>@@ -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);

Actions: View | Diff

Attachments on bug 197197: 152374 | 152452 | 152453