| 1 |
tetromino 13/09/02 18:29:07 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: glib-2.36.4-r1.ebuild |
| 5 |
Removed: glib-2.34.3.ebuild glib-2.36.3-r1.ebuild |
| 6 |
glib-2.36.3-r2.ebuild |
| 7 |
Log: |
| 8 |
Fix segfaults in vlc and other applications that try to unload libgobject at runtime (bug #405173, thanks to Cédric D. for finding a good solution). Drop old ebuilds. |
| 9 |
|
| 10 |
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61) |
| 11 |
|
| 12 |
Revision Changes Path |
| 13 |
1.575 dev-libs/glib/ChangeLog |
| 14 |
|
| 15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?rev=1.575&view=markup |
| 16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?rev=1.575&content-type=text/plain |
| 17 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?r1=1.574&r2=1.575 |
| 18 |
|
| 19 |
Index: ChangeLog |
| 20 |
=================================================================== |
| 21 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v |
| 22 |
retrieving revision 1.574 |
| 23 |
retrieving revision 1.575 |
| 24 |
diff -u -r1.574 -r1.575 |
| 25 |
--- ChangeLog 1 Sep 2013 19:47:58 -0000 1.574 |
| 26 |
+++ ChangeLog 2 Sep 2013 18:29:07 -0000 1.575 |
| 27 |
@@ -1,6 +1,15 @@ |
| 28 |
# ChangeLog for dev-libs/glib |
| 29 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 30 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.574 2013/09/01 19:47:58 pacho Exp $ |
| 31 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.575 2013/09/02 18:29:07 tetromino Exp $ |
| 32 |
+ |
| 33 |
+*glib-2.36.4-r1 (02 Sep 2013) |
| 34 |
+ |
| 35 |
+ 02 Sep 2013; Alexandre Rostovtsev <tetromino@g.o> -glib-2.34.3.ebuild, |
| 36 |
+ -glib-2.36.3-r1.ebuild, -glib-2.36.3-r2.ebuild, +glib-2.36.4-r1.ebuild, |
| 37 |
+ -files/glib-2.36.3-revert-ext34.patch, +files/glib-2.36.4-znodelete.patch: |
| 38 |
+ Fix segfaults in vlc and other applications that try to unload libgobject at |
| 39 |
+ runtime (bug #405173, thanks to Cédric D. for finding a good solution). Drop |
| 40 |
+ old ebuilds. |
| 41 |
|
| 42 |
01 Sep 2013; Pacho Ramos <pacho@g.o> glib-2.36.4.ebuild: |
| 43 |
Pass --disable-compile-warnings configure option to drop -Werror usage |
| 44 |
|
| 45 |
|
| 46 |
|
| 47 |
1.1 dev-libs/glib/glib-2.36.4-r1.ebuild |
| 48 |
|
| 49 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.36.4-r1.ebuild?rev=1.1&view=markup |
| 50 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.36.4-r1.ebuild?rev=1.1&content-type=text/plain |
| 51 |
|
| 52 |
Index: glib-2.36.4-r1.ebuild |
| 53 |
=================================================================== |
| 54 |
# Copyright 1999-2013 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.36.4-r1.ebuild,v 1.1 2013/09/02 18:29:07 tetromino Exp $ |
| 57 |
|
| 58 |
EAPI="5" |
| 59 |
PYTHON_COMPAT=( python2_{5,6,7} ) |
| 60 |
# Avoid runtime dependency on python when USE=test |
| 61 |
|
| 62 |
inherit autotools bash-completion-r1 gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal |
| 63 |
|
| 64 |
DESCRIPTION="The GLib library of C routines" |
| 65 |
HOMEPAGE="http://www.gtk.org/" |
| 66 |
SRC_URI="${SRC_URI} |
| 67 |
http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf |
| 68 |
|
| 69 |
LICENSE="LGPL-2+" |
| 70 |
SLOT="2" |
| 71 |
IUSE="debug fam kernel_linux selinux static-libs systemtap test utils xattr" |
| 72 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
| 73 |
|
| 74 |
# FIXME: want libselinux[${MULTILIB_USEDEP}] - bug #480960 |
| 75 |
RDEPEND=" |
| 76 |
virtual/libiconv[${MULTILIB_USEDEP}] |
| 77 |
virtual/libffi[${MULTILIB_USEDEP}] |
| 78 |
sys-libs/zlib[${MULTILIB_USEDEP}] |
| 79 |
|| ( |
| 80 |
>=dev-libs/elfutils-0.142 |
| 81 |
>=dev-libs/libelf-0.8.12 |
| 82 |
>=sys-freebsd/freebsd-lib-9.2_rc1 |
| 83 |
) |
| 84 |
selinux? ( sys-libs/libselinux ) |
| 85 |
xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] ) |
| 86 |
fam? ( virtual/fam[${MULTILIB_USEDEP}] ) |
| 87 |
utils? ( |
| 88 |
${PYTHON_DEPS} |
| 89 |
>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] ) |
| 90 |
abi_x86_32? ( |
| 91 |
!<=app-emulation/emul-linux-x86-baselibs-20130224-r9 |
| 92 |
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
| 93 |
) |
| 94 |
" |
| 95 |
DEPEND="${RDEPEND} |
| 96 |
app-text/docbook-xml-dtd:4.1.2 |
| 97 |
>=dev-libs/libxslt-1.0 |
| 98 |
>=sys-devel/gettext-0.11 |
| 99 |
>=dev-util/gtk-doc-am-1.15 |
| 100 |
systemtap? ( >=dev-util/systemtap-1.3 ) |
| 101 |
test? ( |
| 102 |
sys-devel/gdb |
| 103 |
${PYTHON_DEPS} |
| 104 |
>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] |
| 105 |
>=sys-apps/dbus-1.2.14 ) |
| 106 |
!<dev-libs/gobject-introspection-1.$(get_version_component_range 2) |
| 107 |
!<dev-util/gtk-doc-1.15-r2 |
| 108 |
" |
| 109 |
# gobject-introspection blocker to ensure people don't mix |
| 110 |
# different g-i and glib major versions |
| 111 |
|
| 112 |
PDEPEND="x11-misc/shared-mime-info |
| 113 |
!<gnome-base/gvfs-1.6.4-r990" |
| 114 |
# shared-mime-info needed for gio/xdgmime, bug #409481 |
| 115 |
# Earlier versions of gvfs do not work with glib |
| 116 |
|
| 117 |
DOCS="AUTHORS ChangeLog* NEWS* README" |
| 118 |
|
| 119 |
pkg_setup() { |
| 120 |
if use kernel_linux ; then |
| 121 |
CONFIG_CHECK="~INOTIFY_USER" |
| 122 |
if use test; then |
| 123 |
CONFIG_CHECK="~IPV6" |
| 124 |
WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." |
| 125 |
export IPV6_DISABLED="yes" |
| 126 |
fi |
| 127 |
linux-info_pkg_setup |
| 128 |
fi |
| 129 |
} |
| 130 |
|
| 131 |
src_prepare() { |
| 132 |
# Prevent build failure in stage3 where pkgconfig is not available, bug #481056 |
| 133 |
mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die |
| 134 |
|
| 135 |
# Fix gmodule issues on fbsd; bug #184301, upstream bug #107626 |
| 136 |
epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch |
| 137 |
|
| 138 |
if use test; then |
| 139 |
# Do not try to remove files on live filesystem, upstream bug #619274 |
| 140 |
sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \ |
| 141 |
-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed" |
| 142 |
|
| 143 |
# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 |
| 144 |
if ! has_version dev-util/desktop-file-utils ; then |
| 145 |
ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," |
| 146 |
ewarn "think on installing it to get these tests run." |
| 147 |
sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die |
| 148 |
sed -i -e "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die |
| 149 |
sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die |
| 150 |
sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die |
| 151 |
fi |
| 152 |
|
| 153 |
# gdesktopappinfo requires existing terminal (gnome-terminal or any |
| 154 |
# other), falling back to xterm if one doesn't exist |
| 155 |
if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then |
| 156 |
ewarn "Some tests will be skipped due to missing terminal program" |
| 157 |
sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die |
| 158 |
fi |
| 159 |
|
| 160 |
# Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853 |
| 161 |
if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:3' ; then |
| 162 |
ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:3" |
| 163 |
ewarn "not being present on your system, think on installing them to get these tests run." |
| 164 |
sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die |
| 165 |
sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die |
| 166 |
sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die |
| 167 |
sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die |
| 168 |
sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die |
| 169 |
sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die |
| 170 |
sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die |
| 171 |
# needed to prevent gdbus-threading from asserting |
| 172 |
ln -sfn $(type -P true) gio/tests/gdbus-testserver.py |
| 173 |
fi |
| 174 |
|
| 175 |
# Some tests need ipv6, upstream bug #667468 |
| 176 |
if [[ -n "${IPV6_DISABLED}" ]]; then |
| 177 |
sed -i -e "/socket\/ipv6_sync/d" gio/tests/socket.c || die |
| 178 |
sed -i -e "/socket\/ipv6_async/d" gio/tests/socket.c || die |
| 179 |
sed -i -e "/socket\/ipv6_v4mapped/d" gio/tests/socket.c || die |
| 180 |
fi |
| 181 |
|
| 182 |
# Test relies on /usr/bin/true, but we have /bin/true, upstream bug #698655 |
| 183 |
sed -i -e "s:/usr/bin/true:/bin/true:" gio/tests/desktop-app-info.c || die |
| 184 |
|
| 185 |
# thread test fails, upstream bug #679306 |
| 186 |
epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch" |
| 187 |
fi |
| 188 |
|
| 189 |
# gdbus-codegen is a separate package |
| 190 |
epatch "${FILESDIR}/${PN}-2.35.x-external-gdbus-codegen.patch" |
| 191 |
|
| 192 |
# do not allow libgobject to unload; bug #405173, https://bugzilla.gnome.org/show_bug.cgi?id=707298 |
| 193 |
epatch "${FILESDIR}/${PN}-2.36.4-znodelete.patch" |
| 194 |
|
| 195 |
# leave python shebang alone |
| 196 |
sed -e '/${PYTHON}/d' \ |
| 197 |
-i glib/Makefile.{am,in} || die |
| 198 |
|
| 199 |
# Gentoo handles completions in a different directory |
| 200 |
sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \ |
| 201 |
gio/Makefile.am || die |
| 202 |
|
| 203 |
epatch_user |
| 204 |
|
| 205 |
# Needed for the punt-python-check patch, disabling timeout test |
| 206 |
# Also needed to prevent croscompile failures, see bug #267603 |
| 207 |
# Also needed for the no-gdbus-codegen patch |
| 208 |
eautoreconf |
| 209 |
|
| 210 |
# FIXME: Really needed when running eautoreconf before? bug#???? |
| 211 |
#[[ ${CHOST} == *-freebsd* ]] && elibtoolize |
| 212 |
|
| 213 |
epunt_cxx |
| 214 |
} |
| 215 |
|
| 216 |
multilib_src_configure() { |
| 217 |
# Avoid circular depend with dev-util/pkgconfig and |
| 218 |
# native builds (cross-compiles won't need pkg-config |
| 219 |
# in the target ROOT to work here) |
| 220 |
if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then |
| 221 |
if has_version sys-apps/dbus; then |
| 222 |
export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include" |
| 223 |
export DBUS1_LIBS="-ldbus-1" |
| 224 |
fi |
| 225 |
export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)" |
| 226 |
export LIBFFI_LIBS="-lffi" |
| 227 |
fi |
| 228 |
|
| 229 |
local myconf |
| 230 |
|
| 231 |
# Building with --disable-debug highly unrecommended. It will build glib in |
| 232 |
# an unusable form as it disables some commonly used API. Please do not |
| 233 |
# convert this to the use_enable form, as it results in a broken build. |
| 234 |
use debug && myconf="--enable-debug" |
| 235 |
|
| 236 |
# Only used by the gresource bin |
| 237 |
multilib_is_native_abi || myconf="${myconf} --disable-libelf" |
| 238 |
|
| 239 |
# FIXME: change to "$(use_enable selinux)" when libselinux is multilibbed, bug #480960 |
| 240 |
if multilib_is_native_abi; then |
| 241 |
myconf="${myconf} $(use_enable selinux)" |
| 242 |
else |
| 243 |
myconf="${myconf} --disable-selinux" |
| 244 |
fi |
| 245 |
|
| 246 |
# Always use internal libpcre, bug #254659 |
| 247 |
ECONF_SOURCE="${S}" econf ${myconf} \ |
| 248 |
$(use_enable xattr) \ |
| 249 |
$(use_enable fam) \ |
| 250 |
$(use_enable selinux) \ |
| 251 |
$(use_enable static-libs static) \ |
| 252 |
$(use_enable systemtap dtrace) \ |
| 253 |
$(use_enable systemtap systemtap) \ |
| 254 |
$(use_enable test modular-tests) \ |
| 255 |
--disable-compile-warnings \ |
| 256 |
--enable-man \ |
| 257 |
--with-pcre=internal \ |
| 258 |
--with-threads=posix \ |
| 259 |
--with-xml-catalog="${EPREFIX}/etc/xml/catalog" |
| 260 |
} |
| 261 |
|
| 262 |
multilib_src_install_all() { |
| 263 |
if use utils ; then |
| 264 |
python_replicate_script "${ED}"/usr/bin/gtester-report |
| 265 |
else |
| 266 |
rm "${ED}usr/bin/gtester-report" |
| 267 |
rm "${ED}usr/share/man/man1/gtester-report.1" |
| 268 |
fi |
| 269 |
|
| 270 |
# Do not install charset.alias even if generated, leave it to libiconv |
| 271 |
rm -f "${ED}/usr/lib/charset.alias" |
| 272 |
|
| 273 |
# Don't install gdb python macros, bug 291328 |
| 274 |
rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/" |
| 275 |
|
| 276 |
# Completely useless with or without USE static-libs, people need to use |
| 277 |
# pkg-config |
| 278 |
prune_libtool_files --modules |
| 279 |
} |
| 280 |
|
| 281 |
multilib_src_test() { |
| 282 |
gnome2_environment_reset |
| 283 |
|
| 284 |
unset DBUS_SESSION_BUS_ADDRESS |
| 285 |
export XDG_CONFIG_DIRS=/etc/xdg |
| 286 |
export XDG_DATA_DIRS=/usr/local/share:/usr/share |
| 287 |
export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" |
| 288 |
unset GSETTINGS_BACKEND # bug 352451 |
| 289 |
export LC_TIME=C # bug #411967 |
| 290 |
python_export_best |
| 291 |
|
| 292 |
# Related test is a bit nitpicking |
| 293 |
mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
| 294 |
chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
| 295 |
|
| 296 |
# Hardened: gdb needs this, bug #338891 |
| 297 |
if host-is-pax ; then |
| 298 |
pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \ |
| 299 |
|| die "Hardened adjustment failed" |
| 300 |
fi |
| 301 |
|
| 302 |
# Need X for dbus-launch session X11 initialization |
| 303 |
Xemake check |
| 304 |
} |
| 305 |
|
| 306 |
pkg_postinst() { |
| 307 |
if has_version '<x11-libs/gtk+-3.0.12:3'; then |
| 308 |
# To have a clear upgrade path for gtk+-3.0.x users, have to resort to |
| 309 |
# a warning instead of a blocker |
| 310 |
ewarn |
| 311 |
ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes." |
| 312 |
ewarn "You should upgrade to a newer version of gtk+:3 immediately." |
| 313 |
fi |
| 314 |
} |
Archives