Add missing filesdir, thanks to angry_vincent

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x18F89C67

3 files changed, 109 insertions, 15 deletions

diff --git a/app-arch/engrampa/ChangeLog b/app-arch/engrampa/ChangeLog
index 4902d00c2e95..0dfb64a853e2 100644
--- a/app-arch/engrampa/ChangeLog
+++ b/app-arch/engrampa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/engrampa
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/engrampa/ChangeLog,v 1.11 2015/07/13 01:05:04 np-hardass Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/engrampa/ChangeLog,v 1.12 2015/07/13 17:10:00 np-hardass Exp $
+
+  13 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org>
+  +files/engrampa-1.8.1-caja-schema-fix.patch:
+  Add missing filesdir, thanks to angry_vincent
 
   13 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
   Fix typo in metadata.xml
diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest
index eb0eb51c6e8a..d57c2bcc4d02 100644
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@@ -1,27 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX engrampa-1.8.1-caja-schema-fix.patch 3013 SHA256 9756dd68492b00efea20136c213e73492143904190dcf0af0418c169eca1c12d SHA512 10adea46216871894143feaa4e738d1833f99f984920f9e6af03808dff545d00d41325e38bdcfc73b68cbf26ecab2e41e1704c6097132d8a42e312012b986efa WHIRLPOOL ef7d76bf1a869b4b7f745dcf5a49584aca1e59f0d3d5b01d3ce1a2f3d6563d15e904cc28c2bfcb192fd7e8eddf58f9e8ac2ae12b50f2e8cf6befc4e6361eafc6
 DIST engrampa-1.8.0.tar.xz 1357360 SHA256 d802acee43e24b8513e661a91dd7943ebdc55270ed0ceee0a8e29f981f0f6230 SHA512 3be9ba254cefe82e16eb533d5738dacb29e770e30b7a8cc1e62af0476b9b28d90bb86937f559d40eda79116172035c730d8f50053936857587c198461a401eea WHIRLPOOL c625de1156e582f58beed4b04087528e08f1d93de804b022bfc69ed04b12e3c53df92a51534693434d7b3237890d7ee8334a5cd830040b0374aa5f70710ab921
 DIST engrampa-1.8.1.tar.xz 1367088 SHA256 f8c541de364352005b2f4a100140197a2190269d3dbffe032e284a98478f1be7 SHA512 0733ef93d34356d6c9cdda7ac91c97ef10fe47df0962375e0270b25873c2271ade4ee9b82f7d6c4c3fd1de5dbe51e9ca1b30acf208b3a7f80a19a4899299b00b WHIRLPOOL 63fde3e27240b175dff12d7a3e15123413033faa7f49a0dcb6fa75eb8b51ab63246879ebacd4295f95b8f9964b48fcba85264378ea3659e5864b43e591133318
 EBUILD engrampa-1.8.0-r1.ebuild 2284 SHA256 470be3e0368ea92b581990343c8692f58a169112204139ab50f6f0a4ecdd56d5 SHA512 966d4b82fd583f66cfbf7d04ef06059c39a9b458bae79061b0116d75721af44b83cd5344b9fddc3372caca147fd5c21979a44c527b7ec75f510e7e06058aa8a2 WHIRLPOOL 814bdece378e2e78f881cfcf082b9f98ef5241893157f3e79fdec2e04fb2a0663b3865245081994a12abdbd1ff5edd03d9f929cb9d27aa94b8521ad790040e03
 EBUILD engrampa-1.8.0.ebuild 2413 SHA256 7294aa75c323477d94b59a81ace29fb8d3a37de2c0b965b62941a77fdaef4e98 SHA512 10cd53f17467e1b31bdca919b15dc91346a854f1c78e6926154bcf7dd3c8ed456f16d81434828de2be1bed1d56225819a3df8d9dd9f53a3e22ed570973f18f29 WHIRLPOOL 8b83c723255a0e8eba2f8e117c58c965b09aa797a8e44649ce549e2bf9ffe6ff718877df1596778c3e41334963e322509c05d49a917948ff78d0767dd44641c3
 EBUILD engrampa-1.8.1-r1.ebuild 2284 SHA256 2dadd83e8da4a6d9cf2645244e2f56e5b9e2305e89229bf2cd9313c3efcfdadf SHA512 f236dee5a91b19525d4534aa3d0ad43329daf0ad51344007f008866fda00eda636693abf7abd0975942204223bf35c447530ce86c7cfe56a092ebfdf6a8723a7 WHIRLPOOL b30d1da841b276ffa699d8f82a4cbfb08af9aa857b1a982a73a1a4c156e27b282b70684d2dc152d3a9d76fd90a1360e8e6b20bfb0139b404af3426dcba347d80
