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-extra/mate-utils/files/, mate-extra/mate-utils/
Date: Wed, 02 Sep 2020 05:55:56
Message-Id: 1599026138.5608e262420ba168eb32f6f9c04d8cfbf2513a15.np-hardass@gentoo
1 commit: 5608e262420ba168eb32f6f9c04d8cfbf2513a15
2 Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 2 05:43:12 2020 +0000
4 Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 2 05:55:38 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=5608e262
7
8 mate-extra/mate-utils: 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-extra/mate-utils/Manifest | 2 -
14 .../mate-utils-1.22.2-gcc-10-fno-common.patch | 37 ++++++++++++
15 mate-extra/mate-utils/mate-utils-1.22.1-r1.ebuild | 68 ----------------------
16 ...s-1.22.0.ebuild => mate-utils-1.22.2-r1.ebuild} | 4 ++
17 mate-extra/mate-utils/mate-utils-1.22.2.ebuild | 65 ---------------------
18 ...s-1.24.0.ebuild => mate-utils-1.24.0-r1.ebuild} | 3 +-
19 6 files changed, 43 insertions(+), 136 deletions(-)
20
21 diff --git a/mate-extra/mate-utils/Manifest b/mate-extra/mate-utils/Manifest
22 index cd12a5d..3f09230 100644
23 --- a/mate-extra/mate-utils/Manifest
24 +++ b/mate-extra/mate-utils/Manifest
25 @@ -1,4 +1,2 @@
26 -DIST mate-utils-1.22.0.tar.xz 7300112 BLAKE2B 8a613b6dcb99e652ad6b44bd64ad9b2f9c809713b5fb904059b64234b51e2a06b2290dcf14d7dde82e8011be2ca395fe74d87bcae5b903b196d55bb50e8fdf07 SHA512 248c6e4108900768a4e8b272d20ac9b2d70e8bf77375f4669a099f4d8386c2e8affeafb772d209f00906f96f20d7ee347167ef4837186f44d8aaad85ef855f70
27 -DIST mate-utils-1.22.1.tar.xz 7284496 BLAKE2B 83e7e39a0daadae595ab2cc90ad250f61a294afc896df28bf17259cec619af4b0c9d1927c07b03a0cdd7449174af258227678299823169e2cb4d9c4d3ec98c92 SHA512 0f70f088de80440ff6954c899eab75c2bf22d332293c1ec61bf8391396ed31a2ab126279dc4d9dab6f4932225120309bc52e122bcd5a8dc17abccfd6e480390d
28 DIST mate-utils-1.22.2.tar.xz 7306448 BLAKE2B 0fb28f85e39ac58c1e78e6f5f4c6d01e72a2b8c32197739b93ec3f17617b4676fdfe251b81e3b5b01c44f69136d9bfc8d12d64fff832d5a9f1c30591b2facebb SHA512 bf33019ebd1dc4ff6010ba0824981334b7065a62dfc7a73170487df5f165ad20831a900ef4e4e0641ca130aa618f82aa27606f0a48c2cb9907ea7ef118f02a60
29 DIST mate-utils-1.24.0.tar.xz 7930068 BLAKE2B 0e2c82afbc2d8a90b8c31d56d9bfbb3a477b1e9cd67108e52c96f4087d09336ed9e6980551e39b43797743b9ef86cc2beabfa84fd7a5820e38122e0d0a7c968d SHA512 d8945c85936a55d22f3ed94c9858ba84cadf552a63cdd2d9eec9120111ad71526ac88772f8e4b7a6a460b691574534e52706fba35a0395b1d894b27eece9e92c
30
31 diff --git a/mate-extra/mate-utils/files/mate-utils-1.22.2-gcc-10-fno-common.patch b/mate-extra/mate-utils/files/mate-utils-1.22.2-gcc-10-fno-common.patch
32 new file mode 100644
33 index 0000000..052c1a2
34 --- /dev/null
35 +++ b/mate-extra/mate-utils/files/mate-utils-1.22.2-gcc-10-fno-common.patch
36 @@ -0,0 +1,37 @@
37 +From d2d4902a68b8eabf4dc26a8ba49019e5ea6040c6 Mon Sep 17 00:00:00 2001
38 +From: rbuj <robert.buj@×××××.com>
39 +Date: Wed, 29 Jan 2020 16:22:09 +0100
40 +Subject: [PATCH] Fix build using gcc 10 -fno-common flag
41 +
42 +Closes #258
43 +---
44 + baobab/src/baobab.c | 2 ++
45 + baobab/src/baobab.h | 2 +-
46 + 2 files changed, 3 insertions(+), 1 deletion(-)
47 +
48 +diff --git a/baobab/src/baobab.c b/baobab/src/baobab.c
49 +index 07af1a1d..d4edde1f 100644
50 +--- a/baobab/src/baobab.c
51 ++++ b/baobab/src/baobab.c
52 +@@ -42,6 +42,8 @@
53 + static void push_iter_in_stack (GtkTreeIter *);
54 + static GtkTreeIter pop_iter_from_stack (void);
55 +
56 ++BaobabApplication baobab;
57 ++
58 + static gint currentdepth = 0;
59 + static GtkTreeIter currentiter;
60 + static GtkTreeIter firstiter;
61 +diff --git a/baobab/src/baobab.h b/baobab/src/baobab.h
62 +index b8d01817..76b22d6a 100644
63 +--- a/baobab/src/baobab.h
64 ++++ b/baobab/src/baobab.h
65 +@@ -99,7 +99,7 @@ struct _BaobabApplication {
66 + };
67 +
68 + /* Application singleton */
69 +-BaobabApplication baobab;
70 ++extern BaobabApplication baobab;
71 +
72 + struct chan_data {
73 + guint64 size;
74
75 diff --git a/mate-extra/mate-utils/mate-utils-1.22.1-r1.ebuild b/mate-extra/mate-utils/mate-utils-1.22.1-r1.ebuild
76 deleted file mode 100644
77 index eda9351..0000000
78 --- a/mate-extra/mate-utils/mate-utils-1.22.1-r1.ebuild
79 +++ /dev/null
80 @@ -1,68 +0,0 @@
81 -# Copyright 1999-2020 Gentoo Authors
82 -# Distributed under the terms of the GNU General Public License v2
83 -
84 -EAPI=6
85 -
86 -MATE_LA_PUNT="yes"
87 -
88 -inherit mate
89 -
90 -if [[ ${PV} != 9999 ]]; then
91 - KEYWORDS="~amd64 ~arm ~arm64 ~x86"
92 -fi
93 -
94 -DESCRIPTION="Utilities for the MATE desktop"
95 -LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
96 -SLOT="0"
97 -
98 -IUSE="X applet debug ipv6 test"
99 -RESTRICT="!test? ( test )"
100 -
101 -RDEPEND="
102 - dev-libs/atk
103 - >=dev-libs/glib-2.50:2
104 - >=gnome-base/libgtop-2.12:2=
105 - >=media-libs/libcanberra-0.4[gtk3]
106 - sys-libs/zlib
107 - x11-libs/cairo
108 - x11-libs/gdk-pixbuf:2
109 - >=x11-libs/gtk+-3.22:3
110 - x11-libs/libICE
111 - x11-libs/libSM
112 - x11-libs/libX11
113 - x11-libs/libXext
114 - x11-libs/pango
115 - applet? ( >=mate-base/mate-panel-1.17.0 )"
116 -
117 -DEPEND="${RDEPEND}
118 - app-text/rarian
119 - >=app-text/scrollkeeper-dtd-1:1.0
120 - app-text/yelp-tools
121 - dev-util/glib-utils
122 - dev-util/gtk-doc
123 - dev-util/gtk-doc-am
124 - >=dev-util/intltool-0.50.1
125 - gnome-base/librsvg
126 - sys-devel/gettext
127 - virtual/pkgconfig
128 - x11-base/xorg-proto"
129 -
130 -PATCHES=( "${FILESDIR}/${PN}-1.22.1-make-inkscape-optional.patch" )
131 -
132 -src_prepare() {
133 - # Make apps visible in all DEs.
134 - LC_ALL=C find . -iname '*.desktop.in*' -exec \
135 - sed -e '/OnlyShowIn/d' -i {} + || die
136 -
137 - mate_src_prepare
138 -}
139 -
140 -src_configure() {
141 - mate_src_configure \
142 - --disable-maintainer-flags \
143 - --enable-zlib \
144 - --enable-debug=$(usex debug yes minimum) \
145 - $(use_with X x) \
146 - $(use_enable applet gdict-applet) \
147 - $(use_enable ipv6)
148 -}
149
150 diff --git a/mate-extra/mate-utils/mate-utils-1.22.0.ebuild b/mate-extra/mate-utils/mate-utils-1.22.2-r1.ebuild
151 similarity index 95%
152 rename from mate-extra/mate-utils/mate-utils-1.22.0.ebuild
153 rename to mate-extra/mate-utils/mate-utils-1.22.2-r1.ebuild
154 index 1d7235c..b58cd08 100644
155 --- a/mate-extra/mate-utils/mate-utils-1.22.0.ebuild
156 +++ b/mate-extra/mate-utils/mate-utils-1.22.2-r1.ebuild
157 @@ -46,6 +46,10 @@ DEPEND="${RDEPEND}
158 virtual/pkgconfig
159 x11-base/xorg-proto"
160
161 +PATCHES=(
162 + "${FILESDIR}/${P}-gcc-10-fno-common.patch"
163 +)
164 +
165 src_prepare() {
166 # Make apps visible in all DEs.
167 LC_ALL=C find . -iname '*.desktop.in*' -exec \
168
169 diff --git a/mate-extra/mate-utils/mate-utils-1.22.2.ebuild b/mate-extra/mate-utils/mate-utils-1.22.2.ebuild
170 deleted file mode 100644
171 index e739dfd..0000000
172 --- a/mate-extra/mate-utils/mate-utils-1.22.2.ebuild
173 +++ /dev/null
174 @@ -1,65 +0,0 @@
175 -# Copyright 1999-2020 Gentoo Authors
176 -# Distributed under the terms of the GNU General Public License v2
177 -
178 -EAPI=6
179 -
180 -MATE_LA_PUNT="yes"
181 -
182 -inherit mate
183 -
184 -if [[ ${PV} != 9999 ]]; then
185 - KEYWORDS="~amd64 ~arm ~arm64 ~x86"
186 -fi
187 -
188 -DESCRIPTION="Utilities for the MATE desktop"
189 -LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
190 -SLOT="0"
191 -
192 -IUSE="X applet debug ipv6 test"
193 -RESTRICT="!test? ( test )"
194 -
195 -RDEPEND="
196 - dev-libs/atk
197 - >=dev-libs/glib-2.50:2
198 - >=gnome-base/libgtop-2.12:2=
199 - >=media-libs/libcanberra-0.4[gtk3]
200 - sys-libs/zlib
201 - x11-libs/cairo
202 - x11-libs/gdk-pixbuf:2
203 - >=x11-libs/gtk+-3.22:3
204 - x11-libs/libICE
205 - x11-libs/libSM
206 - x11-libs/libX11
207 - x11-libs/libXext
208 - x11-libs/pango
209 - applet? ( >=mate-base/mate-panel-1.17.0 )"
210 -
211 -DEPEND="${RDEPEND}
212 - app-text/rarian
213 - >=app-text/scrollkeeper-dtd-1:1.0
214 - app-text/yelp-tools
215 - dev-util/glib-utils
216 - dev-util/gtk-doc
217 - dev-util/gtk-doc-am
218 - >=dev-util/intltool-0.50.1
219 - sys-devel/gettext
220 - virtual/pkgconfig
221 - x11-base/xorg-proto"
222 -
223 -src_prepare() {
224 - # Make apps visible in all DEs.
225 - LC_ALL=C find . -iname '*.desktop.in*' -exec \
226 - sed -e '/OnlyShowIn/d' -i {} + || die
227 -
228 - mate_src_prepare
229 -}
230 -
231 -src_configure() {
232 - mate_src_configure \
233 - --disable-maintainer-flags \
234 - --enable-zlib \
235 - --enable-debug=$(usex debug yes minimum) \
236 - $(use_with X x) \
237 - $(use_enable applet gdict-applet) \
238 - $(use_enable ipv6)
239 -}
240
241 diff --git a/mate-extra/mate-utils/mate-utils-1.24.0.ebuild b/mate-extra/mate-utils/mate-utils-1.24.0-r1.ebuild
242 similarity index 96%
243 rename from mate-extra/mate-utils/mate-utils-1.24.0.ebuild
244 rename to mate-extra/mate-utils/mate-utils-1.24.0-r1.ebuild
245 index c6f2825..28df90e 100644
246 --- a/mate-extra/mate-utils/mate-utils-1.24.0.ebuild
247 +++ b/mate-extra/mate-utils/mate-utils-1.24.0-r1.ebuild
248 @@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
249 inherit mate
250
251 if [[ ${PV} != 9999 ]]; then
252 - KEYWORDS="~amd64 ~arm ~arm64 ~x86"
253 + KEYWORDS="amd64 ~arm ~arm64 x86"
254 fi
255
256 DESCRIPTION="Utilities for the MATE desktop"
257 @@ -63,6 +63,7 @@ src_prepare() {
258
259 src_configure() {
260 mate_src_configure \
261 + --disable-static \
262 --enable-zlib \
263 --enable-debug=$(usex debug yes minimum) \
264 $(use_with X x) \