1 |
commit: 33f06a2f55dd58ae723164e8bdb2362250e3972d |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Apr 2 13:14:35 2016 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 2 13:15:37 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33f06a2f |
7 |
|
8 |
gnome-extra/gnome-tweak-tool: Stop relying on libsoup-gnome |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
|
12 |
.../files/gnome-tweak-tool-3.18.1-libsoup.patch | 41 ++++++++++++ |
13 |
.../gnome-tweak-tool-3.18.1-r2.ebuild | 78 ++++++++++++++++++++++ |
14 |
2 files changed, 119 insertions(+) |
15 |
|
16 |
diff --git a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.18.1-libsoup.patch b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.18.1-libsoup.patch |
17 |
new file mode 100644 |
18 |
index 0000000..16aac12 |
19 |
--- /dev/null |
20 |
+++ b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.18.1-libsoup.patch |
21 |
@@ -0,0 +1,41 @@ |
22 |
+From 0335e0edd652542ab6b995dc3e4334251b582b5d Mon Sep 17 00:00:00 2001 |
23 |
+From: Rui Matos <tiagomatos@×××××.com> |
24 |
+Date: Sun, 17 Jan 2016 19:48:51 +0100 |
25 |
+Subject: egowrapper: Port to new Soup.Session API |
26 |
+ |
27 |
+This also allows us to stop using SoupGNOME since Soup.Session now |
28 |
+uses the system's default proxy by default. |
29 |
+ |
30 |
+https://bugzilla.gnome.org/show_bug.cgi?id=759951 |
31 |
+--- |
32 |
+ gtweak/egowrapper.py | 6 ++---- |
33 |
+ 1 file changed, 2 insertions(+), 4 deletions(-) |
34 |
+ |
35 |
+diff --git a/gtweak/egowrapper.py b/gtweak/egowrapper.py |
36 |
+index 738172a..9657c9b 100644 |
37 |
+--- a/gtweak/egowrapper.py |
38 |
++++ b/gtweak/egowrapper.py |
39 |
+@@ -20,9 +20,8 @@ import logging |
40 |
+ |
41 |
+ import gi |
42 |
+ gi.require_version("Soup", "2.4") |
43 |
+-gi.require_version("SoupGNOME", "2.4") |
44 |
+ from gi.repository import GObject |
45 |
+-from gi.repository import Soup, SoupGNOME |
46 |
++from gi.repository import Soup |
47 |
+ |
48 |
+ class ExtensionsDotGnomeDotOrg(GObject.GObject): |
49 |
+ |
50 |
+@@ -35,8 +34,7 @@ class ExtensionsDotGnomeDotOrg(GObject.GObject): |
51 |
+ |
52 |
+ def __init__(self, shell_version_tuple): |
53 |
+ GObject.GObject.__init__(self) |
54 |
+- self._session = Soup.SessionAsync.new() |
55 |
+- self._session.add_feature_by_type(SoupGNOME.ProxyResolverGNOME) |
56 |
++ self._session = Soup.Session.new() |
57 |
+ |
58 |
+ self._shell_version_tuple = shell_version_tuple |
59 |
+ self._extensions = {} |
60 |
+-- |
61 |
+cgit v0.12 |
62 |
+ |
63 |
|
64 |
diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.18.1-r2.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.18.1-r2.ebuild |
65 |
new file mode 100644 |
66 |
index 0000000..46f7e03 |
67 |
--- /dev/null |
68 |
+++ b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.18.1-r2.ebuild |
69 |
@@ -0,0 +1,78 @@ |
70 |
+# Copyright 1999-2015 Gentoo Foundation |
71 |
+# Distributed under the terms of the GNU General Public License v2 |
72 |
+# $Id$ |
73 |
+ |
74 |
+EAPI="5" |
75 |
+GCONF_DEBUG="no" |
76 |
+GNOME2_LA_PUNT="yes" |
77 |
+PYTHON_COMPAT=( python2_7 ) |
78 |
+ |
79 |
+inherit eutils gnome2 python-r1 |
80 |
+ |
81 |
+DESCRIPTION="Tool to customize GNOME 3 options" |
82 |
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/GnomeTweakTool" |
83 |
+ |
84 |
+LICENSE="GPL-2+" |
85 |
+SLOT="0" |
86 |
+IUSE="" |
87 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
88 |
+ |
89 |
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
90 |
+ |
91 |
+# Newer pygobject needed due upstream bug #723951 |
92 |
+COMMON_DEPEND=" |
93 |
+ ${PYTHON_DEPS} |
94 |
+ dev-libs/glib:2[dbus] |
95 |
+ >=dev-python/pygobject-3.10.2:3[${PYTHON_USEDEP}] |
96 |
+ >=gnome-base/gsettings-desktop-schemas-3.4 |
97 |
+" |
98 |
+# g-s-d, gnome-desktop, gnome-shell etc. needed at runtime for the gsettings schemas |
99 |
+RDEPEND="${COMMON_DEPEND} |
100 |
+ >=gnome-base/gnome-desktop-3.6.0.1:3=[introspection] |
101 |
+ >=x11-libs/gtk+-3.12:3[introspection] |
102 |
+ |
103 |
+ net-libs/libsoup[introspection] |
104 |
+ x11-libs/libnotify[introspection] |
105 |
+ |
106 |
+ >=gnome-base/gnome-settings-daemon-3 |
107 |
+ gnome-base/gnome-shell |
108 |
+ >=gnome-base/nautilus-3 |
109 |
+" |
110 |
+DEPEND="${COMMON_DEPEND} |
111 |
+ >=dev-util/intltool-0.40.0 |
112 |
+ virtual/pkgconfig |
113 |
+" |
114 |
+ |
115 |
+src_prepare() { |
116 |
+ # Add contents of Gentoo's cursor theme directory to cursor theme list |
117 |
+ epatch "${FILESDIR}/${PN}-3.10.1-gentoo-cursor-themes.patch" |
118 |
+ |
119 |
+ # Prevent problems setting WM preferences, upstream bug #706834 |
120 |
+ epatch "${FILESDIR}/${PN}-3.8.1-wm-preferences.patch" |
121 |
+ |
122 |
+ # Stop relying on libsoup-gnome (from 'master') |
123 |
+ epatch "${FILESDIR}/${PN}-3.18.1-libsoup.patch" |
124 |
+ |
125 |
+ gnome2_src_prepare |
126 |
+ python_copy_sources |
127 |
+} |
128 |
+ |
129 |
+src_configure() { |
130 |
+ python_foreach_impl run_in_build_dir gnome2_src_configure |
131 |
+} |
132 |
+ |
133 |
+src_compile() { |
134 |
+ python_foreach_impl run_in_build_dir gnome2_src_compile |
135 |
+} |
136 |
+ |
137 |
+src_test() { |
138 |
+ python_foreach_impl run_in_build_dir default |
139 |
+} |
140 |
+ |
141 |
+src_install() { |
142 |
+ install_python() { |
143 |
+ gnome2_src_install |
144 |
+ python_doscript gnome-tweak-tool || die |
145 |
+ } |
146 |
+ python_foreach_impl run_in_build_dir install_python |
147 |
+} |