-MISC ChangeLog 1818 SHA256 3c003f00ee1e71897079b043cbf9f94ca2f89cb0f3e2e5fed0379d582c6542b4 SHA512 98fb358748221b847ca4aab095b5f06de57f1f7bb4f332b6c6911d2e5478516a0f837bd5aa9d1ac275aea35b52e386be02d9621afc4dd27b342039d1c4bf9444 WHIRLPOOL 6e95c752f2bb4baf65bcf14b2354815127fc55e72ef1d3f2e76fad08035a07319cf68ea05318a1f307cdd0820d1f05c752f4f4f4d670e6764bc37e22b64bfbe8
+MISC ChangeLog 1964 SHA256 9c7bc793ce1509d053fa970f647e5198c253173f980bfed0e1cd373df9fad66d SHA512 47b1455dae4ee371d51e1b91837e88105f43c31f5bd2b7de28d833e6e1e6cda454ac33e50e985b9298414960f47789161d139ca08c9f9ddc1c0e43347716c330 WHIRLPOOL ca25bd37a558e91274340cad8bbbd3ec7d8554624b1b27a6da0b61d339600f6be9283e2ade81a429607c681a75be566f5b607bec627f27d2ac862cb57aac4c22
 MISC metadata.xml 409 SHA256 816348f16a2bdf6f577161e36440e883c39a6a5cf32bdd94fe6996e3066e713c SHA512 6c2b2d9e627b366f11ad795e9778eed9b1fa91aaa450b10b4614be540b8fbe3206ccc1eb62ea6e75c97a5b928f34ede4bb1bcdc81a78a0c5db0ce9dfe0405435 WHIRLPOOL 4b56c88885aec52a54c7bbbd9be2aaebe9db4a86bf59a9584509b34da6f28915b0544d9c06e5bb0e97762d140cae36f548a7cad00bdcf93f13ffd07224eb47cc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVow7AAAoJEBzZQR2yrxj74HYP/2DRD89jdb4OXyp/7/KmukVa
-iQDuWuvnoBlySP9g9hx8P558UsdIF7JTPv+7Z77TmdGLe8SLh7udweUg4SQbA0F4
-TOJt1zHpfvweT8tzt20m+S4s/7+BzQBOghO79pcbUiRSEPXjeBGlCj+RORBvLpOR
-ueszjaggXnkCeFNqG9DfJryVaFIZO6wipLnNbMiV6RX/9aSVWO9e7SqcvJ753dwr
-1QSwCikFa5e6yF+drD9BOD9kTmsU7fyV2C9d0LUrCkK3qnj830y8Zt2BDXhDcIJr
-lR6kqAcItxCfxdH0m4RJqiCIpd5ro1/RTTpQA0d35VHzQRJptaVBrC3uHjEG+W3c
-hfJ4buPC53E+ff+NsfU+lNKl7AO1PCleAhel9NxqpuasgA7JLDbkCVPQHOHbU73X
-qiSSGm5/V3gcxRmMJfBV15T8U+tTYKAEgl4IU3IhyO6Cug9rmR2HAX2x1XFp7e4B
-6nmy5b63o4SC6oVnP2DDUF8+lnI+/9vDf1D1lsNTIPtZ2RcUHA2TsC47ImjXuVrx
-LFnWN+9HbTb/jW7mPiaJ29uzPklQX4P80nc+r59nWVXTEXSJ9pyPxBQc3kPNzOng
-OaWbr7FBvSDxboQopLlSPpOoNGi9aLTpnDL7ZO1AbYAF9SQw5MGcvvN4LSgH5nRw
-cPtecnIQhp4FX6phvSDi
-=nD70
+iQIcBAEBCAAGBQJVo/DyAAoJEBzZQR2yrxj7EXYP/0+aH8V4uG022F8OLJ12jmwR
+ron1PZzGu8Q1Ryelj9JT4NfKLLMJ45OGluDzx7O1VkKOFG7iULyGUQgxKU/Ra/2n
+aOoAwqI7j65Wo16+cYbGxNtopSbZycbwtSIwd2q3CaAamwhFgNXiNwo4EQf1PUdm
+29oEjdmO6/JGur2RkIqJY8a4yzdgiPsbX7Wjp6wZQuCcS509CSe+3cpLNuydcoHN
+nV3JXKGetwQZQm4njP7ESIwBBd1QpaHhcjTJZBw0ku3CtxTkFRar3+mDGi8G674M
+BBZMQxssQd/NhqnO03aG9YYQuBULpANbmiReW+jFkH1QVrY9Kvy3eecGAKJ3aQ1z
+HfyEmty2a7fNTE5e5gqdKiREwDPvSgDsfKUgrLQjdTgj//acDbTnKkQBKGo3wdjX
+EEI91N9fTZVYLs5PaocNMrB1os9qEGxpsJLySSqeVb+yAxE3wo/uAXxqQ30I/OpF
+XXOG+9LQQwCH6Gs69atYwGWBoa8qMpdycMSKWoVELSmOisQUGMv69rE/HXp6oLRn
+bHikas7AyW4u3c4AKki+wZ8g9nHzZn/C016KxSLxdjM0cM/LfX8qrydGfGlSMvKf
+YTatjP70zDSWC7OgWe+0/XXe8aHRdNBhU61IuJV2qcndlfwyW2ESdx8ViYJaaKxi
+pVGFp6xXdW30nWZxw/MF
+=ASd+
 -----END PGP SIGNATURE-----
