View | Details | Raw Unified | Return to bug 197197 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-5 / +15 lines)
Lines 14-22 Link Here
14
BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
14
BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
15
15
16
LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \
16
LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \
17
		libspectre.so:${PORTSDIR}/print/libspectre \
17
		libspectre.so:${PORTSDIR}/print/libspectre
18
		libsecret-1.so:${PORTSDIR}/security/libsecret \
19
		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
20
18
21
RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
19
RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
22
20
Lines 39-54 Link Here
39
37
40
GLIB_SCHEMAS=	org.mate.Atril.gschema.xml
38
GLIB_SCHEMAS=	org.mate.Atril.gschema.xml
41
39
42
OPTIONS_DEFINE=	DVI T1LIB CAJA COMICS DJVU
40
OPTIONS_DEFINE=	DBUS DVI T1LIB CAJA COMICS DJVU KEYRING
43
OPTIONS_DEFAULT=CAJA COMICS
41
OPTIONS_DEFAULT=DBUS CAJA COMICS KEYRING
44
DVI_DESC=	DVI viewer support
42
DVI_DESC=	DVI viewer support
45
T1LIB_DESC=	T1LIB for TYPE1 fonts to DVI (Enables DVI)
43
T1LIB_DESC=	T1LIB for TYPE1 fonts to DVI (Enables DVI)
46
CAJA_DESC=	Caja plugin
44
CAJA_DESC=	Caja plugin
47
COMICS_DESC=	Comic book archives support
45
COMICS_DESC=	Comic book archives support
48
DJVU_DESC=	DJVU support
46
DJVU_DESC=	DJVU support
47
KEYRING_DESC=	Keyring password manager support
49
48
49
DBUS_LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
50
DBUS_CONFIGURE_ENABLE= dbus
51
KEYRING_LIB_DEPENDS= libsecret-1.so:${PORTSDIR}/security/libsecret
52
KEYRING_CONFIGURE_WITH= keyring
53
50
.include <bsd.port.options.mk>
54
.include <bsd.port.options.mk>
51
55
56
.if ${PORT_OPTIONS:MDBUS}
57
PLIST_SUB+=	DBUS=""
58
.else
59
PLIST_SUB+=	DBUS="@comment "
60
.endif
61
52
.if ${PORT_OPTIONS:MDVI} || ${PORT_OPTIONS:MT1LIB}
62
.if ${PORT_OPTIONS:MDVI} || ${PORT_OPTIONS:MT1LIB}
53
63
54
USE_TEX=	base
64
USE_TEX=	base
(-)files/patch-shell_ev-window.c (+50 lines)
Line 0 Link Here
1
--- shell/ev-window.c.orig	2015-01-30 14:16:41 UTC
2
+++ shell/ev-window.c
3
@@ -422,12 +422,12 @@ ev_window_setup_action_sensitivity (EvWi
4
 	if (has_document && !ev_print_operation_exists_for_document(document))
5
 		ok_to_print = FALSE;
6
 
7
-	if (has_document &&
8
+	if (has_document && ev_window->priv->lockdown_settings &&
9
 	    g_settings_get_boolean (ev_window->priv->lockdown_settings, MATE_LOCKDOWN_SAVE)) {
10
 		ok_to_copy = FALSE;
11
 	}
12
 
13
-	if (has_document &&
14
+	if (has_document && ev_window->priv->lockdown_settings &&
15
 	    g_settings_get_boolean (ev_window->priv->lockdown_settings, MATE_LOCKDOWN_PRINT)) {
16
 		ok_to_print = FALSE;
17
 	}
18
@@ -1375,12 +1375,14 @@ ev_window_setup_document (EvWindow *ev_w
19
 				  ev_window);
20
 	}
21
 
22
-	if (!ev_window->priv->lockdown_settings)
23
-		ev_window->priv->lockdown_settings = g_settings_new (MATE_LOCKDOWN_SCHEMA);
24
-	g_signal_connect (ev_window->priv->lockdown_settings,
25
-				 "changed",
26
-				 G_CALLBACK (lockdown_changed),
27
-				 ev_window);
28
+	if (g_settings_schema_source_lookup(g_settings_schema_source_get_default(), MATE_LOCKDOWN_SCHEMA, FALSE) != NULL) {
29
+		if (!ev_window->priv->lockdown_settings)
30
+			ev_window->priv->lockdown_settings = g_settings_new (MATE_LOCKDOWN_SCHEMA);
31
+		g_signal_connect (ev_window->priv->lockdown_settings,
32
+							"changed",
33
+							G_CALLBACK (lockdown_changed),
34
+							ev_window);
35
+	}
36
 
37
 	ev_window_setup_action_sensitivity (ev_window);
38
 
39
@@ -3330,6 +3332,11 @@ ev_window_print_range (EvWindow *ev_wind
40
 
41
 	ev_print_operation_set_embed_page_setup (op, !g_settings_get_boolean (ev_window->priv->lockdown_settings,
42
 									     MATE_LOCKDOWN_PRINT_SETUP));
43
+	if (ev_window->priv->lockdown_settings)
44
+		ev_print_operation_set_embed_page_setup (op, !g_settings_get_boolean (ev_window->priv->lockdown_settings,
45
+													MATE_LOCKDOWN_PRINT_SETUP));
46
+	else
47
+		ev_print_operation_set_embed_page_setup (op, TRUE);
48
 
49
 	g_object_unref (print_settings);
50
 	g_object_unref (print_page_setup);
(-)pkg-plist (-2 / +2 lines)
Lines 70-76 Link Here
70
libdata/pkgconfig/atril-document-1.5.0.pc
70
libdata/pkgconfig/atril-document-1.5.0.pc
71
libdata/pkgconfig/atril-view-1.5.0.pc
71
libdata/pkgconfig/atril-view-1.5.0.pc
72
libexec/atril-convert-metadata
72
libexec/atril-convert-metadata
73
libexec/atrild
73
%%DBUS%%libexec/atrild
74
man/man1/atril-previewer.1.gz
74
man/man1/atril-previewer.1.gz
75
man/man1/atril-thumbnailer.1.gz
75
man/man1/atril-thumbnailer.1.gz
76
man/man1/atril.1.gz
76
man/man1/atril.1.gz
Lines 119-125 Link Here
119
%%DATADIR%%/icons/hicolor/scalable/actions/object-rotate-left.svg
119
%%DATADIR%%/icons/hicolor/scalable/actions/object-rotate-left.svg
120
%%DATADIR%%/icons/hicolor/scalable/actions/object-rotate-right.svg
120
%%DATADIR%%/icons/hicolor/scalable/actions/object-rotate-right.svg
121
%%DATADIR%%/icons/hicolor/scalable/mimetypes/x-office-presentation.svg
121
%%DATADIR%%/icons/hicolor/scalable/mimetypes/x-office-presentation.svg
122
share/dbus-1/services/org.mate.atril.Daemon.service
122
%%DBUS%%share/dbus-1/services/org.mate.atril.Daemon.service
123
share/gtk-doc/html/atril/EggFindBar.html
123
share/gtk-doc/html/atril/EggFindBar.html
124
share/gtk-doc/html/atril/EvFileMonitor.html
124
share/gtk-doc/html/atril/EvFileMonitor.html
125
share/gtk-doc/html/atril/EvHistory.html
125
share/gtk-doc/html/atril/EvHistory.html

Return to bug 197197