1 |
commit: 26db5ae6feda107df9746ab8a5968a549a7b3586 |
2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Jun 11 04:49:13 2018 +0000 |
4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
5 |
CommitDate: Mon Jun 11 04:49:13 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=26db5ae6 |
7 |
|
8 |
dev-libs/glib: version bump to 2.54.3-r6 |
9 |
|
10 |
dev-libs/glib/Manifest | 8 +- |
11 |
.../files/glib-2.54.3-external-gdbus-codegen.patch | 86 ++++++++++++++++++++++ |
12 |
dev-libs/glib/glib-2.52.3.ebuild | 2 +- |
13 |
.../{glib-2.52.3.ebuild => glib-2.54.3-r6.ebuild} | 36 +++++---- |
14 |
dev-libs/glib/metadata.xml | 46 +++++++----- |
15 |
5 files changed, 139 insertions(+), 39 deletions(-) |
16 |
|
17 |
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest |
18 |
index c894393..b840e13 100644 |
19 |
--- a/dev-libs/glib/Manifest |
20 |
+++ b/dev-libs/glib/Manifest |
21 |
@@ -1,3 +1,5 @@ |
22 |
-DIST glib-2.50.3.tar.xz 7589284 SHA256 82ee94bf4c01459b6b00cb9db0545c2237921e3060c0b74cff13fbc020cfd999 SHA512 ef35806c15170b6608445f255136c0bebd2d433adf903c2af2865f6a57b4f2fcfc1e4a7cea1a0dac48ff5fe26248fbf7886dba4a8d209506f0a94160df8fb7af WHIRLPOOL fc8effb457005a234ccb164d74026cec4af7f9a70eef0a8d58efebfacdcf0d7f7713042a9476e6a89e4effbdf4b0d59377811790557cc991cf6b397e5e984f93 |
23 |
-DIST glib-2.52.3.tar.xz 7679972 SHA256 25ee7635a7c0fcd4ec91cbc3ae07c7f8f5ce621d8183511f414ded09e7e4e128 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017 WHIRLPOOL 733ab64abbd60c633833d662d6b58e011478f85d1b0ab48a4af4cbe79e6c9973ccc86247dec2897a0c7663edeee516a3f034c14ac9b5e7a3dba97a04a88298f0 |
24 |
-DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486 |
25 |
+DIST glib-2.50.3.tar.xz 7589284 BLAKE2B 8648e5d9e8f4c943ca3ec5a5ec01f380f55f76555bf4ec731e211b33d0e23c29ea2a9323e2e839f35f89f292863df76d4e8c622fc44c0e5905eb904576618dbd SHA512 ef35806c15170b6608445f255136c0bebd2d433adf903c2af2865f6a57b4f2fcfc1e4a7cea1a0dac48ff5fe26248fbf7886dba4a8d209506f0a94160df8fb7af |
26 |
+DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017 |
27 |
+DIST glib-2.54.3-patchset.tar.xz 39488 BLAKE2B 0bebd1f8eadd1796c355dbad20739ec2428a5b67e363e6ea61e2bab1e672506c438c80c602e87ec7d221ad92ad5c52adf7b57fb13441835e41f1e1208c26c6db SHA512 3d880c2681893da9267c8b2ba9a695eddbb1cef63f4ea26e052ce2f69e1e9d78eccdb27b235cbf0693ecd262bd70d020b24f82fc72ab11a4dbc2c929cfb72942 |
28 |
+DIST glib-2.54.3.tar.xz 7836536 BLAKE2B 140e7cf09a41b72a5b22e5b87e9674cbfdfe1b82f3cf5f0fd3ecb2ed6b1f62a90f8b4c0bc2f655e297f91394f771f6ecad210357e31f104ee49ca178be6b9d76 SHA512 23eb4458684624f80c17aa784eab42a38eec87bb5979fcfe56f0bc63b5c7bcf8251a0d4ea916fe2c8109ff5b14a4b60c6260755d079ff984c0d8e6a2871d307d |
29 |
+DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 |
30 |
|
31 |
diff --git a/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen.patch |
32 |
new file mode 100644 |
33 |
index 0000000..a27966e |
34 |
--- /dev/null |
35 |
+++ b/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen.patch |
36 |
@@ -0,0 +1,86 @@ |
37 |
+From 2e47d49bc91d83cd0abea4c1944bfca4336040fa Mon Sep 17 00:00:00 2001 |
38 |
+From: Sobhan Mohammadpour <sobhan@g.o> |
39 |
+Date: Fri, 23 Feb 2018 15:27:33 +0330 |
40 |
+Subject: [PATCH] glib-2.54.3-external-gdbus-codegen-for-autotools |
41 |
+ |
42 |
+--- |
43 |
+ configure.ac | 1 - |
44 |
+ docs/reference/gio/Makefile.am | 1 - |
45 |
+ gio/Makefile.am | 2 +- |
46 |
+ gio/tests/Makefile.am | 6 ++---- |
47 |
+ gio/tests/gdbus-object-manager-example/Makefile.am | 6 ++---- |
48 |
+ 5 files changed, 5 insertions(+), 11 deletions(-) |
49 |
+ |
50 |
+diff --git a/configure.ac b/configure.ac |
51 |
+index 0457c90..07166c9 100644 |
52 |
+--- a/configure.ac |
53 |
++++ b/configure.ac |
54 |
+@@ -3469,7 +3469,6 @@ gobject/glib-mkenums |
55 |
+ gobject/tests/Makefile |
56 |
+ gthread/Makefile |
57 |
+ gio/Makefile |
58 |
+-gio/gdbus-2.0/codegen/Makefile |
59 |
+ gio/gdbus-2.0/codegen/config.py |
60 |
+ gio/gnetworking.h |
61 |
+ gio/xdgmime/Makefile |
62 |
+diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am |
63 |
+index 5741a3e..d38e768 100644 |
64 |
+--- a/docs/reference/gio/Makefile.am |
65 |
++++ b/docs/reference/gio/Makefile.am |
66 |
+@@ -177,7 +177,6 @@ man_MANS += \ |
67 |
+ gsettings.1 \ |
68 |
+ gresource.1 \ |
69 |
+ gdbus.1 \ |
70 |
+- gdbus-codegen.1 \ |
71 |
+ gio.1 \ |
72 |
+ $(NULL) |
73 |
+ |
74 |
+diff --git a/gio/Makefile.am b/gio/Makefile.am |
75 |
+index b2db995..53d7162 100644 |
76 |
+--- a/gio/Makefile.am |
77 |
++++ b/gio/Makefile.am |
78 |
+@@ -1,6 +1,6 @@ |
79 |
+ include $(top_srcdir)/glib.mk |
80 |
+ |
81 |
+-SUBDIRS = gdbus-2.0/codegen |
82 |
++SUBDIRS = |
83 |
+ |
84 |
+ if OS_UNIX |
85 |
+ if !OS_COCOA |
86 |
+diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am |
87 |
+index acc1da4..7c51eab 100644 |
88 |
+--- a/gio/tests/Makefile.am |
89 |
++++ b/gio/tests/Makefile.am |
90 |
+@@ -460,10 +460,8 @@ gnotification_SOURCES = $(gdbus_sessionbus_sources) gnotifica |
91 |
+ |
92 |
+ BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h |
93 |
+ gdbus-test-codegen.o: gdbus-test-codegen-generated.h |
94 |
+-gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen |
95 |
+- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ |
96 |
+- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ |
97 |
+- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ |
98 |
++gdbus-test-codegen-generated.h: test-codegen.xml Makefile |
99 |
++ $(AM_V_GEN) gdbus-codegen \ |
100 |
+ --interface-prefix org.project. \ |
101 |
+ --generate-c-code gdbus-test-codegen-generated \ |
102 |
+ --c-generate-object-manager \ |
103 |
+diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am |
104 |
+index 1d0464c..f390dca 100644 |
105 |
+--- a/gio/tests/gdbus-object-manager-example/Makefile.am |
106 |
++++ b/gio/tests/gdbus-object-manager-example/Makefile.am |
107 |
+@@ -11,10 +11,8 @@ GDBUS_GENERATED = \ |
108 |
+ gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \ |
109 |
+ $(NULL) |
110 |
+ |
111 |
+-$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen |
112 |
+- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ |
113 |
+- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ |
114 |
+- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ |
115 |
++$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile |
116 |
++ $(AM_V_GEN) gdbus-codegen \ |
117 |
+ --interface-prefix org.gtk.GDBus.Example.ObjectManager. \ |
118 |
+ --c-namespace Example \ |
119 |
+ --c-generate-object-manager \ |
120 |
+-- |
121 |
+2.16.1 |
122 |
+ |
123 |
|
124 |
diff --git a/dev-libs/glib/glib-2.52.3.ebuild b/dev-libs/glib/glib-2.52.3.ebuild |
125 |
index b1e3423..c9b6aac 100644 |
126 |
--- a/dev-libs/glib/glib-2.52.3.ebuild |
127 |
+++ b/dev-libs/glib/glib-2.52.3.ebuild |
128 |
@@ -27,7 +27,7 @@ REQUIRED_USE=" |
129 |
test? ( ${PYTHON_REQUIRED_USE} ) |
130 |
" |
131 |
|
132 |
-KEYWORDS="amd64 ~arm ~mips ~ppc ~x86" |
133 |
+KEYWORDS="amd64 arm ~mips ppc x86" |
134 |
|
135 |
# Added util-linux multilib dependency to have libmount support (which |
136 |
# is always turned on on linux systems, unless explicitly disabled, but |
137 |
|
138 |
diff --git a/dev-libs/glib/glib-2.52.3.ebuild b/dev-libs/glib/glib-2.54.3-r6.ebuild |
139 |
similarity index 88% |
140 |
copy from dev-libs/glib/glib-2.52.3.ebuild |
141 |
copy to dev-libs/glib/glib-2.54.3-r6.ebuild |
142 |
index b1e3423..2260379 100644 |
143 |
--- a/dev-libs/glib/glib-2.52.3.ebuild |
144 |
+++ b/dev-libs/glib/glib-2.54.3-r6.ebuild |
145 |
@@ -6,28 +6,28 @@ |
146 |
# then to be think very closely. |
147 |
|
148 |
EAPI=6 |
149 |
-PYTHON_COMPAT=( python2_7 ) |
150 |
+PYTHON_COMPAT=( python{2_7,3_5,3_6} ) |
151 |
# Completely useless with or without USE static-libs, people need to use |
152 |
# pkg-config |
153 |
GNOME2_LA_PUNT="yes" |
154 |
|
155 |
inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \ |
156 |
- multilib multilib-minimal pax-utils python-r1 toolchain-funcs versionator virtualx |
157 |
+ multilib multilib-minimal pax-utils python-single-r1 toolchain-funcs versionator virtualx |
158 |
|
159 |
DESCRIPTION="The GLib library of C routines" |
160 |
HOMEPAGE="https://www.gtk.org/" |
161 |
-SRC_URI="${SRC_URI} |
162 |
+SRC_URI="${SRC_URI} https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz |
163 |
https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf |
164 |
|
165 |
LICENSE="LGPL-2.1+" |
166 |
SLOT="2" |
167 |
IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr" |
168 |
REQUIRED_USE=" |
169 |
- utils? ( ${PYTHON_REQUIRED_USE} ) |
170 |
+ ${PYTHON_REQUIRED_USE} |
171 |
test? ( ${PYTHON_REQUIRED_USE} ) |
172 |
-" |
173 |
+" # test dep left here and elsewhere to not forget, as global python requirement is supposed to be temporary until a split package is made with meson |
174 |
|
175 |
-KEYWORDS="amd64 ~arm ~mips ~ppc ~x86" |
176 |
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86" |
177 |
|
178 |
# Added util-linux multilib dependency to have libmount support (which |
179 |
# is always turned on on linux systems, unless explicitly disabled, but |
180 |
@@ -44,9 +44,9 @@ RDEPEND=" |
181 |
selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) |
182 |
xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) |
183 |
fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) |
184 |
+ ${PYTHON_DEPS} |
185 |
utils? ( |
186 |
- ${PYTHON_DEPS} |
187 |
- >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] |
188 |
+ >=dev-util/gdbus-codegen-${PV} |
189 |
virtual/libelf:0= |
190 |
) |
191 |
" |
192 |
@@ -59,7 +59,7 @@ DEPEND="${RDEPEND} |
193 |
test? ( |
194 |
sys-devel/gdb |
195 |
${PYTHON_DEPS} |
196 |
- >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] |
197 |
+ >=dev-util/gdbus-codegen-${PV} |
198 |
>=sys-apps/dbus-1.2.14 ) |
199 |
!<dev-util/gtk-doc-1.15-r2 |
200 |
" |
201 |
@@ -84,6 +84,8 @@ pkg_setup() { |
202 |
fi |
203 |
linux-info_pkg_setup |
204 |
fi |
205 |
+ # FIXME: Move python deps that are only required at build time of other packages to a split package |
206 |
+ python-single-r1_pkg_setup |
207 |
} |
208 |
|
209 |
src_prepare() { |
210 |
@@ -123,13 +125,13 @@ src_prepare() { |
211 |
fi |
212 |
|
213 |
# gdbus-codegen is a separate package |
214 |
- eapply "${FILESDIR}"/${PN}-2.50.0-external-gdbus-codegen.patch |
215 |
+ eapply "${FILESDIR}"/${PN}-2.54.3-external-gdbus-codegen.patch |
216 |
+ |
217 |
+ # Upstream glib-2-54 branch; includes fixups for potential libreoffice lockups |
218 |
+ eapply "${WORKDIR}"/patches/ |
219 |
|
220 |
- # Leave python shebang alone - handled by python_replicate_script |
221 |
- # We could call python_setup and give configure a valid --with-python |
222 |
- # arg, but that would mean a build dep on python when USE=utils. |
223 |
- sed -e '/${PYTHON}/d' \ |
224 |
- -i glib/Makefile.{am,in} || die |
225 |
+ # Leave gtester-report python shebang alone - handled by python_fix_shebang |
226 |
+ sed -e '/${PYTHON}/d' -i glib/Makefile.{am,in} || die |
227 |
|
228 |
# Also needed to prevent cross-compile failures, see bug #267603 |
229 |
eautoreconf |
230 |
@@ -185,6 +187,7 @@ multilib_src_configure() { |
231 |
$(use_enable systemtap dtrace) \ |
232 |
$(use_enable systemtap systemtap) \ |
233 |
$(multilib_native_use_enable utils libelf) \ |
234 |
+ --with-python=${EPYTHON} \ |
235 |
--disable-compile-warnings \ |
236 |
--enable-man \ |
237 |
--with-pcre=system \ |
238 |
@@ -229,8 +232,9 @@ multilib_src_install_all() { |
239 |
einstalldocs |
240 |
|
241 |
if use utils ; then |
242 |
- python_replicate_script "${ED}"/usr/bin/gtester-report |
243 |
+ python_fix_shebang "${ED}"/usr/bin/gtester-report |
244 |
else |
245 |
+ # gtester-report is heavily deprecated, so do not install by default - https://bugzilla.gnome.org/show_bug.cgi?id=668035#c4 |
246 |
rm "${ED}usr/bin/gtester-report" |
247 |
rm "${ED}usr/share/man/man1/gtester-report.1" |
248 |
fi |
249 |
|
250 |
diff --git a/dev-libs/glib/metadata.xml b/dev-libs/glib/metadata.xml |
251 |
index b73f9ed..b88cceb 100644 |
252 |
--- a/dev-libs/glib/metadata.xml |
253 |
+++ b/dev-libs/glib/metadata.xml |
254 |
@@ -1,23 +1,31 @@ |
255 |
<?xml version="1.0" encoding="UTF-8"?> |
256 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
257 |
<pkgmetadata> |
258 |
- <maintainer type="project"> |
259 |
- <email>gnome@g.o</email> |
260 |
- <name>Gentoo GNOME Desktop</name> |
261 |
- </maintainer> |
262 |
- <use> |
263 |
- <flag name="dbus">Enable dependencies required by glib libraries |
264 |
- using dbus service to manage settings saving</flag> |
265 |
- <flag name="mime">Pull in shared MIME database that many glib-based |
266 |
- applications require at runtime to detect or open files. Warning: |
267 |
- do not disable this flag unless installing on a headless server.</flag> |
268 |
- <flag name="systemtap">Build support for profiling and tracing using |
269 |
- <pkg>dev-util/systemtap</pkg></flag> |
270 |
- <flag name="utils">Install gtester-report utility to generate test |
271 |
- report files for your software; build gresource utility with |
272 |
- ELF support.</flag> |
273 |
- </use> |
274 |
- <upstream> |
275 |
- <remote-id type="cpe">cpe:/a:gnome:glib</remote-id> |
276 |
- </upstream> |
277 |
+ <maintainer type="project"> |
278 |
+ <email>gnome@g.o</email> |
279 |
+ <name>Gentoo GNOME Desktop</name> |
280 |
+ </maintainer> |
281 |
+ <use> |
282 |
+ <flag name="dbus"> |
283 |
+ Enable dependencies required by glib libraries |
284 |
+ using dbus service to manage settings saving |
285 |
+ </flag> |
286 |
+ <flag name="mime"> |
287 |
+ Pull in shared MIME database that many glib-based |
288 |
+ applications require at runtime to detect or open files. Warning: |
289 |
+ do not disable this flag unless installing on a headless server. |
290 |
+ </flag> |
291 |
+ <flag name="systemtap"> |
292 |
+ Build support for profiling and tracing using |
293 |
+ <pkg>dev-util/systemtap</pkg> |
294 |
+ </flag> |
295 |
+ <flag name="utils"> |
296 |
+ Install gtester-report utility to generate test |
297 |
+ report files for your software; build gresource utility with |
298 |
+ ELF support. |
299 |
+ </flag> |
300 |
+ </use> |
301 |
+ <upstream> |
302 |
+ <remote-id type="cpe">cpe:/a:gnome:glib</remote-id> |
303 |
+ </upstream> |
304 |
</pkgmetadata> |