Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Adam Feldman <np-hardass@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gentoo-mate:master commit in: mate-base/mate-applets/files/, mate-base/mate-applets/
Date: Wed, 02 Sep 2020 05:55:50
Message-Id: 1599026136.2ee9b842eacdd8c5870442e49d32da842422e298.np-hardass@gentoo
1 commit: 2ee9b842eacdd8c5870442e49d32da842422e298
2 Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 2 05:25:23 2020 +0000
4 Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 2 05:55:36 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=2ee9b842
7
8 mate-base/mate-applets: Sync with ::gentoo
9
10 Package-Manager: Portage-2.3.103, Repoman-2.3.23
11 Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>
12
13 mate-base/mate-applets/Manifest | 2 -
14 .../mate-applets-1.22.2-gcc-10-fno-common.patch | 45 +++++++++++
15 mate-base/mate-applets/mate-applets-1.22.0.ebuild | 86 ----------------------
16 mate-base/mate-applets/mate-applets-1.22.1.ebuild | 85 ---------------------
17 ...1.22.2.ebuild => mate-applets-1.22.2-r1.ebuild} | 6 +-
18 mate-base/mate-applets/mate-applets-1.24.0.ebuild | 2 +-
19 6 files changed, 51 insertions(+), 175 deletions(-)
20
21 diff --git a/mate-base/mate-applets/Manifest b/mate-base/mate-applets/Manifest
22 index d953a28..9bfa42e 100644
23 --- a/mate-base/mate-applets/Manifest
24 +++ b/mate-base/mate-applets/Manifest
25 @@ -1,4 +1,2 @@
26 -DIST mate-applets-1.22.0.tar.xz 7739668 BLAKE2B dc3768d2f5eb987907f1ffb1a049dff990140c66c51427dc9095298be92b17b2b1e9695f3c35dae73433e1e50d05477e94aad1697b2bf15706515c16150096d7 SHA512 2f3e17414171ec5ab6967b76b1291d99783c3091b51127788f99148f46d5f2068edf7d890c3ebca1a59c29cbda4a06be11c852e5e88d4dc58e9981d906c9e34c
27 -DIST mate-applets-1.22.1.tar.xz 7602112 BLAKE2B 22dc076d188cddf9c5160d7ecaddb14ecc41a575abac91b72959054f3fe1c961c80b1aa9171150e7c4ce61ccee0783572726386319312dc97f64d4f9266c1a6d SHA512 d132c8b5e433a557785745032235a5792d04edd7c249269d9a4066fb345b76955bdca71164f7b321f41f566803694d85d9cd7690fbd699daa54788572f0eb986
28 DIST mate-applets-1.22.2.tar.xz 7648744 BLAKE2B 85235f12c1436c3caaa6429aabd16822ae34c5c4bd7a575aa9be2c2e9080734b39180e34b22fdf265a64b5ebffb24071d8768b99f55736631403da02882e45fe SHA512 a57ed37d6ddef303e40cbd8f811d1c6be473eeee78a5b56c5eb280d7dba10668678bf9203425f735fb3b356f4ec33eb2369867aa3ab4b446748fe36b80194e8f
29 DIST mate-applets-1.24.0.tar.xz 8142812 BLAKE2B cbb76d6d64bb6e9b9f93197dbe79e2751877b0604c5a84ff4b6b00608f2930925bdbc2824dc96848c84496fa5f16ab38458775727b22cb07f4db9ca854f93c42 SHA512 345a80b123c705997d44ac5a4bea5249045d75181c3802cf49b2eb08decc14a12f75f2e06e6ebfae267b937ff10edf7638cd64332e2e2e731695e6260df5222e
30
31 diff --git a/mate-base/mate-applets/files/mate-applets-1.22.2-gcc-10-fno-common.patch b/mate-base/mate-applets/files/mate-applets-1.22.2-gcc-10-fno-common.patch
32 new file mode 100644
33 index 0000000..f768e18
34 --- /dev/null
35 +++ b/mate-base/mate-applets/files/mate-applets-1.22.2-gcc-10-fno-common.patch
36 @@ -0,0 +1,45 @@
37 +From c477b6fd2eec63f629ff5934e78c190ea6c73911 Mon Sep 17 00:00:00 2001
38 +From: rbuj <robert.buj@×××××.com>
39 +Date: Wed, 29 Jan 2020 17:10:12 +0100
40 +Subject: [PATCH] Fix build using gcc 10 -fno-common flag
41 +
42 +---
43 + drivemount/drive-list.c | 4 ++++
44 + drivemount/drive-list.h | 2 +-
45 + 2 files changed, 5 insertions(+), 1 deletion(-)
46 +
47 +diff --git a/drivemount/drive-list.c b/drivemount/drive-list.c
48 +index a20e1329..1b3679b3 100644
49 +--- a/drivemount/drive-list.c
50 ++++ b/drivemount/drive-list.c
51 +@@ -32,6 +32,8 @@
52 +
53 + G_DEFINE_TYPE (DriveList, drive_list, GTK_TYPE_GRID);
54 +
55 ++GSettings *settings;
56 ++
57 + static GVolumeMonitor *volume_monitor = NULL;
58 +
59 + static void drive_list_finalize (GObject *object);
60 +@@ -153,6 +155,8 @@ drive_list_finalize (GObject *object)
61 + g_hash_table_destroy (self->volumes);
62 + g_hash_table_destroy (self->mounts);
63 +
64 ++ g_object_unref (settings);
65 ++
66 + if (G_OBJECT_CLASS (drive_list_parent_class)->finalize)
67 + (* G_OBJECT_CLASS (drive_list_parent_class)->finalize) (object);
68 + }
69 +diff --git a/drivemount/drive-list.h b/drivemount/drive-list.h
70 +index c7e844dd..ea55b908 100644
71 +--- a/drivemount/drive-list.h
72 ++++ b/drivemount/drive-list.h
73 +@@ -65,7 +65,7 @@ void drive_list_set_panel_size (DriveList *list,
74 + int panel_size);
75 + void drive_list_set_transparent (DriveList *self,
76 + gboolean transparent);
77 +-GSettings *settings;
78 ++extern GSettings *settings;
79 + void drive_list_redraw (DriveList *self);
80 + void settings_color_changed (GSettings *settings, gchar *key, DriveList *drive_list);
81 +
82
83 diff --git a/mate-base/mate-applets/mate-applets-1.22.0.ebuild b/mate-base/mate-applets/mate-applets-1.22.0.ebuild
84 deleted file mode 100644
85 index 077a17c..0000000
86 --- a/mate-base/mate-applets/mate-applets-1.22.0.ebuild
87 +++ /dev/null
88 @@ -1,86 +0,0 @@
89 -# Copyright 1999-2020 Gentoo Authors
90 -# Distributed under the terms of the GNU General Public License v2
91 -
92 -EAPI=6
93 -
94 -inherit mate
95 -
96 -if [[ ${PV} != 9999 ]]; then
97 - KEYWORDS="amd64 ~arm ~arm64 x86"
98 -fi
99 -
100 -DESCRIPTION="Applets for the MATE Desktop and Panel"
101 -LICENSE="CC-BY-SA-3.0 FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
102 -SLOT="0"
103 -
104 -IUSE="X ipv6 policykit +upower"
105 -
106 -COMMON_DEPEND="dev-libs/atk
107 - >=dev-libs/dbus-glib-0.74
108 - >=dev-libs/glib-2.50:2
109 - >=dev-libs/libmateweather-1.17.0
110 - >=dev-libs/libxml2-2.5:2
111 - dev-python/pygobject:3
112 - >=gnome-base/libgtop-2.12.0:2=
113 - >=gnome-extra/gucharmap-3.0:2.90
114 - >=mate-base/mate-panel-1.17.0
115 - >=net-wireless/wireless-tools-28_pre9:0
116 - >=sys-apps/dbus-1.1.2
117 - sys-power/cpupower
118 - x11-libs/gdk-pixbuf:2
119 - >=x11-libs/gtk+-3.22:3
120 - x11-libs/gtksourceview:3.0
121 - >=x11-libs/libnotify-0.7
122 - x11-libs/libX11
123 - >=x11-libs/libwnck-3.0:3
124 - x11-libs/pango
125 - virtual/libintl
126 - policykit? ( >=sys-auth/polkit-0.97:0 )
127 - upower? ( >=sys-power/upower-0.9.23 )
128 - !!net-analyzer/mate-netspeed"
129 -
130 -RDEPEND="${COMMON_DEPEND}
131 - >=mate-base/mate-settings-daemon-1.6"
132 -
133 -DEPEND="${COMMON_DEPEND}
134 - app-text/docbook-xml-dtd:4.3
135 - app-text/rarian
136 - >=app-text/scrollkeeper-dtd-1:1.0
137 - app-text/yelp-tools
138 - >=dev-util/intltool-0.50.1
139 - dev-libs/libxslt
140 - sys-devel/gettext:*
141 - virtual/pkgconfig:*"
142 -
143 -PATCHES=( "${FILESDIR}"/${P}-cpupower.patch )
144 -
145 -src_configure() {
146 - mate_src_configure \
147 - --libexecdir=/usr/libexec/mate-applets \
148 - --with-cpufreq-lib=cpupower \
149 - $(use_with X x) \
150 - $(use_with upower) \
151 - $(use_enable ipv6) \
152 - $(use_enable policykit polkit)
153 -}
154 -
155 -src_test() {
156 - unset DBUS_SESSION_BUS_ADDRESS
157 - emake check
158 -}
159 -
160 -src_install() {
161 - mate_src_install
162 -
163 - local APPLETS="accessx-status battstat charpick command cpufreq drivemount
164 - geyes mateweather multiload netspeed stickynotes
165 - timerapplet trashapplet"
166 -
167 - for applet in ${APPLETS}; do
168 - docinto ${applet}
169 -
170 - for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
171 - [ -s ${applet}/${d} ] && dodoc ${applet}/${d}
172 - done
173 - done
174 -}
175
176 diff --git a/mate-base/mate-applets/mate-applets-1.22.1.ebuild b/mate-base/mate-applets/mate-applets-1.22.1.ebuild
177 deleted file mode 100644
178 index 38f90f1..0000000
179 --- a/mate-base/mate-applets/mate-applets-1.22.1.ebuild
180 +++ /dev/null
181 @@ -1,85 +0,0 @@
182 -# Copyright 1999-2020 Gentoo Authors
183 -# Distributed under the terms of the GNU General Public License v2
184 -
185 -EAPI=6
186 -
187 -inherit mate
188 -
189 -if [[ ${PV} != 9999 ]]; then
190 - KEYWORDS="~amd64 ~arm ~arm64 ~x86"
191 -fi
192 -
193 -DESCRIPTION="Applets for the MATE Desktop and Panel"
194 -LICENSE="CC-BY-SA-3.0 FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
195 -SLOT="0"
196 -
197 -IUSE="X ipv6 policykit +upower"
198 -
199 -COMMON_DEPEND="dev-libs/atk
200 - >=dev-libs/dbus-glib-0.74
201 - >=dev-libs/glib-2.50:2
202 - >=dev-libs/libmateweather-1.17.0
203 - >=dev-libs/libxml2-2.5:2
204 - >=gnome-base/libgtop-2.12.0:2=
205 - >=gnome-extra/gucharmap-3.0:2.90
206 - >=mate-base/mate-panel-1.17.0
207 - >=net-wireless/wireless-tools-28_pre9:0
208 - >=sys-apps/dbus-1.1.2
209 - sys-power/cpupower
210 - x11-libs/gdk-pixbuf:2
211 - >=x11-libs/gtk+-3.22:3
212 - x11-libs/gtksourceview:3.0
213 - >=x11-libs/libnotify-0.7
214 - x11-libs/libX11
215 - >=x11-libs/libwnck-3.0:3
216 - x11-libs/pango
217 - virtual/libintl
218 - policykit? ( >=sys-auth/polkit-0.97:0 )
219 - upower? ( >=sys-power/upower-0.9.23 )
220 - !!net-analyzer/mate-netspeed"
221 -
222 -RDEPEND="${COMMON_DEPEND}
223 - >=mate-base/mate-settings-daemon-1.6"
224 -
225 -DEPEND="${COMMON_DEPEND}
226 - app-text/docbook-xml-dtd:4.3
227 - app-text/rarian
228 - >=app-text/scrollkeeper-dtd-1:1.0
229 - app-text/yelp-tools
230 - >=dev-util/intltool-0.50.1
231 - dev-libs/libxslt
232 - sys-devel/gettext:*
233 - virtual/pkgconfig:*"
234 -
235 -PATCHES=( "${FILESDIR}"/${PN}-1.22.0-cpupower.patch )
236 -
237 -src_configure() {
238 - mate_src_configure \
239 - --libexecdir=/usr/libexec/mate-applets \
240 - --with-cpufreq-lib=cpupower \
241 - $(use_with X x) \
242 - $(use_with upower) \
243 - $(use_enable ipv6) \
244 - $(use_enable policykit polkit)
245 -}
246 -
247 -src_test() {
248 - unset DBUS_SESSION_BUS_ADDRESS
249 - emake check
250 -}
251 -
252 -src_install() {
253 - mate_src_install
254 -
255 - local APPLETS="accessx-status battstat charpick command cpufreq drivemount
256 - geyes mateweather multiload netspeed stickynotes
257 - timerapplet trashapplet"
258 -
259 - for applet in ${APPLETS}; do
260 - docinto ${applet}
261 -
262 - for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
263 - [ -s ${applet}/${d} ] && dodoc ${applet}/${d}
264 - done
265 - done
266 -}
267
268 diff --git a/mate-base/mate-applets/mate-applets-1.22.2.ebuild b/mate-base/mate-applets/mate-applets-1.22.2-r1.ebuild
269 similarity index 95%
270 rename from mate-base/mate-applets/mate-applets-1.22.2.ebuild
271 rename to mate-base/mate-applets/mate-applets-1.22.2-r1.ebuild
272 index edec396..a92aa88 100644
273 --- a/mate-base/mate-applets/mate-applets-1.22.2.ebuild
274 +++ b/mate-base/mate-applets/mate-applets-1.22.2-r1.ebuild
275 @@ -6,7 +6,7 @@ EAPI=6
276 inherit mate
277
278 if [[ ${PV} != 9999 ]]; then
279 - KEYWORDS="~amd64 ~arm ~arm64 ~x86"
280 + KEYWORDS="amd64 ~arm ~arm64 x86"
281 fi
282
283 DESCRIPTION="Applets for the MATE Desktop and Panel"
284 @@ -55,6 +55,10 @@ DEPEND="${COMMON_DEPEND}
285 sys-devel/gettext:*
286 virtual/pkgconfig:*"
287
288 +PATCHES=(
289 + "${FILESDIR}/${P}-gcc-10-fno-common.patch"
290 +)
291 +
292 src_configure() {
293
294 # configure.ac logic is a little hinky
295
296 diff --git a/mate-base/mate-applets/mate-applets-1.24.0.ebuild b/mate-base/mate-applets/mate-applets-1.24.0.ebuild
297 index 7831931..eec4c6a 100644
298 --- a/mate-base/mate-applets/mate-applets-1.24.0.ebuild
299 +++ b/mate-base/mate-applets/mate-applets-1.24.0.ebuild
300 @@ -6,7 +6,7 @@ EAPI=6
301 inherit mate
302
303 if [[ ${PV} != 9999 ]]; then
304 - KEYWORDS="~amd64 ~arm ~arm64 ~x86"
305 + KEYWORDS="amd64 ~arm ~arm64 x86"
306 fi
307
308 DESCRIPTION="Applets for the MATE Desktop and Panel"
Report Message
Find on MARC Find on Google Groups