diff --git a/app-arch/engrampa/files/engrampa-1.8.1-caja-schema-fix.patch b/app-arch/engrampa/files/engrampa-1.8.1-caja-schema-fix.patch
new file mode 100644
index 000000000000..2068046465da
--- /dev/null
+++ b/app-arch/engrampa/files/engrampa-1.8.1-caja-schema-fix.patch
@@ -0,0 +1,89 @@
+From 49f97664d7fdfc7914245cb26f660cbedd36afa4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Thu, 2 Oct 2014 14:29:01 +0200
+Subject: [PATCH] Use Caja GSettings schema optionally
+
+Excludes changes to glib version in configure.ac
+
+This makes Caja dependency optional.
+
+Closes https://github.com/mate-desktop/engrampa/pull/60
+---
+ configure.ac    |  2 +-
+ src/fr-window.c | 34 ++++++++++++++++++++++++----------
+ 2 files changed, 25 insertions(+), 11 deletions(-)
+
+diff --git a/src/fr-window.c b/src/fr-window.c
+index f9ceef8..6994066 100644
+--- a/src/fr-window.c
++++ b/src/fr-window.c
+@@ -638,7 +638,9 @@ fr_window_free_private_data (FrWindow *window)
+ 	_g_object_unref (window->priv->settings_ui);
+ 	_g_object_unref (window->priv->settings_general);
+ 	_g_object_unref (window->priv->settings_dialogs);
+-	_g_object_unref (window->priv->settings_caja);
++
++	if (window->priv->settings_caja)
++		_g_object_unref (window->priv->settings_caja);
+ }
+ 
+ 
+@@ -4598,11 +4600,13 @@ static gboolean
+ is_single_click_policy (FrWindow *window)
+ {
+ 	char     *value;
+-	gboolean  result;
++	gboolean  result = FALSE;
+ 
+-	value = g_settings_get_string (window->priv->settings_caja, CAJA_CLICK_POLICY);
+-	result = (value != NULL) && (strncmp (value, "single", 6) == 0);
+-	g_free (value);
++	if (window->priv->settings_caja) {
++		value = g_settings_get_string (window->priv->settings_caja, CAJA_CLICK_POLICY);
++		result = (value != NULL) && (strncmp (value, "single", 6) == 0);
++		g_free (value);
++	}
+ 
+ 	return result;
+ }
+@@ -5384,6 +5388,8 @@ fr_window_construct (FrWindow *window)
+ 	GtkToolItem      *open_recent_tool_item;
+ 	GtkWidget        *menu_item;
+ 	GError           *error = NULL;
++	GSettingsSchemaSource *schema_source;
++	GSettingsSchema  *caja_schema;
+ 
+ 	/* data common to all windows. */
+ 
+@@ -5401,7 +5407,13 @@ fr_window_construct (FrWindow *window)
+ 	window->priv->settings_ui = g_settings_new (ENGRAMPA_SCHEMA_UI);
+ 	window->priv->settings_general = g_settings_new (ENGRAMPA_SCHEMA_GENERAL);
+ 	window->priv->settings_dialogs = g_settings_new (ENGRAMPA_SCHEMA_DIALOGS);
+-	window->priv->settings_caja = g_settings_new (CAJA_SCHEMA);
++
++	schema_source = g_settings_schema_source_get_default ();
++	caja_schema = g_settings_schema_source_lookup (schema_source, CAJA_SCHEMA, FALSE);
++	if (caja_schema) {
++		window->priv->settings_caja = g_settings_new (CAJA_SCHEMA);
++		g_settings_schema_unref (caja_schema);
++	}
+ 
+ 	/* Create the application. */
+ 
+@@ -5994,10 +6006,12 @@ fr_window_construct (FrWindow *window)
+ 			"changed::" PREF_LISTING_USE_MIME_ICONS,
+ 			G_CALLBACK (pref_use_mime_icons_changed),
+ 			window);
+-	g_signal_connect (window->priv->settings_caja,
+-			"changed::" CAJA_CLICK_POLICY,
+-			G_CALLBACK (pref_click_policy_changed),
+-			window);
++
++	if (window->priv->settings_caja)
++		g_signal_connect (window->priv->settings_caja,
++				"changed::" CAJA_CLICK_POLICY,
++				G_CALLBACK (pref_click_policy_changed),
++				window);
+ 
+ 	/* Give focus to the list. */
+