1 |
pacho 11/01/17 17:58:59 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: glib-2.26.1-r1.ebuild |
5 |
Removed: glib-2.26.0-r1.ebuild |
6 |
Log: |
7 |
Revision bump to include upstream patches from 2.32 branch and fix gsettings.m4 rules to work when there are no schemas, bug #350020. Remove old testing. |
8 |
|
9 |
(Portage version: 2.1.9.31/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.435 dev-libs/glib/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?rev=1.435&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?rev=1.435&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?r1=1.434&r2=1.435 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v |
21 |
retrieving revision 1.434 |
22 |
retrieving revision 1.435 |
23 |
diff -u -r1.434 -r1.435 |
24 |
--- ChangeLog 11 Jan 2011 16:23:49 -0000 1.434 |
25 |
+++ ChangeLog 17 Jan 2011 17:58:59 -0000 1.435 |
26 |
@@ -1,6 +1,20 @@ |
27 |
# ChangeLog for dev-libs/glib |
28 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.434 2011/01/11 16:23:49 pacho Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.435 2011/01/17 17:58:59 pacho Exp $ |
31 |
+ |
32 |
+*glib-2.26.1-r1 (17 Jan 2011) |
33 |
+ |
34 |
+ 17 Jan 2011; Pacho Ramos <pacho@g.o> -glib-2.26.0-r1.ebuild, |
35 |
+ -files/glib-2.26.0-error-pileup.patch, -files/glib-2.26.0-not-close.patch, |
36 |
+ -files/glib-2.26.0-unref-null.patch, +glib-2.26.1-r1.ebuild, |
37 |
+ +files/glib-2.26.1-deprecation-tests.patch, |
38 |
+ +files/glib-2.26.1-gdbus-flushes.patch, |
39 |
+ +files/glib-2.26.1-gsettings-read.patch, |
40 |
+ +files/glib-2.26.1-gsettings-rules.patch, |
41 |
+ +files/glib-2.26.1-locked-message.patch: |
42 |
+ Revision bump to include upstream patches from 2.32 branch and fix |
43 |
+ gsettings.m4 rules to work when there are no schemas, bug #350020. Remove old |
44 |
+ testing. |
45 |
|
46 |
11 Jan 2011; Pacho Ramos <pacho@g.o> glib-2.26.1.ebuild: |
47 |
Inform users about possible breakage when updating glib and not dbus-glib, |
48 |
|
49 |
|
50 |
|
51 |
1.1 dev-libs/glib/glib-2.26.1-r1.ebuild |
52 |
|
53 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.26.1-r1.ebuild?rev=1.1&view=markup |
54 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.26.1-r1.ebuild?rev=1.1&content-type=text/plain |
55 |
|
56 |
Index: glib-2.26.1-r1.ebuild |
57 |
=================================================================== |
58 |
# Copyright 1999-2011 Gentoo Foundation |
59 |
# Distributed under the terms of the GNU General Public License v2 |
60 |
# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.26.1-r1.ebuild,v 1.1 2011/01/17 17:58:59 pacho Exp $ |
61 |
|
62 |
EAPI="3" |
63 |
|
64 |
inherit autotools gnome.org libtool eutils flag-o-matic pax-utils |
65 |
|
66 |
DESCRIPTION="The GLib library of C routines" |
67 |
HOMEPAGE="http://www.gtk.org/" |
68 |
|
69 |
LICENSE="LGPL-2" |
70 |
SLOT="2" |
71 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" |
72 |
IUSE="debug doc fam +introspection selinux +static-libs test xattr" |
73 |
|
74 |
RDEPEND="virtual/libiconv |
75 |
sys-libs/zlib |
76 |
xattr? ( sys-apps/attr ) |
77 |
fam? ( virtual/fam )" |
78 |
DEPEND="${RDEPEND} |
79 |
>=dev-util/pkgconfig-0.16 |
80 |
>=sys-devel/gettext-0.11 |
81 |
>=dev-util/gtk-doc-am-1.13 |
82 |
doc? ( |
83 |
>=dev-libs/libxslt-1.0 |
84 |
>=dev-util/gtk-doc-1.13 |
85 |
~app-text/docbook-xml-dtd-4.1.2 ) |
86 |
test? ( >=sys-apps/dbus-1.2.14 )" |
87 |
PDEPEND="introspection? ( dev-libs/gobject-introspection )" |
88 |
|
89 |
# eautoreconf needs gtk-doc-am |
90 |
# XXX: Consider adding test? ( sys-devel/gdb ); assert-msg-test tries to use it |
91 |
|
92 |
src_prepare() { |
93 |
if use ia64 ; then |
94 |
# Only apply for < 4.1 |
95 |
local major=$(gcc-major-version) |
96 |
local minor=$(gcc-minor-version) |
97 |
if (( major < 4 || ( major == 4 && minor == 0 ) )); then |
98 |
epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch" |
99 |
fi |
100 |
fi |
101 |
|
102 |
# gsettings.m4: Fix rules to work when there are no schemas, bug #350020 |
103 |
epatch "${FILESDIR}/${PN}-2.26.1-gsettings-rules.patch" |
104 |
|
105 |
# Deprecation check in tests/testglib.c, upstream bug #635093 |
106 |
epatch "${FILESDIR}/${P}-deprecation-tests.patch" |
107 |
|
108 |
# Can't read GSettings:backend property, upstream bug #636100 |
109 |
epatch "${FILESDIR}/${P}-gsettings-read.patch" |
110 |
|
111 |
# Cannot send a locked message with PRESERVE_SERIAL flag, upstream bug #632544 |
112 |
epatch "${FILESDIR}/${P}-locked-message.patch" |
113 |
|
114 |
# GDBus message idle can execute while flushes are pending, upstream bug #635626 |
115 |
epatch "${FILESDIR}/${P}-gdbus-flushes.patch" |
116 |
|
117 |
# Don't fail gio tests when ran without userpriv, upstream bug 552912 |
118 |
# This is only a temporary workaround, remove as soon as possible |
119 |
epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch" |
120 |
|
121 |
# Fix gmodule issues on fbsd; bug #184301 |
122 |
epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch |
123 |
|
124 |
# Don't check for python, hence removing the build-time python dep. |
125 |
# We remove the gdb python scripts in src_install due to bug 291328 |
126 |
epatch "${FILESDIR}/${PN}-2.25-punt-python-check.patch" |
127 |
|
128 |
# Fix test failure when upgrading from 2.22 to 2.24, upstream bug 621368 |
129 |
epatch "${FILESDIR}/${PN}-2.24-assert-test-failure.patch" |
130 |
|
131 |
# skip tests that require writing to /root/.dbus, upstream bug ??? |
132 |
epatch "${FILESDIR}/${PN}-2.25-skip-tests-with-dbus-keyring.patch" |
133 |
|
134 |
# Do not try to remove files on live filesystem, upstream bug #619274 |
135 |
sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \ |
136 |
-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed" |
137 |
|
138 |
# Disable failing tests, upstream bug #??? |
139 |
epatch "${FILESDIR}/${PN}-2.26.0-disable-locale-sensitive-test.patch" |
140 |
epatch "${FILESDIR}/${PN}-2.26.0-disable-volumemonitor-broken-test.patch" |
141 |
|
142 |
if ! use test; then |
143 |
# don't waste time building tests |
144 |
sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \ |
145 |
|| die "sed failed" |
146 |
fi |
147 |
|
148 |
# Needed for the punt-python-check patch. |
149 |
# Also needed to prevent croscompile failures, see bug #267603 |
150 |
eautoreconf |
151 |
|
152 |
[[ ${CHOST} == *-freebsd* ]] && elibtoolize |
153 |
|
154 |
epunt_cxx |
155 |
} |
156 |
|
157 |
src_configure() { |
158 |
local myconf |
159 |
|
160 |
# Building with --disable-debug highly unrecommended. It will build glib in |
161 |
# an unusable form as it disables some commonly used API. Please do not |
162 |
# convert this to the use_enable form, as it results in a broken build. |
163 |
# -- compnerd (3/27/06) |
164 |
# disable-visibility needed for reference debug, bug #274647 |
165 |
use debug && myconf="--enable-debug --disable-visibility" |
166 |
|
167 |
# Always use internal libpcre, bug #254659 |
168 |
econf ${myconf} \ |
169 |
$(use_enable xattr) \ |
170 |
$(use_enable doc man) \ |
171 |
$(use_enable doc gtk-doc) \ |
172 |
$(use_enable fam) \ |
173 |
$(use_enable selinux) \ |
174 |
$(use_enable static-libs static) \ |
175 |
--enable-regex \ |
176 |
--with-pcre=internal \ |
177 |
--with-threads=posix |
178 |
} |
179 |
|
180 |
src_install() { |
181 |
local f |
182 |
emake DESTDIR="${D}" install || die "Installation failed" |
183 |
|
184 |
# Do not install charset.alias even if generated, leave it to libiconv |
185 |
rm -f "${ED}/usr/lib/charset.alias" |
186 |
|
187 |
# Don't install gdb python macros, bug 291328 |
188 |
rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/" |
189 |
|
190 |
dodoc AUTHORS ChangeLog* NEWS* README || die "dodoc failed" |
191 |
|
192 |
insinto /usr/share/bash-completion |
193 |
for f in gdbus gsettings; do |
194 |
newins "${ED}/etc/bash_completion.d/${f}-bash-completion.sh" ${f} || die |
195 |
done |
196 |
rm -rf "${ED}/etc" |
197 |
} |
198 |
|
199 |
src_test() { |
200 |
unset DBUS_SESSION_BUS_ADDRESS |
201 |
export XDG_CONFIG_DIRS=/etc/xdg |
202 |
export XDG_DATA_DIRS=/usr/local/share:/usr/share |
203 |
export XDG_DATA_HOME="${T}" |
204 |
|
205 |
# Hardened: gdb needs this, bug #338891 |
206 |
if host-is-pax ; then |
207 |
pax-mark -mr "${S}"/tests/.libs/assert-msg-test \ |
208 |
|| die "Hardened adjustment failed" |
209 |
fi |
210 |
|
211 |
emake check || die "tests failed" |
212 |
} |
213 |
|
214 |
pkg_preinst() { |
215 |
# Only give the introspection message if: |
216 |
# * The user has it enabled |
217 |
# * Has glib already installed |
218 |
# * Previous version was different from new version |
219 |
if use introspection && has_version "${CATEGORY}/${PN}"; then |
220 |
if ! has_version "=${CATEGORY}/${PF}"; then |
221 |
ewarn "You must rebuild gobject-introspection so that the installed" |
222 |
ewarn "typelibs and girs are regenerated for the new APIs in glib" |
223 |
fi |
224 |
fi |
225 |
} |
226 |
|
227 |
pkg_postinst() { |
228 |
# Inform users about possible breakage when updating glib and not dbus-glib, bug #297483 |
229 |
if has_version dev-libs/dbus-glib; then |
230 |
ewarn "If you experience a breakage after updating dev-libs/glib try" |
231 |
ewarn "rebuilding dev-libs/dbus-glib" |
232 |
fi |
233 |
} |