diff options
| -rw-r--r-- | app-arch/engrampa/Manifest | 1 | ||||
| -rw-r--r-- | app-arch/engrampa/engrampa-1.8.1-r1.ebuild | 82 | ||||
| -rw-r--r-- | app-arch/engrampa/files/engrampa-1.8.0-caja-schema-fix.patch | 89 |
3 files changed, 0 insertions, 172 deletions
diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest index ae80ea0b31e9..3b4a47bd4d55 100644 --- a/app-arch/engrampa/Manifest +++ b/app-arch/engrampa/Manifest @@ -1,2 +1 @@ DIST engrampa-1.10.2.tar.xz 1378888 SHA256 964bf6fd8463b378e3bdd7713e86eca9dd65f1a6d99e10bb59cb2185084f986b SHA512 86772801d80584c4020fce63cde11478a914372598f3c41774f4248817a05e37eb72842cd2f88be81c22969452f33806738d94a872ffe4ca8743fe8a9c115e1d WHIRLPOOL db2824550840296b636ea48ac987e004184d9cc41c669f0f2c30b67da8ebd6e991d5e27a55a5691c004cce4df26fb101318420d67f20015af55b6f5521525891 -DIST engrampa-1.8.1.tar.xz 1367088 SHA256 f8c541de364352005b2f4a100140197a2190269d3dbffe032e284a98478f1be7 SHA512 0733ef93d34356d6c9cdda7ac91c97ef10fe47df0962375e0270b25873c2271ade4ee9b82f7d6c4c3fd1de5dbe51e9ca1b30acf208b3a7f80a19a4899299b00b WHIRLPOOL 63fde3e27240b175dff12d7a3e15123413033faa7f49a0dcb6fa75eb8b51ab63246879ebacd4295f95b8f9964b48fcba85264378ea3659e5864b43e591133318 diff --git a/app-arch/engrampa/engrampa-1.8.1-r1.ebuild b/app-arch/engrampa/engrampa-1.8.1-r1.ebuild deleted file mode 100644 index f3e399ab904f..000000000000 --- a/app-arch/engrampa/engrampa-1.8.1-r1.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" - -inherit gnome2 versionator - -MATE_BRANCH="$(get_version_component_range 1-2)" - -SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz" -DESCRIPTION="Engrampa archive manager for MATE" -HOMEPAGE="http://mate-desktop.org" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="caja" - -RDEPEND=">=x11-libs/gtk+-2.21.4:2 - >=dev-libs/glib-2.25.5:2 - >=dev-libs/json-glib-0.14:0 - x11-libs/gdk-pixbuf:2 - x11-libs/pango:0 - virtual/libintl:0 - caja? ( >=mate-base/caja-1.8:0 ) - !!app-arch/mate-file-archiver" - -DEPEND="${RDEPEND} - >=dev-util/intltool-0.35:* - dev-util/itstool:0 - >=mate-base/mate-common-1.8:0 - sys-devel/gettext:* - virtual/pkgconfig:*" - -src_prepare() { - epatch "${FILESDIR}/engrampa-1.8.0-caja-schema-fix.patch" - gnome2_src_prepare - - # Drop DEPRECATED flags as configure option doesn't do it, bug #385453 - sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \ - copy-n-paste/Makefile.am copy-n-paste/Makefile.in || die -} - -src_configure() { - gnome2_src_configure \ - --disable-run-in-place \ - --disable-packagekit \ - --disable-deprecations \ - --with-gtk=2.0 \ - $(use_enable caja caja-actions) -} - -DOCS="AUTHORS HACKING MAINTAINERS NEWS README TODO" - -pkg_postinst() { - gnome2_pkg_postinst - - elog "" - elog "${PN} is a frontend for several archiving utilities. If you want a" - elog "particular achive format supported install the relevant package." - elog - elog "For example:" - elog " 7-zip : emerge app-arch/p7zip" - elog " ace : emerge app-arch/unace" - elog " arj : emerge app-arch/arj" - elog " cpio : emerge app-arch/cpio" - elog " deb : emerge app-arch/dpkg" - elog " iso : emerge app-cdr/cdrtools" - elog " jar,zip : emerge app-arch/zip or emerge app-arch/unzip" - elog " lha : emerge app-arch/lha" - elog " lzma : emerge app-arch/xz-utils" - elog " lzop : emerge app-arch/lzop" - elog " rar : emerge app-arch/unrar" - elog " rpm : emerge app-arch/rpm" - elog " unstuff : emerge app-arch/stuffit" - elog " zoo : emerge app-arch/zoo" -} diff --git a/app-arch/engrampa/files/engrampa-1.8.0-caja-schema-fix.patch b/app-arch/engrampa/files/engrampa-1.8.0-caja-schema-fix.patch deleted file mode 100644 index 2068046465da..000000000000 --- a/app-arch/engrampa/files/engrampa-1.8.0-caja-schema-fix.patch +++ /dev/null @@ -1,89 +0,0 @@ -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. */ - |