* [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/glib/, dev-libs/glib/files/
@ 2023-05-03 11:49 Fabian Groffen
0 siblings, 0 replies; 4+ messages in thread
From: Fabian Groffen @ 2023-05-03 11:49 UTC (permalink / raw
To: gentoo-commits
commit: 1d2c9baea436b09c31c69fc36b779cb08881951a
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed May 3 11:49:39 2023 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed May 3 11:49:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1d2c9bae
dev-libs/glib: migrated to gx86
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
dev-libs/glib/Manifest | 3 -
dev-libs/glib/files/2.56-gmodule-cygwin.patch | 149 ----------
.../files/glib-2.54.3-external-gdbus-codegen.patch | 86 ------
...-2.64.1-mark-gdbus-server-auth-test-flaky.patch | 32 ---
.../files/glib-2.74.4-implicit-func-decl.patch | 24 --
dev-libs/glib/glib-2.74.4.ebuild | 309 ---------------------
dev-libs/glib/glib-2.74.6.ebuild | 308 --------------------
dev-libs/glib/glib-2.76.2.ebuild | 300 --------------------
dev-libs/glib/metadata.xml | 35 ---
9 files changed, 1246 deletions(-)
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
deleted file mode 100644
index 58917cecf0..0000000000
--- a/dev-libs/glib/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST glib-2.74.4.tar.xz 5208484 BLAKE2B 01a2818e63469019abcd1215fa85521b9a2e55644040e8fe2797f68cabe897a191ae2c1cc2ab75d5ba9980d63adbfc00636b295ee942d70579e7eba1e1f49502 SHA512 912f6b0559fcb5ad55fa36837a348228b8e2498c490271204ced9f2e4a9eab804de4745f3ec439a198eb275d7263f18bc670f45460e2be55a2cbe45466b02fc6
-DIST glib-2.74.6.tar.xz 5217312 BLAKE2B 07b0a5cb74c1451ba863d5f9a781a122d3d20af1f1227177025de114279277cacada3dd6ab5eb5ad5c0bff5ac7abab6fdfbe0551f44d07b2ddc9141a0640a8c8 SHA512 6b6d113012ec90f6cf77513ec0132668c49aa7224c806181ad662388701004667cdf6d263050d6f896b8688c085abf461aa3e659eb288e6ba93ba4970a2f181b
-DIST glib-2.76.2.tar.xz 5273836 BLAKE2B db5d5e45fe4a17bade7f5bf923ac0e5541237d19146ede33b4d52f05b82e4ecb94519393f49ac3b04e17d0f56bfd5dd99b8e81ae80956cfdb5cb2396cd5ec8cc SHA512 5a99723d72ae987999bdf3eac4f3cabe2e014616038f2006e84060b97d6d290b7d44a20d700e9c0f4572a6defed56169f624bcd21b0337f32832b311aa2737e6
diff --git a/dev-libs/glib/files/2.56-gmodule-cygwin.patch b/dev-libs/glib/files/2.56-gmodule-cygwin.patch
deleted file mode 100644
index 4665a2901a..0000000000
--- a/dev-libs/glib/files/2.56-gmodule-cygwin.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-This is derived from github/cygwinports/glib2.0/2.50-gmodule-cygwin.patch
-as of commit id 3a873fdd1b9a9e649563fe8e6b8ae6951b0dd3be for glib-2.54.3,
-and rebased for glib-2.56.2.
---- origsrc/glib-2.50.3/gmodule/gmodule-win32.c
-+++ src/glib-2.50.3/gmodule/gmodule-win32.c
-@@ -37,7 +37,20 @@
-
- #ifdef G_WITH_CYGWIN
- #include <sys/cygwin.h>
--#endif
-+#include <dlfcn.h>
-+
-+static gchar*
-+fetch_dlerror (gboolean replace_null)
-+{
-+ gchar *msg = dlerror ();
-+
-+ if (!msg && replace_null)
-+ return "unknown dl-error";
-+
-+ return msg;
-+}
-+
-+#else
-
- static void
- set_error (const gchar *format,
-@@ -62,22 +75,26 @@ set_error (const gchar *format,
- g_free (error);
- }
-
-+#endif /* G_WITH_CYGWIN */
-+
- /* --- functions --- */
- static gpointer
- _g_module_open (const gchar *file_name,
- gboolean bind_lazy,
- gboolean bind_local)
- {
-+#ifdef G_WITH_CYGWIN
-+ gpointer handle;
-+
-+ handle = dlopen (file_name,
-+ (bind_local ? RTLD_LOCAL : RTLD_GLOBAL) | (bind_lazy ? RTLD_LAZY : RTLD_NOW));
-+ if (!handle)
-+ g_module_set_error (fetch_dlerror (TRUE));
-+#else
- HINSTANCE handle;
- wchar_t *wfilename;
- DWORD old_mode;
- BOOL success;
--#ifdef G_WITH_CYGWIN
-- gchar tmp[MAX_PATH];
--
-- cygwin_conv_to_win32_path(file_name, tmp);
-- file_name = tmp;
--#endif
- wfilename = g_utf8_to_utf16 (file_name, -1, NULL, NULL, NULL);
-
- /* suppress error dialog */
-@@ -91,26 +108,44 @@ _g_module_open (const gchar *file_name,
-
- if (!handle)
- set_error ("'%s': ", file_name);
-+#endif
-
- return handle;
- }
-
-+#ifndef G_WITH_CYGWIN
- static gint dummy;
- static gpointer null_module_handle = &dummy;
-+#endif
-
- static gpointer
- _g_module_self (void)
- {
-+#ifdef G_WITH_CYGWIN
-+ gpointer handle;
-+
-+ handle = dlopen (NULL, RTLD_GLOBAL | RTLD_LAZY);
-+ if (!handle)
-+ g_module_set_error (fetch_dlerror (TRUE));
-+
-+ return handle;
-+#else
- return null_module_handle;
-+#endif
- }
-
- static void
- _g_module_close (gpointer handle,
- gboolean is_unref)
- {
-+#ifdef G_WITH_CYGWIN
-+ if (dlclose (handle) != 0)
-+ g_module_set_error (fetch_dlerror (TRUE));
-+#else
- if (handle != null_module_handle)
- if (!FreeLibrary (handle))
- set_error ("");
-+#endif
- }
-
- static gpointer
-@@ -129,8 +164,19 @@ find_in_any_module_using_toolhelp (const
- if (Module32First (snapshot, &me32))
- {
- do {
-- if ((p = GetProcAddress (me32.hModule, symbol_name)) != NULL)
-- break;
-+ if ((p = GetProcAddress (me32.hModule, symbol_name)) != NULL) {
-+#ifdef G_WITH_CYGWIN
-+ /* if symbol is found in another module, we probably do not want it */
-+ ssize_t size = cygwin_conv_path (CCP_WIN_A_TO_POSIX, me32.szExePath, NULL, 0);
-+ char *posix = (char *) alloca (size);
-+ cygwin_conv_path (CCP_WIN_A_TO_POSIX, me32.szExePath, posix, size);
-+ if (g_strstr_len (posix, size, "/usr/lib")
-+ || g_strstr_len (posix, size, "/usr/local/lib"))
-+ p = NULL;
-+ else
-+#endif
-+ break;
-+ }
- } while (Module32Next (snapshot, &me32));
- }
-
-@@ -156,6 +202,13 @@ _g_module_symbol (gpointer handle,
- {
- gpointer p;
-
-+#ifdef G_WITH_CYGWIN
-+ p = dlsym (handle, symbol_name);
-+ if (!p)
-+ p = find_in_any_module (symbol_name);
-+ if (!p)
-+ g_module_set_error (fetch_dlerror (FALSE));
-+#else
- if (handle == null_module_handle)
- {
- if ((p = GetProcAddress (GetModuleHandle (NULL), symbol_name)) == NULL)
-@@ -166,6 +219,7 @@ _g_module_symbol (gpointer handle,
-
- if (!p)
- set_error ("");
-+#endif
-
- return p;
- }
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
deleted file mode 100644
index a27966e039..0000000000
--- a/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 2e47d49bc91d83cd0abea4c1944bfca4336040fa Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <sobhan@gentoo.org>
-Date: Fri, 23 Feb 2018 15:27:33 +0330
-Subject: [PATCH] glib-2.54.3-external-gdbus-codegen-for-autotools
-
----
- configure.ac | 1 -
- docs/reference/gio/Makefile.am | 1 -
- gio/Makefile.am | 2 +-
- gio/tests/Makefile.am | 6 ++----
- gio/tests/gdbus-object-manager-example/Makefile.am | 6 ++----
- 5 files changed, 5 insertions(+), 11 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0457c90..07166c9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3469,7 +3469,6 @@ gobject/glib-mkenums
- gobject/tests/Makefile
- gthread/Makefile
- gio/Makefile
--gio/gdbus-2.0/codegen/Makefile
- gio/gdbus-2.0/codegen/config.py
- gio/gnetworking.h
- gio/xdgmime/Makefile
-diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
-index 5741a3e..d38e768 100644
---- a/docs/reference/gio/Makefile.am
-+++ b/docs/reference/gio/Makefile.am
-@@ -177,7 +177,6 @@ man_MANS += \
- gsettings.1 \
- gresource.1 \
- gdbus.1 \
-- gdbus-codegen.1 \
- gio.1 \
- $(NULL)
-
-diff --git a/gio/Makefile.am b/gio/Makefile.am
-index b2db995..53d7162 100644
---- a/gio/Makefile.am
-+++ b/gio/Makefile.am
-@@ -1,6 +1,6 @@
- include $(top_srcdir)/glib.mk
-
--SUBDIRS = gdbus-2.0/codegen
-+SUBDIRS =
-
- if OS_UNIX
- if !OS_COCOA
-diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
-index acc1da4..7c51eab 100644
---- a/gio/tests/Makefile.am
-+++ b/gio/tests/Makefile.am
-@@ -460,10 +460,8 @@ gnotification_SOURCES = $(gdbus_sessionbus_sources) gnotifica
-
- BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
- gdbus-test-codegen.o: gdbus-test-codegen-generated.h
--gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+gdbus-test-codegen-generated.h: test-codegen.xml Makefile
-+ $(AM_V_GEN) gdbus-codegen \
- --interface-prefix org.project. \
- --generate-c-code gdbus-test-codegen-generated \
- --c-generate-object-manager \
-diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
-index 1d0464c..f390dca 100644
---- a/gio/tests/gdbus-object-manager-example/Makefile.am
-+++ b/gio/tests/gdbus-object-manager-example/Makefile.am
-@@ -11,10 +11,8 @@ GDBUS_GENERATED = \
- gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \
- $(NULL)
-
--$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile
-+ $(AM_V_GEN) gdbus-codegen \
- --interface-prefix org.gtk.GDBus.Example.ObjectManager. \
- --c-namespace Example \
- --c-generate-object-manager \
---
-2.16.1
-
diff --git a/dev-libs/glib/files/glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch b/dev-libs/glib/files/glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch
deleted file mode 100644
index d1a41ecb79..0000000000
--- a/dev-libs/glib/files/glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 95b22035f6151ab465c37fe5e3e340713cb74e23 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Tue, 24 Mar 2020 18:44:54 -0700
-Subject: [PATCH] Mark gdbus-server-auth test flaky
-
-See https://gitlab.gnome.org/GNOME/glib/-/issues/1954
----
- gio/tests/meson.build | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/gio/tests/meson.build b/gio/tests/meson.build
-index 788cf978b..7f45d0191 100644
---- a/gio/tests/meson.build
-+++ b/gio/tests/meson.build
-@@ -122,12 +122,13 @@ if dbus1_dep.found()
- },
- 'gdbus-server-auth' : {
- 'dependencies' : [dbus1_dep],
-+ 'suite' : ['flaky'],
- },
- }
- else
- # We can build a cut-down version of this test without libdbus
- gio_tests += {
-- 'gdbus-server-auth' : {},
-+ 'gdbus-server-auth' : {'suite' : ['flaky']},
- }
- endif
-
---
-2.24.1
-
diff --git a/dev-libs/glib/files/glib-2.74.4-implicit-func-decl.patch b/dev-libs/glib/files/glib-2.74.4-implicit-func-decl.patch
deleted file mode 100644
index 9cd48a2645..0000000000
--- a/dev-libs/glib/files/glib-2.74.4-implicit-func-decl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3165
-
-From 6626765a79f125cf0ec9cdaefa51ceef718d41e7 Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro <mcatanzaro@redhat.com>
-Date: Tue, 20 Dec 2022 17:10:41 -0600
-Subject: [PATCH] gthread-posix: need to #include <errno.h>
-
-a79c6af23eff5ee978db62e048828c9a992a1261 uses errno without the required
-header.
-
-
-(cherry picked from commit 03cb4261e00cf505790f4fd4e69f97b2ef4fcccd)
---- a/glib/gthreadprivate.h
-+++ b/glib/gthreadprivate.h
-@@ -41,6 +41,7 @@ struct _GRealThread
- /* system thread implementation (gthread-posix.c, gthread-win32.c) */
-
- #if defined(HAVE_FUTEX) || defined(HAVE_FUTEX_TIME64)
-+#include <errno.h>
- #include <linux/futex.h>
- #include <sys/syscall.h>
- #include <unistd.h>
---
-GitLab
diff --git a/dev-libs/glib/glib-2.74.4.ebuild b/dev-libs/glib/glib-2.74.4.ebuild
deleted file mode 100644
index 27b4f43b7a..0000000000
--- a/dev-libs/glib/glib-2.74.4.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr"
-RESTRICT="!test? ( test )"
-#REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
-
-KEYWORDS="~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-# * elfutils (via libelf) does not build on Windows. gresources are not embedded
-# within ELF binaries on that platform anyway and inspecting ELF binaries from
-# other platforms is not that useful so exclude the dependency in this case.
-# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
-# these are used by GIO, which glib[static-libs] consumers don't really seem
-# to need at all, thus not imposing the deps for now and once some consumers
-# are actually found to static link libgio-2.0.a, we can revisit and either add
-# them or just put the (build) deps in that rare consumer instead of recursive
-# RDEPEND here (due to lack of recursive DEPEND).
-RDEPEND="
- !<dev-util/gdbus-codegen-${PV}
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- >=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},unicode(+),static-libs?]
- >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- >=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
- kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
- selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
- xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
- elf? ( virtual/libelf:0= )
- sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-# libxml2 used for optional tests that get automatically skipped
-BDEPEND="
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- >=sys-devel/gettext-0.19.8
- gtk-doc? ( >=dev-util/gtk-doc-1.33
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5 )
- systemtap? ( >=dev-util/systemtap-1.3 )
- ${PYTHON_DEPS}
- test? ( >=sys-apps/dbus-1.2.14 )
- virtual/pkgconfig
-"
-# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
-
-PDEPEND="
- dbus? ( gnome-base/dconf )
- mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# dconf is needed to be able to save settings, bug #498436
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/gio-querymodules$(get_exeext)
-)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
- "${FILESDIR}"/${P}-implicit-func-decl.patch
-)
-
-pkg_setup() {
- if use kernel_linux ; then
- CONFIG_CHECK="~INOTIFY_USER"
- if use test ; then
- CONFIG_CHECK="~IPV6"
- WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
- fi
- linux-info_pkg_setup
- fi
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- if use test; then
- # TODO: Review the test exclusions, especially now with meson
- # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
- if ! has_version dev-util/desktop-file-utils ; then
- ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
- ewarn "think on installing it to get these tests run."
- sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
- sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
- fi
-
- # gdesktopappinfo requires existing terminal (gnome-terminal or any
- # other), falling back to xterm if one doesn't exist
- #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
- # ewarn "Some tests will be skipped due to missing terminal program"
- # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
- # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
- sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
- # desktop-app-info/launch* might fail similarly
- sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
- #fi
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=722604
- sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
- sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
-
- ewarn "Tests for search-utils have been skipped"
- sed -i -e "/search-utils/d" glib/tests/meson.build || die
-
- # Play nice with network-sandbox, but this approach would defeat the purpose of the test
- #sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
- else
- # Don't build tests, also prevents extra deps, bug #512022
- sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
- fi
-
- # Don't build fuzzing binaries - not used
- sed -i -e '/subdir.*fuzzing/d' meson.build || die
-
- # gdbus-codegen is a separate package
- sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
-
- # Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
- sed -i -e '/install_dir/d' gio/tests/meson.build || die
-
- cat > "${T}/glib-test-ld-wrapper" <<-EOF
- #!/usr/bin/env sh
- exec \${LD:-ld} "\$@"
- EOF
- chmod a+x "${T}/glib-test-ld-wrapper" || die
- sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
-
- # make default sane for us
- if use prefix ; then
- sed -i -e "s:/usr/local:${EPREFIX}/usr:" gio/xdgmime/xdgmime.c || die
- # bug #308609, without path, bug #314057
- export PERL=perl
- fi
-
- if [[ ${CHOST} == *-solaris* ]] ; then
- # fix standards conflicts
- sed -i \
- -e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/_POSIX_PTHREAD_SEMANTICS/' \
- -e '/\<_XOPEN_SOURCE\>/s/\<2\>/600/' \
- meson.build || die
- sed -i -e '/#define\s\+_POSIX_SOURCE/d' \
- glib/giounix.c || die
- fi
-
- # disable native macOS integrations
- sed -i -e '/glib_conf.set(.HAVE_\(CARBON\|COCOA\).)/s/true/false/' \
- meson.build || die
-
- default
- gnome2_environment_reset
- # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
-}
-
-multilib_src_configure() {
- if use debug; then
- append-cflags -DG_ENABLE_DEBUG
- else
- append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
- fi
-
- # TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
- #if tc-is-cross-compiler ; then
- # https://bugzilla.gnome.org/show_bug.cgi?id=756473
- # TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
- #case ${CHOST} in
- #hppa*|metag*) export glib_cv_stack_grows=yes ;;
- #*) export glib_cv_stack_grows=no ;;
- #esac
- #fi
-
- local emesonargs=(
- -Ddefault_library=$(usex static-libs both shared)
- $(meson_feature selinux)
- $(meson_use xattr)
- -Dlibmount=enabled # only used if host_system == 'linux'
- -Dman=true
- $(meson_use systemtap dtrace)
- $(meson_use systemtap)
- $(meson_feature sysprof)
- $(meson_native_use_bool gtk-doc gtk_doc)
- $(meson_use test tests)
- -Dinstalled_tests=false
- -Dnls=enabled
- -Doss_fuzz=disabled
- $(meson_native_use_feature elf libelf)
- -Dmultiarch=false
- )
- meson_src_configure
-}
-
-multilib_src_test() {
- export XDG_CONFIG_DIRS=/etc/xdg
- export XDG_DATA_DIRS=/usr/local/share:/usr/share
- export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
- export LC_TIME=C # bug #411967
- export TZ=UTC
- unset GSETTINGS_BACKEND # bug #596380
- python_setup
-
- # https://bugs.gentoo.org/839807
- local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
- addpredict /usr/b
-
- # Related test is a bit nitpicking
- mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
- chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
- meson_src_test --timeout-multiplier 2 --no-suite flaky
-}
-
-multilib_src_install() {
- meson_src_install
- keepdir /usr/$(get_libdir)/gio/modules
-}
-
-multilib_src_install_all() {
- # These are installed by dev-util/glib-utils
- # TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
- rm "${ED}/usr/bin/glib-genmarshal" || die
- rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
- rm "${ED}/usr/bin/glib-mkenums" || die
- rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
- rm "${ED}/usr/bin/gtester-report" || die
- rm "${ED}/usr/share/man/man1/gtester-report.1" || die
- # gdbus-codegen manpage installed by dev-util/gdbus-codegen
- rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
-}
-
-pkg_preinst() {
- xdg_pkg_preinst
-
- # Make gschemas.compiled belong to glib alone
- local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
-
- if [[ -e ${EROOT}${cache} ]]; then
- cp "${EROOT}"${cache} "${ED}"/${cache} || die
- else
- touch "${ED}"${cache} || die
- fi
-
- multilib_pkg_preinst() {
- # Make giomodule.cache belong to glib alone
- local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
-
- if [[ -e ${EROOT}${cache} ]]; then
- cp "${EROOT}"${cache} "${ED}"${cache} || die
- else
- touch "${ED}"${cache} || die
- fi
- }
-
- # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
- # file due to inability to create it and GIO might not look at any of the modules there
- if ! tc-is-cross-compiler ; then
- multilib_foreach_abi multilib_pkg_preinst
- fi
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- # glib installs no schemas itself, but we force update for fresh install in case
- # something has dropped in a schemas file without direct glib dep; and for upgrades
- # in case the compiled schema format could have changed
- gnome2_schemas_update
-
- multilib_pkg_postinst() {
- gnome2_giomodule_cache_update \
- || die "Update GIO modules cache failed (for ${ABI})"
- }
- if ! tc-is-cross-compiler ; then
- multilib_foreach_abi multilib_pkg_postinst
- else
- ewarn "Updating of GIO modules cache skipped due to cross-compilation."
- ewarn "You might want to run gio-querymodules manually on the target for"
- ewarn "your final image for performance reasons and re-run it when packages"
- ewarn "installing GIO modules get upgraded or added to the image."
- fi
-
- for v in ${REPLACING_VERSIONS}; do
- if ver_test "$v" "-lt" "2.63.6"; then
- ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
- ewarn "to restart your session for \"Open With\" dialogs to work."
- fi
- done
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-
- if [[ -z ${REPLACED_BY_VERSION} ]]; then
- multilib_pkg_postrm() {
- rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
- }
- multilib_foreach_abi multilib_pkg_postrm
- rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
- fi
-}
diff --git a/dev-libs/glib/glib-2.74.6.ebuild b/dev-libs/glib/glib-2.74.6.ebuild
deleted file mode 100644
index 9f97df7fe3..0000000000
--- a/dev-libs/glib/glib-2.74.6.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr"
-RESTRICT="!test? ( test )"
-#REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
-
-KEYWORDS="~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-# * elfutils (via libelf) does not build on Windows. gresources are not embedded
-# within ELF binaries on that platform anyway and inspecting ELF binaries from
-# other platforms is not that useful so exclude the dependency in this case.
-# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
-# these are used by GIO, which glib[static-libs] consumers don't really seem
-# to need at all, thus not imposing the deps for now and once some consumers
-# are actually found to static link libgio-2.0.a, we can revisit and either add
-# them or just put the (build) deps in that rare consumer instead of recursive
-# RDEPEND here (due to lack of recursive DEPEND).
-RDEPEND="
- !<dev-util/gdbus-codegen-${PV}
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- >=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},unicode(+),static-libs?]
- >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- >=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
- kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
- selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
- xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
- elf? ( virtual/libelf:0= )
- sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-# libxml2 used for optional tests that get automatically skipped
-BDEPEND="
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- >=sys-devel/gettext-0.19.8
- gtk-doc? ( >=dev-util/gtk-doc-1.33
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5 )
- systemtap? ( >=dev-util/systemtap-1.3 )
- ${PYTHON_DEPS}
- test? ( >=sys-apps/dbus-1.2.14 )
- virtual/pkgconfig
-"
-# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
-
-PDEPEND="
- dbus? ( gnome-base/dconf )
- mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# dconf is needed to be able to save settings, bug #498436
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/gio-querymodules$(get_exeext)
-)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
-)
-
-pkg_setup() {
- if use kernel_linux ; then
- CONFIG_CHECK="~INOTIFY_USER"
- if use test ; then
- CONFIG_CHECK="~IPV6"
- WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
- fi
- linux-info_pkg_setup
- fi
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- if use test; then
- # TODO: Review the test exclusions, especially now with meson
- # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
- if ! has_version dev-util/desktop-file-utils ; then
- ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
- ewarn "think on installing it to get these tests run."
- sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
- sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
- fi
-
- # gdesktopappinfo requires existing terminal (gnome-terminal or any
- # other), falling back to xterm if one doesn't exist
- #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
- # ewarn "Some tests will be skipped due to missing terminal program"
- # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
- # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
- sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
- # desktop-app-info/launch* might fail similarly
- sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
- #fi
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=722604
- sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
- sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
-
- ewarn "Tests for search-utils have been skipped"
- sed -i -e "/search-utils/d" glib/tests/meson.build || die
-
- # Play nice with network-sandbox, but this approach would defeat the purpose of the test
- #sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
- else
- # Don't build tests, also prevents extra deps, bug #512022
- sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
- fi
-
- # Don't build fuzzing binaries - not used
- sed -i -e '/subdir.*fuzzing/d' meson.build || die
-
- # gdbus-codegen is a separate package
- sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
-
- # Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
- sed -i -e '/install_dir/d' gio/tests/meson.build || die
-
- cat > "${T}/glib-test-ld-wrapper" <<-EOF
- #!/usr/bin/env sh
- exec \${LD:-ld} "\$@"
- EOF
- chmod a+x "${T}/glib-test-ld-wrapper" || die
- sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
-
- # make default sane for us
- if use prefix ; then
- sed -i -e "s:/usr/local:${EPREFIX}/usr:" gio/xdgmime/xdgmime.c || die
- # bug #308609, without path, bug #314057
- export PERL=perl
- fi
-
- if [[ ${CHOST} == *-solaris* ]] ; then
- # fix standards conflicts
- sed -i \
- -e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/_POSIX_PTHREAD_SEMANTICS/' \
- -e '/\<_XOPEN_SOURCE\>/s/\<2\>/600/' \
- meson.build || die
- sed -i -e '/#define\s\+_POSIX_SOURCE/d' \
- glib/giounix.c || die
- fi
-
- # disable native macOS integrations
- sed -i -e '/glib_conf.set(.HAVE_\(CARBON\|COCOA\).)/s/true/false/' \
- meson.build || die
-
- default
- gnome2_environment_reset
- # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
-}
-
-multilib_src_configure() {
- if use debug; then
- append-cflags -DG_ENABLE_DEBUG
- else
- append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
- fi
-
- # TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
- #if tc-is-cross-compiler ; then
- # https://bugzilla.gnome.org/show_bug.cgi?id=756473
- # TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
- #case ${CHOST} in
- #hppa*|metag*) export glib_cv_stack_grows=yes ;;
- #*) export glib_cv_stack_grows=no ;;
- #esac
- #fi
-
- local emesonargs=(
- -Ddefault_library=$(usex static-libs both shared)
- $(meson_feature selinux)
- $(meson_use xattr)
- -Dlibmount=enabled # only used if host_system == 'linux'
- -Dman=true
- $(meson_use systemtap dtrace)
- $(meson_use systemtap)
- $(meson_feature sysprof)
- $(meson_native_use_bool gtk-doc gtk_doc)
- $(meson_use test tests)
- -Dinstalled_tests=false
- -Dnls=enabled
- -Doss_fuzz=disabled
- $(meson_native_use_feature elf libelf)
- -Dmultiarch=false
- )
- meson_src_configure
-}
-
-multilib_src_test() {
- export XDG_CONFIG_DIRS=/etc/xdg
- export XDG_DATA_DIRS=/usr/local/share:/usr/share
- export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
- export LC_TIME=C # bug #411967
- export TZ=UTC
- unset GSETTINGS_BACKEND # bug #596380
- python_setup
-
- # https://bugs.gentoo.org/839807
- local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
- addpredict /usr/b
-
- # Related test is a bit nitpicking
- mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
- chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
- meson_src_test --timeout-multiplier 2 --no-suite flaky
-}
-
-multilib_src_install() {
- meson_src_install
- keepdir /usr/$(get_libdir)/gio/modules
-}
-
-multilib_src_install_all() {
- # These are installed by dev-util/glib-utils
- # TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
- rm "${ED}/usr/bin/glib-genmarshal" || die
- rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
- rm "${ED}/usr/bin/glib-mkenums" || die
- rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
- rm "${ED}/usr/bin/gtester-report" || die
- rm "${ED}/usr/share/man/man1/gtester-report.1" || die
- # gdbus-codegen manpage installed by dev-util/gdbus-codegen
- rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
-}
-
-pkg_preinst() {
- xdg_pkg_preinst
-
- # Make gschemas.compiled belong to glib alone
- local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
-
- if [[ -e ${EROOT}${cache} ]]; then
- cp "${EROOT}"${cache} "${ED}"/${cache} || die
- else
- touch "${ED}"${cache} || die
- fi
-
- multilib_pkg_preinst() {
- # Make giomodule.cache belong to glib alone
- local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
-
- if [[ -e ${EROOT}${cache} ]]; then
- cp "${EROOT}"${cache} "${ED}"${cache} || die
- else
- touch "${ED}"${cache} || die
- fi
- }
-
- # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
- # file due to inability to create it and GIO might not look at any of the modules there
- if ! tc-is-cross-compiler ; then
- multilib_foreach_abi multilib_pkg_preinst
- fi
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- # glib installs no schemas itself, but we force update for fresh install in case
- # something has dropped in a schemas file without direct glib dep; and for upgrades
- # in case the compiled schema format could have changed
- gnome2_schemas_update
-
- multilib_pkg_postinst() {
- gnome2_giomodule_cache_update \
- || die "Update GIO modules cache failed (for ${ABI})"
- }
- if ! tc-is-cross-compiler ; then
- multilib_foreach_abi multilib_pkg_postinst
- else
- ewarn "Updating of GIO modules cache skipped due to cross-compilation."
- ewarn "You might want to run gio-querymodules manually on the target for"
- ewarn "your final image for performance reasons and re-run it when packages"
- ewarn "installing GIO modules get upgraded or added to the image."
- fi
-
- for v in ${REPLACING_VERSIONS}; do
- if ver_test "$v" "-lt" "2.63.6"; then
- ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
- ewarn "to restart your session for \"Open With\" dialogs to work."
- fi
- done
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-
- if [[ -z ${REPLACED_BY_VERSION} ]]; then
- multilib_pkg_postrm() {
- rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
- }
- multilib_foreach_abi multilib_pkg_postrm
- rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
- fi
-}
diff --git a/dev-libs/glib/glib-2.76.2.ebuild b/dev-libs/glib/glib-2.76.2.ebuild
deleted file mode 100644
index d1a21f2e7f..0000000000
--- a/dev-libs/glib/glib-2.76.2.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
-
-KEYWORDS="~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-# * elfutils (via libelf) does not build on Windows. gresources are not embedded
-# within ELF binaries on that platform anyway and inspecting ELF binaries from
-# other platforms is not that useful so exclude the dependency in this case.
-# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
-# these are used by GIO, which glib[static-libs] consumers don't really seem
-# to need at all, thus not imposing the deps for now and once some consumers
-# are actually found to static link libgio-2.0.a, we can revisit and either add
-# them or just put the (build) deps in that rare consumer instead of recursive
-# RDEPEND here (due to lack of recursive DEPEND).
-RDEPEND="
- !<dev-util/gdbus-codegen-${PV}
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- >=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},unicode(+),static-libs?]
- >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- >=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
- kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
- selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
- xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
- elf? ( virtual/libelf:0= )
- sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-# libxml2 used for optional tests that get automatically skipped
-BDEPEND="
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- >=sys-devel/gettext-0.19.8
- gtk-doc? ( >=dev-util/gtk-doc-1.33
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5 )
- systemtap? ( >=dev-util/systemtap-1.3 )
- ${PYTHON_DEPS}
- test? ( >=sys-apps/dbus-1.2.14 )
- virtual/pkgconfig
-"
-# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
-
-PDEPEND="
- dbus? ( gnome-base/dconf )
- mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# dconf is needed to be able to save settings, bug #498436
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/gio-querymodules$(get_exeext)
-)
-
-pkg_setup() {
- if use kernel_linux ; then
- CONFIG_CHECK="~INOTIFY_USER"
- if use test ; then
- CONFIG_CHECK="~IPV6"
- WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
- fi
- linux-info_pkg_setup
- fi
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- if use test; then
- # TODO: Review the test exclusions, especially now with meson
- # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
- if ! has_version dev-util/desktop-file-utils ; then
- ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
- ewarn "think on installing it to get these tests run."
- sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
- sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
- fi
-
- # gdesktopappinfo requires existing terminal (gnome-terminal or any
- # other), falling back to xterm if one doesn't exist
- #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
- # ewarn "Some tests will be skipped due to missing terminal program"
- # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
- # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
- sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
- # desktop-app-info/launch* might fail similarly
- sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
- #fi
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=722604
- sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
- sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
-
- ewarn "Tests for search-utils have been skipped"
- sed -i -e "/search-utils/d" glib/tests/meson.build || die
-
- # Play nice with network-sandbox, but this approach would defeat the purpose of the test
- #sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
- else
- # Don't build tests, also prevents extra deps, bug #512022
- sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
- fi
-
- # Don't build fuzzing binaries - not used
- sed -i -e '/subdir.*fuzzing/d' meson.build || die
-
- # gdbus-codegen is a separate package
- sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
-
- # Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
- sed -i -e '/install_dir/d' gio/tests/meson.build || die
-
- cat > "${T}/glib-test-ld-wrapper" <<-EOF
- #!/usr/bin/env sh
- exec \${LD:-ld} "\$@"
- EOF
- chmod a+x "${T}/glib-test-ld-wrapper" || die
- sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
-
- # make default sane for us
- if use prefix ; then
- sed -i -e "s:/usr/local:${EPREFIX}/usr:" gio/xdgmime/xdgmime.c || die
- # bug #308609, without path, bug #314057
- export PERL=perl
- fi
-
- if [[ ${CHOST} == *-solaris* ]] ; then
- # fix standards conflicts
- sed -i \
- -e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/_POSIX_PTHREAD_SEMANTICS/' \
- -e '/\<_XOPEN_SOURCE\>/s/\<2\>/600/' \
- meson.build || die
- sed -i -e '/#define\s\+_POSIX_SOURCE/d' \
- glib/giounix.c || die
- fi
-
- # disable native macOS integrations
- sed -i -e '/glib_conf.set(.HAVE_\(CARBON\|COCOA\).)/s/true/false/' \
- meson.build || die
-
- default
- gnome2_environment_reset
- # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
-}
-
-multilib_src_configure() {
- # TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
- #if tc-is-cross-compiler ; then
- # https://bugzilla.gnome.org/show_bug.cgi?id=756473
- # TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
- #case ${CHOST} in
- #hppa*|metag*) export glib_cv_stack_grows=yes ;;
- #*) export glib_cv_stack_grows=no ;;
- #esac
- #fi
-
- local emesonargs=(
- --buildtype $(usex debug debug plain)
- -Ddefault_library=$(usex static-libs both shared)
- -Druntime_dir="${EPREFIX}"/run
- $(meson_feature selinux)
- $(meson_use xattr)
- -Dlibmount=enabled # only used if host_system == 'linux'
- -Dman=true
- $(meson_use systemtap dtrace)
- $(meson_use systemtap)
- $(meson_feature sysprof)
- $(meson_native_use_bool gtk-doc gtk_doc)
- $(meson_use test tests)
- -Dinstalled_tests=false
- -Dnls=enabled
- -Doss_fuzz=disabled
- $(meson_native_use_feature elf libelf)
- -Dmultiarch=false
- )
- meson_src_configure
-}
-
-multilib_src_test() {
- export XDG_CONFIG_DIRS=/etc/xdg
- export XDG_DATA_DIRS=/usr/local/share:/usr/share
- export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
- export LC_TIME=C # bug #411967
- export TZ=UTC
- unset GSETTINGS_BACKEND # bug #596380
- python_setup
-
- # https://bugs.gentoo.org/839807
- local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
- addpredict /usr/b
-
- # Related test is a bit nitpicking
- mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
- chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
- meson_src_test --timeout-multiplier 2 --no-suite flaky
-}
-
-multilib_src_install() {
- meson_src_install
- keepdir /usr/$(get_libdir)/gio/modules
-}
-
-multilib_src_install_all() {
- # These are installed by dev-util/glib-utils
- # TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
- rm "${ED}/usr/bin/glib-genmarshal" || die
- rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
- rm "${ED}/usr/bin/glib-mkenums" || die
- rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
- rm "${ED}/usr/bin/gtester-report" || die
- rm "${ED}/usr/share/man/man1/gtester-report.1" || die
- # gdbus-codegen manpage installed by dev-util/gdbus-codegen
- rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
-}
-
-pkg_preinst() {
- xdg_pkg_preinst
-
- # Make gschemas.compiled belong to glib alone
- local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
-
- if [[ -e ${EROOT}${cache} ]]; then
- cp "${EROOT}"${cache} "${ED}"/${cache} || die
- else
- touch "${ED}"${cache} || die
- fi
-
- multilib_pkg_preinst() {
- # Make giomodule.cache belong to glib alone
- local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
-
- if [[ -e ${EROOT}${cache} ]]; then
- cp "${EROOT}"${cache} "${ED}"${cache} || die
- else
- touch "${ED}"${cache} || die
- fi
- }
-
- # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
- # file due to inability to create it and GIO might not look at any of the modules there
- if ! tc-is-cross-compiler ; then
- multilib_foreach_abi multilib_pkg_preinst
- fi
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- # glib installs no schemas itself, but we force update for fresh install in case
- # something has dropped in a schemas file without direct glib dep; and for upgrades
- # in case the compiled schema format could have changed
- gnome2_schemas_update
-
- multilib_pkg_postinst() {
- gnome2_giomodule_cache_update \
- || die "Update GIO modules cache failed (for ${ABI})"
- }
- if ! tc-is-cross-compiler ; then
- multilib_foreach_abi multilib_pkg_postinst
- else
- ewarn "Updating of GIO modules cache skipped due to cross-compilation."
- ewarn "You might want to run gio-querymodules manually on the target for"
- ewarn "your final image for performance reasons and re-run it when packages"
- ewarn "installing GIO modules get upgraded or added to the image."
- fi
-
- for v in ${REPLACING_VERSIONS}; do
- if ver_test "$v" "-lt" "2.63.6"; then
- ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
- ewarn "to restart your session for \"Open With\" dialogs to work."
- fi
- done
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-
- if [[ -z ${REPLACED_BY_VERSION} ]]; then
- multilib_pkg_postrm() {
- rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
- }
- multilib_foreach_abi multilib_pkg_postrm
- rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
- fi
-}
diff --git a/dev-libs/glib/metadata.xml b/dev-libs/glib/metadata.xml
deleted file mode 100644
index 2d02878840..0000000000
--- a/dev-libs/glib/metadata.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
- <use>
- <flag name="dbus">
- Enable dependencies required by glib libraries
- using dbus service to manage settings saving
- </flag>
- <flag name="mime">
- Pull in shared MIME database that many glib-based
- applications require at runtime to detect or open files. Warning:
- do not disable this flag unless installing on a headless server.
- </flag>
- <flag name="systemtap">
- Build support for profiling and tracing using
- <pkg>dev-util/systemtap</pkg>
- </flag>
- <flag name="sysprof">
- Enable profiling data capture support using
- <pkg>dev-util/sysprof-capture</pkg>
- </flag>
- <flag name="utils">
- Install gtester-report utility to generate test
- report files for your software; build gresource utility with
- ELF support.
- </flag>
- </use>
- <upstream>
- <remote-id type="cpe">cpe:/a:gnome:glib</remote-id>
- </upstream>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/glib/, dev-libs/glib/files/
@ 2022-12-27 18:32 Fabian Groffen
0 siblings, 0 replies; 4+ messages in thread
From: Fabian Groffen @ 2022-12-27 18:32 UTC (permalink / raw
To: gentoo-commits
commit: 9596b736667d8625ffb8f8d2c02a7dc75408d83e
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 18:31:43 2022 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 18:31:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9596b736
dev-libs/glib: sync with gx86, forced due to EAPI support drop
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
dev-libs/glib/Manifest | 11 +-
.../files/glib-2.74.4-implicit-func-decl.patch | 24 ++
dev-libs/glib/glib-2.56.2-r1.ebuild | 350 ---------------------
.../{glib-2.66.2-r1.ebuild => glib-2.74.4.ebuild} | 77 +++--
4 files changed, 68 insertions(+), 394 deletions(-)
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 08fe290e6c..b5b199a67d 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,10 +1 @@
-AUX 2.56-gmodule-cygwin.patch 3482 BLAKE2B 094036560ed444e050858ff52a4c5f25e13c4988069898e78417def247dae78145d337ff8a6265c7d23fa91f26a48c255b5562de2e9634c5262b90b36a5677f4 SHA512 b5faedf2a484c70c16abf3e4a3557ce5b6939995b93fa46644ee4ae7527bdd6a47cced5ae6837b79d1f74836ace0de14d568358a31125ccb9d4d4273219ca0e7
-AUX glib-2.54.3-external-gdbus-codegen.patch 3233 BLAKE2B 6b96851b7485164ef6c94da1847152a87064eb5c9f9b0ae6996eca84e89c7807bea5cb7c58b8d42dee07eee96647d2439b8c62af023b37849d4465e0c013eca6 SHA512 70d942086f6181532b5f95c5a3e0d8bfc7d204ca2d4ee68850af82062b572cc146ac4a5516547011ef39386e10bc291deea32a19fe518e649f4f8ac60271b69c
-AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923c8bb54ead80d829aeb7a5c8a42c62e960e7305bc3fad69c67fd21e1c9f20b5c9002c0319cf3d77992b9cb71912c9b813b723e0a56aaea38330ad SHA512 ccd92d2f1fd495618ac788ffe6b69acec05a521a0ee8ff2bacb1dce6e283a04bbc2a10e61b37fc29f3893003fa154fa0d30bc37ed266b3f813200cd8ed17c116
-DIST glib-2.56.2.tar.xz 8041756 BLAKE2B 1af5bb37378856e959602bcb9299266bba46b990839c923f6b9881624aed306af0779005281b3e3a46b5994c54812edc86aade9cb782c596fd63b6fd91baba51 SHA512 8201ea82d3613d2e879284abe01520b766da30957c5a1a22f3e6019b0cce6bf95d25beae78867b6a133401c4165153c0c92974dd459ab12f9e0e9dd0c95df5d4
-DIST glib-2.66.2.tar.xz 4836456 BLAKE2B 5484a7fe497dbe06df7ce11dbc8836c95dbb01e6e309516b82158f2915eeee36ccbe6e904cb6ae9a5a0223ccc0b52f6e64d61a418bf790538bc90388430977b2 SHA512 30278c066c6b209f45fcfdb9ffc4732236451464506b93c0fff0964ff8aac58c15be85c3793c686d4740d9d97857984bc0ab71e38d5da11c5fd860e569fb6cb9
-DIST glib-cygwinports-3a873fdd1b9a9e649563fe8e6b8ae6951b0dd3be.zip 13038 BLAKE2B 08f217e204c8518137722dcd535c100cbdc56e43dcf3d16a339c93353c594287670215c130b2c7f83235145632fad6d30903ae099f5999bf72ec070a12da4484 SHA512 fd4925d6a2380c5ff551e812a182de20f7b59e5d134a2c54b985efe85ab334499b0050097ca5c3271f14e2c3c5e89650e134a01e4c5be06bad05a12eaaf9fe53
-DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
-EBUILD glib-2.56.2-r1.ebuild 11695 BLAKE2B f0f846b08805b59dda01de904738ef78d9ee9c6483b51c592858117fc07d11322194ae209d396691f25fbb4d09d02b233548350986cc0fb003d04a9c98591407 SHA512 515997880fdd4f99d53a4883aaab7e1647d60c5a51f300d741f22bef395338adf4cda8790308032775d251a3c93b73b7010aa71c072691e4527899705a11258f
-EBUILD glib-2.66.2-r1.ebuild 10805 BLAKE2B fdf2468b6db411f5014442b3595eb59cb9df86ede91dd3dff49e54232585a0c23bbbff6ffed1c0681fcfbd52223465b4ae26474538bc95fb371deea426a9ee7d SHA512 426d81d96283664d41fef2e2fa7ee16453d10c6f434f502a0fd52d43477c3080bad1b1e4ddfaa79e02b03b6fc981f4a36f77cf3d398b36df97c83b02138b4ac8
-MISC metadata.xml 1098 BLAKE2B f2bd17f50d68c553b9040e954c0ef91edd29a3f1f7731bc7f45e3a936f702209985d111ad376ca0b51bdb4736d9ee508151fbb57b273a32beb1148aa027226c6 SHA512 2745b70b29ba0517144343f5d3f4b7c3389200b1ecbd2830e29bd9a90ca59ebeedf4d66b26a3241e3d3a3066f9a26ae223d075b9b2b82d67e4642e784f236c20
+DIST glib-2.74.4.tar.xz 5208484 BLAKE2B 01a2818e63469019abcd1215fa85521b9a2e55644040e8fe2797f68cabe897a191ae2c1cc2ab75d5ba9980d63adbfc00636b295ee942d70579e7eba1e1f49502 SHA512 912f6b0559fcb5ad55fa36837a348228b8e2498c490271204ced9f2e4a9eab804de4745f3ec439a198eb275d7263f18bc670f45460e2be55a2cbe45466b02fc6
diff --git a/dev-libs/glib/files/glib-2.74.4-implicit-func-decl.patch b/dev-libs/glib/files/glib-2.74.4-implicit-func-decl.patch
new file mode 100644
index 0000000000..9cd48a2645
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.74.4-implicit-func-decl.patch
@@ -0,0 +1,24 @@
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3165
+
+From 6626765a79f125cf0ec9cdaefa51ceef718d41e7 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@redhat.com>
+Date: Tue, 20 Dec 2022 17:10:41 -0600
+Subject: [PATCH] gthread-posix: need to #include <errno.h>
+
+a79c6af23eff5ee978db62e048828c9a992a1261 uses errno without the required
+header.
+
+
+(cherry picked from commit 03cb4261e00cf505790f4fd4e69f97b2ef4fcccd)
+--- a/glib/gthreadprivate.h
++++ b/glib/gthreadprivate.h
+@@ -41,6 +41,7 @@ struct _GRealThread
+ /* system thread implementation (gthread-posix.c, gthread-win32.c) */
+
+ #if defined(HAVE_FUTEX) || defined(HAVE_FUTEX_TIME64)
++#include <errno.h>
+ #include <linux/futex.h>
+ #include <sys/syscall.h>
+ #include <unistd.h>
+--
+GitLab
diff --git a/dev-libs/glib/glib-2.56.2-r1.ebuild b/dev-libs/glib/glib-2.56.2-r1.ebuild
deleted file mode 100644
index b160eea0a1..0000000000
--- a/dev-libs/glib/glib-2.56.2-r1.ebuild
+++ /dev/null
@@ -1,350 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8,3_9} ) # only for tests
-GNOME2_EAUTORECONF=yes
-
-inherit autotools bash-completion-r1 flag-o-matic gnome2 libtool linux-info \
- multilib multilib-minimal pax-utils python-any-r1 toolchain-funcs virtualx
-
-# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
-# adding new dependencies end up making stage3 to grow. Every addition needs
-# then to be think very closely.
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="https://www.gtk.org/"
-SRC_URI="${SRC_URI}
- https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
-CYGWINPORTS_GITREV="3a873fdd1b9a9e649563fe8e6b8ae6951b0dd3be"
-
-[[ -n ${CYGWINPORTS_GITREV} ]] &&
-SRC_URI+=" elibc_Cygwin? (
- https://github.com/cygwinports/glib2.0/archive/${CYGWINPORTS_GITREV}.zip
- -> ${PN}-cygwinports-${CYGWINPORTS_GITREV}.zip )"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
-
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-# Added util-linux multilib dependency to have libmount support (which
-# is always turned on on linux systems, unless explicitly disabled, but
-# this ebuild does not do that anyway) (bug #599586)
-
-RDEPEND="
- !<dev-util/gdbus-codegen-${PV}
- >=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?]
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- dev-libs/libffi:=[${MULTILIB_USEDEP}]
- >=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- !prefix-stack? ( kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) )
- selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
- xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
- fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
- utils? (
- >=dev-util/gdbus-codegen-${PV}
- virtual/libelf:0=
- )
-"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.1.2
- >=dev-libs/libxslt-1.0
- >=sys-devel/gettext-0.11
- >=dev-util/gtk-doc-am-1.20
- systemtap? ( >=dev-util/systemtap-1.3 )
- ${PYTHON_DEPS}
- test? (
- sys-devel/gdb
- >=dev-util/gdbus-codegen-${PV}
- >=sys-apps/dbus-1.2.14 )
- !<dev-util/gtk-doc-1.15-r2
-"
-# Migration of glib-genmarshal, glib-mkenums and gtester-report to a separate
-# python depending package, which can be buildtime depended in packages that
-# need these tools, without pulling in python at runtime.
-RDEPEND="${RDEPEND}
- !prefix-stack? ( >=dev-util/glib-utils-${PV} )"
-PDEPEND="
- dbus? ( gnome-base/dconf )
- mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# dconf is needed to be able to save settings, bug #498436
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/gio-querymodules$(get_exeext)
-)
-
-pkg_setup() {
- if use kernel_linux ; then
- CONFIG_CHECK="~INOTIFY_USER"
- if use test ; then
- CONFIG_CHECK="~IPV6"
- WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
- fi
- linux-info_pkg_setup
- fi
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # Prevent build failure in stage3 where pkgconfig is not available, bug #481056
- mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
-
- if use test; then
- # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
- if ! has_version dev-util/desktop-file-utils ; then
- ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
- ewarn "think on installing it to get these tests run."
- sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
- sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
- fi
-
- # gdesktopappinfo requires existing terminal (gnome-terminal or any
- # other), falling back to xterm if one doesn't exist
- if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
- ewarn "Some tests will be skipped due to missing terminal program"
- sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
- fi
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=722604
- sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
- sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
-
- ewarn "Tests for search-utils have been skipped"
- sed -i -e "/search-utils/d" glib/tests/Makefile.am || die
- else
- # Don't build tests, also prevents extra deps, bug #512022
- sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
- fi
-
- # gdbus-codegen is a separate package
- eapply "${FILESDIR}"/${PN}-2.54.3-external-gdbus-codegen.patch
-
- if [[ -n ${CYGWINPORTS_GITREV} ]] && use elibc_Cygwin; then
- local p d="${WORKDIR}/glib2.0-${CYGWINPORTS_GITREV}"
- for p in $(
- sed -ne '/PATCH_URI="/,/"/{s/.*="//;s/".*//;p}' \
- < "${d}"/glib2.0.cygport
- ); do
- if [[ ${p} == 2.50-gmodule-cygwin.patch ]]; then
- # Cygwinports has not upgraded to 2.56 yet
- epatch "${FILESDIR}"/2.56-gmodule-cygwin.patch
- continue
- fi
- epatch "${d}/${p}"
- done
- fi
-
- # make default sane for us
- if use prefix ; then
- sed -i -e "s:/usr/local:${EPREFIX}/usr:" gio/xdgmime/xdgmime.c || die
- # bug #308609, without path, bug #314057
- export PERL=perl
- fi
-
- if [[ ${CHOST} == *-solaris* ]] ; then
- # fix standards conflicts
- sed -i \
- -e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/\1_DISABLED/' \
- -e '/\<_XOPEN_SOURCE\>/s/ 2,/600,/' \
- configure.ac || die
- sed -i -e '/#define\s\+_POSIX_SOURCE/d' \
- glib/giounix.c || die
- fi
-
- # disable native macOS integrations
- sed -i -e '/glib_have_\(carbon\|cocoa\)=yes/s/yes/no/' \
- configure{.ac,} || die
-
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- # Avoid circular depend with dev-util/pkgconfig and
- # native builds (cross-compiles won't need pkg-config
- # in the target ROOT to work here)
- if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
- if has_version sys-apps/dbus; then
- export DBUS1_CFLAGS="-I${EPREFIX}/usr/include/dbus-1.0 -I${EPREFIX}/usr/$(get_libdir)/dbus-1.0/include"
- export DBUS1_LIBS="-ldbus-1"
- fi
- export LIBFFI_CFLAGS="-I$(echo ${EPREFIX}/usr/$(get_libdir)/libffi-*/include)"
- export LIBFFI_LIBS="-lffi"
- export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass
- export PCRE_LIBS="-lpcre"
- fi
-
- # These configure tests don't work when cross-compiling.
- if tc-is-cross-compiler ; then
- # https://bugzilla.gnome.org/show_bug.cgi?id=756473
- case ${CHOST} in
- hppa*|metag*) export glib_cv_stack_grows=yes ;;
- *) export glib_cv_stack_grows=no ;;
- esac
- # https://bugzilla.gnome.org/show_bug.cgi?id=756474
- export glib_cv_uscore=no
- # https://bugzilla.gnome.org/show_bug.cgi?id=756475
- export ac_cv_func_posix_get{pwuid,grgid}_r=yes
- fi
-
- local myconf
-
- case "${CHOST}" in
- *-mingw*) myconf="${myconf} --with-threads=win32" ;;
- *) myconf="${myconf} --with-threads=posix" ;;
- esac
-
- # non-glibc platforms use GNU libiconv, but configure needs to know about
- # that not to get confused when it finds something outside the prefix too
- if use !elibc_glibc ; then
- myconf="${myconf} --with-libiconv=gnu"
- # add the libdir for libtool, otherwise it'll make love with system
- # installed libiconv. Automake passes LDFLAGS before local libs,
- # add this to LIBS instead to come after local lib dirs.
- append-libs "-L${EPREFIX}/usr/$(get_libdir)"
- fi
-
- local xmlcatalog="${EPREFIX}/etc/xml/catalog"
- grep -q catalog= "${xmlcatalog}" ||
- grep -q catalog= "${BROOT-${PORTAGE_OVERRIDE_EPREFIX}}/etc/xml/catalog" &&
- xmlcatalog="${BROOT-${PORTAGE_OVERRIDE_EPREFIX}}/etc/xml/catalog"
-
- # libelf used only by the gresource bin
- ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
- $(usex debug --enable-debug=yes ' ') \
- $(use_enable xattr) \
- $(use_enable fam) \
- $(use_enable kernel_linux libmount) \
- $(use_enable selinux) \
- $(use_enable static-libs static) \
- $(use_enable systemtap dtrace) \
- $(use_enable systemtap systemtap) \
- $(multilib_native_use_enable utils libelf) \
- --with-python=${EPYTHON} \
- --disable-compile-warnings \
- --enable-man \
- --with-pcre=system \
- --with-xml-catalog="${xmlcatalog}"
-
- if multilib_is_native_abi; then
- local d
- for d in glib gio gobject; do
- ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
- done
- fi
-}
-
-multilib_src_test() {
- export XDG_CONFIG_DIRS="${EPREFIX}"/etc/xdg
- export XDG_DATA_DIRS="${EPREFIX}"/usr/local/share:/usr/share
- export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
- export LC_TIME=C # bug #411967
- unset GSETTINGS_BACKEND # bug #596380
- python_setup
-
- # Related test is a bit nitpicking
- mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
- chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
- # Hardened: gdb needs this, bug #338891
- if host-is-pax ; then
- pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
- || die "Hardened adjustment failed"
- fi
-
- # Need X for dbus-launch session X11 initialization
- virtx emake check
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" completiondir="$(get_bashcompdir)" install
- keepdir /usr/$(get_libdir)/gio/modules
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- # These are installed by dev-util/glib-utils
- # TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit with meson
- rm "${ED}usr/bin/glib-genmarshal" || die
- rm "${ED}usr/share/man/man1/glib-genmarshal.1" || die
- rm "${ED}usr/bin/glib-mkenums" || die
- rm "${ED}usr/share/man/man1/glib-mkenums.1" || die
- rm "${ED}usr/bin/gtester-report" || die
- rm "${ED}usr/share/man/man1/gtester-report.1" || die
-
- # Do not install charset.alias even if generated, leave it to libiconv
- rm -f "${ED}/usr/$(get_libdir)/charset.alias"
-
- # Don't install gdb python macros, bug 291328
- rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
-
- # Completely useless with or without USE static-libs, people need to use pkg-config
- find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
- gnome2_pkg_preinst
-
- # Make gschemas.compiled belong to glib alone
- local cache="usr/share/glib-2.0/schemas/gschemas.compiled"
-
- if [[ -e ${EROOT}${cache} ]]; then
- cp "${EROOT}"${cache} "${ED}"/${cache} || die
- else
- touch "${ED}"/${cache} || die
- fi
-
- multilib_pkg_preinst() {
- # Make giomodule.cache belong to glib alone
- local cache="usr/$(get_libdir)/gio/modules/giomodule.cache"
-
- if [[ -e ${EROOT}${cache} ]]; then
- cp "${EROOT}"${cache} "${ED}"/${cache} || die
- else
- touch "${ED}"/${cache} || die
- fi
- }
-
- # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
- # file due to inability to create it and GIO might not look at any of the modules there
- if ! tc-is-cross-compiler ; then
- multilib_foreach_abi multilib_pkg_preinst
- fi
-}
-
-pkg_postinst() {
- # force (re)generation of gschemas.compiled
- GNOME2_ECLASS_GLIB_SCHEMAS="force"
-
- gnome2_pkg_postinst
-
- multilib_pkg_postinst() {
- gnome2_giomodule_cache_update \
- || die "Update GIO modules cache failed (for ${ABI})"
- }
- if ! tc-is-cross-compiler ; then
- multilib_foreach_abi multilib_pkg_postinst
- else
- ewarn "Updating of GIO modules cache skipped due to cross-compilation."
- ewarn "You might want to run gio-querymodules manually on the target for"
- ewarn "your final image for performance reasons and re-run it when packages"
- ewarn "installing GIO modules get upgraded or added to the image."
- fi
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-
- if [[ -z ${REPLACED_BY_VERSION} ]]; then
- multilib_pkg_postrm() {
- rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache
- }
- multilib_foreach_abi multilib_pkg_postrm
- rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled
- fi
-}
diff --git a/dev-libs/glib/glib-2.66.2-r1.ebuild b/dev-libs/glib/glib-2.74.4.ebuild
similarity index 84%
rename from dev-libs/glib/glib-2.66.2-r1.ebuild
rename to dev-libs/glib/glib-2.74.4.ebuild
index 9621a46221..26772b2746 100644
--- a/dev-libs/glib/glib-2.66.2-r1.ebuild
+++ b/dev-libs/glib/glib-2.74.4.ebuild
@@ -1,27 +1,23 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
-inherit flag-o-matic gnome.org gnome2-utils linux-info meson multilib multilib-minimal python-any-r1 toolchain-funcs xdg
+inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
DESCRIPTION="The GLib library of C routines"
HOMEPAGE="https://www.gtk.org/"
LICENSE="LGPL-2.1+"
SLOT="2"
-IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs sysprof systemtap test utils xattr"
+IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr"
RESTRICT="!test? ( test )"
+#REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
-# meson/ninja buildsystem, breaks of course (at least on Solaris), most
-# likely will introduce problems during bootstrap too
-#KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-# * libelf isn't strictly necessary, but makes gresource tool more useful, and
-# the check is automagic in gio/meson.build. gresource is not a multilib tool
-# right now, thus it doesn't matter if non-native ABI libelf exists or not
-# (non-native binary is overwritten, it doesn't matter if libelf was linked to).
# * elfutils (via libelf) does not build on Windows. gresources are not embedded
# within ELF binaries on that platform anyway and inspecting ELF binaries from
# other platforms is not that useful so exclude the dependency in this case.
@@ -32,27 +28,25 @@ RESTRICT="!test? ( test )"
# them or just put the (build) deps in that rare consumer instead of recursive
# RDEPEND here (due to lack of recursive DEPEND).
RDEPEND="
- !<dev-util/gdbus-codegen-2.66.0
+ !<dev-util/gdbus-codegen-${PV}
>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- >=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
- dev-libs/libffi:=[${MULTILIB_USEDEP}]
+ >=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},unicode(+),static-libs?]
+ >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
- !prefix-stack? ( kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] ) )
+ kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
- kernel_linux? ( virtual/libelf:0= )
- fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- sysprof? ( >=dev-util/sysprof-capture-3.38:4[${MULTILIB_USEDEP}] )
+ elf? ( virtual/libelf:0= )
+ sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
"
+DEPEND="${RDEPEND}"
# libxml2 used for optional tests that get automatically skipped
BDEPEND="
app-text/docbook-xsl-stylesheets
dev-libs/libxslt
>=sys-devel/gettext-0.19.8
- gtk-doc? ( >=dev-util/gtk-doc-1.32-r2
+ gtk-doc? ( >=dev-util/gtk-doc-1.33
app-text/docbook-xml-dtd:4.2
app-text/docbook-xml-dtd:4.5 )
systemtap? ( >=dev-util/systemtap-1.3 )
@@ -75,6 +69,7 @@ MULTILIB_CHOST_TOOLS=(
PATCHES=(
"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
+ "${FILESDIR}"/${P}-implicit-func-decl.patch
)
pkg_setup() {
@@ -148,7 +143,21 @@ src_prepare() {
export PERL=perl
fi
- xdg_src_prepare
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ # fix standards conflicts
+ sed -i \
+ -e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/_POSIX_PTHREAD_SEMANTICS/' \
+ -e '/\<_XOPEN_SOURCE\>/s/\<2\>/600/' \
+ meson.build || die
+ sed -i -e '/#define\s\+_POSIX_SOURCE/d' \
+ glib/giounix.c || die
+ fi
+
+ # disable native macOS integrations
+ sed -i -e '/glib_conf.set(.HAVE_\(CARBON\|COCOA\).)/s/true/false/' \
+ meson.build || die
+
+ default
gnome2_environment_reset
# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
}
@@ -175,32 +184,34 @@ multilib_src_configure() {
$(meson_feature selinux)
$(meson_use xattr)
-Dlibmount=enabled # only used if host_system == 'linux'
- -Dinternal_pcre=false
-Dman=true
$(meson_use systemtap dtrace)
$(meson_use systemtap)
$(meson_feature sysprof)
- -Dgtk_doc=$(multilib_native_usex gtk-doc true false)
- $(meson_use fam)
+ $(meson_native_use_bool gtk-doc gtk_doc)
+ $(meson_use test tests)
-Dinstalled_tests=false
-Dnls=enabled
-Doss_fuzz=disabled
+ $(meson_native_use_feature elf libelf)
+ -Dmultiarch=false
)
meson_src_configure
}
-multilib_src_compile() {
- meson_src_compile
-}
-
multilib_src_test() {
- export XDG_CONFIG_DIRS="${EPREFIX}"/etc/xdg
- export XDG_DATA_DIRS="${EPREFIX}"/usr/local/share:/usr/share
+ export XDG_CONFIG_DIRS=/etc/xdg
+ export XDG_DATA_DIRS=/usr/local/share:/usr/share
export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
export LC_TIME=C # bug #411967
+ export TZ=UTC
unset GSETTINGS_BACKEND # bug #596380
python_setup
+ # https://bugs.gentoo.org/839807
+ local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
+ addpredict /usr/b
+
# Related test is a bit nitpicking
mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
@@ -214,8 +225,6 @@ multilib_src_install() {
}
multilib_src_install_all() {
- einstalldocs
-
# These are installed by dev-util/glib-utils
# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
rm "${ED}/usr/bin/glib-genmarshal" || die
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/glib/, dev-libs/glib/files/
@ 2020-12-15 19:43 Fabian Groffen
0 siblings, 0 replies; 4+ messages in thread
From: Fabian Groffen @ 2020-12-15 19:43 UTC (permalink / raw
To: gentoo-commits
ttings-read.patch dev-libs/glib/files/glib-2.26.1-gsettings-rules.patch dev-libs/glib/files/glib-2.26.1-locked-message.patch dev-libs/glib/files/glib-2.26.1-solaris-thread.patch dev-libs/glib/files/glib-2.26.1-solaris.patch dev-libs/glib/files/glib-2.28.6-interix.patch dev-libs/glib/files/glib-2.29.18-external-gdbus-codegen.patch dev-libs/glib/files/glib-2.30.1-external-gdbus-codegen.patch dev-libs/glib/files/glib-2.30.1-homedir-env.patch dev-libs/glib/files/glib-2.30.2-machine-id.patch dev-libs/glib/files/glib-2.30.2-missing-decls.patch dev-libs/glib/files/glib-2.31.x-external-gdbus-codegen.patch dev-libs/glib/files/glib-2.32.1-fix-libelf-check.patch dev-libs/glib/files/glib-2.32.1-gnustep-not-cocoa.patch dev-libs/glib/files/glib-2.32.1-solaris-FIONREAD.patch dev-libs/glib/files/glib-2.32.1-solaris-nsl.patch dev-libs/glib/files/glib-2.32.1-solaris-thread.patch dev-libs/glib/files/glib-2.32.2-solaris-libelf.patch dev-libs/glib/files/glib-2.32.3-solaris-libelf.patch dev-libs/glib/file
s/glib-2.32.4-CVE-2012-3524.patch dev-libs/glib/files/glib-2.32.4-bashcomp.patch dev-libs/glib/files/glib-2.32.4-interix.patch dev-libs/glib/files/glib-2.32.4-solaris-nsl.patch dev-libs/glib/files/glib-2.34.0-testsuite-skip-gdbus-auth-tests.patch dev-libs/glib/files/glib-2.34.0-testsuite-skip-thread4.patch dev-libs/glib/files/glib-2.34.3-automake-1.13.patch dev-libs/glib/files/glib-2.35.x-external-gdbus-codegen.patch dev-libs/glib/files/glib-2.36.3-solaris.patch dev-libs/glib/files/glib-2.36.4-aix.patch dev-libs/glib/files/glib-2.36.4-znodelete.patch dev-libs/glib/files/glib-2.37.x-external-gdbus-codegen.patch dev-libs/glib/files/glib-2.38.2-O_DIRECTORY-solaris.patch dev-libs/glib/files/glib-2.38.2-aix.patch dev-libs/glib/files/glib-2.38.2-configure.patch dev-libs/glib/files/glib-2.38.2-sigaction.patch dev-libs/glib/files/glib-2.39.2-aix.patch dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch dev-libs/glib/files/glib-2.50.0-external-gdbus-codegen.patch dev-libs/glib/files
/glib-2.6.3-testglib-ssp.patch dev-libs/glib/glib-2.5
6.2.ebuild dev-libs/glib/glib-2.66.2.ebuild
X-VCS-Directories: dev-libs/glib/files/ dev-libs/glib/
X-VCS-Committer: grobian
X-VCS-Committer-Name: Fabian Groffen
X-VCS-Revision: ea1ecc41dfa761091264a958da657e746e78a787
X-VCS-Branch: master
Date: Tue, 15 Dec 2020 19:43:02 +0000 (UTC)
commit: ea1ecc41dfa761091264a958da657e746e78a787
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 15 19:42:51 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Dec 15 19:42:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ea1ecc41
dev-libs/glib: drop ~ppc-aix (and cleanup)]
Bug: https://bugs.gentoo.org/760057
Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
.../glib/files/glib-1.2.10-automake-1.13.patch | 23 -
dev-libs/glib/files/glib-1.2.10-automake.patch | 29 -
.../glib/files/glib-1.2.10-configure-LANG.patch | 44 --
dev-libs/glib/files/glib-1.2.10-gcc34-fix.patch | 41 --
dev-libs/glib/files/glib-1.2.10-m4.patch | 9 -
.../glib/files/glib-2.10.3-ia64-atomic-ops.patch | 39 --
.../glib/files/glib-2.12.11-solaris-thread.patch | 37 --
dev-libs/glib/files/glib-2.12.12-fbsd.patch | 35 -
dev-libs/glib/files/glib-2.16.1-interix.patch | 92 ---
dev-libs/glib/files/glib-2.16.3-libtool.patch | 10 -
dev-libs/glib/files/glib-2.16.3-macos-inline.patch | 16 -
.../files/glib-2.16.3-pcre-buffer-overflow.patch | 15 -
.../glib-2.18.1-gdesktopappinfo-memleak-fix.patch | 38 --
...karound-gio-test-failure-without-userpriv.patch | 20 -
dev-libs/glib/files/glib-2.18.2-interix.patch | 17 -
dev-libs/glib/files/glib-2.18.3-iconv.patch | 12 -
dev-libs/glib/files/glib-2.18.3-winnt-lt2.patch | 573 ----------------
dev-libs/glib/files/glib-2.18.3-winnt.patch | 609 -----------------
.../files/glib-2.18.4-compile-warning-sol64.patch | 14 -
dev-libs/glib/files/glib-2.18.4-gcc44.patch | 607 -----------------
dev-libs/glib/files/glib-2.18.4-irix.patch | 16 -
dev-libs/glib/files/glib-2.20.1-gio-unref.patch | 27 -
dev-libs/glib/files/glib-2.20.3-mint.patch | 55 --
dev-libs/glib/files/glib-2.20.5-winnt-exeext.patch | 36 -
.../glib/files/glib-2.22.3-interix-network.patch | 614 -----------------
dev-libs/glib/files/glib-2.22.3-interix.patch | 19 -
.../glib/files/glib-2.22.4-interix-network.patch | 615 -----------------
dev-libs/glib/files/glib-2.22.5-nothreads.patch | 31 -
.../glib/files/glib-2.24-assert-test-failure.patch | 19 -
.../glib/files/glib-2.24-punt-python-check.patch | 20 -
.../glib/files/glib-2.25-punt-python-check.patch | 20 -
.../glib-2.25-skip-tests-with-dbus-keyring.patch | 22 -
...glib-2.26.0-disable-locale-sensitive-test.patch | 50 --
...-2.26.0-disable-volumemonitor-broken-test.patch | 43 --
.../glib/files/glib-2.26.1-deprecation-tests.patch | 43 --
| 11 -
.../glib/files/glib-2.26.1-gdatetime-test.patch | 21 -
.../glib/files/glib-2.26.1-gdbus-flushes.patch | 64 --
.../glib/files/glib-2.26.1-gsettings-read.patch | 25 -
.../glib/files/glib-2.26.1-gsettings-rules.patch | 33 -
.../glib/files/glib-2.26.1-locked-message.patch | 68 --
.../glib/files/glib-2.26.1-solaris-thread.patch | 37 --
dev-libs/glib/files/glib-2.26.1-solaris.patch | 30 -
dev-libs/glib/files/glib-2.28.6-interix.patch | 728 ---------------------
.../glib-2.29.18-external-gdbus-codegen.patch | 95 ---
.../files/glib-2.30.1-external-gdbus-codegen.patch | 75 ---
dev-libs/glib/files/glib-2.30.1-homedir-env.patch | 61 --
dev-libs/glib/files/glib-2.30.2-machine-id.patch | 32 -
.../glib/files/glib-2.30.2-missing-decls.patch | 36 -
.../files/glib-2.31.x-external-gdbus-codegen.patch | 99 ---
.../glib/files/glib-2.32.1-fix-libelf-check.patch | 11 -
.../glib/files/glib-2.32.1-gnustep-not-cocoa.patch | 29 -
.../glib/files/glib-2.32.1-solaris-FIONREAD.patch | 26 -
dev-libs/glib/files/glib-2.32.1-solaris-nsl.patch | 13 -
.../glib/files/glib-2.32.1-solaris-thread.patch | 37 --
.../glib/files/glib-2.32.2-solaris-libelf.patch | 23 -
.../glib/files/glib-2.32.3-solaris-libelf.patch | 23 -
.../glib/files/glib-2.32.4-CVE-2012-3524.patch | 247 -------
dev-libs/glib/files/glib-2.32.4-bashcomp.patch | 27 -
dev-libs/glib/files/glib-2.32.4-interix.patch | 713 --------------------
dev-libs/glib/files/glib-2.32.4-solaris-nsl.patch | 13 -
...ib-2.34.0-testsuite-skip-gdbus-auth-tests.patch | 62 --
.../files/glib-2.34.0-testsuite-skip-thread4.patch | 44 --
.../glib/files/glib-2.34.3-automake-1.13.patch | 23 -
.../files/glib-2.35.x-external-gdbus-codegen.patch | 112 ----
dev-libs/glib/files/glib-2.36.3-solaris.patch | 29 -
dev-libs/glib/files/glib-2.36.4-aix.patch | 247 -------
dev-libs/glib/files/glib-2.36.4-znodelete.patch | 65 --
.../files/glib-2.37.x-external-gdbus-codegen.patch | 111 ----
.../files/glib-2.38.2-O_DIRECTORY-solaris.patch | 51 --
dev-libs/glib/files/glib-2.38.2-aix.patch | 181 -----
dev-libs/glib/files/glib-2.38.2-configure.patch | 24 -
dev-libs/glib/files/glib-2.38.2-sigaction.patch | 23 -
dev-libs/glib/files/glib-2.39.2-aix.patch | 12 -
.../files/glib-2.40.0-external-gdbus-codegen.patch | 95 ---
.../files/glib-2.50.0-external-gdbus-codegen.patch | 93 ---
dev-libs/glib/files/glib-2.6.3-testglib-ssp.patch | 11 -
dev-libs/glib/glib-2.56.2.ebuild | 2 +-
dev-libs/glib/glib-2.66.2.ebuild | 2 +-
79 files changed, 2 insertions(+), 7672 deletions(-)
diff --git a/dev-libs/glib/files/glib-1.2.10-automake-1.13.patch b/dev-libs/glib/files/glib-1.2.10-automake-1.13.patch
deleted file mode 100644
index abca1ed8db..0000000000
--- a/dev-libs/glib/files/glib-1.2.10-automake-1.13.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Replace macros deprecated in automake-1.13; fixed upstream in glib-2.36
-
-diff --git a/configure.in b/configure.in
-index e94cc77..d88d834 100644
---- a/configure.in
-+++ b/configure.in
-@@ -60,7 +60,7 @@ PACKAGE=glib
- AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
-
- # Specify a configuration file
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
-
- AC_DEFINE_UNQUOTED(GLIB_MAJOR_VERSION, $GLIB_MAJOR_VERSION)
- AC_DEFINE_UNQUOTED(GLIB_MINOR_VERSION, $GLIB_MINOR_VERSION)
-@@ -151,7 +151,6 @@ AC_DEFINE_UNQUOTED(G_COMPILED_WITH_DEBUGGING, "${enable_debug}")
-
- # Checks for programs.
- AC_PROG_CC
--AM_PROG_CC_STDC
- AC_PROG_INSTALL
-
- changequote(,)dnl
diff --git a/dev-libs/glib/files/glib-1.2.10-automake.patch b/dev-libs/glib/files/glib-1.2.10-automake.patch
deleted file mode 100644
index c4f8fd3211..0000000000
--- a/dev-libs/glib/files/glib-1.2.10-automake.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-fix errors with newer automake:
-
-gmodule/Makefile.am:44: testgmodule_LDFLAGS must be set with `=' before using `+='
-
-Makefile.am:73: BUILT_SOURCES multiply defined in condition TRUE ...
-Makefile.am:11: ... `BUILT_SOURCES' previously defined here
-
---- Makefile.am
-+++ Makefile.am
-@@ -70,7 +70,7 @@
-
- CONFIGURE_DEPENDENCIES = acglib.m4
-
--BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
-+BUILT_SOURCES += stamp-gc-h #note: not glibconfig.h
- glibconfig.h: stamp-gc-h
- @:
- stamp-gc-h: config.status
---- gmodule/Makefile.am
-+++ gmodule/Makefile.am
-@@ -41,7 +41,7 @@
- libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ $(libglib)
-
- noinst_PROGRAMS = testgmodule
--testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@
-+testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@
- testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@
-
- .PHONY: files release
diff --git a/dev-libs/glib/files/glib-1.2.10-configure-LANG.patch b/dev-libs/glib/files/glib-1.2.10-configure-LANG.patch
deleted file mode 100644
index b5e9e82a74..0000000000
--- a/dev-libs/glib/files/glib-1.2.10-configure-LANG.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in
-option parsing, it may break.
-
-http://bugs.gentoo.org/133679
-
---- configure
-+++ configure
-@@ -54,6 +54,19 @@
- infodir='${prefix}/info'
- mandir='${prefix}/man'
-
-+# NLS nuisances.
-+for as_var in \
-+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+ LC_TELEPHONE LC_TIME
-+do
-+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+ eval $as_var=C; export $as_var
-+ else
-+ unset $as_var
-+ fi
-+done
-+
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-@@ -452,16 +463,6 @@
- esac
- done
-
--# NLS nuisances.
--# Only set these to C if already set. These must not be set unconditionally
--# because not all systems understand e.g. LANG=C (notably SCO).
--# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
--# Non-C LC_CTYPE values break the ctype check.
--if test "${LANG+set}" = set; then LANG=C; export LANG; fi
--if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
--if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
--if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi
--
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
- rm -rf conftest* confdefs.h
- # AIX cpp loses on an empty file, so make sure it contains at least a newline.
diff --git a/dev-libs/glib/files/glib-1.2.10-gcc34-fix.patch b/dev-libs/glib/files/glib-1.2.10-gcc34-fix.patch
deleted file mode 100644
index 1b896484d2..0000000000
--- a/dev-libs/glib/files/glib-1.2.10-gcc34-fix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- glib-1.2.10/gstrfuncs.c.orig 2001-02-27 07:00:22.000000000 +0100
-+++ glib-1.2.10/gstrfuncs.c 2004-03-01 13:19:49.531603760 +0100
-@@ -867,7 +867,7 @@
- /* beware of positional parameters
- */
- case '$':
-- g_warning (G_GNUC_PRETTY_FUNCTION
-+ g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION,
- "(): unable to handle positional parameters (%%n$)");
- len += 1024; /* try adding some safety padding */
- break;
-@@ -1034,7 +1034,7 @@
- /* n . dddddddddddddddddddddddd E +- eeee */
- conv_len += 1 + 1 + MAX (24, spec.precision) + 1 + 1 + 4;
- if (spec.mod_extra_long)
-- g_warning (G_GNUC_PRETTY_FUNCTION
-+ g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION,
- "(): unable to handle long double, collecting double only");
- #ifdef HAVE_LONG_DOUBLE
- #error need to implement special handling for long double
-@@ -1077,7 +1077,7 @@
- conv_done = TRUE;
- if (spec.mod_long)
- {
-- g_warning (G_GNUC_PRETTY_FUNCTION
-+ g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION,
- "(): unable to handle wide char strings");
- len += 1024; /* try adding some safety padding */
- }
-@@ -1108,9 +1108,8 @@
- conv_len += format - spec_start;
- break;
- default:
-- g_warning (G_GNUC_PRETTY_FUNCTION
-- "(): unable to handle `%c' while parsing format",
-- c);
-+ g_warning ("%s(): unable to handle `%c' while parsing format",
-+ G_GNUC_PRETTY_FUNCTION, c);
- break;
- }
- conv_done |= conv_len > 0;
diff --git a/dev-libs/glib/files/glib-1.2.10-m4.patch b/dev-libs/glib/files/glib-1.2.10-m4.patch
deleted file mode 100644
index f57ecf7c11..0000000000
--- a/dev-libs/glib/files/glib-1.2.10-m4.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Fix aclocal warning:
-/usr/share/aclocal/glib.m4:8: warning: underquoted definition of AM_PATH_GLIB
---- glib-1.2.10/glib.m4
-+++ glib-1.2.10/glib.m4
-@@ -7,3 +7,3 @@
- dnl
--AC_DEFUN(AM_PATH_GLIB,
-+AC_DEFUN([AM_PATH_GLIB],
- [dnl
diff --git a/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch b/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch
deleted file mode 100644
index 0859e3310a..0000000000
--- a/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From Debian, this one is needed for gcc < 4.1...
-
---- glib-2.10.0/glib/gatomic.c 2006-02-24 14:02:51.000000000 +0000
-+++ glib-2.10.0/glib/gatomic.c 2006-03-06 18:12:06.000000000 +0000
-@@ -414,14 +414,14 @@
- g_atomic_int_exchange_and_add (volatile gint *atomic,
- gint val)
- {
-- return __sync_fetch_and_add (atomic, val);
-+ return __sync_fetch_and_add_si (atomic, val);
- }
-
- void
- g_atomic_int_add (volatile gint *atomic,
- gint val)
- {
-- __sync_fetch_and_add (atomic, val);
-+ __sync_fetch_and_add_si (atomic, val);
- }
-
- gboolean
-@@ -429,7 +429,7 @@
- gint oldval,
- gint newval)
- {
-- return __sync_bool_compare_and_swap (atomic, oldval, newval);
-+ return __sync_bool_compare_and_swap_si (atomic, oldval, newval);
- }
-
- gboolean
-@@ -437,7 +437,7 @@
- gpointer oldval,
- gpointer newval)
- {
-- return __sync_bool_compare_and_swap ((long *)atomic,
-+ return __sync_bool_compare_and_swap_di ((long *)atomic,
- (long)oldval, (long)newval);
- }
-
diff --git a/dev-libs/glib/files/glib-2.12.11-solaris-thread.patch b/dev-libs/glib/files/glib-2.12.11-solaris-thread.patch
deleted file mode 100644
index 2ec6ba4e9d..0000000000
--- a/dev-libs/glib/files/glib-2.12.11-solaris-thread.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-* Michael Haubenwallner
- Thing is, one really should not link against both libthread and
- libpthread, but use '-pthread' gcc-flag or '-mt' suncc-flag instead.
-
- Don't know where glib-folks have information from found in that
- comment.
-
-* Fabian Groffen
- patch both configure and configure.in (in the right order) such that a
- sudden autoreconf doesn't wipe out our changes.
-
-Multiple reports for these, but unfortunately all ignored/unfixed, e.g.:
-http://mail-index.netbsd.org/pkgsrc-users/2010/12/02/msg013239.html
-http://mail.gnome.org/archives/gtk-devel-list/2007-July/msg00060.html
-
---- configure.in
-+++ configure.in
-@@ -1785,7 +1785,7 @@
- *-*-cygwin*|*-*-darwin*)
- # skip cygwin and darwin -pthread or -pthreads test
- ;;
-- *-solaris*)
-+ xxx*-solaris*)
- # These compiler/linker flags work with both Sun Studio and gcc
- # Sun Studio expands -mt to -D_REENTRANT and -lthread
- # gcc expands -pthreads to -D_REENTRANT -D_PTHREADS -lpthread
---- configure
-+++ configure
-@@ -37030,7 +37030,7 @@
- *-*-cygwin*|*-*-darwin*)
- # skip cygwin and darwin -pthread or -pthreads test
- ;;
-- *-solaris*)
-+ xxx*-solaris*)
- # These compiler/linker flags work with both Sun Studio and gcc
- # Sun Studio expands -mt to -D_REENTRANT and -lthread
- # gcc expands -pthreads to -D_REENTRANT -D_PTHREADS -lpthread
diff --git a/dev-libs/glib/files/glib-2.12.12-fbsd.patch b/dev-libs/glib/files/glib-2.12.12-fbsd.patch
deleted file mode 100644
index 5aca6950a2..0000000000
--- a/dev-libs/glib/files/glib-2.12.12-fbsd.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From deeb71226d4ab465d48805d899ec88eb836a6966 Mon Sep 17 00:00:00 2001
-From: Daniel Gryniewicz <dang@gentoo.org>
-Date: Sun, 24 Nov 2013 19:46:13 +0100
-Subject: [PATCH 1/4] Fix gmodule issue on FreeBSD
-
-Gentoo bug #184301, Gnome bug #107626.
----
- gmodule/gmodule-dl.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/gmodule/gmodule-dl.c b/gmodule/gmodule-dl.c
-index a606f17..57fc41b 100644
---- a/gmodule/gmodule-dl.c
-+++ b/gmodule/gmodule-dl.c
-@@ -107,6 +107,7 @@ _g_module_open (const gchar *file_name,
- static gpointer
- _g_module_self (void)
- {
-+#ifndef __FreeBSD__
- gpointer handle;
-
- /* to query symbols from the program itself, special link options
-@@ -122,6 +123,9 @@ _g_module_self (void)
- g_module_set_error (fetch_dlerror (TRUE));
-
- return handle;
-+#else
-+ return RTLD_DEFAULT;
-+#endif
- }
-
- static void
---
-1.8.3.2
-
diff --git a/dev-libs/glib/files/glib-2.16.1-interix.patch b/dev-libs/glib/files/glib-2.16.1-interix.patch
deleted file mode 100644
index 4432974dec..0000000000
--- a/dev-libs/glib/files/glib-2.16.1-interix.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-* mduft@gentoo.org: add support for reading file systems on interix.
-
-http://bugzilla.gnome.org/show_bug.cgi?id=570073
-
---- glib-2.16.1.orig/gio/gunixmounts.c 2008-03-25 13:39:53 +0100
-+++ glib-2.16.1/gio/gunixmounts.c 2008-03-25 14:13:10 +0100
-@@ -45,6 +45,11 @@
- #include <string.h>
- #include <signal.h>
-
-+#if defined(__INTERIX)
-+# include <sys/statvfs.h>
-+# include <dirent.h>
-+#endif
-+
- #include "gunixmounts.h"
- #include "gfile.h"
- #include "gfilemonitor.h"
-@@ -592,6 +597,60 @@
-
- return g_list_reverse (return_list);
- }
-+#elif defined(__INTERIX)
-+
-+static char *
-+get_mtab_monitor_file (void)
-+{
-+ return NULL;
-+}
-+
-+static GList *
-+_g_get_unix_mounts (void)
-+{
-+ DIR* dirp = opendir("/dev/fs");
-+ GList* return_list = NULL;
-+
-+ if(!dirp) {
-+ g_warning("unable to read /dev/fs!");
-+ return NULL;
-+ } else {
-+ char filename[9 + NAME_MAX];
-+
-+ while(1) {
-+ struct statvfs statbuf;
-+ struct dirent entry;
-+ struct dirent* result;
-+
-+ if(readdir_r(dirp, &entry, &result) || result == NULL) {
-+ break;
-+ }
-+
-+ strcpy(filename, "/dev/fs/");
-+ strcat(filename, entry.d_name);
-+
-+ if(statvfs(filename, &statbuf) == 0) {
-+ GUnixMountEntry* mount_entry = g_new0(GUnixMountEntry, 1);
-+
-+ mount_entry->mount_path = g_strdup(statbuf.f_mntonname);
-+ mount_entry->device_path = g_strdup(statbuf.f_mntfromname);
-+ mount_entry->filesystem_type = g_strdup(statbuf.f_fstypename);
-+
-+ if(statbuf.f_flag & ST_RDONLY) {
-+ mount_entry->is_read_only = TRUE;
-+ }
-+
-+ return_list = g_list_prepend(return_list, mount_entry);
-+ }
-+ }
-+
-+ return_list = g_list_reverse(return_list);
-+
-+ closedir(dirp);
-+ }
-+
-+ return return_list;
-+}
- #else
- #error No _g_get_unix_mounts() implementation for system
- #endif
-@@ -972,6 +1031,12 @@
-
- return g_list_reverse (return_list);
- }
-+#elif defined(__INTERIX)
-+static GList *
-+_g_get_unix_mount_points (void)
-+{
-+ return _g_get_unix_mounts();
-+}
- #else
- #error No g_get_mount_table() implementation for system
- #endif
diff --git a/dev-libs/glib/files/glib-2.16.3-libtool.patch b/dev-libs/glib/files/glib-2.16.3-libtool.patch
deleted file mode 100644
index e43bdef620..0000000000
--- a/dev-libs/glib/files/glib-2.16.3-libtool.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.in.old 2008-06-02 09:28:34.954174000 -0500
-+++ configure.in 2008-06-02 09:29:06.087819000 -0500
-@@ -492,6 +492,7 @@
- AM_DISABLE_STATIC
- AC_LIBTOOL_WIN32_DLL
- AM_PROG_LIBTOOL
-+m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
-
- if test "x$GCC" = "xyes"; then
- case " $CFLAGS " in
diff --git a/dev-libs/glib/files/glib-2.16.3-macos-inline.patch b/dev-libs/glib/files/glib-2.16.3-macos-inline.patch
deleted file mode 100644
index 9f09340c7e..0000000000
--- a/dev-libs/glib/files/glib-2.16.3-macos-inline.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-* s.cloherty@ieee.org: properly keep symbols inside on OSX
-
-http://bugs.gentoo.org/show_bug.cgi?id=221075
-http://bugzilla.gnome.org/show_bug.cgi?id=570072
-
---- glib/gutils.h
-+++ glib/gutils.h
-@@ -96,6 +96,8 @@
- #ifdef G_IMPLEMENT_INLINES
- # define G_INLINE_FUNC
- # undef G_CAN_INLINE
-+#elif defined (__APPLE__)
-+# define G_INLINE_FUNC static inline
- #elif defined (__GNUC__)
- # if defined (__GNUC_STDC_INLINE__) || defined (__GNUC_GNU_INLINE__)
- # define G_INLINE_FUNC extern inline __attribute__ ((__gnu_inline__))
diff --git a/dev-libs/glib/files/glib-2.16.3-pcre-buffer-overflow.patch b/dev-libs/glib/files/glib-2.16.3-pcre-buffer-overflow.patch
deleted file mode 100644
index 18fd0525be..0000000000
--- a/dev-libs/glib/files/glib-2.16.3-pcre-buffer-overflow.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- glib/pcre/pcre_compile.c.orig 2008-06-30 10:42:54.000000000 +0300
-+++ glib/pcre/pcre_compile.c 2008-06-30 10:43:10.000000000 +0300
-@@ -4699,11 +4699,11 @@ we set the flag only if there is a liter
- {
- if (code == cd->start_code + 1 + LINK_SIZE &&
- (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE))
- {
- cd->external_options = newoptions;
-- options = newoptions;
-+ options = *optionsptr = newoptions;
- }
- else
- {
- if ((options & PCRE_IMS) != (newoptions & PCRE_IMS))
- {
diff --git a/dev-libs/glib/files/glib-2.18.1-gdesktopappinfo-memleak-fix.patch b/dev-libs/glib/files/glib-2.18.1-gdesktopappinfo-memleak-fix.patch
deleted file mode 100644
index 473fcbd27a..0000000000
--- a/dev-libs/glib/files/glib-2.18.1-gdesktopappinfo-memleak-fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-2008-09-20 Matthias Clasen
-
-* gdesktopappinfo.c (expand_macro_single): Plug a memory leak
-
---- branches/glib-2-18/gio/gdesktopappinfo.c 2008/09/21 00:00:18 7520
-+++ branches/glib-2-18/gio/gdesktopappinfo.c 2008/09/21 00:04:37 7521
-@@ -480,7 +480,7 @@
- {
- GFile *file;
- char *result = NULL;
-- char *path;
-+ char *path, *name;
-
- file = g_file_new_for_uri (uri);
- path = g_file_get_path (file);
-@@ -500,12 +500,20 @@
- case 'd':
- case 'D':
- if (path)
-- result = g_shell_quote (g_path_get_dirname (path));
-+ {
-+ name = g_path_get_dirname (path);
-+ result = g_shell_quote (name);
-+ g_free (name);
-+ }
- break;
- case 'n':
- case 'N':
- if (path)
-- result = g_shell_quote (g_path_get_basename (path));
-+ {
-+ name = g_path_get_basename (path);
-+ result = g_shell_quote (name);
-+ g_free (name);
-+ }
- break;
- }
-
diff --git a/dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch b/dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch
deleted file mode 100644
index cabe56f567..0000000000
--- a/dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Temporary workaround for gio tests failure when ran without FEATURES=userpriv
-until upstream bug #552912 is fixed
-
---- gio/tests/live-g-file.c.orig 2008-09-25 05:44:12.848556034 +0300
-+++ gio/tests/live-g-file.c 2008-09-25 06:12:34.248726237 +0300
-@@ -769,11 +769,14 @@
- if (posix_compat)
- {
- /* target directory is not accessible (no execute flag) */
-+#if 0
-+/* Fails when ran as root */
- do_copy_move (root, item, TEST_DIR_NO_ACCESS,
- TEST_NO_ACCESS);
- /* target directory is readonly */
- do_copy_move (root, item, TEST_DIR_NO_WRITE,
- TEST_NO_ACCESS);
-+#endif
- }
- }
- }
diff --git a/dev-libs/glib/files/glib-2.18.2-interix.patch b/dev-libs/glib/files/glib-2.18.2-interix.patch
deleted file mode 100644
index 32abeedd7a..0000000000
--- a/dev-libs/glib/files/glib-2.18.2-interix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-* mduft@gentoo.org: fix a wrong preprocessor directive (which is not noticed
- on systems that have both "chown" and "utimes")
- breaks on Interix
-
-http://bugzilla.gnome.org/show_bug.cgi?id=570069
-
---- glib-2.18.2.orig/gio/glocalfileinfo.c 2008-10-30 09:56:45 +0100
-+++ glib-2.18.2/gio/glocalfileinfo.c 2008-10-30 09:58:04 +0100
-@@ -2165,7 +2165,7 @@
- #ifdef HAVE_UTIMES
- GFileAttributeValue *mtime, *mtime_usec, *atime, *atime_usec;
- #endif
--#if defined (HAVE_CHOWN) && defined (HAVE_UTIMES)
-+#if defined (HAVE_CHOWN) || defined (HAVE_UTIMES)
- GFileAttributeStatus status;
- #endif
- gboolean res;
diff --git a/dev-libs/glib/files/glib-2.18.3-iconv.patch b/dev-libs/glib/files/glib-2.18.3-iconv.patch
deleted file mode 100644
index 3c7d45979c..0000000000
--- a/dev-libs/glib/files/glib-2.18.3-iconv.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru glib-2.18.3.orig/configure.in glib-2.18.3/configure.in
---- glib-2.18.3.orig/configure.in 2008-12-19 09:06:54 +0100
-+++ glib-2.18.3/configure.in 2008-12-19 09:11:43 +0100
-@@ -470,7 +470,7 @@
- dnl Now we are done with gettext checks, figure out ICONV_LIBS
- dnl
-
--if test x"$glib_native_win32" != xyes; then
-+if test x$with_libiconv != xnative ; then
- if test x$with_libiconv != xno ; then
- case " $INTLLIBS " in
- *[[\ \ ]]-liconv[[\ \ ]]*) ;;
diff --git a/dev-libs/glib/files/glib-2.18.3-winnt-lt2.patch b/dev-libs/glib/files/glib-2.18.3-winnt-lt2.patch
deleted file mode 100644
index d852a41327..0000000000
--- a/dev-libs/glib/files/glib-2.18.3-winnt-lt2.patch
+++ /dev/null
@@ -1,573 +0,0 @@
-diff -ru glib-2.18.3.orig/Makefile.am glib-2.18.3/Makefile.am
---- glib-2.18.3.orig/Makefile.am 2008-12-04 13:34:21 +0100
-+++ glib-2.18.3/Makefile.am 2008-12-04 13:33:24 +0100
-@@ -3,7 +3,7 @@
-
- AUTOMAKE_OPTIONS = 1.7
-
--SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
-+SUBDIRS = . m4macros glib gmodule gthread gobject gio tests docs
- DIST_SUBDIRS = $(SUBDIRS) build
-
- bin_SCRIPTS = glib-gettextize
-diff -ru glib-2.18.3.orig/configure.in glib-2.18.3/configure.in
---- glib-2.18.3.orig/configure.in 2008-12-04 13:34:21 +0100
-+++ glib-2.18.3/configure.in 2008-12-04 13:33:24 +0100
-@@ -117,7 +117,7 @@
- AC_MSG_CHECKING([for Win32])
- LIB_EXE_MACHINE_FLAG=X86
- case "$host" in
-- *-*-mingw*)
-+ *-*-mingw*|*-winnt*)
- glib_native_win32=yes
- glib_pid_type='void *'
- glib_cv_stack_grows=no
-@@ -142,6 +142,9 @@
- ;;
- esac
- case $host in
-+ *-winnt*)
-+ glib_os_parity=yes
-+ ;;
- *-*-linux*)
- glib_os_linux=yes
- ;;
-@@ -166,7 +169,7 @@
- AM_CONDITIONAL(OS_LINUX, [test "$glib_os_linux" = "yes"])
- AM_CONDITIONAL(OS_CARBON, [test "$glib_have_carbon" = "yes"])
-
--if test "$glib_native_win32" = "yes"; then
-+if test "$glib_native_win32" = "yes" -a "$glib_os_parity" != "yes"; then
- AC_CHECK_TOOL(WINDRES, windres, no)
- if test "$WINDRES" = no; then
- AC_MSG_ERROR([*** Could not find an implementation of windres in your PATH.])
-@@ -180,7 +183,7 @@
- fi
- AM_CONDITIONAL(MS_LIB_AVAILABLE, [test x$ms_librarian = xyes])
-
--if test "$glib_native_win32" != yes; then
-+if test "$glib_native_win32" != yes -a "$glib_os_parity" != "yes"; then
- # libtool option to control which symbols are exported
- # right now, symbols starting with _ are not exported
- LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^g.*"'
-@@ -373,7 +376,7 @@
-
- dnl On Windows we use a native implementation
-
--if test x"$glib_native_win32" = xyes; then
-+if test x"$glib_native_win32" = xyes -a "$glib_os_parity" != "yes"; then
- with_libiconv=native
- else
- AC_ARG_WITH(libiconv,
-@@ -502,7 +505,7 @@
-
- CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES"
-
--if test "$glib_native_win32" = "yes"; then
-+if test "$glib_native_win32" = "yes" -a "$glib_os_parity" != "yes"; then
- if test x$enable_static = xyes -a x$enable_shared = xyes; then
- AC_MSG_ERROR([Can not build both shared and static at the same time on Windows.])
- fi
-@@ -513,7 +516,7 @@
- AC_SUBST(GLIB_WIN32_STATIC_COMPILATION_DEFINE)
- fi
- fi
--AM_CONDITIONAL(OS_WIN32_AND_DLL_COMPILATION, [test x$glib_native_win32 = xyes -a x$glib_win32_static_compilation != xyes])
-+AM_CONDITIONAL(OS_WIN32_AND_DLL_COMPILATION, [test x$glib_native_win32 = xyes -a x$glib_win32_static_compilation != xyes -a "$glib_os_parity" != "yes"])
-
- dnl
- dnl DU4 native cc currently needs -std1 for ANSI mode (instead of K&R)
-@@ -1310,7 +1313,7 @@
- dnl *** force native WIN32 shared lib loader
- if test -z "$G_MODULE_IMPL"; then
- case "$host" in
-- *-*-mingw*|*-*-cygwin*) G_MODULE_IMPL=G_MODULE_IMPL_WIN32 ;;
-+ *-*-mingw*|*-*-cygwin*|*-winnt*) G_MODULE_IMPL=G_MODULE_IMPL_WIN32 ;;
- esac
- fi
- dnl *** force native AIX library loader
-@@ -1468,7 +1471,7 @@
-
- AC_MSG_CHECKING(for gspawn implementation)
- case "$host" in
-- *-*-mingw*)
-+ *-*-mingw*|*-winnt*)
- GSPAWN=gspawn-win32.lo
- ;;
- *)
-@@ -1484,7 +1487,7 @@
-
- AC_MSG_CHECKING(for GIOChannel implementation)
- case "$host" in
-- *-*-mingw*)
-+ *-*-mingw*|*-winnt*)
- GIO=giowin32.lo
- ;;
- *)
-@@ -1644,7 +1647,7 @@
-
- AC_MSG_CHECKING(for platform-dependent source)
- case "$host" in
-- *-*-cygwin*|*-*-mingw*)
-+ *-*-cygwin*|*-*-mingw*|*-winnt*)
- PLATFORMDEP=gwin32.lo
- ;;
- *)
-@@ -1656,7 +1659,7 @@
-
- AC_MSG_CHECKING([whether to compile timeloop])
- case "$host" in
-- *-*-cygwin*|*-*-mingw*|*-*-minix)
-+ *-*-cygwin*|*-*-mingw*|*-*-minix|*-winnt*)
- enable_timeloop=no
- ;;
- *)
-@@ -1668,7 +1671,7 @@
-
- AC_MSG_CHECKING([if building for some Win32 platform])
- case "$host" in
-- *-*-mingw*|*-*-cygwin*)
-+ *-*-mingw*|*-*-cygwin*|*-winnt*)
- platform_win32=yes
- ;;
- *)
-@@ -1774,7 +1777,7 @@
- fi
- if test "x$want_threads" = xyes || test "x$want_threads" = xwin32; then
- case $host in
-- *-*-mingw*)
-+ *-*-mingw*|*-winnt*)
- have_threads=win32
- ;;
- esac
-@@ -1903,7 +1906,7 @@
- G_THREAD_CFLAGS="-Kthread"
- G_THREAD_LIBS=$G_THREAD_CFLAGS
- ;;
-- *-mingw*)
-+ *-mingw*|*-winnt*)
- # No flag needed when using MSVCRT.DLL
- G_THREAD_CFLAGS=""
- ;;
-@@ -3280,7 +3283,7 @@
- #define G_PLATFORM_WIN32
- #define G_WITH_CYGWIN"
- ;;
-- *-*-mingw*)
-+ *-*-mingw*|*-winnt*)
- glib_os="#define G_OS_WIN32
- #define G_PLATFORM_WIN32"
- ;;
-diff -ru glib-2.18.3.orig/gio/glocalfile.c glib-2.18.3/gio/glocalfile.c
---- glib-2.18.3.orig/gio/glocalfile.c 2008-12-04 13:34:21 +0100
-+++ glib-2.18.3/gio/glocalfile.c 2008-12-04 13:33:24 +0100
-@@ -91,6 +91,7 @@
- #include <windows.h>
- #include <io.h>
- #include <direct.h>
-+#include <shellapi.h>
-
- #ifndef FILE_READ_ONLY_VOLUME
- #define FILE_READ_ONLY_VOLUME 0x00080000
-diff -ru glib-2.18.3.orig/gio/gwin32appinfo.c glib-2.18.3/gio/gwin32appinfo.c
---- glib-2.18.3.orig/gio/gwin32appinfo.c 2008-12-04 13:34:21 +0100
-+++ glib-2.18.3/gio/gwin32appinfo.c 2008-12-04 13:33:24 +0100
-@@ -33,6 +33,7 @@
- #include "glibintl.h"
-
- #include <windows.h>
-+#include <shellapi.h>
- #include <shlwapi.h>
-
- #include "gioalias.h"
-diff -ru glib-2.18.3.orig/gio/gwin32mount.c glib-2.18.3/gio/gwin32mount.c
---- glib-2.18.3.orig/gio/gwin32mount.c 2008-12-04 13:34:21 +0100
-+++ glib-2.18.3/gio/gwin32mount.c 2008-12-04 13:33:24 +0100
-@@ -28,6 +28,7 @@
- #include <string.h>
- #define WIN32_MEAN_AND_LEAN
- #include <windows.h>
-+#include <shellapi.h>
-
- #include <glib.h>
- #include "gwin32volumemonitor.h"
-diff -ru glib-2.18.3.orig/glib/gconvert.c glib-2.18.3/glib/gconvert.c
---- glib-2.18.3.orig/glib/gconvert.c 2008-12-04 13:34:21 +0100
-+++ glib-2.18.3/glib/gconvert.c 2008-12-04 13:33:24 +0100
-@@ -24,7 +24,7 @@
-
- #include "glib.h"
-
--#ifndef G_OS_WIN32
-+#if !defined G_OS_WIN32 || defined __PARITY__
- #include <iconv.h>
- #endif
- #include <errno.h>
-@@ -36,7 +36,7 @@
- #include "gthreadprivate.h"
- #include "gunicode.h"
-
--#ifdef G_OS_WIN32
-+#if defined G_OS_WIN32 && !defined __PARITY__
- #include "win_iconv.c"
- #endif
-
-diff -ru glib-2.18.3.orig/glib/gfileutils.c glib-2.18.3/glib/gfileutils.c
---- glib-2.18.3.orig/glib/gfileutils.c 2008-12-04 13:34:21 +0100
-+++ glib-2.18.3/glib/gfileutils.c 2008-12-04 13:33:24 +0100
-@@ -41,6 +41,17 @@
- #include <io.h>
- #endif /* G_OS_WIN32 */
-
-+#ifdef __PARITY__
-+/*
-+ * Parity provides automatic path conversion from interix -> windows,
-+ * but only for the ACSII versions of stdio functions. since glib uses
-+ * the wide char versions, we need to manually convert...
-+ */
-+# include <internal/pcrt.h>
-+#else
-+# define PCRT_CONV(x) x
-+#endif
-+
- #ifndef S_ISLNK
- #define S_ISLNK(x) 0
- #endif
-@@ -191,7 +202,7 @@
- # define FILE_ATTRIBUTE_DEVICE 64
- # endif
- int attributes;
-- wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
-+ wchar_t *wfilename = g_utf8_to_utf16 (PCRT_CONV(filename), -1, NULL, NULL, NULL);
-
- if (wfilename == NULL)
- return FALSE;
-@@ -326,7 +337,7 @@
- g_file_test (const gchar *filename,
- GFileTest test)
- {
-- gchar *utf8_filename = g_locale_to_utf8 (filename, -1, NULL, NULL, NULL);
-+ gchar *utf8_filename = g_locale_to_utf8 (PCRT_CONV(filename), -1, NULL, NULL, NULL);
- gboolean retval;
-
- if (utf8_filename == NULL)
-@@ -872,7 +883,7 @@
- gsize *length,
- GError **error)
- {
-- gchar *utf8_filename = g_locale_to_utf8 (filename, -1, NULL, NULL, error);
-+ gchar *utf8_filename = g_locale_to_utf8 (PCRT_CONV(filename), -1, NULL, NULL, error);
- gboolean retval;
-
- if (utf8_filename == NULL)
-diff -ru glib-2.18.3.orig/glib/gmessages.c glib-2.18.3/glib/gmessages.c
---- glib-2.18.3.orig/glib/gmessages.c 2008-12-04 13:34:21 +0100
-+++ glib-2.18.3/glib/gmessages.c 2008-12-04 13:37:02 +0100
-@@ -481,8 +481,12 @@
- #ifdef G_OS_WIN32
- gchar *locale_msg = g_locale_from_utf8 (fatal_msg_buf, -1, NULL, NULL, NULL);
-
-+#ifdef __PARITY__
-+ fprintf(stderr, locale_msg);
-+#else
- MessageBox (NULL, locale_msg, NULL,
- MB_ICONERROR|MB_SETFOREGROUND);
-+#endif
- if (IsDebuggerPresent () && !(test_level & G_LOG_FLAG_RECURSION))
- G_BREAKPOINT ();
- else
-diff -ru glib-2.18.3.orig/glib/gspawn-win32-helper.c glib-2.18.3/glib/gspawn-win32-helper.c
---- glib-2.18.3.orig/glib/gspawn-win32-helper.c 2008-12-04 13:34:21 +0100
-+++ glib-2.18.3/glib/gspawn-win32-helper.c 2008-12-04 13:33:24 +0100
-@@ -23,6 +23,10 @@
-
- #include <fcntl.h>
-
-+#ifdef __PARITY__
-+# define HELPER_CONSOLE
-+#endif
-+
- #undef G_LOG_DOMAIN
- #include "glib.h"
- #define GSPAWN_HELPER
-diff -ru glib-2.18.3.orig/glib/gstdio.c glib-2.18.3/glib/gstdio.c
---- glib-2.18.3.orig/glib/gstdio.c 2008-12-04 13:34:21 +0100
-+++ glib-2.18.3/glib/gstdio.c 2008-12-04 13:33:24 +0100
-@@ -43,6 +43,17 @@
- #include <utime.h>
- #endif
-
-+#ifdef __PARITY__
-+/*
-+ * Parity provides automatic path conversion from interix -> windows,
-+ * but only for the ACSII versions of stdio functions. since glib uses
-+ * the wide char versions, we need to manually convert...
-+ */
-+# include <internal/pcrt.h>
-+#else
-+# define PCRT_CONV(x) x
-+#endif
-+
- #include "gstdio.h"
-
- #include "galias.h"
-@@ -81,7 +92,7 @@
- int mode)
- {
- #ifdef G_OS_WIN32
-- wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
-+ wchar_t *wfilename = g_utf8_to_utf16 (PCRT_CONV(filename), -1, NULL, NULL, NULL);
- int retval;
- int save_errno;
-
-@@ -132,7 +143,7 @@
- int mode)
- {
- #ifdef G_OS_WIN32
-- wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
-+ wchar_t *wfilename = g_utf8_to_utf16 (PCRT_CONV(filename), -1, NULL, NULL, NULL);
- int retval;
- int save_errno;
-
-@@ -189,7 +200,7 @@
- int mode)
- {
- #ifdef G_OS_WIN32
-- wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
-+ wchar_t *wfilename = g_utf8_to_utf16 (PCRT_CONV(filename), -1, NULL, NULL, NULL);
- int retval;
- int save_errno;
-
-@@ -246,7 +257,7 @@
- int mode)
- {
- #ifdef G_OS_WIN32
-- wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
-+ wchar_t *wfilename = g_utf8_to_utf16 (PCRT_CONV(filename), -1, NULL, NULL, NULL);
- int retval;
- int save_errno;
-
-@@ -289,7 +300,7 @@
- const gchar *newfilename)
- {
- #ifdef G_OS_WIN32
-- wchar_t *woldfilename = g_utf8_to_utf16 (oldfilename, -1, NULL, NULL, NULL);
-+ wchar_t *woldfilename = g_utf8_to_utf16 (PCRT_CONV(oldfilename), -1, NULL, NULL, NULL);
- wchar_t *wnewfilename;
- int retval;
- int save_errno = 0;
-@@ -300,7 +311,7 @@
- return -1;
- }
-
-- wnewfilename = g_utf8_to_utf16 (newfilename, -1, NULL, NULL, NULL);
-+ wnewfilename = g_utf8_to_utf16 (PCRT_CONV(newfilename), -1, NULL, NULL, NULL);
-
- if (wnewfilename == NULL)
- {
-@@ -361,7 +372,7 @@
- int mode)
- {
- #ifdef G_OS_WIN32
-- wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
-+ wchar_t *wfilename = g_utf8_to_utf16 (PCRT_CONV(filename), -1, NULL, NULL, NULL);
- int retval;
- int save_errno;
-
-@@ -400,7 +411,7 @@
- g_chdir (const gchar *path)
- {
- #ifdef G_OS_WIN32
-- wchar_t *wpath = g_utf8_to_utf16 (path, -1, NULL, NULL, NULL);
-+ wchar_t *wpath = g_utf8_to_utf16 (PCRT_CONV(path), -1, NULL, NULL, NULL);
- int retval;
- int save_errno;
-
-@@ -446,7 +457,8 @@
- struct stat *buf)
- {
- #ifdef G_OS_WIN32
-- wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
-+ char* fnconv = PCRT_CONV(filename);
-+ wchar_t *wfilename = g_utf8_to_utf16 (fnconv, -1, NULL, NULL, NULL);
- int retval;
- int save_errno;
- int len;
-@@ -461,7 +473,7 @@
- while (len > 0 && G_IS_DIR_SEPARATOR (wfilename[len-1]))
- len--;
- if (len > 0 &&
-- (!g_path_is_absolute (filename) || len > g_path_skip_root (filename) - filename))
-+ (!g_path_is_absolute (fnconv) || len > g_path_skip_root (fnconv) - fnconv))
- wfilename[len] = '\0';
-
- retval = _wstat (wfilename, (struct _stat *) buf);
-@@ -529,7 +541,7 @@
- g_unlink (const gchar *filename)
- {
- #ifdef G_OS_WIN32
-- wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
-+ wchar_t *wfilename = g_utf8_to_utf16 (PCRT_CONV(filename), -1, NULL, NULL, NULL);
- int retval;
- int save_errno;
-
-@@ -581,7 +593,7 @@
- g_remove (const gchar *filename)
- {
- #ifdef G_OS_WIN32
-- wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
-+ wchar_t *wfilename = g_utf8_to_utf16 (PCRT_CONV(filename), -1, NULL, NULL, NULL);
- int retval;
- int save_errno;
-
-@@ -624,7 +636,7 @@
- g_rmdir (const gchar *filename)
- {
- #ifdef G_OS_WIN32
-- wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
-+ wchar_t *wfilename = g_utf8_to_utf16 (PCRT_CONV(filename), -1, NULL, NULL, NULL);
- int retval;
- int save_errno;
-
-@@ -675,7 +687,7 @@
- const gchar *mode)
- {
- #ifdef G_OS_WIN32
-- wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
-+ wchar_t *wfilename = g_utf8_to_utf16 (PCRT_CONV(filename), -1, NULL, NULL, NULL);
- wchar_t *wmode;
- FILE *retval;
- int save_errno;
-@@ -731,7 +743,7 @@
- FILE *stream)
- {
- #ifdef G_OS_WIN32
-- wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
-+ wchar_t *wfilename = g_utf8_to_utf16 (PCRT_CONV(filename), -1, NULL, NULL, NULL);
- wchar_t *wmode;
- FILE *retval;
- int save_errno;
-@@ -785,7 +797,7 @@
- struct utimbuf *utb)
- {
- #ifdef G_OS_WIN32
-- wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
-+ wchar_t *wfilename = g_utf8_to_utf16 (PCRT_CONV(filename), -1, NULL, NULL, NULL);
- int retval;
- int save_errno;
-
-diff -ru glib-2.18.3.orig/glib/gutils.c glib-2.18.3/glib/gutils.c
---- glib-2.18.3.orig/glib/gutils.c 2008-12-04 13:34:21 +0100
-+++ glib-2.18.3/glib/gutils.c 2008-12-04 13:33:24 +0100
-@@ -1485,6 +1485,18 @@
- return g_strdup ("C:\\");
- }
-
-+static char *
-+get_windows_tempdir (void)
-+{
-+ char tmpdir[MAX_PATH];
-+
-+ if(!GetTempPathA(MAX_PATH, tmpdir)) {
-+ return g_strdup("C:\\");
-+ }
-+
-+ return g_strdup(tmpdir);
-+}
-+
- #endif
-
- /* HOLDS: g_utils_global_lock */
-@@ -1493,16 +1505,15 @@
- {
- gchar hostname[100];
-
-+#ifdef G_OS_WIN32
-+ g_tmp_dir = get_windows_tempdir ();
-+#else
- g_tmp_dir = g_strdup (g_getenv ("TMPDIR"));
- if (!g_tmp_dir)
- g_tmp_dir = g_strdup (g_getenv ("TMP"));
- if (!g_tmp_dir)
- g_tmp_dir = g_strdup (g_getenv ("TEMP"));
-
--#ifdef G_OS_WIN32
-- if (!g_tmp_dir)
-- g_tmp_dir = get_windows_directory_root ();
--#else
- #ifdef P_tmpdir
- if (!g_tmp_dir)
- {
-@@ -1540,12 +1551,14 @@
- /* In case HOME is Unix-style (it happens), convert it to
- * Windows style.
- */
-+#ifndef __PARITY__
- if (g_home_dir)
- {
- gchar *p;
- while ((p = strchr (g_home_dir, '/')) != NULL)
- *p = '\\';
- }
-+#endif
-
- if (!g_home_dir)
- {
-diff -ru glib-2.18.3.orig/glib/tests/strfuncs.c glib-2.18.3/glib/tests/strfuncs.c
---- glib-2.18.3.orig/glib/tests/strfuncs.c 2008-12-04 13:34:21 +0100
-+++ glib-2.18.3/glib/tests/strfuncs.c 2008-12-04 13:33:24 +0100
-@@ -29,6 +29,10 @@
- #include <string.h>
- #include "glib.h"
-
-+#ifdef __PARITY__
-+# define isnan _isnan
-+#endif
-+
- #define GLIB_TEST_STRING "el dorado "
-
- #define FOR_ALL_CTYPE(macro) \
-@@ -952,11 +956,13 @@
- check_strtod_string ("-infinity", -our_inf, FALSE, 0);
- check_strtod_string ("-.75,0", -0.75, TRUE, 4);
-
-+ #ifndef __PARITY__
- d = 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.0;
- g_assert (d == g_ascii_strtod (g_ascii_dtostr (buffer, sizeof (buffer), d), NULL));
-
- d = -179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.0;
- g_assert (d == g_ascii_strtod (g_ascii_dtostr (buffer, sizeof (buffer), d), NULL));
-+ #endif
-
- d = pow (2.0, -1024.1);
- g_assert (d == g_ascii_strtod (g_ascii_dtostr (buffer, sizeof (buffer), d), NULL));
-diff -ru glib-2.18.3.orig/tests/refcount/signals.c glib-2.18.3/tests/refcount/signals.c
---- glib-2.18.3.orig/tests/refcount/signals.c 2008-12-04 13:34:21 +0100
-+++ glib-2.18.3/tests/refcount/signals.c 2008-12-04 13:33:24 +0100
-@@ -9,7 +9,7 @@
- #define MY_IS_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_TYPE ((tclass), G_TYPE_TEST))
- #define MY_TEST_GET_CLASS(test) (G_TYPE_INSTANCE_GET_CLASS ((test), G_TYPE_TEST, GTestClass))
-
--static GRand *rand;
-+static GRand *g_rand;
-
- typedef struct _GTest GTest;
- typedef struct _GTestClass GTestClass;
-@@ -81,7 +81,7 @@
- NULL
- };
-
-- rand = g_rand_new();
-+ g_rand = g_rand_new();
-
- test_type = g_type_register_static (G_TYPE_OBJECT, "GTest",
- &test_info, 0);
-@@ -197,7 +197,7 @@
- static void
- my_test_do_prop (GTest * test)
- {
-- test->value = g_rand_int (rand);
-+ test->value = g_rand_int (g_rand);
- g_object_notify (G_OBJECT (test), "test-prop");
- }
-
diff --git a/dev-libs/glib/files/glib-2.18.3-winnt.patch b/dev-libs/glib/files/glib-2.18.3-winnt.patch
deleted file mode 100644
index 499a64eb1b..0000000000
--- a/dev-libs/glib/files/glib-2.18.3-winnt.patch
+++ /dev/null
@@ -1,609 +0,0 @@
-diff -ru glib-2.18.3.orig/Makefile.am glib-2.18.3/Makefile.am
---- glib-2.18.3.orig/Makefile.am 2008-12-04 13:34:21 +0100
-+++ glib-2.18.3/Makefile.am 2008-12-04 13:33:24 +0100
-@@ -3,7 +3,7 @@
-
- AUTOMAKE_OPTIONS = 1.7
-
--SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
-+SUBDIRS = . m4macros glib gmodule gthread gobject gio tests docs
- DIST_SUBDIRS = $(SUBDIRS) build
-
- bin_SCRIPTS = glib-gettextize
-diff -ru glib-2.18.3.orig/configure.in glib-2.18.3/configure.in
---- glib-2.18.3.orig/configure.in 2008-12-04 13:34:21 +0100
-+++ glib-2.18.3/configure.in 2008-12-04 13:33:24 +0100
-@@ -117,7 +117,7 @@
- AC_MSG_CHECKING([for Win32])
- LIB_EXE_MACHINE_FLAG=X86
- case "$host" in
-- *-*-mingw*)
-+ *-*-mingw*|*-winnt*)
- glib_native_win32=yes
- glib_pid_type='void *'
- glib_cv_stack_grows=no
-@@ -142,6 +142,9 @@
- ;;
- esac
- case $host in
-+ *-winnt*)
-+ glib_os_parity=yes
-+ ;;
- *-*-linux*)
- glib_os_linux=yes
- ;;
-@@ -166,7 +169,7 @@
- AM_CONDITIONAL(OS_LINUX, [test "$glib_os_linux" = "yes"])
- AM_CONDITIONAL(OS_CARBON, [test "$glib_have_carbon" = "yes"])
-
--if test "$glib_native_win32" = "yes"; then
-+if test "$glib_native_win32" = "yes" -a "$glib_os_parity" != "yes"; then
- AC_CHECK_TOOL(WINDRES, windres, no)
- if test "$WINDRES" = no; then
- AC_MSG_ERROR([*** Could not find an implementation of windres in your PATH.])
-@@ -180,7 +183,7 @@
- fi
- AM_CONDITIONAL(MS_LIB_AVAILABLE, [test x$ms_librarian = xyes])
-
--if test "$glib_native_win32" != yes; then
-+if test "$glib_native_win32" != yes -a "$glib_os_parity" != "yes"; then
- # libtool option to control which symbols are exported
- # right now, symbols starting with _ are not exported
- LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^g.*"'
-@@ -373,7 +376,7 @@
-
- dnl On Windows we use a native implementation
-
--if test x"$glib_native_win32" = xyes; then
-+if test x"$glib_native_win32" = xyes -a "$glib_os_parity" != "yes"; then
- with_libiconv=native
- else
- AC_ARG_WITH(libiconv,
-@@ -502,7 +505,7 @@
-
- CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES"
-
--if test "$glib_native_win32" = "yes"; then
-+if test "$glib_native_win32" = "yes" -a "$glib_os_parity" != "yes"; then
- if test x$enable_static = xyes -a x$enable_shared = xyes; then
- AC_MSG_ERROR([Can not build both shared and static at the same time on Windows.])
- fi
-@@ -513,7 +516,7 @@
- AC_SUBST(GLIB_WIN32_STATIC_COMPILATION_DEFINE)
- fi
- fi
--AM_CONDITIONAL(OS_WIN32_AND_DLL_COMPILATION, [test x$glib_native_win32 = xyes -a x$glib_win32_static_compilation != xyes])
-+AM_CONDITIONAL(OS_WIN32_AND_DLL_COMPILATION, [test x$glib_native_win32 = xyes -a x$glib_win32_static_compilation != xyes -a "$glib_os_parity" != "yes"])
-
- dnl
- dnl DU4 native cc currently needs -std1 for ANSI mode (instead of K&R)
-@@ -1310,7 +1313,7 @@
- dnl *** force native WIN32 shared lib loader
- if test -z "$G_MODULE_IMPL"; then
- case "$host" in
-- *-*-mingw*|*-*-cygwin*) G_MODULE_IMPL=G_MODULE_IMPL_WIN32 ;;
-+ *-*-mingw*|*-*-cygwin*|*-winnt*) G_MODULE_IMPL=G_MODULE_IMPL_WIN32 ;;
- esac
- fi
- dnl *** force native AIX library loader
-@@ -1468,7 +1471,7 @@
-
- AC_MSG_CHECKING(for gspawn implementation)
- case "$host" in
-- *-*-mingw*)
-+ *-*-mingw*|*-winnt*)
- GSPAWN=gspawn-win32.lo
- ;;
- *)
-@@ -1484,7 +1487,7 @@
-
- AC_MSG_CHECKING(for GIOChannel implementation)
- case "$host" in
-- *-*-mingw*)
-+ *-*-mingw*|*-winnt*)
- GIO=giowin32.lo
- ;;
- *)
-@@ -1644,7 +1647,7 @@
-
- AC_MSG_CHECKING(for platform-dependent source)
- case "$host" in
-- *-*-cygwin*|*-*-mingw*)
-+ *-*-cygwin*|*-*-mingw*|*-winnt*)
- PLATFORMDEP=gwin32.lo
- ;;
- *)
-@@ -1656,7 +1659,7 @@
-
- AC_MSG_CHECKING([whether to compile timeloop])
- case "$host" in
-- *-*-cygwin*|*-*-mingw*|*-*-minix)
-+ *-*-cygwin*|*-*-mingw*|*-*-minix|*-winnt*)
- enable_timeloop=no
- ;;
- *)
-@@ -1668,7 +1671,7 @@
-
- AC_MSG_CHECKING([if building for some Win32 platform])
- case "$host" in
-- *-*-mingw*|*-*-cygwin*)
-+ *-*-mingw*|*-*-cygwin*|*-winnt*)
- platform_win32=yes
- ;;
- *)
-@@ -1774,7 +1777,7 @@
- fi
- if test "x$want_threads" = xyes || test "x$want_threads" = xwin32; then
- case $host in
-- *-*-mingw*)
-+ *-*-mingw*|*-winnt*)
- have_threads=win32
- ;;
- esac
-@@ -1903,7 +1906,7 @@
- G_THREAD_CFLAGS="-Kthread"
- G_THREAD_LIBS=$G_THREAD_CFLAGS
- ;;
-- *-mingw*)
-+ *-mingw*|*-winnt*)
- # No flag needed when using MSVCRT.DLL
- G_THREAD_CFLAGS=""
- ;;
-@@ -3280,7 +3283,7 @@
- #define G_PLATFORM_WIN32
- #define G_WITH_CYGWIN"
- ;;
-- *-*-mingw*)
-+ *-*-mingw*|*-winnt*)
- glib_os="#define G_OS_WIN32
- #define G_PLATFORM_WIN32"
- ;;
-diff -ru glib-2.18.3.orig/gio/Makefile.am glib-2.18.3/gio/Makefile.am
---- glib-2.18.3.orig/gio/Makefile.am 2008-12-04 13:34:21 +0100
-+++ glib-2.18.3/gio/Makefile.am 2008-12-04 13:33:24 +0100
-@@ -62,7 +62,7 @@
- if CROSS_COMPILING
- glib_genmarshal=$(GLIB_GENMARSHAL)
- else
-- glib_genmarshal=../gobject/glib-genmarshal
-+ glib_genmarshal=../gobject/glib-genmarshal$(EXEEXT)
- endif
-
- gio-marshal.h: gio-marshal.list
-diff -ru glib-2.18.3.orig/gio/glocalfile.c glib-2.18.3/gio/glocalfile.c
---- glib-2.18.3.orig/gio/glocalfile.c 2008-12-04 13:34:21 +0100
-+++ glib-2.18.3/gio/glocalfile.c 2008-12-04 13:33:24 +0100
-@@ -91,6 +91,7 @@
- #include <windows.h>
- #include <io.h>
- #include <direct.h>
-+#include <shellapi.h>
-
- #ifndef FILE_READ_ONLY_VOLUME
- #define FILE_READ_ONLY_VOLUME 0x00080000
-diff -ru glib-2.18.3.orig/gio/gwin32appinfo.c glib-2.18.3/gio/gwin32appinfo.c
---- glib-2.18.3.orig/gio/gwin32appinfo.c 2008-12-04 13:34:21 +0100
-+++ glib-2.18.3/gio/gwin32appinfo.c 2008-12-04 13:33:24 +0100
-@@ -33,6 +33,7 @@
- #include "glibintl.h"
-
- #include <windows.h>
-+#include <shellapi.h>
- #include <shlwapi.h>
-
- #include "gioalias.h"
-diff -ru glib-2.18.3.orig/gio/gwin32mount.c glib-2.18.3/gio/gwin32mount.c
---- glib-2.18.3.orig/gio/gwin32mount.c 2008-12-04 13:34:21 +0100
-+++ glib-2.18.3/gio/gwin32mount.c 2008-12-04 13:33:24 +0100
-@@ -28,6 +28,7 @@
- #include <string.h>
- #define WIN32_MEAN_AND_LEAN
- #include <windows.h>
-+#include <shellapi.h>
-
- #include <glib.h>
- #include "gwin32volumemonitor.h"
-diff -ru glib-2.18.3.orig/glib/gconvert.c glib-2.18.3/glib/gconvert.c
---- glib-2.18.3.orig/glib/gconvert.c 2008-12-04 13:34:21 +0100
-+++ glib-2.18.3/glib/gconvert.c 2008-12-04 13:33:24 +0100
-@@ -24,7 +24,7 @@
-
- #include "glib.h"
-
--#ifndef G_OS_WIN32
-+#if !defined G_OS_WIN32 || defined __PARITY__
- #include <iconv.h>
- #endif
- #include <errno.h>
-@@ -36,7 +36,7 @@
- #include "gthreadprivate.h"
- #include "gunicode.h"
-
--#ifdef G_OS_WIN32
-+#if defined G_OS_WIN32 && !defined __PARITY__
- #include "win_iconv.c"
- #endif
-
-diff -ru glib-2.18.3.orig/glib/gfileutils.c glib-2.18.3/glib/gfileutils.c
---- glib-2.18.3.orig/glib/gfileutils.c 2008-12-04 13:34:21 +0100
-+++ glib-2.18.3/glib/gfileutils.c 2008-12-04 13:33:24 +0100
-@@ -41,6 +41,17 @@
- #include <io.h>
- #endif /* G_OS_WIN32 */
-
-+#ifdef __PARITY__
-+/*
-+ * Parity provides automatic path conversion from interix -> windows,
-+ * but only for the ACSII versions of stdio functions. since glib uses
-+ * the wide char versions, we need to manually convert...
-+ */
-+# include <internal/pcrt.h>
-+#else
-+# define PCRT_CONV(x) x
-+#endif
-+
- #ifndef S_ISLNK
- #define S_ISLNK(x) 0
- #endif
-@@ -191,7 +202,7 @@
- # define FILE_ATTRIBUTE_DEVICE 64
- # endif
- int attributes;
-- wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
-+ wchar_t *wfilename = g_utf8_to_utf16 (PCRT_CONV(filename), -1, NULL, NULL, NULL);
-
- if (wfilename == NULL)
- return FALSE;
-@@ -326,7 +337,7 @@
- g_file_test (const gchar *filename,
- GFileTest test)
- {
-- gchar *utf8_filename = g_locale_to_utf8 (filename, -1, NULL, NULL, NULL);
-+ gchar *utf8_filename = g_locale_to_utf8 (PCRT_CONV(filename), -1, NULL, NULL, NULL);
- gboolean retval;
-
- if (utf8_filename == NULL)
-@@ -872,7 +883,7 @@
- gsize *length,
- GError **error)
- {
-- gchar *utf8_filename = g_locale_to_utf8 (filename, -1, NULL, NULL, error);
-+ gchar *utf8_filename = g_locale_to_utf8 (PCRT_CONV(filename), -1, NULL, NULL, error);
- gboolean retval;
-
- if (utf8_filename == NULL)
-diff -ru glib-2.18.3.orig/glib/gmessages.c glib-2.18.3/glib/gmessages.c
---- glib-2.18.3.orig/glib/gmessages.c 2008-12-04 13:34:21 +0100
-+++ glib-2.18.3/glib/gmessages.c 2008-12-04 13:37:02 +0100
-@@ -481,8 +481,12 @@
- #ifdef G_OS_WIN32
- gchar *locale_msg = g_locale_from_utf8 (fatal_msg_buf, -1, NULL, NULL, NULL);
-
-+#ifdef __PARITY__
-+ fprintf(stderr, locale_msg);
-+#else
- MessageBox (NULL, locale_msg, NULL,
- MB_ICONERROR|MB_SETFOREGROUND);
-+#endif
- if (IsDebuggerPresent () && !(test_level & G_LOG_FLAG_RECURSION))
- G_BREAKPOINT ();
- else
-diff -ru glib-2.18.3.orig/glib/gspawn-win32-helper.c glib-2.18.3/glib/gspawn-win32-helper.c
---- glib-2.18.3.orig/glib/gspawn-win32-helper.c 2008-12-04 13:34:21 +0100
-+++ glib-2.18.3/glib/gspawn-win32-helper.c 2008-12-04 13:33:24 +0100
-@@ -23,6 +23,10 @@
-
- #include <fcntl.h>
-
-+#ifdef __PARITY__
-+# define HELPER_CONSOLE
-+#endif
-+
- #undef G_LOG_DOMAIN
- #include "glib.h"
- #define GSPAWN_HELPER
-diff -ru glib-2.18.3.orig/glib/gstdio.c glib-2.18.3/glib/gstdio.c
---- glib-2.18.3.orig/glib/gstdio.c 2008-12-04 13:34:21 +0100
-+++ glib-2.18.3/glib/gstdio.c 2008-12-04 13:33:24 +0100
-@@ -43,6 +43,17 @@
- #include <utime.h>
- #endif
-
-+#ifdef __PARITY__
-+/*
-+ * Parity provides automatic path conversion from interix -> windows,
-+ * but only for the ACSII versions of stdio functions. since glib uses
-+ * the wide char versions, we need to manually convert...
-+ */
-+# include <internal/pcrt.h>
-+#else
-+# define PCRT_CONV(x) x
-+#endif
-+
- #include "gstdio.h"
-
- #include "galias.h"
-@@ -81,7 +92,7 @@
- int mode)
- {
- #ifdef G_OS_WIN32
-- wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
-+ wchar_t *wfilename = g_utf8_to_utf16 (PCRT_CONV(filename), -1, NULL, NULL, NULL);
- int retval;
- int save_errno;
-
-@@ -132,7 +143,7 @@
- int mode)
- {
- #ifdef G_OS_WIN32
-- wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
-+ wchar_t *wfilename = g_utf8_to_utf16 (PCRT_CONV(filename), -1, NULL, NULL, NULL);
- int retval;
- int save_errno;
-
-@@ -189,7 +200,7 @@
- int mode)
- {
- #ifdef G_OS_WIN32
-- wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
-+ wchar_t *wfilename = g_utf8_to_utf16 (PCRT_CONV(filename), -1, NULL, NULL, NULL);
- int retval;
- int save_errno;
-
-@@ -246,7 +257,7 @@
- int mode)
- {
- #ifdef G_OS_WIN32
-- wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
-+ wchar_t *wfilename = g_utf8_to_utf16 (PCRT_CONV(filename), -1, NULL, NULL, NULL);
- int retval;
- int save_errno;
-
-@@ -289,7 +300,7 @@
- const gchar *newfilename)
- {
- #ifdef G_OS_WIN32
-- wchar_t *woldfilename = g_utf8_to_utf16 (oldfilename, -1, NULL, NULL, NULL);
-+ wchar_t *woldfilename = g_utf8_to_utf16 (PCRT_CONV(oldfilename), -1, NULL, NULL, NULL);
- wchar_t *wnewfilename;
- int retval;
- int save_errno = 0;
-@@ -300,7 +311,7 @@
- return -1;
- }
-
-- wnewfilename = g_utf8_to_utf16 (newfilename, -1, NULL, NULL, NULL);
-+ wnewfilename = g_utf8_to_utf16 (PCRT_CONV(newfilename), -1, NULL, NULL, NULL);
-
- if (wnewfilename == NULL)
- {
-@@ -361,7 +372,7 @@
- int mode)
- {
- #ifdef G_OS_WIN32
-- wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
-+ wchar_t *wfilename = g_utf8_to_utf16 (PCRT_CONV(filename), -1, NULL, NULL, NULL);
- int retval;
- int save_errno;
-
-@@ -400,7 +411,7 @@
- g_chdir (const gchar *path)
- {
- #ifdef G_OS_WIN32
-- wchar_t *wpath = g_utf8_to_utf16 (path, -1, NULL, NULL, NULL);
-+ wchar_t *wpath = g_utf8_to_utf16 (PCRT_CONV(path), -1, NULL, NULL, NULL);
- int retval;
- int save_errno;
-
-@@ -446,7 +457,8 @@
- struct stat *buf)
- {
- #ifdef G_OS_WIN32
-- wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
-+ char* fnconv = PCRT_CONV(filename);
-+ wchar_t *wfilename = g_utf8_to_utf16 (fnconv, -1, NULL, NULL, NULL);
- int retval;
- int save_errno;
- int len;
-@@ -461,7 +473,7 @@
- while (len > 0 && G_IS_DIR_SEPARATOR (wfilename[len-1]))
- len--;
- if (len > 0 &&
-- (!g_path_is_absolute (filename) || len > g_path_skip_root (filename) - filename))
-+ (!g_path_is_absolute (fnconv) || len > g_path_skip_root (fnconv) - fnconv))
- wfilename[len] = '\0';
-
- retval = _wstat (wfilename, (struct _stat *) buf);
-@@ -529,7 +541,7 @@
- g_unlink (const gchar *filename)
- {
- #ifdef G_OS_WIN32
-- wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
-+ wchar_t *wfilename = g_utf8_to_utf16 (PCRT_CONV(filename), -1, NULL, NULL, NULL);
- int retval;
- int save_errno;
-
-@@ -581,7 +593,7 @@
- g_remove (const gchar *filename)
- {
- #ifdef G_OS_WIN32
-- wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
-+ wchar_t *wfilename = g_utf8_to_utf16 (PCRT_CONV(filename), -1, NULL, NULL, NULL);
- int retval;
- int save_errno;
-
-@@ -624,7 +636,7 @@
- g_rmdir (const gchar *filename)
- {
- #ifdef G_OS_WIN32
-- wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
-+ wchar_t *wfilename = g_utf8_to_utf16 (PCRT_CONV(filename), -1, NULL, NULL, NULL);
- int retval;
- int save_errno;
-
-@@ -675,7 +687,7 @@
- const gchar *mode)
- {
- #ifdef G_OS_WIN32
-- wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
-+ wchar_t *wfilename = g_utf8_to_utf16 (PCRT_CONV(filename), -1, NULL, NULL, NULL);
- wchar_t *wmode;
- FILE *retval;
- int save_errno;
-@@ -731,7 +743,7 @@
- FILE *stream)
- {
- #ifdef G_OS_WIN32
-- wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
-+ wchar_t *wfilename = g_utf8_to_utf16 (PCRT_CONV(filename), -1, NULL, NULL, NULL);
- wchar_t *wmode;
- FILE *retval;
- int save_errno;
-@@ -785,7 +797,7 @@
- struct utimbuf *utb)
- {
- #ifdef G_OS_WIN32
-- wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
-+ wchar_t *wfilename = g_utf8_to_utf16 (PCRT_CONV(filename), -1, NULL, NULL, NULL);
- int retval;
- int save_errno;
-
-diff -ru glib-2.18.3.orig/glib/gutils.c glib-2.18.3/glib/gutils.c
---- glib-2.18.3.orig/glib/gutils.c 2008-12-04 13:34:21 +0100
-+++ glib-2.18.3/glib/gutils.c 2008-12-04 13:33:24 +0100
-@@ -1485,6 +1485,18 @@
- return g_strdup ("C:\\");
- }
-
-+static char *
-+get_windows_tempdir (void)
-+{
-+ char tmpdir[MAX_PATH];
-+
-+ if(!GetTempPathA(MAX_PATH, tmpdir)) {
-+ return g_strdup("C:\\");
-+ }
-+
-+ return g_strdup(tmpdir);
-+}
-+
- #endif
-
- /* HOLDS: g_utils_global_lock */
-@@ -1493,16 +1505,15 @@
- {
- gchar hostname[100];
-
-+#ifdef G_OS_WIN32
-+ g_tmp_dir = get_windows_tempdir ();
-+#else
- g_tmp_dir = g_strdup (g_getenv ("TMPDIR"));
- if (!g_tmp_dir)
- g_tmp_dir = g_strdup (g_getenv ("TMP"));
- if (!g_tmp_dir)
- g_tmp_dir = g_strdup (g_getenv ("TEMP"));
-
--#ifdef G_OS_WIN32
-- if (!g_tmp_dir)
-- g_tmp_dir = get_windows_directory_root ();
--#else
- #ifdef P_tmpdir
- if (!g_tmp_dir)
- {
-@@ -1540,12 +1551,14 @@
- /* In case HOME is Unix-style (it happens), convert it to
- * Windows style.
- */
-+#ifndef __PARITY__
- if (g_home_dir)
- {
- gchar *p;
- while ((p = strchr (g_home_dir, '/')) != NULL)
- *p = '\\';
- }
-+#endif
-
- if (!g_home_dir)
- {
-diff -ru glib-2.18.3.orig/glib/tests/strfuncs.c glib-2.18.3/glib/tests/strfuncs.c
---- glib-2.18.3.orig/glib/tests/strfuncs.c 2008-12-04 13:34:21 +0100
-+++ glib-2.18.3/glib/tests/strfuncs.c 2008-12-04 13:33:24 +0100
-@@ -29,6 +29,10 @@
- #include <string.h>
- #include "glib.h"
-
-+#ifdef __PARITY__
-+# define isnan _isnan
-+#endif
-+
- #define GLIB_TEST_STRING "el dorado "
-
- #define FOR_ALL_CTYPE(macro) \
-@@ -952,11 +956,13 @@
- check_strtod_string ("-infinity", -our_inf, FALSE, 0);
- check_strtod_string ("-.75,0", -0.75, TRUE, 4);
-
-+ #ifndef __PARITY__
- d = 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.0;
- g_assert (d == g_ascii_strtod (g_ascii_dtostr (buffer, sizeof (buffer), d), NULL));
-
- d = -179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.0;
- g_assert (d == g_ascii_strtod (g_ascii_dtostr (buffer, sizeof (buffer), d), NULL));
-+ #endif
-
- d = pow (2.0, -1024.1);
- g_assert (d == g_ascii_strtod (g_ascii_dtostr (buffer, sizeof (buffer), d), NULL));
-diff -ru glib-2.18.3.orig/gobject/Makefile.am glib-2.18.3/gobject/Makefile.am
---- glib-2.18.3.orig/gobject/Makefile.am 2008-12-04 13:34:21 +0100
-+++ glib-2.18.3/gobject/Makefile.am 2008-12-04 13:33:24 +0100
-@@ -169,7 +169,7 @@
- if CROSS_COMPILING
- glib_genmarshal=$(GLIB_GENMARSHAL)
- else
-- glib_genmarshal=./glib-genmarshal
-+ glib_genmarshal=./glib-genmarshal$(EXEEXT)
- endif
-
- gmarshal.h: stamp-gmarshal.h
-diff -ru glib-2.18.3.orig/tests/gobject/Makefile.am glib-2.18.3/tests/gobject/Makefile.am
---- glib-2.18.3.orig/tests/gobject/Makefile.am 2008-12-04 13:34:21 +0100
-+++ glib-2.18.3/tests/gobject/Makefile.am 2008-12-04 13:33:24 +0100
-@@ -25,7 +25,7 @@
- if CROSS_COMPILING
- glib_genmarshal=$(GLIB_GENMARSHAL)
- else
-- glib_genmarshal=$(top_builddir)/gobject/glib-genmarshal
-+ glib_genmarshal=$(top_builddir)/gobject/glib-genmarshal$(EXEEXT)
- endif
-
- testmarshal.h: stamp-testmarshal.h
-diff -ru glib-2.18.3.orig/tests/refcount/signals.c glib-2.18.3/tests/refcount/signals.c
---- glib-2.18.3.orig/tests/refcount/signals.c 2008-12-04 13:34:21 +0100
-+++ glib-2.18.3/tests/refcount/signals.c 2008-12-04 13:33:24 +0100
-@@ -9,7 +9,7 @@
- #define MY_IS_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_TYPE ((tclass), G_TYPE_TEST))
- #define MY_TEST_GET_CLASS(test) (G_TYPE_INSTANCE_GET_CLASS ((test), G_TYPE_TEST, GTestClass))
-
--static GRand *rand;
-+static GRand *g_rand;
-
- typedef struct _GTest GTest;
- typedef struct _GTestClass GTestClass;
-@@ -81,7 +81,7 @@
- NULL
- };
-
-- rand = g_rand_new();
-+ g_rand = g_rand_new();
-
- test_type = g_type_register_static (G_TYPE_OBJECT, "GTest",
- &test_info, 0);
-@@ -197,7 +197,7 @@
- static void
- my_test_do_prop (GTest * test)
- {
-- test->value = g_rand_int (rand);
-+ test->value = g_rand_int (g_rand);
- g_object_notify (G_OBJECT (test), "test-prop");
- }
-
diff --git a/dev-libs/glib/files/glib-2.18.4-compile-warning-sol64.patch b/dev-libs/glib/files/glib-2.18.4-compile-warning-sol64.patch
deleted file mode 100644
index 4e412750aa..0000000000
--- a/dev-libs/glib/files/glib-2.18.4-compile-warning-sol64.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-fen-helper.c:240: warning: implicit declaration of function ‘g_file_new_for_path’
-
-portage barfs on this on 64-bits arches these days
-
---- gio/fen/fen-helper.c
-+++ gio/fen/fen-helper.c
-@@ -29,6 +29,7 @@
- #include "fen-kernel.h"
- #ifdef GIO_COMPILATION
- #include "gfilemonitor.h"
-+#include "gfile.h"
- #else
- #include "gam_event.h"
- #include "gam_server.h"
diff --git a/dev-libs/glib/files/glib-2.18.4-gcc44.patch b/dev-libs/glib/files/glib-2.18.4-gcc44.patch
deleted file mode 100644
index 6ad10a0a81..0000000000
--- a/dev-libs/glib/files/glib-2.18.4-gcc44.patch
+++ /dev/null
@@ -1,607 +0,0 @@
-diff -Naur glib-2.18.4-orig/glib/gatomic.c glib-2.18.4/glib/gatomic.c
---- glib-2.18.4-orig/glib/gatomic.c 2009-04-02 15:20:51.000000000 -0400
-+++ glib-2.18.4/glib/gatomic.c 2009-04-02 15:36:21.000000000 -0400
-@@ -36,7 +36,7 @@
- /* Adapted from CVS version 1.10 of glibc's sysdeps/i386/i486/bits/atomic.h
- */
- gint
--g_atomic_int_exchange_and_add (volatile gint *atomic,
-+g_atomic_int_exchange_and_add (volatile gint G_GNUC_MAY_ALIAS *atomic,
- gint val)
- {
- gint result;
-@@ -48,7 +48,7 @@
- }
-
- void
--g_atomic_int_add (volatile gint *atomic,
-+g_atomic_int_add (volatile gint G_GNUC_MAY_ALIAS *atomic,
- gint val)
- {
- __asm__ __volatile__ ("lock; addl %1,%0"
-@@ -57,7 +57,7 @@
- }
-
- gboolean
--g_atomic_int_compare_and_exchange (volatile gint *atomic,
-+g_atomic_int_compare_and_exchange (volatile gint G_GNUC_MAY_ALIAS *atomic,
- gint oldval,
- gint newval)
- {
-@@ -75,7 +75,7 @@
- * arguments and calling the former function */
-
- gboolean
--g_atomic_pointer_compare_and_exchange (volatile gpointer *atomic,
-+g_atomic_pointer_compare_and_exchange (volatile gpointer G_GNUC_MAY_ALIAS *atomic,
- gpointer oldval,
- gpointer newval)
- {
-@@ -103,7 +103,7 @@
-
- # if GLIB_SIZEOF_VOID_P == 4 /* 32-bit system */
- gboolean
--g_atomic_pointer_compare_and_exchange (volatile gpointer *atomic,
-+g_atomic_pointer_compare_and_exchange (volatile gpointer G_GNUC_MAY_ALIAS *atomic,
- gpointer oldval,
- gpointer newval)
- {
-@@ -116,7 +116,7 @@
- }
- # elif GLIB_SIZEOF_VOID_P == 8 /* 64-bit system */
- gboolean
--g_atomic_pointer_compare_and_exchange (volatile gpointer *atomic,
-+g_atomic_pointer_compare_and_exchange (volatile gpointer G_GNUC_MAY_ALIAS *atomic,
- gpointer oldval,
- gpointer newval)
- {
-@@ -162,7 +162,7 @@
- })
- # if GLIB_SIZEOF_VOID_P == 4 /* 32-bit system */
- gboolean
--g_atomic_pointer_compare_and_exchange (volatile gpointer *atomic,
-+g_atomic_pointer_compare_and_exchange (volatile gpointer G_GNUC_MAY_ALIAS *atomic,
- gpointer oldval,
- gpointer newval)
- {
-@@ -188,7 +188,7 @@
- }
- # elif GLIB_SIZEOF_VOID_P == 8 /* 64-bit system */
- gboolean
--g_atomic_pointer_compare_and_exchange (volatile gpointer *atomic,
-+g_atomic_pointer_compare_and_exchange (volatile gpointer G_GNUC_MAY_ALIAS *atomic,
- gpointer oldval,
- gpointer newval)
- {
-@@ -220,7 +220,7 @@
- /* Adapted from CVS version 1.9 of glibc's sysdeps/x86_64/bits/atomic.h
- */
- gint
--g_atomic_int_exchange_and_add (volatile gint *atomic,
-+g_atomic_int_exchange_and_add (volatile gint G_GNUC_MAY_ALIAS *atomic,
- gint val)
- {
- gint result;
-@@ -232,7 +232,7 @@
- }
-
- void
--g_atomic_int_add (volatile gint *atomic,
-+g_atomic_int_add (volatile gint G_GNUC_MAY_ALIAS *atomic,
- gint val)
- {
- __asm__ __volatile__ ("lock; addl %1,%0"
-@@ -241,7 +241,7 @@
- }
-
- gboolean
--g_atomic_int_compare_and_exchange (volatile gint *atomic,
-+g_atomic_int_compare_and_exchange (volatile gint G_GNUC_MAY_ALIAS *atomic,
- gint oldval,
- gint newval)
- {
-@@ -255,7 +255,7 @@
- }
-
- gboolean
--g_atomic_pointer_compare_and_exchange (volatile gpointer *atomic,
-+g_atomic_pointer_compare_and_exchange (volatile gpointer G_GNUC_MAY_ALIAS *atomic,
- gpointer oldval,
- gpointer newval)
- {
-@@ -277,7 +277,7 @@
- /* Non-optimizing compile bails on the following two asm statements
- * for reasons unknown to the author */
- gint
--g_atomic_int_exchange_and_add (volatile gint *atomic,
-+g_atomic_int_exchange_and_add (volatile gint G_GNUC_MAY_ALIAS *atomic,
- gint val)
- {
- gint result, temp;
-@@ -303,7 +303,7 @@
-
- /* The same as above, to save a function call repeated here */
- void
--g_atomic_int_add (volatile gint *atomic,
-+g_atomic_int_add (volatile gint G_GNUC_MAY_ALIAS *atomic,
- gint val)
- {
- gint result, temp;
-@@ -327,7 +327,7 @@
- }
- # else /* !__OPTIMIZE__ */
- gint
--g_atomic_int_exchange_and_add (volatile gint *atomic,
-+g_atomic_int_exchange_and_add (volatile gint G_GNUC_MAY_ALIAS *atomic,
- gint val)
- {
- gint result;
-@@ -339,7 +339,7 @@
- }
-
- void
--g_atomic_int_add (volatile gint *atomic,
-+g_atomic_int_add (volatile gint G_GNUC_MAY_ALIAS *atomic,
- gint val)
- {
- gint result;
-@@ -351,7 +351,7 @@
-
- # if GLIB_SIZEOF_VOID_P == 4 /* 32-bit system */
- gboolean
--g_atomic_int_compare_and_exchange (volatile gint *atomic,
-+g_atomic_int_compare_and_exchange (volatile gint G_GNUC_MAY_ALIAS *atomic,
- gint oldval,
- gint newval)
- {
-@@ -383,7 +383,7 @@
- }
-
- gboolean
--g_atomic_pointer_compare_and_exchange (volatile gpointer *atomic,
-+g_atomic_pointer_compare_and_exchange (volatile gpointer G_GNUC_MAY_ALIAS *atomic,
- gpointer oldval,
- gpointer newval)
- {
-@@ -415,7 +415,7 @@
- }
- # elif GLIB_SIZEOF_VOID_P == 8 /* 64-bit system */
- gboolean
--g_atomic_int_compare_and_exchange (volatile gint *atomic,
-+g_atomic_int_compare_and_exchange (volatile gint G_GNUC_MAY_ALIAS *atomic,
- gint oldval,
- gint newval)
- {
-@@ -449,7 +449,7 @@
- }
-
- gboolean
--g_atomic_pointer_compare_and_exchange (volatile gpointer *atomic,
-+g_atomic_pointer_compare_and_exchange (volatile gpointer G_GNUC_MAY_ALIAS *atomic,
- gpointer oldval,
- gpointer newval)
- {
-@@ -489,7 +489,7 @@
- /* Adapted from CVS version 1.8 of glibc's sysdeps/ia64/bits/atomic.h
- */
- gint
--g_atomic_int_exchange_and_add (volatile gint *atomic,
-+g_atomic_int_exchange_and_add (volatile gint G_GNUC_MAY_ALIAS *atomic,
- gint val)
- {
- return __sync_fetch_and_add (atomic, val);
-@@ -503,7 +503,7 @@
- }
-
- gboolean
--g_atomic_int_compare_and_exchange (volatile gint *atomic,
-+g_atomic_int_compare_and_exchange (volatile gint G_GNUC_MAY_ALIAS *atomic,
- gint oldval,
- gint newval)
- {
-@@ -511,7 +511,7 @@
- }
-
- gboolean
--g_atomic_pointer_compare_and_exchange (volatile gpointer *atomic,
-+g_atomic_pointer_compare_and_exchange (volatile gpointer G_GNUC_MAY_ALIAS *atomic,
- gpointer oldval,
- gpointer newval)
- {
-@@ -534,7 +534,7 @@
-
- # if GLIB_SIZEOF_VOID_P == 4 /* 32-bit system */
- gboolean
--g_atomic_pointer_compare_and_exchange (volatile gpointer *atomic,
-+g_atomic_pointer_compare_and_exchange (volatile gpointer G_GNUC_MAY_ALIAS *atomic,
- gpointer oldval,
- gpointer newval)
- {
-@@ -546,7 +546,7 @@
- }
- # elif GLIB_SIZEOF_VOID_P == 8 /* 64-bit system */
- gboolean
--g_atomic_pointer_compare_and_exchange (volatile gpointer *atomic,
-+g_atomic_pointer_compare_and_exchange (volatile gpointer G_GNUC_MAY_ALIAS *atomic,
- gpointer oldval,
- gpointer newval)
- {
-@@ -590,7 +590,7 @@
- }
-
- gint
--g_atomic_int_exchange_and_add (volatile gint *atomic,
-+g_atomic_int_exchange_and_add (volatile gint G_GNUC_MAY_ALIAS *atomic,
- gint val)
- {
- gint result;
-@@ -604,7 +604,7 @@
- }
-
- void
--g_atomic_int_add (volatile gint *atomic,
-+g_atomic_int_add (volatile gint G_GNUC_MAY_ALIAS *atomic,
- gint val)
- {
- atomic_spin_lock();
-@@ -613,7 +613,7 @@
- }
-
- gboolean
--g_atomic_int_compare_and_exchange (volatile gint *atomic,
-+g_atomic_int_compare_and_exchange (volatile gint G_GNUC_MAY_ALIAS *atomic,
- gint oldval,
- gint newval)
- {
-@@ -633,7 +633,7 @@
- }
-
- gboolean
--g_atomic_pointer_compare_and_exchange (volatile gpointer *atomic,
-+g_atomic_pointer_compare_and_exchange (volatile gpointer G_GNUC_MAY_ALIAS *atomic,
- gpointer oldval,
- gpointer newval)
- {
-@@ -675,21 +675,21 @@
- # endif
-
- gint32
--g_atomic_int_exchange_and_add (volatile gint32 *atomic,
-+g_atomic_int_exchange_and_add (volatile gint32 G_GNUC_MAY_ALIAS *atomic,
- gint32 val)
- {
- return InterlockedExchangeAdd (atomic, val);
- }
-
- void
--g_atomic_int_add (volatile gint32 *atomic,
-+g_atomic_int_add (volatile gint32 G_GNUC_MAY_ALIAS *atomic,
- gint32 val)
- {
- InterlockedExchangeAdd (atomic, val);
- }
-
- gboolean
--g_atomic_int_compare_and_exchange (volatile gint32 *atomic,
-+g_atomic_int_compare_and_exchange (volatile gint32 G_GNUC_MAY_ALIAS *atomic,
- gint32 oldval,
- gint32 newval)
- {
-@@ -705,7 +705,7 @@
- }
-
- gboolean
--g_atomic_pointer_compare_and_exchange (volatile gpointer *atomic,
-+g_atomic_pointer_compare_and_exchange (volatile gpointer G_GNUC_MAY_ALIAS *atomic,
- gpointer oldval,
- gpointer newval)
- {
-@@ -726,7 +726,7 @@
- static GMutex *g_atomic_mutex;
-
- gint
--g_atomic_int_exchange_and_add (volatile gint *atomic,
-+g_atomic_int_exchange_and_add (volatile gint G_GNUC_MAY_ALIAS *atomic,
- gint val)
- {
- gint result;
-@@ -741,7 +741,7 @@
-
-
- void
--g_atomic_int_add (volatile gint *atomic,
-+g_atomic_int_add (volatile gint G_GNUC_MAY_ALIAS *atomic,
- gint val)
- {
- g_mutex_lock (g_atomic_mutex);
-@@ -750,7 +750,7 @@
- }
-
- gboolean
--g_atomic_int_compare_and_exchange (volatile gint *atomic,
-+g_atomic_int_compare_and_exchange (volatile gint G_GNUC_MAY_ALIAS *atomic,
- gint oldval,
- gint newval)
- {
-@@ -770,7 +770,7 @@
- }
-
- gboolean
--g_atomic_pointer_compare_and_exchange (volatile gpointer *atomic,
-+g_atomic_pointer_compare_and_exchange (volatile gpointer G_GNUC_MAY_ALIAS *atomic,
- gpointer oldval,
- gpointer newval)
- {
-@@ -791,7 +791,7 @@
-
- #ifdef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED
- gint
--g_atomic_int_get (volatile gint *atomic)
-+g_atomic_int_get (volatile gint G_GNUC_MAY_ALIAS *atomic)
- {
- gint result;
-
-@@ -803,7 +803,7 @@
- }
-
- void
--g_atomic_int_set (volatile gint *atomic,
-+g_atomic_int_set (volatile gint G_GNUC_MAY_ALIAS *atomic,
- gint newval)
- {
- g_mutex_lock (g_atomic_mutex);
-@@ -812,7 +812,7 @@
- }
-
- gpointer
--g_atomic_pointer_get (volatile gpointer *atomic)
-+g_atomic_pointer_get (volatile gpointer G_GNUC_MAY_ALIAS *atomic)
- {
- gpointer result;
-
-@@ -824,7 +824,7 @@
- }
-
- void
--g_atomic_pointer_set (volatile gpointer *atomic,
-+g_atomic_pointer_set (volatile gpointer G_GNUC_MAY_ALIAS *atomic,
- gpointer newval)
- {
- g_mutex_lock (g_atomic_mutex);
-@@ -834,14 +834,14 @@
- #endif /* G_ATOMIC_OP_MEMORY_BARRIER_NEEDED */
- #elif defined (G_ATOMIC_OP_MEMORY_BARRIER_NEEDED)
- gint
--g_atomic_int_get (volatile gint *atomic)
-+g_atomic_int_get (volatile gint G_GNUC_MAY_ALIAS *atomic)
- {
- G_ATOMIC_MEMORY_BARRIER;
- return *atomic;
- }
-
- void
--g_atomic_int_set (volatile gint *atomic,
-+g_atomic_int_set (volatile gint G_GNUC_MAY_ALIAS *atomic,
- gint newval)
- {
- *atomic = newval;
-@@ -849,14 +849,14 @@
- }
-
- gpointer
--g_atomic_pointer_get (volatile gpointer *atomic)
-+g_atomic_pointer_get (volatile gpointer G_GNUC_MAY_ALIAS *atomic)
- {
- G_ATOMIC_MEMORY_BARRIER;
- return *atomic;
- }
-
- void
--g_atomic_pointer_set (volatile gpointer *atomic,
-+g_atomic_pointer_set (volatile gpointer G_GNUC_MAY_ALIAS *atomic,
- gpointer newval)
- {
- *atomic = newval;
-@@ -866,7 +866,7 @@
-
- #ifdef ATOMIC_INT_CMP_XCHG
- gboolean
--g_atomic_int_compare_and_exchange (volatile gint *atomic,
-+g_atomic_int_compare_and_exchange (volatile gint G_GNUC_MAY_ALIAS *atomic,
- gint oldval,
- gint newval)
- {
-@@ -874,7 +874,7 @@
- }
-
- gint
--g_atomic_int_exchange_and_add (volatile gint *atomic,
-+g_atomic_int_exchange_and_add (volatile gint G_GNUC_MAY_ALIAS *atomic,
- gint val)
- {
- gint result;
-@@ -886,7 +886,7 @@
- }
-
- void
--g_atomic_int_add (volatile gint *atomic,
-+g_atomic_int_add (volatile gint G_GNUC_MAY_ALIAS *atomic,
- gint val)
- {
- gint result;
-@@ -906,26 +906,26 @@
-
- #ifndef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED
- gint
--(g_atomic_int_get) (volatile gint *atomic)
-+(g_atomic_int_get) (volatile gint G_GNUC_MAY_ALIAS *atomic)
- {
- return g_atomic_int_get (atomic);
- }
-
- void
--(g_atomic_int_set) (volatile gint *atomic,
-+(g_atomic_int_set) (volatile gint G_GNUC_MAY_ALIAS *atomic,
- gint newval)
- {
- g_atomic_int_set (atomic, newval);
- }
-
- gpointer
--(g_atomic_pointer_get) (volatile gpointer *atomic)
-+(g_atomic_pointer_get) (volatile gpointer G_GNUC_MAY_ALIAS *atomic)
- {
- return g_atomic_pointer_get (atomic);
- }
-
- void
--(g_atomic_pointer_set) (volatile gpointer *atomic,
-+(g_atomic_pointer_set) (volatile gpointer G_GNUC_MAY_ALIAS *atomic,
- gpointer newval)
- {
- g_atomic_pointer_set (atomic, newval);
-diff -Naur glib-2.18.4-orig/glib/gatomic.h glib-2.18.4/glib/gatomic.h
---- glib-2.18.4-orig/glib/gatomic.h 2009-04-02 15:20:51.000000000 -0400
-+++ glib-2.18.4/glib/gatomic.h 2009-04-02 15:40:20.000000000 -0400
-@@ -38,29 +38,42 @@
-
- G_BEGIN_DECLS
-
--gint g_atomic_int_exchange_and_add (volatile gint *atomic,
-+gint g_atomic_int_exchange_and_add (volatile gint G_GNUC_MAY_ALIAS *atomic,
- gint val);
--void g_atomic_int_add (volatile gint *atomic,
-+void g_atomic_int_add (volatile gint G_GNUC_MAY_ALIAS *atomic,
- gint val);
--gboolean g_atomic_int_compare_and_exchange (volatile gint *atomic,
-+gboolean g_atomic_int_compare_and_exchange (volatile gint G_GNUC_MAY_ALIAS *atomic,
- gint oldval,
- gint newval);
--gboolean g_atomic_pointer_compare_and_exchange (volatile gpointer *atomic,
-+gboolean g_atomic_pointer_compare_and_exchange (volatile gpointer G_GNUC_MAY_ALIAS *atomic,
- gpointer oldval,
- gpointer newval);
-
--gint g_atomic_int_get (volatile gint *atomic);
--void g_atomic_int_set (volatile gint *atomic,
-+gint g_atomic_int_get (volatile gint G_GNUC_MAY_ALIAS *atomic);
-+void g_atomic_int_set (volatile gint G_GNUC_MAY_ALIAS *atomic,
- gint newval);
--gpointer g_atomic_pointer_get (volatile gpointer *atomic);
--void g_atomic_pointer_set (volatile gpointer *atomic,
-+gpointer g_atomic_pointer_get (volatile gpointer G_GNUC_MAY_ALIAS *atomic);
-+void g_atomic_pointer_set (volatile gpointer G_GNUC_MAY_ALIAS *atomic,
- gpointer newval);
-
- #ifndef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED
--# define g_atomic_int_get(atomic) (*(atomic))
-+# define g_atomic_int_get(atomic) ((gint)*(atomic))
- # define g_atomic_int_set(atomic, newval) ((void) (*(atomic) = (newval)))
--# define g_atomic_pointer_get(atomic) (*(atomic))
-+# define g_atomic_pointer_get(atomic) ((gpointer)*(atomic))
- # define g_atomic_pointer_set(atomic, newval) ((void) (*(atomic) = (newval)))
-+#else
-+# define g_atomic_int_get(atomic) \
-+ ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gint) ? 1 : -1]), \
-+ (g_atomic_int_get) ((volatile gint G_GNUC_MAY_ALIAS *) (void *) (atomic)))
-+# define g_atomic_int_set(atomic, newval) \
-+ ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gint) ? 1 : -1]), \
-+ (g_atomic_int_set) ((volatile gint G_GNUC_MAY_ALIAS *) (void *) (atomic), (newval)))
-+# define g_atomic_pointer_get(atomic) \
-+ ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gpointer) ? 1 : -1]), \
-+ (g_atomic_pointer_get) ((volatile gpointer G_GNUC_MAY_ALIAS *) (void *) (atomic)))
-+# define g_atomic_pointer_set(atomic, newval) \
-+ ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gpointer) ? 1 : -1]), \
-+ (g_atomic_pointer_set) ((volatile gpointer G_GNUC_MAY_ALIAS *) (void *) (atomic), (newval)))
- #endif /* G_ATOMIC_OP_MEMORY_BARRIER_NEEDED */
-
- #define g_atomic_int_inc(atomic) (g_atomic_int_add ((atomic), 1))
-diff -Naur glib-2.18.4-orig/glib/gdataset.c glib-2.18.4/glib/gdataset.c
---- glib-2.18.4-orig/glib/gdataset.c 2009-04-02 15:20:51.000000000 -0400
-+++ glib-2.18.4/glib/gdataset.c 2009-04-02 15:40:38.000000000 -0400
-@@ -44,7 +44,7 @@
-
- /* datalist pointer accesses have to be carried out atomically */
- #define G_DATALIST_GET_POINTER(datalist) \
-- ((GData*) ((gsize) g_atomic_pointer_get ((gpointer*) datalist) & ~(gsize) G_DATALIST_FLAGS_MASK))
-+ ((GData*) ((gsize) g_atomic_pointer_get (datalist) & ~(gsize) G_DATALIST_FLAGS_MASK))
-
- #define G_DATALIST_SET_POINTER(datalist, pointer) G_STMT_START { \
- gpointer _oldv, _newv; \
-@@ -505,7 +505,7 @@
- {
- g_return_if_fail (datalist != NULL);
-
-- g_atomic_pointer_set ((gpointer*) datalist, NULL);
-+ g_atomic_pointer_set (datalist, NULL);
- }
-
- /**
-diff -Naur glib-2.18.4-orig/glib/gdatasetprivate.h glib-2.18.4/glib/gdatasetprivate.h
---- glib-2.18.4-orig/glib/gdatasetprivate.h 2009-04-02 15:20:51.000000000 -0400
-+++ glib-2.18.4/glib/gdatasetprivate.h 2009-04-02 15:40:44.000000000 -0400
-@@ -36,7 +36,7 @@
- * barriers to take effect without acquiring the global dataset mutex.
- */
- #define G_DATALIST_GET_FLAGS(datalist) \
-- ((gsize) g_atomic_pointer_get ((gpointer*) datalist) & G_DATALIST_FLAGS_MASK)
-+ ((gsize) g_atomic_pointer_get (datalist) & G_DATALIST_FLAGS_MASK)
-
-
- G_END_DECLS
-diff -Naur glib-2.18.4-orig/glib/gthread.c glib-2.18.4/glib/gthread.c
---- glib-2.18.4-orig/glib/gthread.c 2009-04-02 15:20:51.000000000 -0400
-+++ glib-2.18.4/glib/gthread.c 2009-04-02 15:40:51.000000000 -0400
-@@ -204,7 +204,7 @@
- {
- gboolean need_init = FALSE;
- g_mutex_lock (g_once_mutex);
-- if (g_atomic_pointer_get ((void**) value_location) == NULL)
-+ if (g_atomic_pointer_get (value_location) == NULL)
- {
- if (!g_slist_find (g_once_init_list, (void*) value_location))
- {
-@@ -224,11 +224,11 @@
- g_once_init_leave (volatile gsize *value_location,
- gsize initialization_value)
- {
-- g_return_if_fail (g_atomic_pointer_get ((void**) value_location) == NULL);
-+ g_return_if_fail (g_atomic_pointer_get (value_location) == NULL);
- g_return_if_fail (initialization_value != 0);
- g_return_if_fail (g_once_init_list != NULL);
-
-- g_atomic_pointer_set ((void**) value_location, (void*) initialization_value);
-+ g_atomic_pointer_set (value_location, (void*) initialization_value);
- g_mutex_lock (g_once_mutex);
- g_once_init_list = g_slist_remove (g_once_init_list, (void*) value_location);
- g_cond_broadcast (g_once_cond);
-@@ -256,7 +256,7 @@
- g_mutex_lock (g_once_mutex);
-
- if (!(*mutex))
-- g_atomic_pointer_set ((void**) mutex, g_mutex_new());
-+ g_atomic_pointer_set (mutex, g_mutex_new());
-
- g_mutex_unlock (g_once_mutex);
-
-diff -Naur glib-2.18.4-orig/glib/gthread.h glib-2.18.4/glib/gthread.h
---- glib-2.18.4-orig/glib/gthread.h 2009-04-02 15:20:51.000000000 -0400
-+++ glib-2.18.4/glib/gthread.h 2009-04-02 15:40:56.000000000 -0400
-@@ -145,7 +145,7 @@
- GMutex* g_static_mutex_get_mutex_impl (GMutex **mutex);
-
- #define g_static_mutex_get_mutex_impl_shortcut(mutex) \
-- (g_atomic_pointer_get ((gpointer*)(void*)mutex) ? *(mutex) : \
-+ (g_atomic_pointer_get (mutex) ? *(mutex) : \
- g_static_mutex_get_mutex_impl (mutex))
-
- /* shorthands for conditional and unconditional function calls */
-@@ -336,7 +336,7 @@
- G_INLINE_FUNC gboolean
- g_once_init_enter (volatile gsize *value_location)
- {
-- if G_LIKELY (g_atomic_pointer_get ((void*volatile*) value_location) != NULL)
-+ if G_LIKELY ((gpointer) g_atomic_pointer_get (value_location) != NULL)
- return FALSE;
- else
- return g_once_init_enter_impl (value_location);
diff --git a/dev-libs/glib/files/glib-2.18.4-irix.patch b/dev-libs/glib/files/glib-2.18.4-irix.patch
deleted file mode 100644
index 73b66ec763..0000000000
--- a/dev-libs/glib/files/glib-2.18.4-irix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-* srcshelton@gmail.com: MIPSpro on IRIX fix
-
-http://bugs.gentoo.org/show_bug.cgi?id=256916
-http://bugzilla.gnome.org/show_bug.cgi?id=570068
-
---- glib-2.18.4/glib/tests/option-context.c
-+++ glib-2.18.4/glib/tests/option-context.c
-@@ -428,7 +428,7 @@ assert_no_error (GError *error)
-
- static void
- assert_error (GError *error,
-- GQuark *domain,
-+ GQuark domain,
- gint code)
- {
- g_assert (error && error->domain == domain && error->code == code);
diff --git a/dev-libs/glib/files/glib-2.20.1-gio-unref.patch b/dev-libs/glib/files/glib-2.20.1-gio-unref.patch
deleted file mode 100644
index 6fb8916e4c..0000000000
--- a/dev-libs/glib/files/glib-2.20.1-gio-unref.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 76439bd5d31019a449bac938c325990bc2a54400 Mon Sep 17 00:00:00 2001
-From: Paul Pogonyshev <pogonyshev@gmx.net>
-Date: Mon, 4 May 2009 22:32:35 +0300
-Subject: [PATCH] Don't try to ref NULL pointer in g_desktop_app_info_dup()
-
-Fixes bug #573246.
----
- gio/gdesktopappinfo.c | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
-index fcd7737..fea0761 100644
---- a/gio/gdesktopappinfo.c
-+++ b/gio/gdesktopappinfo.c
-@@ -417,7 +417,8 @@ g_desktop_app_info_dup (GAppInfo *appinfo)
- new_info->comment = g_strdup (info->comment);
- new_info->nodisplay = info->nodisplay;
- new_info->icon_name = g_strdup (info->icon_name);
-- new_info->icon = g_object_ref (info->icon);
-+ if (info->icon)
-+ new_info->icon = g_object_ref (info->icon);
- new_info->only_show_in = g_strdupv (info->only_show_in);
- new_info->not_show_in = g_strdupv (info->not_show_in);
- new_info->try_exec = g_strdup (info->try_exec);
---
-1.6.2.4
-
diff --git a/dev-libs/glib/files/glib-2.20.3-mint.patch b/dev-libs/glib/files/glib-2.20.3-mint.patch
deleted file mode 100644
index 965ed7a618..0000000000
--- a/dev-libs/glib/files/glib-2.20.3-mint.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-http://bugs.gentoo.org/277485
-
-<alanh@fairlite.co.uk>: patch for FreeMiNT
-
---- glib/gmain.c
-+++ glib/gmain.c
-@@ -75,6 +75,10 @@
- #include <sys/wait.h>
- #endif
-
-+#ifdef __MINT__
-+#define SA_RESTART 0
-+#endif
-+
- #include "galias.h"
-
- /* Types */
---- configure.in
-+++ configure.in
-@@ -1838,8 +1838,8 @@
- # One of them does for most gcc versions and some other platforms/compilers
- # too and could be considered as the canonical way to go.
- case $host in
-- *-*-cygwin*|*-*-darwin*)
-- # skip cygwin and darwin -pthread or -pthreads test
-+ *-*-cygwin*|*-*-darwin*|*-*-mint*)
-+ # skip cygwin and darwin and mint -pthread or -pthreads test
- ;;
- xxx*-solaris*)
- # These compiler/linker flags work with both Sun Studio and gcc
---- configure
-+++ configure
-@@ -37030,8 +37030,8 @@
- # One of them does for most gcc versions and some other platforms/compilers
- # too and could be considered as the canonical way to go.
- case $host in
-- *-*-cygwin*|*-*-darwin*)
-- # skip cygwin and darwin -pthread or -pthreads test
-+ *-*-cygwin*|*-*-darwin*|*-*-mint*)
-+ # skip cygwin and darwin and mint -pthread or -pthreads test
- ;;
- xxx*-solaris*)
- # These compiler/linker flags work with both Sun Studio and gcc
---- glib/gtester.c
-+++ glib/gtester.c
-@@ -26,6 +26,9 @@
- #include <sys/wait.h>
- #include <errno.h>
- #include <signal.h>
-+#ifdef __MINT__
-+#define SA_RESTART 0
-+#endif
-
- /* the read buffer size in bytes */
- #define READ_BUFFER_SIZE 4096
diff --git a/dev-libs/glib/files/glib-2.20.5-winnt-exeext.patch b/dev-libs/glib/files/glib-2.20.5-winnt-exeext.patch
deleted file mode 100644
index 0ac9c0c0ed..0000000000
--- a/dev-libs/glib/files/glib-2.20.5-winnt-exeext.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ru glib-2.20.5.orig/gio/Makefile.am glib-2.20.5/gio/Makefile.am
---- glib-2.20.5.orig/gio/Makefile.am 2009-10-23 12:00:31 +0200
-+++ glib-2.20.5/gio/Makefile.am 2009-10-23 12:01:14 +0200
-@@ -62,7 +62,7 @@
- if CROSS_COMPILING
- glib_genmarshal=$(GLIB_GENMARSHAL)
- else
-- glib_genmarshal=../gobject/glib-genmarshal
-+ glib_genmarshal=../gobject/glib-genmarshal$(EXEEXT)
- endif
-
- gio-marshal.h: gio-marshal.list
-diff -ru glib-2.20.5.orig/gobject/Makefile.am glib-2.20.5/gobject/Makefile.am
---- glib-2.20.5.orig/gobject/Makefile.am 2009-10-23 12:00:31 +0200
-+++ glib-2.20.5/gobject/Makefile.am 2009-10-23 12:01:41 +0200
-@@ -169,7 +169,7 @@
- if CROSS_COMPILING
- glib_genmarshal=$(GLIB_GENMARSHAL)
- else
-- glib_genmarshal=./glib-genmarshal
-+ glib_genmarshal=./glib-genmarshal$(EXEEXT)
- endif
-
- gmarshal.h: stamp-gmarshal.h
-diff -ru glib-2.20.5.orig/tests/gobject/Makefile.am glib-2.20.5/tests/gobject/Makefile.am
---- glib-2.20.5.orig/tests/gobject/Makefile.am 2009-10-23 12:00:32 +0200
-+++ glib-2.20.5/tests/gobject/Makefile.am 2009-10-23 12:01:56 +0200
-@@ -25,7 +25,7 @@
- if CROSS_COMPILING
- glib_genmarshal=$(GLIB_GENMARSHAL)
- else
-- glib_genmarshal=$(top_builddir)/gobject/glib-genmarshal
-+ glib_genmarshal=$(top_builddir)/gobject/glib-genmarshal$(EXEEXT)
- endif
-
- testmarshal.h: stamp-testmarshal.h
diff --git a/dev-libs/glib/files/glib-2.22.3-interix-network.patch b/dev-libs/glib/files/glib-2.22.3-interix-network.patch
deleted file mode 100644
index 04d10ca03d..0000000000
--- a/dev-libs/glib/files/glib-2.22.3-interix-network.patch
+++ /dev/null
@@ -1,614 +0,0 @@
-diff -x '*.Po' -x '*.Plo' -ru glib-2.22.3.orig/gio/ginetaddress.c glib-2.22.3/gio/ginetaddress.c
---- glib-2.22.3.orig/gio/ginetaddress.c 2010-01-15 14:21:11 +0100
-+++ glib-2.22.3/gio/ginetaddress.c 2010-01-15 15:14:24 +0100
-@@ -78,7 +78,9 @@
- GSocketFamily family;
- union {
- struct in_addr ipv4;
-+#ifdef AF_INET6
- struct in6_addr ipv6;
-+#endif
- } addr;
- };
-
-@@ -115,9 +117,15 @@
-
- case PROP_BYTES:
- memcpy (&address->priv->addr, g_value_get_pointer (value),
-- address->priv->family == AF_INET ?
-- sizeof (address->priv->addr.ipv4) :
-- sizeof (address->priv->addr.ipv6));
-+ address->priv->family ==
-+#ifdef AF_INET6
-+ AF_INET ?
-+#endif // AF_INET6
-+ sizeof (address->priv->addr.ipv4)
-+#ifdef AF_INET6
-+ : sizeof (address->priv->addr.ipv6)
-+#endif // AF_INET6
-+ );
- break;
-
- default:
-@@ -410,7 +418,9 @@
- gint len;
- #else /* !G_OS_WIN32 */
- struct in_addr in_addr;
-+#ifdef AF_INET6
- struct in6_addr in6_addr;
-+#endif // AF_INET6
- #endif
-
- /* Make sure _g_networking_init() has been called */
-@@ -426,16 +436,24 @@
-
- #else /* !G_OS_WIN32 */
-
-+#ifdef AF_INET6
- if (inet_pton (AF_INET, string, &in_addr) > 0)
-+#endif // AF_INET6
- return g_inet_address_new_from_bytes ((guint8 *)&in_addr, AF_INET);
-+#ifdef AF_INET6
- else if (inet_pton (AF_INET6, string, &in6_addr) > 0)
- return g_inet_address_new_from_bytes ((guint8 *)&in6_addr, AF_INET6);
-+#endif // AF_INET6
- #endif
-
- return NULL;
- }
-
-+#ifdef AF_INET6
- #define G_INET_ADDRESS_FAMILY_IS_VALID(family) ((family) == AF_INET || (family) == AF_INET6)
-+#else // !AF_INET6
-+#define G_INET_ADDRESS_FAMILY_IS_VALID(family) ((family) == AF_INET)
-+#endif // !AF_INET6
-
- /**
- * g_inet_address_new_from_bytes:
-@@ -478,14 +496,18 @@
- {
- g_return_val_if_fail (G_INET_ADDRESS_FAMILY_IS_VALID (family), NULL);
-
-+#ifdef AF_INET6
- if (family == AF_INET)
- {
-+#endif // AF_INET6
- guint8 addr[4] = {127, 0, 0, 1};
-
- return g_inet_address_new_from_bytes (addr, family);
-+#ifdef AF_INET6
- }
- else
- return g_inet_address_new_from_bytes (in6addr_loopback.s6_addr, family);
-+#endif // AF_INET6
- }
-
- /**
-@@ -505,14 +527,18 @@
- {
- g_return_val_if_fail (G_INET_ADDRESS_FAMILY_IS_VALID (family), NULL);
-
-+#ifdef AF_INET6
- if (family == AF_INET)
- {
-+#endif // AF_INET6
- guint8 addr[4] = {0, 0, 0, 0};
-
- return g_inet_address_new_from_bytes (addr, family);
-+#ifdef AF_INET6
- }
- else
- return g_inet_address_new_from_bytes (in6addr_any.s6_addr, family);
-+#endif // AF_INET6
- }
-
-
-@@ -530,7 +556,11 @@
- gchar *
- g_inet_address_to_string (GInetAddress *address)
- {
-+#ifdef AF_INET6
- gchar buffer[INET6_ADDRSTRLEN];
-+#else // !AF_INET6
-+ gchar buffer[16]; // interix misses ADDRSTRLEN, which i would use otherwise
-+#endif // !AF_INET6
- #ifdef G_OS_WIN32
- DWORD buflen = sizeof (buffer), addrlen;
- struct sockaddr_storage sa;
-@@ -561,10 +591,14 @@
-
- #else /* !G_OS_WIN32 */
-
-+#ifdef AF_INET6
- if (address->priv->family == AF_INET)
-+#endif // AF_INET6
- inet_ntop (AF_INET, &address->priv->addr.ipv4, buffer, sizeof (buffer));
-+#ifdef AF_INET6
- else
- inet_ntop (AF_INET6, &address->priv->addr.ipv6, buffer, sizeof (buffer));
-+#endif // AF_INET6
- #endif
-
- return g_strdup (buffer);
-@@ -604,9 +638,13 @@
- gsize
- g_inet_address_get_native_size (GInetAddress *address)
- {
-+#ifdef AF_INET6
- if (address->priv->family == AF_INET)
-+#endif // AF_INET6
- return sizeof (address->priv->addr.ipv4);
-+#ifdef AF_INET6
- return sizeof (address->priv->addr.ipv6);
-+#endif // AF_INET6
- }
-
- /**
-@@ -642,14 +680,18 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-+#ifdef AF_INET6
- if (address->priv->family == AF_INET)
- {
-+#endif // AF_INET6
- guint32 addr4 = g_ntohl (address->priv->addr.ipv4.s_addr);
-
- return addr4 == INADDR_ANY;
-+#ifdef AF_INET6
- }
- else
- return IN6_IS_ADDR_UNSPECIFIED (&address->priv->addr.ipv6);
-+#endif // AF_INET6
- }
-
- /**
-@@ -667,15 +709,19 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-+#ifdef AF_INET6
- if (address->priv->family == AF_INET)
- {
-+#endif // AF_INET6
- guint32 addr4 = g_ntohl (address->priv->addr.ipv4.s_addr);
-
- /* 127.0.0.0/8 */
- return ((addr4 & 0xff000000) == 0x7f000000);
-+#ifdef AF_INET6
- }
- else
- return IN6_IS_ADDR_LOOPBACK (&address->priv->addr.ipv6);
-+#endif // AF_INET6
- }
-
- /**
-@@ -695,15 +741,19 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-+#ifdef AF_INET6
- if (address->priv->family == AF_INET)
- {
-+#endif // AF_INET6
- guint32 addr4 = g_ntohl (address->priv->addr.ipv4.s_addr);
-
- /* 169.254.0.0/16 */
- return ((addr4 & 0xffff0000) == 0xa9fe0000);
-+#ifdef AF_INET6
- }
- else
- return IN6_IS_ADDR_LINKLOCAL (&address->priv->addr.ipv6);
-+#endif // AF_INET6
- }
-
- /**
-@@ -724,17 +774,21 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-+#ifdef AF_INET6
- if (address->priv->family == AF_INET)
- {
-+#endif // AF_INET6
- guint32 addr4 = g_ntohl (address->priv->addr.ipv4.s_addr);
-
- /* 10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16 */
- return ((addr4 & 0xff000000) == 0x0a000000 ||
- (addr4 & 0xfff00000) == 0xac100000 ||
- (addr4 & 0xffff0000) == 0xc0a80000);
-+#ifdef AF_INET6
- }
- else
- return IN6_IS_ADDR_SITELOCAL (&address->priv->addr.ipv6);
-+#endif // AF_INET6
- }
-
- /**
-@@ -752,14 +806,18 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-+#ifdef AF_INET6
- if (address->priv->family == AF_INET)
- {
-+#endif // AF_INET6
- guint32 addr4 = g_ntohl (address->priv->addr.ipv4.s_addr);
-
- return IN_MULTICAST (addr4);
-+#ifdef AF_INET6
- }
- else
- return IN6_IS_ADDR_MULTICAST (&address->priv->addr.ipv6);
-+#endif // AF_INET6
- }
-
- /**
-@@ -777,10 +835,14 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-+#ifdef AF_INET6
- if (address->priv->family == AF_INET)
-+#endif // AF_INET6
- return FALSE;
-+#ifdef AF_INET6
- else
- return IN6_IS_ADDR_MC_GLOBAL (&address->priv->addr.ipv6);
-+#endif // AF_INET6
- }
-
- /**
-@@ -798,10 +860,14 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-+#ifdef AF_INET6
- if (address->priv->family == AF_INET)
-+#endif // AF_INET6
- return FALSE;
-+#ifdef AF_INET6
- else
- return IN6_IS_ADDR_MC_LINKLOCAL (&address->priv->addr.ipv6);
-+#endif // AF_INET6
- }
-
- /**
-@@ -819,10 +885,14 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-+#ifdef AF_INET6
- if (address->priv->family == AF_INET)
-+#endif // AF_INET6
- return FALSE;
-+#ifdef AF_INET6
- else
- return IN6_IS_ADDR_MC_NODELOCAL (&address->priv->addr.ipv6);
-+#endif // AF_INET6
- }
-
- /**
-@@ -840,10 +910,14 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-+#ifdef AF_INET6
- if (address->priv->family == AF_INET)
-+#endif // AF_INET6
- return FALSE;
-+#ifdef AF_INET6
- else
- return IN6_IS_ADDR_MC_ORGLOCAL (&address->priv->addr.ipv6);
-+#endif // AF_INET6
- }
-
- /**
-@@ -861,10 +935,14 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-+#ifdef AF_INET6
- if (address->priv->family == AF_INET)
-+#endif // AF_INET6
- return FALSE;
-+#ifdef AF_INET6
- else
- return IN6_IS_ADDR_MC_SITELOCAL (&address->priv->addr.ipv6);
-+#endif // AF_INET6
- }
-
- #define __G_INET_ADDRESS_C__
-diff -x '*.Po' -x '*.Plo' -ru glib-2.22.3.orig/gio/ginetsocketaddress.c glib-2.22.3/gio/ginetsocketaddress.c
---- glib-2.22.3.orig/gio/ginetsocketaddress.c 2010-01-15 14:21:11 +0100
-+++ glib-2.22.3/gio/ginetsocketaddress.c 2010-01-15 15:10:52 +0100
-@@ -152,8 +152,10 @@
-
- if (family == AF_INET)
- return sizeof (struct sockaddr_in);
-+#ifdef AF_INET6
- else if (family == AF_INET6)
- return sizeof (struct sockaddr_in6);
-+#endif // AF_INET6
- else
- return -1;
- }
-@@ -189,6 +191,7 @@
- memset (sock->sin_zero, 0, sizeof (sock->sin_zero));
- return TRUE;
- }
-+#ifdef AF_INET6
- else if (family == AF_INET6)
- {
- struct sockaddr_in6 *sock = (struct sockaddr_in6 *) dest;
-@@ -206,6 +209,7 @@
- memcpy (&(sock->sin6_addr.s6_addr), g_inet_address_to_bytes (addr->priv->address), sizeof (sock->sin6_addr));
- return TRUE;
- }
-+#endif // AF_INET6
- else
- {
- g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-diff -x '*.Po' -x '*.Plo' -ru glib-2.22.3.orig/gio/gioenums.h glib-2.22.3/gio/gioenums.h
---- glib-2.22.3.orig/gio/gioenums.h 2010-01-15 14:21:11 +0100
-+++ glib-2.22.3/gio/gioenums.h 2010-01-15 14:26:27 +0100
-@@ -559,7 +559,9 @@
- G_SOCKET_FAMILY_UNIX = GLIB_SYSDEF_AF_UNIX,
- #endif
- G_SOCKET_FAMILY_IPV4 = GLIB_SYSDEF_AF_INET,
-+#ifdef AF_INET6
- G_SOCKET_FAMILY_IPV6 = GLIB_SYSDEF_AF_INET6
-+#endif
- } GSocketFamily;
-
- /**
-diff -x '*.Po' -x '*.Plo' -ru glib-2.22.3.orig/gio/gioenumtypes.c glib-2.22.3/gio/gioenumtypes.c
---- glib-2.22.3.orig/gio/gioenumtypes.c 2010-01-15 14:21:11 +0100
-+++ glib-2.22.3/gio/gioenumtypes.c 2010-01-15 15:34:28 +0100
-@@ -569,7 +569,9 @@
- { G_SOCKET_FAMILY_INVALID, "G_SOCKET_FAMILY_INVALID", "invalid" },
- { G_SOCKET_FAMILY_UNIX, "G_SOCKET_FAMILY_UNIX", "unix" },
- { G_SOCKET_FAMILY_IPV4, "G_SOCKET_FAMILY_IPV4", "ipv4" },
-+#ifdef AF_INET6
- { G_SOCKET_FAMILY_IPV6, "G_SOCKET_FAMILY_IPV6", "ipv6" },
-+#endif // AF_INET6
- { 0, NULL, NULL }
- };
- GType g_define_type_id =
-diff -x '*.Po' -x '*.Plo' -ru glib-2.22.3.orig/gio/gnetworkingprivate.h glib-2.22.3/gio/gnetworkingprivate.h
---- glib-2.22.3.orig/gio/gnetworkingprivate.h 2010-01-15 14:21:11 +0100
-+++ glib-2.22.3/gio/gnetworkingprivate.h 2010-01-15 15:15:04 +0100
-@@ -72,7 +72,11 @@
- GError **error);
-
- void _g_resolver_address_to_sockaddr (GInetAddress *address,
-+ #ifdef __INTERIX
-+ struct sockaddr *sa,
-+ #else
- struct sockaddr_storage *sa,
-+ #endif
- gsize *sa_len);
- char *_g_resolver_name_from_nameinfo (GInetAddress *address,
- const gchar *name,
-diff -x '*.Po' -x '*.Plo' -ru glib-2.22.3.orig/gio/gresolver.c glib-2.22.3/gio/gresolver.c
---- glib-2.22.3.orig/gio/gresolver.c 2010-01-15 14:21:11 +0100
-+++ glib-2.22.3/gio/gresolver.c 2010-01-15 15:15:50 +0100
-@@ -758,7 +758,11 @@
- /* Private method to set up a getnameinfo() request */
- void
- _g_resolver_address_to_sockaddr (GInetAddress *address,
-+ #ifdef __INTERIX
-+ struct sockaddr *sa,
-+ #else
- struct sockaddr_storage *sa,
-+ #endif
- gsize *sa_len)
- {
- GSocketAddress *sockaddr;
-diff -x '*.Po' -x '*.Plo' -ru glib-2.22.3.orig/gio/gsocket.c glib-2.22.3/gio/gsocket.c
---- glib-2.22.3.orig/gio/gsocket.c 2010-01-15 14:21:11 +0100
-+++ glib-2.22.3/gio/gsocket.c 2010-01-15 15:28:19 +0100
-@@ -55,6 +55,11 @@
-
- #include "gioalias.h"
-
-+#ifdef __INTERIX
-+# define sockaddr_storage sockaddr
-+# define ss_family sa_family
-+#endif
-+
- /**
- * SECTION:gsocket
- * @short_description: Low-level socket object
-@@ -367,7 +372,9 @@
- switch (address.ss_family)
- {
- case G_SOCKET_FAMILY_IPV4:
-+#ifdef AF_INET6
- case G_SOCKET_FAMILY_IPV6:
-+#endif // AF_INET6
- case G_SOCKET_FAMILY_UNIX:
- socket->priv->family = address.ss_family;
- break;
-@@ -1307,6 +1314,7 @@
- case G_SOCKET_FAMILY_IPV4:
- return TRUE;
-
-+#ifdef AF_INET6
- case G_SOCKET_FAMILY_IPV6:
- #if defined (IPPROTO_IPV6) && defined (IPV6_V6ONLY)
- {
-@@ -1323,6 +1331,7 @@
- #else
- return FALSE;
- #endif
-+#endif // AF_INET6
-
- default:
- return FALSE;
-diff -x '*.Po' -x '*.Plo' -ru glib-2.22.3.orig/gio/gsocketaddress.c glib-2.22.3/gio/gsocketaddress.c
---- glib-2.22.3.orig/gio/gsocketaddress.c 2010-01-15 14:21:11 +0100
-+++ glib-2.22.3/gio/gsocketaddress.c 2010-01-15 15:29:11 +0100
-@@ -225,6 +225,7 @@
- return sockaddr;
- }
-
-+#ifdef AF_INET6
- if (family == AF_INET6)
- {
- struct sockaddr_in6 *addr = (struct sockaddr_in6 *) native;
-@@ -235,6 +236,7 @@
- g_object_unref (iaddr);
- return sockaddr;
- }
-+#endif // AF_INET6
-
- #ifdef G_OS_UNIX
- if (family == AF_UNIX)
-diff -x '*.Po' -x '*.Plo' -ru glib-2.22.3.orig/gio/gsocketlistener.c glib-2.22.3/gio/gsocketlistener.c
---- glib-2.22.3.orig/gio/gsocketlistener.c 2010-01-15 14:21:11 +0100
-+++ glib-2.22.3/gio/gsocketlistener.c 2010-01-15 15:32:17 +0100
-@@ -369,7 +369,9 @@
- {
- gboolean need_ipv4_socket = TRUE;
- GSocket *socket4 = NULL;
-+#ifdef AF_INET6
- GSocket *socket6;
-+#endif // AF_INET6
-
- g_return_val_if_fail (listener != NULL, FALSE);
- g_return_val_if_fail (port != 0, FALSE);
-@@ -377,6 +379,7 @@
- if (!check_listener (listener, error))
- return FALSE;
-
-+#ifdef AF_INET6
- /* first try to create an IPv6 socket */
- socket6 = g_socket_new (G_SOCKET_FAMILY_IPV6,
- G_SOCKET_TYPE_STREAM,
-@@ -420,6 +423,7 @@
- if (g_socket_speaks_ipv4 (socket6))
- need_ipv4_socket = FALSE;
- }
-+#endif // AF_INET6
-
- if (need_ipv4_socket)
- /* We are here for exactly one of the following reasons:
-@@ -462,8 +466,10 @@
- {
- g_object_unref (socket4);
-
-+#ifdef AF_INET6
- if (socket6 != NULL)
- g_object_unref (socket6);
-+#endif // AF_INET6
-
- return FALSE;
- }
-@@ -479,17 +485,23 @@
- * otherwise we need to tell the user we failed.
- */
- {
-+#ifdef AF_INET6
- if (socket6 != NULL)
- g_clear_error (error);
- else
-+#endif // AF_INET6
- return FALSE;
- }
- }
-
-+#ifdef AF_INET6
- g_assert (socket6 != NULL || socket4 != NULL);
-
- if (socket6 != NULL)
- g_ptr_array_add (listener->priv->sockets, socket6);
-+#else // !AF_INET6
-+ g_assert (socket4 != NULL);
-+#endif // !AF_INET6
-
- if (socket4 != NULL)
- g_ptr_array_add (listener->priv->sockets, socket4);
-diff -x '*.Po' -x '*.Plo' -ru glib-2.22.3.orig/gio/gtcpconnection.c glib-2.22.3/gio/gtcpconnection.c
---- glib-2.22.3.orig/gio/gtcpconnection.c 2010-01-15 14:21:11 +0100
-+++ glib-2.22.3/gio/gtcpconnection.c 2010-01-15 15:33:51 +0100
-@@ -42,18 +42,22 @@
- G_SOCKET_FAMILY_IPV4,
- G_SOCKET_TYPE_STREAM,
- G_SOCKET_PROTOCOL_DEFAULT);
-+#ifdef AF_INET6
- g_socket_connection_factory_register_type (g_define_type_id,
- G_SOCKET_FAMILY_IPV6,
- G_SOCKET_TYPE_STREAM,
- G_SOCKET_PROTOCOL_DEFAULT);
-+#endif // AF_INET6
- g_socket_connection_factory_register_type (g_define_type_id,
- G_SOCKET_FAMILY_IPV4,
- G_SOCKET_TYPE_STREAM,
- G_SOCKET_PROTOCOL_TCP);
-+#ifdef AF_INET6
- g_socket_connection_factory_register_type (g_define_type_id,
- G_SOCKET_FAMILY_IPV6,
- G_SOCKET_TYPE_STREAM,
- G_SOCKET_PROTOCOL_TCP);
-+#endif // AF_INET6
- );
-
- static gboolean g_tcp_connection_close (GIOStream *stream,
-diff -x '*.Po' -x '*.Plo' -ru glib-2.22.3.orig/gio/gthreadedresolver.c glib-2.22.3/gio/gthreadedresolver.c
---- glib-2.22.3.orig/gio/gthreadedresolver.c 2010-01-15 14:21:11 +0100
-+++ glib-2.22.3/gio/gthreadedresolver.c 2010-01-15 15:18:22 +0100
-@@ -441,7 +441,11 @@
- do_lookup_by_address (GThreadedResolverRequest *req,
- GError **error)
- {
-+#ifdef __INTERIX
-+ struct sockaddr sockaddr;
-+#else
- struct sockaddr_storage sockaddr;
-+#endif
- gsize sockaddr_size;
- gchar name[NI_MAXHOST];
- gint retval;
-diff -x '*.Po' -x '*.Plo' -ru glib-2.22.3.orig/gio/gunixresolver.c glib-2.22.3/gio/gunixresolver.c
---- glib-2.22.3.orig/gio/gunixresolver.c 2010-01-15 14:21:11 +0100
-+++ glib-2.22.3/gio/gunixresolver.c 2010-01-15 15:19:03 +0100
-@@ -397,7 +397,11 @@
- GUnixResolver *gur = G_UNIX_RESOLVER (resolver);
- GUnixResolverRequest *req;
- _g_asyncns_query_t *qy;
-+#ifdef __INTERIX
-+ struct sockaddr sockaddr;
-+#else
- struct sockaddr_storage sockaddr;
-+#endif
- gsize sockaddr_size;
-
- _g_resolver_address_to_sockaddr (address, &sockaddr, &sockaddr_size);
-diff -x '*.Po' -x '*.Plo' -ru glib-2.22.3.orig/gio/gwin32resolver.c glib-2.22.3/gio/gwin32resolver.c
---- glib-2.22.3.orig/gio/gwin32resolver.c 2010-01-15 14:21:11 +0100
-+++ glib-2.22.3/gio/gwin32resolver.c 2010-01-15 14:28:35 +0100
-@@ -106,7 +106,7 @@
-
- struct {
- GInetAddress *iaddr;
-- struct sockaddr_storage addr;
-+ struct sockaddr addr;
- gsize addrlen;
- gint retval;
- gchar *namebuf;
-diff -x '*.Po' -x '*.Plo' -ru glib-2.22.3.orig/gio/libasyncns/asyncns.c glib-2.22.3/gio/libasyncns/asyncns.c
---- glib-2.22.3.orig/gio/libasyncns/asyncns.c 2010-01-15 14:21:11 +0100
-+++ glib-2.22.3/gio/libasyncns/asyncns.c 2010-01-15 15:20:19 +0100
-@@ -546,7 +546,11 @@
- int ret;
- const nameinfo_request_t *ni_req = (const nameinfo_request_t*) req;
- char hostbuf[NI_MAXHOST], servbuf[NI_MAXSERV];
-+#ifdef __INTERIX
-+ struct sockaddr sa;
-+#else
- struct sockaddr_storage sa;
-+#endif
-
- assert(length >= sizeof(nameinfo_request_t));
- assert(length == sizeof(nameinfo_request_t) + ni_req->sockaddr_len);
diff --git a/dev-libs/glib/files/glib-2.22.3-interix.patch b/dev-libs/glib/files/glib-2.22.3-interix.patch
deleted file mode 100644
index f3bd222263..0000000000
--- a/dev-libs/glib/files/glib-2.22.3-interix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ru glib-2.22.3.orig/configure.in glib-2.22.3/configure.in
---- glib-2.22.3.orig/configure.in 2010-01-14 17:13:21 +0100
-+++ glib-2.22.3/configure.in 2010-01-14 17:20:12 +0100
-@@ -979,7 +979,14 @@
-
- glib_failed=false
- GLIB_CHECK_VALUE(AF_INET, $glib_inet_includes, glib_failed=true)
--GLIB_CHECK_VALUE(AF_INET6, $glib_inet_includes, glib_failed=true)
-+# NO ipv6 support in interix... there never will be propper support
-+# for the older ones (since vista -> partial support)
-+case "$host" in
-+*-interix*) ;;
-+*)
-+ GLIB_CHECK_VALUE(AF_INET6, $glib_inet_includes, glib_failed=true)
-+ ;;
-+esac
- # winsock defines this even though it doesn't support it
- GLIB_CHECK_VALUE(AF_UNIX, $glib_inet_includes, glib_failed=true)
- if $glib_failed ; then
diff --git a/dev-libs/glib/files/glib-2.22.4-interix-network.patch b/dev-libs/glib/files/glib-2.22.4-interix-network.patch
deleted file mode 100644
index a51522c767..0000000000
--- a/dev-libs/glib/files/glib-2.22.4-interix-network.patch
+++ /dev/null
@@ -1,615 +0,0 @@
-diff -ru glib-2.22.4.orig/gio/ginetaddress.c glib-2.22.4/gio/ginetaddress.c
---- glib-2.22.4.orig/gio/ginetaddress.c 2010-02-01 14:53:48 +0100
-+++ glib-2.22.4/gio/ginetaddress.c 2010-02-01 14:59:12 +0100
-@@ -78,7 +78,9 @@
- GSocketFamily family;
- union {
- struct in_addr ipv4;
-+#ifdef AF_INET6
- struct in6_addr ipv6;
-+#endif
- } addr;
- };
-
-@@ -115,9 +117,15 @@
-
- case PROP_BYTES:
- memcpy (&address->priv->addr, g_value_get_pointer (value),
-- address->priv->family == AF_INET ?
-- sizeof (address->priv->addr.ipv4) :
-- sizeof (address->priv->addr.ipv6));
-+ address->priv->family ==
-+#ifdef AF_INET6
-+ AF_INET ?
-+#endif // AF_INET6
-+ sizeof (address->priv->addr.ipv4)
-+#ifdef AF_INET6
-+ : sizeof (address->priv->addr.ipv6)
-+#endif // AF_INET6
-+ );
- break;
-
- default:
-@@ -410,7 +418,9 @@
- gint len;
- #else /* !G_OS_WIN32 */
- struct in_addr in_addr;
-+#ifdef AF_INET6
- struct in6_addr in6_addr;
-+#endif // AF_INET6
- #endif
-
- /* Make sure _g_networking_init() has been called */
-@@ -426,16 +436,24 @@
-
- #else /* !G_OS_WIN32 */
-
-+#ifdef AF_INET6
- if (inet_pton (AF_INET, string, &in_addr) > 0)
-+#endif // AF_INET6
- return g_inet_address_new_from_bytes ((guint8 *)&in_addr, AF_INET);
-+#ifdef AF_INET6
- else if (inet_pton (AF_INET6, string, &in6_addr) > 0)
- return g_inet_address_new_from_bytes ((guint8 *)&in6_addr, AF_INET6);
-+#endif // AF_INET6
- #endif
-
- return NULL;
- }
-
-+#ifdef AF_INET6
- #define G_INET_ADDRESS_FAMILY_IS_VALID(family) ((family) == AF_INET || (family) == AF_INET6)
-+#else // !AF_INET6
-+#define G_INET_ADDRESS_FAMILY_IS_VALID(family) ((family) == AF_INET)
-+#endif // !AF_INET6
-
- /**
- * g_inet_address_new_from_bytes:
-@@ -478,14 +496,18 @@
- {
- g_return_val_if_fail (G_INET_ADDRESS_FAMILY_IS_VALID (family), NULL);
-
-+#ifdef AF_INET6
- if (family == AF_INET)
- {
-+#endif // AF_INET6
- guint8 addr[4] = {127, 0, 0, 1};
-
- return g_inet_address_new_from_bytes (addr, family);
-+#ifdef AF_INET6
- }
- else
- return g_inet_address_new_from_bytes (in6addr_loopback.s6_addr, family);
-+#endif // AF_INET6
- }
-
- /**
-@@ -505,14 +527,18 @@
- {
- g_return_val_if_fail (G_INET_ADDRESS_FAMILY_IS_VALID (family), NULL);
-
-+#ifdef AF_INET6
- if (family == AF_INET)
- {
-+#endif // AF_INET6
- guint8 addr[4] = {0, 0, 0, 0};
-
- return g_inet_address_new_from_bytes (addr, family);
-+#ifdef AF_INET6
- }
- else
- return g_inet_address_new_from_bytes (in6addr_any.s6_addr, family);
-+#endif // AF_INET6
- }
-
-
-@@ -530,7 +556,11 @@
- gchar *
- g_inet_address_to_string (GInetAddress *address)
- {
-+#ifdef AF_INET6
- gchar buffer[INET6_ADDRSTRLEN];
-+#else // !AF_INET6
-+ gchar buffer[16]; // interix misses ADDRSTRLEN, which i would use otherwise
-+#endif // !AF_INET6
- #ifdef G_OS_WIN32
- DWORD buflen = sizeof (buffer), addrlen;
- struct sockaddr_storage sa;
-@@ -561,10 +591,14 @@
-
- #else /* !G_OS_WIN32 */
-
-+#ifdef AF_INET6
- if (address->priv->family == AF_INET)
-+#endif // AF_INET6
- inet_ntop (AF_INET, &address->priv->addr.ipv4, buffer, sizeof (buffer));
-+#ifdef AF_INET6
- else
- inet_ntop (AF_INET6, &address->priv->addr.ipv6, buffer, sizeof (buffer));
-+#endif // AF_INET6
- #endif
-
- return g_strdup (buffer);
-@@ -604,9 +638,13 @@
- gsize
- g_inet_address_get_native_size (GInetAddress *address)
- {
-+#ifdef AF_INET6
- if (address->priv->family == AF_INET)
-+#endif // AF_INET6
- return sizeof (address->priv->addr.ipv4);
-+#ifdef AF_INET6
- return sizeof (address->priv->addr.ipv6);
-+#endif // AF_INET6
- }
-
- /**
-@@ -642,14 +680,18 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-+#ifdef AF_INET6
- if (address->priv->family == AF_INET)
- {
-+#endif // AF_INET6
- guint32 addr4 = g_ntohl (address->priv->addr.ipv4.s_addr);
-
- return addr4 == INADDR_ANY;
-+#ifdef AF_INET6
- }
- else
- return IN6_IS_ADDR_UNSPECIFIED (&address->priv->addr.ipv6);
-+#endif // AF_INET6
- }
-
- /**
-@@ -667,15 +709,19 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-+#ifdef AF_INET6
- if (address->priv->family == AF_INET)
- {
-+#endif // AF_INET6
- guint32 addr4 = g_ntohl (address->priv->addr.ipv4.s_addr);
-
- /* 127.0.0.0/8 */
- return ((addr4 & 0xff000000) == 0x7f000000);
-+#ifdef AF_INET6
- }
- else
- return IN6_IS_ADDR_LOOPBACK (&address->priv->addr.ipv6);
-+#endif // AF_INET6
- }
-
- /**
-@@ -695,15 +741,19 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-+#ifdef AF_INET6
- if (address->priv->family == AF_INET)
- {
-+#endif // AF_INET6
- guint32 addr4 = g_ntohl (address->priv->addr.ipv4.s_addr);
-
- /* 169.254.0.0/16 */
- return ((addr4 & 0xffff0000) == 0xa9fe0000);
-+#ifdef AF_INET6
- }
- else
- return IN6_IS_ADDR_LINKLOCAL (&address->priv->addr.ipv6);
-+#endif // AF_INET6
- }
-
- /**
-@@ -724,17 +774,21 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-+#ifdef AF_INET6
- if (address->priv->family == AF_INET)
- {
-+#endif // AF_INET6
- guint32 addr4 = g_ntohl (address->priv->addr.ipv4.s_addr);
-
- /* 10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16 */
- return ((addr4 & 0xff000000) == 0x0a000000 ||
- (addr4 & 0xfff00000) == 0xac100000 ||
- (addr4 & 0xffff0000) == 0xc0a80000);
-+#ifdef AF_INET6
- }
- else
- return IN6_IS_ADDR_SITELOCAL (&address->priv->addr.ipv6);
-+#endif // AF_INET6
- }
-
- /**
-@@ -752,14 +806,18 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-+#ifdef AF_INET6
- if (address->priv->family == AF_INET)
- {
-+#endif // AF_INET6
- guint32 addr4 = g_ntohl (address->priv->addr.ipv4.s_addr);
-
- return IN_MULTICAST (addr4);
-+#ifdef AF_INET6
- }
- else
- return IN6_IS_ADDR_MULTICAST (&address->priv->addr.ipv6);
-+#endif // AF_INET6
- }
-
- /**
-@@ -777,10 +835,14 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-+#ifdef AF_INET6
- if (address->priv->family == AF_INET)
-+#endif // AF_INET6
- return FALSE;
-+#ifdef AF_INET6
- else
- return IN6_IS_ADDR_MC_GLOBAL (&address->priv->addr.ipv6);
-+#endif // AF_INET6
- }
-
- /**
-@@ -798,10 +860,14 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-+#ifdef AF_INET6
- if (address->priv->family == AF_INET)
-+#endif // AF_INET6
- return FALSE;
-+#ifdef AF_INET6
- else
- return IN6_IS_ADDR_MC_LINKLOCAL (&address->priv->addr.ipv6);
-+#endif // AF_INET6
- }
-
- /**
-@@ -819,10 +885,14 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-+#ifdef AF_INET6
- if (address->priv->family == AF_INET)
-+#endif // AF_INET6
- return FALSE;
-+#ifdef AF_INET6
- else
- return IN6_IS_ADDR_MC_NODELOCAL (&address->priv->addr.ipv6);
-+#endif // AF_INET6
- }
-
- /**
-@@ -840,10 +910,14 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-+#ifdef AF_INET6
- if (address->priv->family == AF_INET)
-+#endif // AF_INET6
- return FALSE;
-+#ifdef AF_INET6
- else
- return IN6_IS_ADDR_MC_ORGLOCAL (&address->priv->addr.ipv6);
-+#endif // AF_INET6
- }
-
- /**
-@@ -861,10 +935,14 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-+#ifdef AF_INET6
- if (address->priv->family == AF_INET)
-+#endif // AF_INET6
- return FALSE;
-+#ifdef AF_INET6
- else
- return IN6_IS_ADDR_MC_SITELOCAL (&address->priv->addr.ipv6);
-+#endif // AF_INET6
- }
-
- #define __G_INET_ADDRESS_C__
-diff -ru glib-2.22.4.orig/gio/ginetsocketaddress.c glib-2.22.4/gio/ginetsocketaddress.c
---- glib-2.22.4.orig/gio/ginetsocketaddress.c 2010-02-01 14:53:48 +0100
-+++ glib-2.22.4/gio/ginetsocketaddress.c 2010-02-01 14:59:12 +0100
-@@ -152,8 +152,10 @@
-
- if (family == AF_INET)
- return sizeof (struct sockaddr_in);
-+#ifdef AF_INET6
- else if (family == AF_INET6)
- return sizeof (struct sockaddr_in6);
-+#endif // AF_INET6
- else
- return -1;
- }
-@@ -189,6 +191,7 @@
- memset (sock->sin_zero, 0, sizeof (sock->sin_zero));
- return TRUE;
- }
-+#ifdef AF_INET6
- else if (family == AF_INET6)
- {
- struct sockaddr_in6 *sock = (struct sockaddr_in6 *) dest;
-@@ -206,6 +209,7 @@
- memcpy (&(sock->sin6_addr.s6_addr), g_inet_address_to_bytes (addr->priv->address), sizeof (sock->sin6_addr));
- return TRUE;
- }
-+#endif // AF_INET6
- else
- {
- g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-diff -ru glib-2.22.4.orig/gio/gioenums.h glib-2.22.4/gio/gioenums.h
---- glib-2.22.4.orig/gio/gioenums.h 2010-02-01 14:53:48 +0100
-+++ glib-2.22.4/gio/gioenums.h 2010-02-01 14:59:12 +0100
-@@ -559,7 +559,9 @@
- G_SOCKET_FAMILY_UNIX = GLIB_SYSDEF_AF_UNIX,
- #endif
- G_SOCKET_FAMILY_IPV4 = GLIB_SYSDEF_AF_INET,
-+#ifdef AF_INET6
- G_SOCKET_FAMILY_IPV6 = GLIB_SYSDEF_AF_INET6
-+#endif
- } GSocketFamily;
-
- /**
-diff -ru glib-2.22.4.orig/gio/gioenumtypes.c glib-2.22.4/gio/gioenumtypes.c
---- glib-2.22.4.orig/gio/gioenumtypes.c 2010-02-01 14:53:48 +0100
-+++ glib-2.22.4/gio/gioenumtypes.c 2010-02-01 14:59:12 +0100
-@@ -569,7 +569,9 @@
- { G_SOCKET_FAMILY_INVALID, "G_SOCKET_FAMILY_INVALID", "invalid" },
- { G_SOCKET_FAMILY_UNIX, "G_SOCKET_FAMILY_UNIX", "unix" },
- { G_SOCKET_FAMILY_IPV4, "G_SOCKET_FAMILY_IPV4", "ipv4" },
-+#ifdef AF_INET6
- { G_SOCKET_FAMILY_IPV6, "G_SOCKET_FAMILY_IPV6", "ipv6" },
-+#endif // AF_INET6
- { 0, NULL, NULL }
- };
- GType g_define_type_id =
-diff -ru glib-2.22.4.orig/gio/gnetworkingprivate.h glib-2.22.4/gio/gnetworkingprivate.h
---- glib-2.22.4.orig/gio/gnetworkingprivate.h 2010-02-01 14:53:49 +0100
-+++ glib-2.22.4/gio/gnetworkingprivate.h 2010-02-01 15:00:51 +0100
-@@ -72,7 +72,11 @@
- GError **error);
-
- void _g_resolver_address_to_sockaddr (GInetAddress *address,
-+ #ifdef __INTERIX
-+ struct sockaddr *sa,
-+ #else
- struct sockaddr_storage *sa,
-+ #endif
- gsize *len);
- char *_g_resolver_name_from_nameinfo (GInetAddress *address,
- const gchar *name,
-diff -ru glib-2.22.4.orig/gio/gresolver.c glib-2.22.4/gio/gresolver.c
---- glib-2.22.4.orig/gio/gresolver.c 2010-02-01 14:53:49 +0100
-+++ glib-2.22.4/gio/gresolver.c 2010-02-01 15:12:40 +0100
-@@ -758,7 +758,11 @@
- /* Private method to set up a getnameinfo() request */
- void
- _g_resolver_address_to_sockaddr (GInetAddress *address,
-+ #ifdef __INTERIX
-+ struct sockaddr *sa,
-+ #else
- struct sockaddr_storage *sa,
-+ #endif
- gsize *len)
- {
- GSocketAddress *sockaddr;
-diff -ru glib-2.22.4.orig/gio/gsocket.c glib-2.22.4/gio/gsocket.c
---- glib-2.22.4.orig/gio/gsocket.c 2010-02-01 14:53:49 +0100
-+++ glib-2.22.4/gio/gsocket.c 2010-02-01 14:59:12 +0100
-@@ -55,6 +55,11 @@
-
- #include "gioalias.h"
-
-+#ifdef __INTERIX
-+# define sockaddr_storage sockaddr
-+# define ss_family sa_family
-+#endif
-+
- /**
- * SECTION:gsocket
- * @short_description: Low-level socket object
-@@ -367,7 +372,9 @@
- switch (address.ss_family)
- {
- case G_SOCKET_FAMILY_IPV4:
-+#ifdef AF_INET6
- case G_SOCKET_FAMILY_IPV6:
-+#endif // AF_INET6
- case G_SOCKET_FAMILY_UNIX:
- socket->priv->family = address.ss_family;
- break;
-@@ -1307,6 +1314,7 @@
- case G_SOCKET_FAMILY_IPV4:
- return TRUE;
-
-+#ifdef AF_INET6
- case G_SOCKET_FAMILY_IPV6:
- #if defined (IPPROTO_IPV6) && defined (IPV6_V6ONLY)
- {
-@@ -1323,6 +1331,7 @@
- #else
- return FALSE;
- #endif
-+#endif // AF_INET6
-
- default:
- return FALSE;
-diff -ru glib-2.22.4.orig/gio/gsocketaddress.c glib-2.22.4/gio/gsocketaddress.c
---- glib-2.22.4.orig/gio/gsocketaddress.c 2010-02-01 14:53:49 +0100
-+++ glib-2.22.4/gio/gsocketaddress.c 2010-02-01 14:59:12 +0100
-@@ -225,6 +225,7 @@
- return sockaddr;
- }
-
-+#ifdef AF_INET6
- if (family == AF_INET6)
- {
- struct sockaddr_in6 *addr = (struct sockaddr_in6 *) native;
-@@ -235,6 +236,7 @@
- g_object_unref (iaddr);
- return sockaddr;
- }
-+#endif // AF_INET6
-
- #ifdef G_OS_UNIX
- if (family == AF_UNIX)
-diff -ru glib-2.22.4.orig/gio/gsocketlistener.c glib-2.22.4/gio/gsocketlistener.c
---- glib-2.22.4.orig/gio/gsocketlistener.c 2010-02-01 14:53:49 +0100
-+++ glib-2.22.4/gio/gsocketlistener.c 2010-02-01 14:59:12 +0100
-@@ -369,7 +369,9 @@
- {
- gboolean need_ipv4_socket = TRUE;
- GSocket *socket4 = NULL;
-+#ifdef AF_INET6
- GSocket *socket6;
-+#endif // AF_INET6
-
- g_return_val_if_fail (listener != NULL, FALSE);
- g_return_val_if_fail (port != 0, FALSE);
-@@ -377,6 +379,7 @@
- if (!check_listener (listener, error))
- return FALSE;
-
-+#ifdef AF_INET6
- /* first try to create an IPv6 socket */
- socket6 = g_socket_new (G_SOCKET_FAMILY_IPV6,
- G_SOCKET_TYPE_STREAM,
-@@ -420,6 +423,7 @@
- if (g_socket_speaks_ipv4 (socket6))
- need_ipv4_socket = FALSE;
- }
-+#endif // AF_INET6
-
- if (need_ipv4_socket)
- /* We are here for exactly one of the following reasons:
-@@ -462,8 +466,10 @@
- {
- g_object_unref (socket4);
-
-+#ifdef AF_INET6
- if (socket6 != NULL)
- g_object_unref (socket6);
-+#endif // AF_INET6
-
- return FALSE;
- }
-@@ -479,17 +485,23 @@
- * otherwise we need to tell the user we failed.
- */
- {
-+#ifdef AF_INET6
- if (socket6 != NULL)
- g_clear_error (error);
- else
-+#endif // AF_INET6
- return FALSE;
- }
- }
-
-+#ifdef AF_INET6
- g_assert (socket6 != NULL || socket4 != NULL);
-
- if (socket6 != NULL)
- g_ptr_array_add (listener->priv->sockets, socket6);
-+#else // !AF_INET6
-+ g_assert (socket4 != NULL);
-+#endif // !AF_INET6
-
- if (socket4 != NULL)
- g_ptr_array_add (listener->priv->sockets, socket4);
-diff -ru glib-2.22.4.orig/gio/gtcpconnection.c glib-2.22.4/gio/gtcpconnection.c
---- glib-2.22.4.orig/gio/gtcpconnection.c 2010-02-01 14:53:49 +0100
-+++ glib-2.22.4/gio/gtcpconnection.c 2010-02-01 14:59:12 +0100
-@@ -42,18 +42,22 @@
- G_SOCKET_FAMILY_IPV4,
- G_SOCKET_TYPE_STREAM,
- G_SOCKET_PROTOCOL_DEFAULT);
-+#ifdef AF_INET6
- g_socket_connection_factory_register_type (g_define_type_id,
- G_SOCKET_FAMILY_IPV6,
- G_SOCKET_TYPE_STREAM,
- G_SOCKET_PROTOCOL_DEFAULT);
-+#endif // AF_INET6
- g_socket_connection_factory_register_type (g_define_type_id,
- G_SOCKET_FAMILY_IPV4,
- G_SOCKET_TYPE_STREAM,
- G_SOCKET_PROTOCOL_TCP);
-+#ifdef AF_INET6
- g_socket_connection_factory_register_type (g_define_type_id,
- G_SOCKET_FAMILY_IPV6,
- G_SOCKET_TYPE_STREAM,
- G_SOCKET_PROTOCOL_TCP);
-+#endif // AF_INET6
- );
-
- static gboolean g_tcp_connection_close (GIOStream *stream,
-diff -ru glib-2.22.4.orig/gio/gthreadedresolver.c glib-2.22.4/gio/gthreadedresolver.c
---- glib-2.22.4.orig/gio/gthreadedresolver.c 2010-02-01 14:53:49 +0100
-+++ glib-2.22.4/gio/gthreadedresolver.c 2010-02-01 14:59:12 +0100
-@@ -441,7 +441,11 @@
- do_lookup_by_address (GThreadedResolverRequest *req,
- GError **error)
- {
-+#ifdef __INTERIX
-+ struct sockaddr sockaddr;
-+#else
- struct sockaddr_storage sockaddr;
-+#endif
- gsize sockaddr_size;
- gchar name[NI_MAXHOST];
- gint retval;
-diff -ru glib-2.22.4.orig/gio/gunixresolver.c glib-2.22.4/gio/gunixresolver.c
---- glib-2.22.4.orig/gio/gunixresolver.c 2010-02-01 14:53:49 +0100
-+++ glib-2.22.4/gio/gunixresolver.c 2010-02-01 14:59:12 +0100
-@@ -397,7 +397,11 @@
- GUnixResolver *gur = G_UNIX_RESOLVER (resolver);
- GUnixResolverRequest *req;
- _g_asyncns_query_t *qy;
-+#ifdef __INTERIX
-+ struct sockaddr sockaddr;
-+#else
- struct sockaddr_storage sockaddr;
-+#endif
- gsize sockaddr_size;
-
- _g_resolver_address_to_sockaddr (address, &sockaddr, &sockaddr_size);
-diff -ru glib-2.22.4.orig/gio/gwin32resolver.c glib-2.22.4/gio/gwin32resolver.c
---- glib-2.22.4.orig/gio/gwin32resolver.c 2010-02-01 14:53:49 +0100
-+++ glib-2.22.4/gio/gwin32resolver.c 2010-02-01 14:59:12 +0100
-@@ -114,7 +114,7 @@
-
- struct {
- GInetAddress *iaddr;
-- struct sockaddr_storage addr;
-+ struct sockaddr addr;
- gsize addrlen;
- gint retval;
- gchar *namebuf;
-Only in glib-2.22.4/gio: gwin32resolver.c.orig
-diff -ru glib-2.22.4.orig/gio/libasyncns/asyncns.c glib-2.22.4/gio/libasyncns/asyncns.c
---- glib-2.22.4.orig/gio/libasyncns/asyncns.c 2010-02-01 14:53:49 +0100
-+++ glib-2.22.4/gio/libasyncns/asyncns.c 2010-02-01 14:59:12 +0100
-@@ -546,7 +546,11 @@
- int ret;
- const nameinfo_request_t *ni_req = (const nameinfo_request_t*) req;
- char hostbuf[NI_MAXHOST], servbuf[NI_MAXSERV];
-+#ifdef __INTERIX
-+ struct sockaddr sa;
-+#else
- struct sockaddr_storage sa;
-+#endif
-
- assert(length >= sizeof(nameinfo_request_t));
- assert(length == sizeof(nameinfo_request_t) + ni_req->sockaddr_len);
diff --git a/dev-libs/glib/files/glib-2.22.5-nothreads.patch b/dev-libs/glib/files/glib-2.22.5-nothreads.patch
deleted file mode 100644
index d96e2a16cf..0000000000
--- a/dev-libs/glib/files/glib-2.22.5-nothreads.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://bugzilla.gnome.org/show_bug.cgi?id=616754
-
---- glib/gthread.h.old 2010-03-16 02:38:47.000000000 +0000
-+++ glib/gthread.h 2010-06-08 20:01:55.000000000 +0000
-@@ -359,12 +359,11 @@
- */
- extern void glib_dummy_decl (void);
- #define G_LOCK_NAME(name) g__ ## name ## _lock
--#ifdef G_THREADS_ENABLED
--# define G_LOCK_DEFINE_STATIC(name) static G_LOCK_DEFINE (name)
--# define G_LOCK_DEFINE(name) \
-+#define G_LOCK_DEFINE(name) \
- GStaticMutex G_LOCK_NAME (name) = G_STATIC_MUTEX_INIT
--# define G_LOCK_EXTERN(name) extern GStaticMutex G_LOCK_NAME (name)
--
-+#define G_LOCK_DEFINE_STATIC(name) static G_LOCK_DEFINE (name)
-+#define G_LOCK_EXTERN(name) extern GStaticMutex G_LOCK_NAME (name)
-+#ifdef G_THREADS_ENABLED
- # ifdef G_DEBUG_LOCKS
- # define G_LOCK(name) G_STMT_START{ \
- g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, \
-@@ -391,9 +390,6 @@
- # define G_TRYLOCK(name) g_static_mutex_trylock (&G_LOCK_NAME (name))
- # endif /* !G_DEBUG_LOCKS */
- #else /* !G_THREADS_ENABLED */
--# define G_LOCK_DEFINE_STATIC(name) extern void glib_dummy_decl (void)
--# define G_LOCK_DEFINE(name) extern void glib_dummy_decl (void)
--# define G_LOCK_EXTERN(name) extern void glib_dummy_decl (void)
- # define G_LOCK(name)
- # define G_UNLOCK(name)
- # define G_TRYLOCK(name) (TRUE)
diff --git a/dev-libs/glib/files/glib-2.24-assert-test-failure.patch b/dev-libs/glib/files/glib-2.24-assert-test-failure.patch
deleted file mode 100644
index 6d8e74f325..0000000000
--- a/dev-libs/glib/files/glib-2.24-assert-test-failure.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Tests fail when upgrading glib from 2.22 to 2.24 if sys-devel/gdb is installed
-because gdb is run on .libs/assert-msg-test before LD_LIBRARY_PATH is set. This
-causes gdb to use the system-wide glib instead, and fail on the test.
-
-This patch exports LD_LIBRARY_PATH before running gdb
-
-https://bugzilla.gnome.org/621368
-
----
---- tests/run-assert-msg-test.sh
-+++ tests/run-assert-msg-test.sh
-@@ -34,6 +34,7 @@ if [ -e ".libs/lt-$msg_test" ]; then
- msg_test="lt-$msg_test"
- fi
- echo_v "Running gdb on assert-msg-test"
-+export LD_LIBRARY_PATH="`dirname $PWD`/glib/.libs:$LD_LIBRARY_PATH"
- OUT=$(gdb --batch --ex run --ex "print (char*) __glib_assert_msg" .libs/$msg_test 2> $error_out) || \
- fail "failed to run gdb"
-
diff --git a/dev-libs/glib/files/glib-2.24-punt-python-check.patch b/dev-libs/glib/files/glib-2.24-punt-python-check.patch
deleted file mode 100644
index 3cbd6dc151..0000000000
--- a/dev-libs/glib/files/glib-2.24-punt-python-check.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Remove python detection from configure.in, we won't be installing the gdb python
-scripts anymore. They use a redhat-specific gdb module that has not been
-upstreamed yet.
-
-https://bugs.gentoo.org/291328
-https://bugzilla.gnome.org/623552
----
---- configure.in
-+++ configure.in
-@@ -379,10 +379,6 @@ if test "x$PERL_PATH" = x ; then
- fi
- AC_SUBST(PERL_PATH)
-
--# Need suitable python path for greport
--AM_PATH_PYTHON(2.4,,PYTHON="/usr/bin/env python2.4")
--
--
- dnl ***********************
- dnl *** Tests for iconv ***
- dnl ***********************
diff --git a/dev-libs/glib/files/glib-2.25-punt-python-check.patch b/dev-libs/glib/files/glib-2.25-punt-python-check.patch
deleted file mode 100644
index 077ebf440f..0000000000
--- a/dev-libs/glib/files/glib-2.25-punt-python-check.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Remove python detection from configure.in, we won't be installing the gdb python
-scripts anymore. They use a redhat-specific gdb module that has not been
-upstreamed yet.
-
-https://bugs.gentoo.org/291328
-https://bugzilla.gnome.org/623552
----
---- configure.ac
-+++ configure.ac
-@@ -379,10 +379,6 @@ if test "x$PERL_PATH" = x ; then
- fi
- AC_SUBST(PERL_PATH)
-
--# Need suitable python path for greport
--AM_PATH_PYTHON(2.4,,PYTHON="/usr/bin/env python2.4")
--
--
- dnl ***********************
- dnl *** Tests for iconv ***
- dnl ***********************
diff --git a/dev-libs/glib/files/glib-2.25-skip-tests-with-dbus-keyring.patch b/dev-libs/glib/files/glib-2.25-skip-tests-with-dbus-keyring.patch
deleted file mode 100644
index baca1eca86..0000000000
--- a/dev-libs/glib/files/glib-2.25-skip-tests-with-dbus-keyring.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gio/tests/gdbus-peer.c.orig 2010-08-28 20:06:11.000000000 +0300
-+++ gio/tests/gdbus-peer.c 2010-08-28 20:06:21.000000000 +0300
-@@ -1448,7 +1448,7 @@
-
- g_test_add_func ("/gdbus/peer-to-peer", test_peer);
- g_test_add_func ("/gdbus/delayed-message-processing", delayed_message_processing);
-- g_test_add_func ("/gdbus/nonce-tcp", test_nonce_tcp);
-+ //g_test_add_func ("/gdbus/nonce-tcp", test_nonce_tcp);
- g_test_add_func ("/gdbus/credentials", test_credentials);
- g_test_add_func ("/gdbus/overflow", test_overflow);
-
---- gio/tests/gdbus-non-socket.c.orig 2010-08-28 20:36:52.000000000 +0300
-+++ gio/tests/gdbus-non-socket.c 2010-08-28 20:37:02.000000000 +0300
-@@ -336,7 +336,7 @@
- /* all the tests rely on a shared main loop */
- loop = g_main_loop_new (NULL, FALSE);
-
-- g_test_add_func ("/gdbus/non-socket", test_non_socket);
-+ //g_test_add_func ("/gdbus/non-socket", test_non_socket);
-
- ret = g_test_run();
-
diff --git a/dev-libs/glib/files/glib-2.26.0-disable-locale-sensitive-test.patch b/dev-libs/glib/files/glib-2.26.0-disable-locale-sensitive-test.patch
deleted file mode 100644
index 235d5c73e0..0000000000
--- a/dev-libs/glib/files/glib-2.26.0-disable-locale-sensitive-test.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 3a02a86a0a413304843c1cfad359922322486da6 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 6 Oct 2010 23:21:01 +0200
-Subject: [PATCH 1/2] gsettings: disable locale sensitive test.
-
----
- gio/tests/gsettings.c | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/gio/tests/gsettings.c b/gio/tests/gsettings.c
-index fdadf96..4d19618 100644
---- a/gio/tests/gsettings.c
-+++ b/gio/tests/gsettings.c
-@@ -625,14 +625,14 @@ test_l10n (void)
- g_free (str);
- str = NULL;
-
-- setlocale (LC_MESSAGES, "de_DE");
-+ /*setlocale (LC_MESSAGES, "de_DE");
- str = g_settings_get_string (settings, "error-message");
- setlocale (LC_MESSAGES, locale);
-
- g_assert_cmpstr (str, ==, "Unbenannt");
- g_object_unref (settings);
- g_free (str);
-- str = NULL;
-+ str = NULL;*/
-
- g_free (locale);
- }
-@@ -666,14 +666,14 @@ test_l10n_context (void)
- g_free (str);
- str = NULL;
-
-- setlocale (LC_MESSAGES, "de_DE");
-+ /*setlocale (LC_MESSAGES, "de_DE");
- g_settings_get (settings, "backspace", "s", &str);
- setlocale (LC_MESSAGES, locale);
-
- g_assert_cmpstr (str, ==, "Löschen");
- g_object_unref (settings);
- g_free (str);
-- str = NULL;
-+ str = NULL;*/
-
- g_free (locale);
- }
---
-1.7.3
-
diff --git a/dev-libs/glib/files/glib-2.26.0-disable-volumemonitor-broken-test.patch b/dev-libs/glib/files/glib-2.26.0-disable-volumemonitor-broken-test.patch
deleted file mode 100644
index 34fad9e2d8..0000000000
--- a/dev-libs/glib/files/glib-2.26.0-disable-volumemonitor-broken-test.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 8eb4fb83d0933d09bb6ef0ec1511a6b0eb2cee9b Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 6 Oct 2010 23:21:22 +0200
-Subject: [PATCH 2/2] volumemonitor: disable failing test
-
----
- gio/tests/volumemonitor.c | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gio/tests/volumemonitor.c b/gio/tests/volumemonitor.c
-index 54123ec..df19b58 100644
---- a/gio/tests/volumemonitor.c
-+++ b/gio/tests/volumemonitor.c
-@@ -112,7 +112,7 @@ test_connected_drives (void)
- g_list_free (drives);
- }
-
--static void
-+/*static void
- test_volumes (void)
- {
- GList *volumes, *l;
-@@ -131,7 +131,7 @@ test_volumes (void)
-
- g_list_foreach (volumes, (GFunc)g_object_unref, NULL);
- g_list_free (volumes);
--}
-+}*/
-
- static void
- test_mounts (void)
-@@ -173,7 +173,7 @@ main (int argc, char *argv[])
- monitor = g_volume_monitor_get ();
-
- g_test_add_func ("/volumemonitor/connected_drives", test_connected_drives);
-- g_test_add_func ("/volumemonitor/volumes", test_volumes);
-+ //g_test_add_func ("/volumemonitor/volumes", test_volumes);
- g_test_add_func ("/volumemonitor/mounts", test_mounts);
-
- ret = g_test_run ();
---
-1.7.3
-
diff --git a/dev-libs/glib/files/glib-2.26.1-deprecation-tests.patch b/dev-libs/glib/files/glib-2.26.1-deprecation-tests.patch
deleted file mode 100644
index c4085aee71..0000000000
--- a/dev-libs/glib/files/glib-2.26.1-deprecation-tests.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From cae0b1c57f0f8ce73f4f117f8abb61c68e34a0e7 Mon Sep 17 00:00:00 2001
-From: Chun-wei Fan <fanchunwei@src.gnome.org>
-Date: Tue, 30 Nov 2010 02:28:00 +0000
-Subject: Bug635093: Deprecation check in tests/testglib.c
-
-The Relation API in glib/grel.h has been marked as
-deprecated (G_DISABLE_DEPRECATED), so added check for
-that macro in this source file and added label to indicate
-deprecation
----
-diff --git a/tests/testglib.c b/tests/testglib.c
-index b4e29f0..158808a 100644
---- a/tests/testglib.c
-+++ b/tests/testglib.c
-@@ -1038,6 +1038,7 @@ hash_table_tests (void)
- g_hash_table_destroy (hash_table);
- }
-
-+#ifndef G_DISABLE_DEPRECATED
- static void
- relation_test (void)
- {
-@@ -1110,6 +1111,7 @@ relation_test (void)
-
- relation = NULL;
- }
-+#endif
-
- static void
- gstring_tests (void)
-@@ -1539,7 +1541,9 @@ main (int argc,
- g_test_add_func ("/testglib/GTree", binary_tree_test);
- g_test_add_func ("/testglib/Arrays", test_arrays);
- g_test_add_func ("/testglib/GHashTable", hash_table_tests);
-- g_test_add_func ("/testglib/Relation", relation_test);
-+#ifndef G_DISABLE_DEPRECATED
-+ g_test_add_func ("/testglib/Relation (deprecated)", relation_test);
-+#endif
- g_test_add_func ("/testglib/File Paths", test_paths);
- g_test_add_func ("/testglib/File Functions", test_file_functions);
- g_test_add_func ("/testglib/Parse Debug Strings", test_g_parse_debug_string);
---
-cgit v0.8.3.1
diff --git a/dev-libs/glib/files/glib-2.26.1-gatomic-header.patch b/dev-libs/glib/files/glib-2.26.1-gatomic-header.patch
deleted file mode 100644
index f6454d446b..0000000000
--- a/dev-libs/glib/files/glib-2.26.1-gatomic-header.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-glib_gatomic_c,v 1.1 2010/10/10 10:52:04 kili Exp $
---- glib/gatomic.c.orig Thu Sep 23 17:26:45 2010
-+++ glib/gatomic.c Sun Oct 10 11:50:01 2010
-@@ -28,6 +28,7 @@
- #endif
-
- #include "gatomic.h"
-+#include "gthread.h"
- #include "gthreadprivate.h"
-
- /**
diff --git a/dev-libs/glib/files/glib-2.26.1-gdatetime-test.patch b/dev-libs/glib/files/glib-2.26.1-gdatetime-test.patch
deleted file mode 100644
index 054f311f75..0000000000
--- a/dev-libs/glib/files/glib-2.26.1-gdatetime-test.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 3f059a6a123dd62257f224b9af7701078783060e Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Sat, 22 Jan 2011 04:41:12 +0000
-Subject: Remove a test that seems to fail depending on time of day
-
----
-diff --git a/glib/tests/gdatetime.c b/glib/tests/gdatetime.c
-index 01f08de..619bb02 100644
---- a/glib/tests/gdatetime.c
-+++ b/glib/tests/gdatetime.c
-@@ -804,7 +804,7 @@ GDateTime *__dt = g_date_time_new_local (2009, 10, 24, 0, 0, 0);\
- TEST_PRINTF_TIME (13, 13, 13, "%r", "01:13:13 PM");
- TEST_PRINTF ("%R", "00:00");
- TEST_PRINTF_TIME (13, 13, 31, "%R", "13:13");
-- TEST_PRINTF ("%s", t_str);
-+ //TEST_PRINTF ("%s", t_str);
- TEST_PRINTF ("%S", "00");
- TEST_PRINTF ("%t", " ");
- TEST_PRINTF ("%W", "42");
---
-cgit v0.8.3.1
diff --git a/dev-libs/glib/files/glib-2.26.1-gdbus-flushes.patch b/dev-libs/glib/files/glib-2.26.1-gdbus-flushes.patch
deleted file mode 100644
index 5ae2d72cf3..0000000000
--- a/dev-libs/glib/files/glib-2.26.1-gdbus-flushes.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From b2315084cb21a1ef072a48b0238a2e614af78be3 Mon Sep 17 00:00:00 2001
-From: Ted Gould <ted@gould.cx>
-Date: Mon, 13 Dec 2010 18:33:15 +0000
-Subject: Bug 635626 – GDBus message idle can execute while flushes are pending
-
-https://bugzilla.gnome.org/show_bug.cgi?id=635626
-
-Signed-off-by: David Zeuthen <davidz@redhat.com>
----
-diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
-index dd9d58a..228c28c 100644
---- a/gio/gdbusprivate.c
-+++ b/gio/gdbusprivate.c
-@@ -431,6 +431,7 @@ struct GDBusWorker
- gint num_writes_pending;
- guint64 write_num_messages_written;
- GList *write_pending_flushes;
-+ gboolean flush_pending;
- };
-
- /* ---------------------------------------------------------------------------------------------------- */
-@@ -1158,6 +1159,12 @@ ostream_flush_cb (GObject *source_object,
- if (error != NULL)
- g_error_free (error);
-
-+ /* Make sure we tell folks that we don't have additional
-+ flushes pending */
-+ g_mutex_lock (data->worker->write_lock);
-+ data->worker->flush_pending = FALSE;
-+ g_mutex_unlock (data->worker->write_lock);
-+
- /* OK, cool, finally kick off the next write */
- maybe_write_next_message (data->worker);
-
-@@ -1210,6 +1217,10 @@ message_written (GDBusWorker *worker,
- worker->write_pending_flushes = g_list_delete_link (worker->write_pending_flushes, l);
- }
- }
-+ if (flushers != NULL)
-+ {
-+ worker->flush_pending = TRUE;
-+ }
- g_mutex_unlock (worker->write_lock);
-
- if (flushers != NULL)
-@@ -1344,7 +1355,7 @@ static gboolean
- write_message_in_idle_cb (gpointer user_data)
- {
- GDBusWorker *worker = user_data;
-- if (worker->num_writes_pending == 0)
-+ if (worker->num_writes_pending == 0 && !worker->flush_pending)
- maybe_write_next_message (worker);
- return FALSE;
- }
-@@ -1427,6 +1438,7 @@ _g_dbus_worker_new (GIOStream *stream,
- worker->stream = g_object_ref (stream);
- worker->capabilities = capabilities;
- worker->cancellable = g_cancellable_new ();
-+ worker->flush_pending = FALSE;
-
- worker->frozen = initially_frozen;
- worker->received_messages_while_frozen = g_queue_new ();
---
-cgit v0.8.3.1
diff --git a/dev-libs/glib/files/glib-2.26.1-gsettings-read.patch b/dev-libs/glib/files/glib-2.26.1-gsettings-read.patch
deleted file mode 100644
index fa5b081bcc..0000000000
--- a/dev-libs/glib/files/glib-2.26.1-gsettings-read.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 900a4c853f8dbf0887c66155ba489ff4570e5948 Mon Sep 17 00:00:00 2001
-From: Matthew Barnes <mbarnes@redhat.com>
-Date: Wed, 01 Dec 2010 00:19:12 +0000
-Subject: Bug 636100 - Can't read GSettings:backend property
-
-The PROP_BACKEND case was missing from the switch statement in
-g_settings_get_property().
----
-diff --git a/gio/gsettings.c b/gio/gsettings.c
-index 94d1f3a..7f775a0 100644
---- a/gio/gsettings.c
-+++ b/gio/gsettings.c
-@@ -417,6 +417,10 @@ g_settings_get_property (GObject *object,
- g_value_set_string (value, settings->priv->schema_name);
- break;
-
-+ case PROP_BACKEND:
-+ g_value_set_object (value, settings->priv->backend);
-+ break;
-+
- case PROP_PATH:
- g_value_set_string (value, settings->priv->path);
- break;
---
-cgit v0.8.3.1
diff --git a/dev-libs/glib/files/glib-2.26.1-gsettings-rules.patch b/dev-libs/glib/files/glib-2.26.1-gsettings-rules.patch
deleted file mode 100644
index 01ce2265ec..0000000000
--- a/dev-libs/glib/files/glib-2.26.1-gsettings-rules.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 393834ac6f32633a31e52441b051dc7d3969a530 Mon Sep 17 00:00:00 2001
-From: Dan Winship <danw@gnome.org>
-Date: Thu, 04 Nov 2010 19:23:22 +0000
-Subject: gsettings.m4: Fix rules to work when there are no schemas
-
-If there are no schemas, don't try to install "" at install time.
-(In particular, automake conditionals don't work properly with
-@-expanded rules, so if you conditionally build a schema, you'll
-still unconditionally get the install rule.)
-
-https://bugzilla.gnome.org/show_bug.cgi?id=633381
----
-diff --git a/m4macros/gsettings.m4 b/m4macros/gsettings.m4
-index 4e4352f..f0ed838 100644
---- a/m4macros/gsettings.m4
-+++ b/m4macros/gsettings.m4
-@@ -47,9 +47,11 @@ install-data-am: install-gsettings-schemas
-
- install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
- @$(NORMAL_INSTALL)
-- test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"
-- $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"
-- test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
-+ if test -n "$^"; then \
-+ test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
-+ $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
-+ test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
-+ fi
-
- uninstall-gsettings-schemas:
- @$(NORMAL_UNINSTALL)
---
-cgit v0.8.3.1
diff --git a/dev-libs/glib/files/glib-2.26.1-locked-message.patch b/dev-libs/glib/files/glib-2.26.1-locked-message.patch
deleted file mode 100644
index acec46e5da..0000000000
--- a/dev-libs/glib/files/glib-2.26.1-locked-message.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 62476cd0f7ca7d3becf81243fb7ac1b97cf7db51 Mon Sep 17 00:00:00 2001
-From: Peng Huang <shawn.p.huang@gmail.com>
-Date: Mon, 13 Dec 2010 18:09:38 +0000
-Subject: Bug 632544 – Cannot send a locked message with PRESERVE_SERIAL flag
-
-https://bugzilla.gnome.org/show_bug.cgi?id=632544
-
-Signed-off-by: David Zeuthen <davidz@redhat.com>
----
-diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c
-index da2b9f9..cf12f41 100644
---- a/gio/gdbusconnection.c
-+++ b/gio/gdbusconnection.c
-@@ -1449,7 +1449,8 @@ g_dbus_connection_send_message_unlocked (GDBusConnection *connection,
- if (out_serial != NULL)
- *out_serial = serial_to_use;
-
-- g_dbus_message_set_serial (message, serial_to_use);
-+ if (!(flags & G_DBUS_SEND_MESSAGE_FLAGS_PRESERVE_SERIAL))
-+ g_dbus_message_set_serial (message, serial_to_use);
-
- g_dbus_message_lock (message);
- _g_dbus_worker_send_message (connection->worker,
-diff --git a/gio/tests/gdbus-connection.c b/gio/tests/gdbus-connection.c
-index 866e27c..5c2939e 100644
---- a/gio/tests/gdbus-connection.c
-+++ b/gio/tests/gdbus-connection.c
-@@ -880,6 +880,18 @@ test_connection_filter (void)
-
- m2 = g_dbus_message_copy (m, &error);
- g_assert_no_error (error);
-+ g_dbus_message_set_serial (m2, data.serial);
-+ /* lock the message to test PRESERVE_SERIAL flag. */
-+ g_dbus_message_lock (m2);
-+ g_dbus_connection_send_message (c, m2, G_DBUS_SEND_MESSAGE_FLAGS_PRESERVE_SERIAL, &data.serial, &error);
-+ g_object_unref (m2);
-+ g_assert_no_error (error);
-+
-+ while (data.num_handled == 2)
-+ g_thread_yield ();
-+
-+ m2 = g_dbus_message_copy (m, &error);
-+ g_assert_no_error (error);
- r = g_dbus_connection_send_message_with_reply_sync (c,
- m2,
- G_DBUS_SEND_MESSAGE_FLAGS_NONE,
-@@ -891,7 +903,7 @@ test_connection_filter (void)
- g_assert_no_error (error);
- g_assert (r != NULL);
- g_object_unref (r);
-- g_assert_cmpint (data.num_handled, ==, 3);
-+ g_assert_cmpint (data.num_handled, ==, 4);
-
- g_dbus_connection_remove_filter (c, filter_id);
-
-@@ -908,8 +920,8 @@ test_connection_filter (void)
- g_assert_no_error (error);
- g_assert (r != NULL);
- g_object_unref (r);
-- g_assert_cmpint (data.num_handled, ==, 3);
-- g_assert_cmpint (data.num_outgoing, ==, 3);
-+ g_assert_cmpint (data.num_handled, ==, 4);
-+ g_assert_cmpint (data.num_outgoing, ==, 4);
-
- /* this is safe; testserver will exit once the bus goes away */
- g_assert (g_spawn_command_line_async (SRCDIR "/gdbus-testserver.py", NULL));
---
-cgit v0.8.3.1
diff --git a/dev-libs/glib/files/glib-2.26.1-solaris-thread.patch b/dev-libs/glib/files/glib-2.26.1-solaris-thread.patch
deleted file mode 100644
index 9e760ff1e6..0000000000
--- a/dev-libs/glib/files/glib-2.26.1-solaris-thread.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-* Michael Haubenwallner
- Thing is, one really should not link against both libthread and
- libpthread, but use '-pthread' gcc-flag or '-mt' suncc-flag instead.
-
- Don't know where glib-folks have information from found in that
- comment.
-
-* Fabian Groffen
- patch both configure and configure.in (in the right order) such that a
- sudden autoreconf doesn't wipe out our changes.
-
-Multiple reports for these, but unfortunately all ignored/unfixed, e.g.:
-http://mail-index.netbsd.org/pkgsrc-users/2010/12/02/msg013239.html
-http://mail.gnome.org/archives/gtk-devel-list/2007-July/msg00060.html
-
---- configure.ac
-+++ configure.ac
-@@ -1785,7 +1785,7 @@
- *-*-cygwin*|*-*-darwin*)
- # skip cygwin and darwin -pthread or -pthreads test
- ;;
-- *-solaris*)
-+ xxx*-solaris*)
- # These compiler/linker flags work with both Sun Studio and gcc
- # Sun Studio expands -mt to -D_REENTRANT and -lthread
- # gcc expands -pthreads to -D_REENTRANT -D_PTHREADS -lpthread
---- configure
-+++ configure
-@@ -37030,7 +37030,7 @@
- *-*-cygwin*|*-*-darwin*)
- # skip cygwin and darwin -pthread or -pthreads test
- ;;
-- *-solaris*)
-+ xxx*-solaris*)
- # These compiler/linker flags work with both Sun Studio and gcc
- # Sun Studio expands -mt to -D_REENTRANT and -lthread
- # gcc expands -pthreads to -D_REENTRANT -D_PTHREADS -lpthread
diff --git a/dev-libs/glib/files/glib-2.26.1-solaris.patch b/dev-libs/glib/files/glib-2.26.1-solaris.patch
deleted file mode 100644
index 99cc7cbc13..0000000000
--- a/dev-libs/glib/files/glib-2.26.1-solaris.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Major and minor are defined in sys/mkdev.h on Solaris
-
-Without this include, linking will fail with an underfined reference to
-major (and minor)
-
-https://bugzilla.gnome.org/show_bug.cgi?id=637013 (APPLIED)
-
---- configure.ac
-+++ configure.ac
-@@ -860,7 +860,7 @@
- AC_CHECK_HEADERS([sys/select.h sys/types.h stdint.h inttypes.h sched.h malloc.h])
- AC_CHECK_HEADERS([sys/vfs.h sys/mount.h sys/vmount.h sys/statfs.h sys/statvfs.h])
- AC_CHECK_HEADERS([mntent.h sys/mnttab.h sys/vfstab.h sys/mntctl.h sys/sysctl.h fstab.h])
--AC_CHECK_HEADERS([sys/uio.h])
-+AC_CHECK_HEADERS([sys/uio.h sys/mkdev.h])
-
- # check for structure fields
- AC_CHECK_MEMBERS([struct stat.st_mtimensec, struct stat.st_mtim.tv_nsec, struct stat.st_atimensec, struct stat.st_atim.tv_nsec, struct stat.st_ctimensec, struct stat.st_ctim.tv_nsec])
---- gio/gdbusmessage.c
-+++ gio/gdbusmessage.c
-@@ -29,6 +29,9 @@
- #include <errno.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#ifdef HAVE_SYS_MKDEV_H
-+#include <sys/mkdev.h>
-+#endif
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
diff --git a/dev-libs/glib/files/glib-2.28.6-interix.patch b/dev-libs/glib/files/glib-2.28.6-interix.patch
deleted file mode 100644
index dbe3636eea..0000000000
--- a/dev-libs/glib/files/glib-2.28.6-interix.patch
+++ /dev/null
@@ -1,728 +0,0 @@
-reported upstream: https://bugzilla.gnome.org/show_bug.cgi?id=652285
-
-diff -ru -x '*.Po' -x '*.Plo' -x '*.lo' -x '*.la' -x '*.o' glib-2.28.6.orig/acinclude.m4 glib-2.28.6/acinclude.m4
---- glib-2.28.6.orig/acinclude.m4 2011-06-09 14:05:51 +0200
-+++ glib-2.28.6/acinclude.m4 2011-06-10 08:25:58 +0200
-@@ -254,9 +254,13 @@
-
- AC_DEFUN([gt_TYPE_LONGDOUBLE],
- [
-+ AC_REQUIRE([AC_CANONICAL_HOST])
- AC_CACHE_CHECK([for long double], gt_cv_c_long_double,
- [if test "$GCC" = yes; then
-- gt_cv_c_long_double=yes
-+ case "$host" in
-+ *-interix*) gt_cv_c_long_double=no ;;
-+ *) gt_cv_c_long_double=yes ;;
-+ esac
- else
- AC_TRY_COMPILE([
- /* The Stardent Vistra knows sizeof(long double), but does not support it. */
-diff -ru -x '*.Po' -x '*.Plo' -x '*.lo' -x '*.la' -x '*.o' glib-2.28.6.orig/configure.ac glib-2.28.6/configure.ac
---- glib-2.28.6.orig/configure.ac 2011-06-09 14:06:00 +0200
-+++ glib-2.28.6/configure.ac 2011-06-10 08:26:32 +0200
-@@ -945,8 +945,12 @@
- AC_CHECK_FUNCS(chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid)
- AC_CHECK_FUNCS(getmntent_r setmntent endmntent hasmntopt getmntinfo)
- # Check for high-resolution sleep functions
-+AC_CHECK_FUNCS(nanosleep usleep)
-+AC_CHECK_FUNCS(sendmsg recvmsg)
- AC_CHECK_FUNCS(splice)
-
-+AC_CHECK_TYPE([struct sockaddr_storage])
-+
- AC_CHECK_HEADERS(crt_externs.h)
- AC_CHECK_FUNCS(_NSGetEnviron)
-
-@@ -966,8 +970,10 @@
- fi
-
- glib_failed=false
-+glib_def_af_inet6=1
- GLIB_CHECK_VALUE(AF_INET, $glib_inet_includes, glib_failed=true)
--GLIB_CHECK_VALUE(AF_INET6, $glib_inet_includes, glib_failed=true)
-+# support systems without AF_INET6 (for example Interix 3.5 and 5.2)
-+GLIB_CHECK_VALUE(AF_INET6, $glib_inet_includes, glib_def_af_inet6=0)
- # winsock defines this even though it doesn't support it
- GLIB_CHECK_VALUE(AF_UNIX, $glib_inet_includes, glib_failed=true)
- if $glib_failed ; then
-@@ -1913,6 +1919,10 @@
- *-*-cygwin*|*-*-darwin*)
- # skip cygwin and darwin -pthread or -pthreads test
- ;;
-+ *-interix*)
-+ G_THREAD_CFLAGS="-D_REENTRANT"
-+ G_THREAD_LIBS="-lpthread"
-+ ;;
- xxx*-solaris*)
- # These compiler/linker flags work with both Sun Studio and gcc
- # Sun Studio expands -mt to -D_REENTRANT and -lthread
-@@ -3248,7 +3258,9 @@
-
- #define GLIB_SYSDEF_AF_UNIX $g_af_unix
- #define GLIB_SYSDEF_AF_INET $g_af_inet
--#define GLIB_SYSDEF_AF_INET6 $g_af_inet6
-+#if $g_def_af_inet6
-+# define GLIB_SYSDEF_AF_INET6 $g_af_inet6
-+#endif
-
- #define GLIB_SYSDEF_MSG_OOB $g_msg_oob
- #define GLIB_SYSDEF_MSG_PEEK $g_msg_peek
-@@ -3556,6 +3568,7 @@
- g_af_unix=$glib_cv_value_AF_UNIX
- g_af_inet=$glib_cv_value_AF_INET
- g_af_inet6=$glib_cv_value_AF_INET6
-+g_def_af_inet6=$glib_def_af_inet6
-
- g_msg_peek=$glib_cv_value_MSG_PEEK
- g_msg_oob=$glib_cv_value_MSG_OOB
-diff -ru -x '*.Po' -x '*.Plo' -x '*.lo' -x '*.la' -x '*.o' glib-2.28.6.orig/gio/ginetaddress.c glib-2.28.6/gio/ginetaddress.c
---- glib-2.28.6.orig/gio/ginetaddress.c 2011-06-09 14:06:00 +0200
-+++ glib-2.28.6/gio/ginetaddress.c 2011-06-09 13:57:48 +0200
-@@ -77,7 +77,9 @@
- GSocketFamily family;
- union {
- struct in_addr ipv4;
-+#ifdef AF_INET6
- struct in6_addr ipv6;
-+#endif
- } addr;
- };
-
-@@ -114,9 +116,11 @@
-
- case PROP_BYTES:
- memcpy (&address->priv->addr, g_value_get_pointer (value),
-- address->priv->family == AF_INET ?
-- sizeof (address->priv->addr.ipv4) :
-- sizeof (address->priv->addr.ipv6));
-+#ifdef AF_INET6
-+ address->priv->family == AF_INET6 ?
-+ sizeof (address->priv->addr.ipv6) :
-+#endif
-+ sizeof (address->priv->addr.ipv4));
- break;
-
- default:
-@@ -409,7 +413,9 @@
- gint len;
- #else /* !G_OS_WIN32 */
- struct in_addr in_addr;
-+#ifdef AF_INET6
- struct in6_addr in6_addr;
-+#endif /* AF_INET6 */
- #endif
-
- /* Make sure _g_networking_init() has been called */
-@@ -427,14 +433,20 @@
-
- if (inet_pton (AF_INET, string, &in_addr) > 0)
- return g_inet_address_new_from_bytes ((guint8 *)&in_addr, AF_INET);
-+#ifdef AF_INET6
- else if (inet_pton (AF_INET6, string, &in6_addr) > 0)
- return g_inet_address_new_from_bytes ((guint8 *)&in6_addr, AF_INET6);
-+#endif /* AF_INET6 */
- #endif
-
- return NULL;
- }
-
--#define G_INET_ADDRESS_FAMILY_IS_VALID(family) ((family) == AF_INET || (family) == AF_INET6)
-+#ifdef AF_INET6
-+# define G_INET_ADDRESS_FAMILY_IS_VALID(family) ((family) == AF_INET || (family) == AF_INET6)
-+#else
-+# define G_INET_ADDRESS_FAMILY_IS_VALID(family) ((family) == AF_INET)
-+#endif
-
- /**
- * g_inet_address_new_from_bytes:
-@@ -477,14 +489,16 @@
- {
- g_return_val_if_fail (G_INET_ADDRESS_FAMILY_IS_VALID (family), NULL);
-
-- if (family == AF_INET)
-+#ifdef AF_INET6
-+ if (family == AF_INET6)
-+ return g_inet_address_new_from_bytes (in6addr_loopback.s6_addr, family);
-+ else
-+#endif
- {
- guint8 addr[4] = {127, 0, 0, 1};
-
- return g_inet_address_new_from_bytes (addr, family);
- }
-- else
-- return g_inet_address_new_from_bytes (in6addr_loopback.s6_addr, family);
- }
-
- /**
-@@ -504,14 +518,16 @@
- {
- g_return_val_if_fail (G_INET_ADDRESS_FAMILY_IS_VALID (family), NULL);
-
-- if (family == AF_INET)
-+#ifdef AF_INET6
-+ if (family == AF_INET6)
-+ return g_inet_address_new_from_bytes (in6addr_any.s6_addr, family);
-+ else
-+#endif
- {
- guint8 addr[4] = {0, 0, 0, 0};
-
- return g_inet_address_new_from_bytes (addr, family);
- }
-- else
-- return g_inet_address_new_from_bytes (in6addr_any.s6_addr, family);
- }
-
-
-@@ -560,10 +576,12 @@
-
- #else /* !G_OS_WIN32 */
-
-- if (address->priv->family == AF_INET)
-- inet_ntop (AF_INET, &address->priv->addr.ipv4, buffer, sizeof (buffer));
-- else
-+#ifdef AF_INET6
-+ if (address->priv->family == AF_INET6)
- inet_ntop (AF_INET6, &address->priv->addr.ipv6, buffer, sizeof (buffer));
-+ else
-+#endif /* AF_INET6 */
-+ inet_ntop (AF_INET, &address->priv->addr.ipv4, buffer, sizeof (buffer));
- #endif
-
- return g_strdup (buffer);
-@@ -603,9 +621,11 @@
- gsize
- g_inet_address_get_native_size (GInetAddress *address)
- {
-- if (address->priv->family == AF_INET)
-- return sizeof (address->priv->addr.ipv4);
-- return sizeof (address->priv->addr.ipv6);
-+#ifdef AF_INET6
-+ if (address->priv->family == AF_INET6)
-+ return sizeof (address->priv->addr.ipv6);
-+#endif
-+ return sizeof (address->priv->addr.ipv4);
- }
-
- /**
-@@ -641,14 +661,16 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-- if (address->priv->family == AF_INET)
-+#ifdef AF_INET6
-+ if (address->priv->family == AF_INET6)
-+ return IN6_IS_ADDR_UNSPECIFIED (&address->priv->addr.ipv6);
-+ else
-+#endif
- {
- guint32 addr4 = g_ntohl (address->priv->addr.ipv4.s_addr);
-
- return addr4 == INADDR_ANY;
- }
-- else
-- return IN6_IS_ADDR_UNSPECIFIED (&address->priv->addr.ipv6);
- }
-
- /**
-@@ -666,15 +688,17 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-- if (address->priv->family == AF_INET)
-+#ifdef AF_INET6
-+ if (address->priv->family == AF_INET6)
-+ return IN6_IS_ADDR_LOOPBACK (&address->priv->addr.ipv6);
-+ else
-+#endif
- {
- guint32 addr4 = g_ntohl (address->priv->addr.ipv4.s_addr);
-
- /* 127.0.0.0/8 */
- return ((addr4 & 0xff000000) == 0x7f000000);
- }
-- else
-- return IN6_IS_ADDR_LOOPBACK (&address->priv->addr.ipv6);
- }
-
- /**
-@@ -694,15 +718,17 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-- if (address->priv->family == AF_INET)
-+#ifdef AF_INET6
-+ if (address->priv->family == AF_INET6)
-+ return IN6_IS_ADDR_LINKLOCAL (&address->priv->addr.ipv6);
-+ else
-+#endif
- {
- guint32 addr4 = g_ntohl (address->priv->addr.ipv4.s_addr);
-
- /* 169.254.0.0/16 */
- return ((addr4 & 0xffff0000) == 0xa9fe0000);
- }
-- else
-- return IN6_IS_ADDR_LINKLOCAL (&address->priv->addr.ipv6);
- }
-
- /**
-@@ -723,7 +749,11 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-- if (address->priv->family == AF_INET)
-+#ifdef AF_INET6
-+ if (address->priv->family == AF_INET6)
-+ return IN6_IS_ADDR_SITELOCAL (&address->priv->addr.ipv6);
-+ else
-+#endif
- {
- guint32 addr4 = g_ntohl (address->priv->addr.ipv4.s_addr);
-
-@@ -732,8 +762,6 @@
- (addr4 & 0xfff00000) == 0xac100000 ||
- (addr4 & 0xffff0000) == 0xc0a80000);
- }
-- else
-- return IN6_IS_ADDR_SITELOCAL (&address->priv->addr.ipv6);
- }
-
- /**
-@@ -751,14 +779,16 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-- if (address->priv->family == AF_INET)
-+#ifdef AF_INET6
-+ if (address->priv->family == AF_INET6)
-+ return IN6_IS_ADDR_MULTICAST (&address->priv->addr.ipv6);
-+ else
-+#endif
- {
- guint32 addr4 = g_ntohl (address->priv->addr.ipv4.s_addr);
-
- return IN_MULTICAST (addr4);
- }
-- else
-- return IN6_IS_ADDR_MULTICAST (&address->priv->addr.ipv6);
- }
-
- /**
-@@ -776,10 +806,12 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-- if (address->priv->family == AF_INET)
-- return FALSE;
-- else
-+#ifdef AF_INET6
-+ if (address->priv->family == AF_INET6)
- return IN6_IS_ADDR_MC_GLOBAL (&address->priv->addr.ipv6);
-+ else
-+#endif
-+ return FALSE;
- }
-
- /**
-@@ -797,10 +829,12 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-- if (address->priv->family == AF_INET)
-- return FALSE;
-- else
-+#ifdef AF_INET6
-+ if (address->priv->family == AF_INET6)
- return IN6_IS_ADDR_MC_LINKLOCAL (&address->priv->addr.ipv6);
-+ else
-+#endif
-+ return FALSE;
- }
-
- /**
-@@ -818,10 +852,12 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-- if (address->priv->family == AF_INET)
-- return FALSE;
-- else
-+#ifdef AF_INET6
-+ if (address->priv->family == AF_INET6)
- return IN6_IS_ADDR_MC_NODELOCAL (&address->priv->addr.ipv6);
-+ else
-+#endif
-+ return FALSE;
- }
-
- /**
-@@ -839,10 +875,12 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-- if (address->priv->family == AF_INET)
-- return FALSE;
-- else
-+#ifdef AF_INET6
-+ if (address->priv->family == AF_INET6)
- return IN6_IS_ADDR_MC_ORGLOCAL (&address->priv->addr.ipv6);
-+ else
-+#endif
-+ return FALSE;
- }
-
- /**
-@@ -860,8 +898,10 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-- if (address->priv->family == AF_INET)
-- return FALSE;
-- else
-+#ifdef AF_INET6
-+ if (address->priv->family == AF_INET6)
- return IN6_IS_ADDR_MC_SITELOCAL (&address->priv->addr.ipv6);
-+ else
-+#endif
-+ return FALSE;
- }
-diff -ru -x '*.Po' -x '*.Plo' -x '*.lo' -x '*.la' -x '*.o' glib-2.28.6.orig/gio/ginetsocketaddress.c glib-2.28.6/gio/ginetsocketaddress.c
---- glib-2.28.6.orig/gio/ginetsocketaddress.c 2011-06-09 14:06:00 +0200
-+++ glib-2.28.6/gio/ginetsocketaddress.c 2011-06-09 13:57:48 +0200
-@@ -151,8 +151,10 @@
-
- if (family == AF_INET)
- return sizeof (struct sockaddr_in);
-+#ifdef AF_INET6
- else if (family == AF_INET6)
- return sizeof (struct sockaddr_in6);
-+#endif
- else
- return -1;
- }
-@@ -188,6 +190,7 @@
- memset (sock->sin_zero, 0, sizeof (sock->sin_zero));
- return TRUE;
- }
-+#ifdef AF_INET6
- else if (family == AF_INET6)
- {
- struct sockaddr_in6 *sock = (struct sockaddr_in6 *) dest;
-@@ -205,6 +208,7 @@
- memcpy (&(sock->sin6_addr.s6_addr), g_inet_address_to_bytes (addr->priv->address), sizeof (sock->sin6_addr));
- return TRUE;
- }
-+#endif
- else
- {
- g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-diff -ru -x '*.Po' -x '*.Plo' -x '*.lo' -x '*.la' -x '*.o' glib-2.28.6.orig/gio/gioenums.h glib-2.28.6/gio/gioenums.h
---- glib-2.28.6.orig/gio/gioenums.h 2011-06-09 14:06:00 +0200
-+++ glib-2.28.6/gio/gioenums.h 2011-06-09 13:57:48 +0200
-@@ -649,7 +649,9 @@
- G_SOCKET_FAMILY_UNIX = GLIB_SYSDEF_AF_UNIX,
- #endif
- G_SOCKET_FAMILY_IPV4 = GLIB_SYSDEF_AF_INET,
-+#ifdef GLIB_SYSDEF_AF_INET6
- G_SOCKET_FAMILY_IPV6 = GLIB_SYSDEF_AF_INET6
-+#endif
- } GSocketFamily;
-
- /**
-diff -ru -x '*.Po' -x '*.Plo' -x '*.lo' -x '*.la' -x '*.o' glib-2.28.6.orig/gio/gioenumtypes.c glib-2.28.6/gio/gioenumtypes.c
---- glib-2.28.6.orig/gio/gioenumtypes.c 2011-06-09 14:06:00 +0200
-+++ glib-2.28.6/gio/gioenumtypes.c 2011-06-09 13:57:48 +0200
-@@ -646,7 +646,9 @@
- { G_SOCKET_FAMILY_INVALID, "G_SOCKET_FAMILY_INVALID", "invalid" },
- { G_SOCKET_FAMILY_UNIX, "G_SOCKET_FAMILY_UNIX", "unix" },
- { G_SOCKET_FAMILY_IPV4, "G_SOCKET_FAMILY_IPV4", "ipv4" },
-+#ifdef G_SOCKET_FAMILY_IPV6
- { G_SOCKET_FAMILY_IPV6, "G_SOCKET_FAMILY_IPV6", "ipv6" },
-+#endif
- { 0, NULL, NULL }
- };
- GType g_define_type_id =
-diff -ru -x '*.Po' -x '*.Plo' -x '*.lo' -x '*.la' -x '*.o' glib-2.28.6.orig/gio/gnetworkingprivate.h glib-2.28.6/gio/gnetworkingprivate.h
---- glib-2.28.6.orig/gio/gnetworkingprivate.h 2011-06-09 14:06:00 +0200
-+++ glib-2.28.6/gio/gnetworkingprivate.h 2011-06-09 13:57:48 +0200
-@@ -49,6 +49,7 @@
- #endif
-
- #include <sys/types.h>
-+#include <netinet/in.h>
- #include <arpa/inet.h>
- #include <arpa/nameser.h>
- #if defined(HAVE_ARPA_NAMESER_COMPAT_H) && !defined(GETSHORT)
-@@ -59,6 +60,10 @@
- #define T_SRV 33
- #endif
-
-+#ifndef INET6_ADDRSTRLEN
-+#define INET6_ADDRSTRLEN 46
-+#endif
-+
- /* We're supposed to define _GNU_SOURCE to get EAI_NODATA, but that
- * won't actually work since <features.h> has already been included at
- * this point. So we define __USE_GNU instead.
-@@ -76,6 +81,11 @@
- #define _PATH_RESCONF "/etc/resolv.conf"
- #endif
-
-+#ifndef HAVE_SOCKADDR_STORAGE
-+# define sockaddr_storage sockaddr
-+# define ss_family sa_family
-+#endif
-+
- #ifndef CMSG_LEN
- /* CMSG_LEN and CMSG_SPACE are defined by RFC 2292, but missing on
- * some older platforms.
-diff -ru -x '*.Po' -x '*.Plo' -x '*.lo' -x '*.la' -x '*.o' glib-2.28.6.orig/gio/gsocket.c glib-2.28.6/gio/gsocket.c
---- glib-2.28.6.orig/gio/gsocket.c 2011-06-09 14:06:00 +0200
-+++ glib-2.28.6/gio/gsocket.c 2011-06-09 13:57:48 +0200
-@@ -377,7 +377,9 @@
- switch (address.ss_family)
- {
- case G_SOCKET_FAMILY_IPV4:
-+#ifdef G_SOCKET_FAMILY_IPV6
- case G_SOCKET_FAMILY_IPV6:
-+#endif
- socket->priv->family = address.ss_family;
- switch (socket->priv->type)
- {
-@@ -1454,6 +1456,7 @@
- case G_SOCKET_FAMILY_IPV4:
- return TRUE;
-
-+#ifdef G_SOCKET_FAMILY_IPV6
- case G_SOCKET_FAMILY_IPV6:
- #if defined (IPPROTO_IPV6) && defined (IPV6_V6ONLY)
- {
-@@ -1470,6 +1473,7 @@
- #else
- return FALSE;
- #endif
-+#endif /* G_SOCKET_FAMILY_IPV6 */
-
- default:
- return FALSE;
-@@ -2922,6 +2926,7 @@
- }
-
- #ifndef G_OS_WIN32
-+#ifdef HAVE_SENDMSG
- {
- struct msghdr msg;
- gssize result;
-@@ -3033,6 +3038,13 @@
-
- return result;
- }
-+#else /* HAVE_SENDMSG */
-+ {
-+ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-+ _("g_socket_send_message not supported"));
-+ return -1;
-+ }
-+#endif /* !HAVE_SENDMSG */
- #else
- {
- struct sockaddr_storage addr;
-@@ -3229,6 +3241,7 @@
- }
-
- #ifndef G_OS_WIN32
-+#ifdef HAVE_RECVMSG
- {
- struct msghdr msg;
- gssize result;
-@@ -3390,6 +3403,13 @@
-
- return result;
- }
-+#else /* HAVE_RECVMSG */
-+ {
-+ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-+ _("g_socket_receive_message not supported"));
-+ return -1;
-+ }
-+#endif /* !HAVE_RECVMSG */
- #else
- {
- struct sockaddr_storage addr;
-diff -ru -x '*.Po' -x '*.Plo' -x '*.lo' -x '*.la' -x '*.o' glib-2.28.6.orig/gio/gsocketaddress.c glib-2.28.6/gio/gsocketaddress.c
---- glib-2.28.6.orig/gio/gsocketaddress.c 2011-06-09 14:06:00 +0200
-+++ glib-2.28.6/gio/gsocketaddress.c 2011-06-09 13:57:48 +0200
-@@ -232,6 +232,7 @@
- return sockaddr;
- }
-
-+#ifdef AF_INET6
- if (family == AF_INET6)
- {
- struct sockaddr_in6 *addr = (struct sockaddr_in6 *) native;
-@@ -246,6 +247,7 @@
- g_object_unref (iaddr);
- return sockaddr;
- }
-+#endif
-
- #ifdef G_OS_UNIX
- if (family == AF_UNIX)
-diff -ru -x '*.Po' -x '*.Plo' -x '*.lo' -x '*.la' -x '*.o' glib-2.28.6.orig/gio/gsocketlistener.c glib-2.28.6/gio/gsocketlistener.c
---- glib-2.28.6.orig/gio/gsocketlistener.c 2011-06-09 14:06:00 +0200
-+++ glib-2.28.6/gio/gsocketlistener.c 2011-06-09 13:57:48 +0200
-@@ -368,7 +368,7 @@
- {
- gboolean need_ipv4_socket = TRUE;
- GSocket *socket4 = NULL;
-- GSocket *socket6;
-+ GSocket *socket6 = NULL;
-
- g_return_val_if_fail (listener != NULL, FALSE);
- g_return_val_if_fail (port != 0, FALSE);
-@@ -376,6 +376,7 @@
- if (!check_listener (listener, error))
- return FALSE;
-
-+#ifdef G_SOCKET_FAMILY_IPV6
- /* first try to create an IPv6 socket */
- socket6 = g_socket_new (G_SOCKET_FAMILY_IPV6,
- G_SOCKET_TYPE_STREAM,
-@@ -419,6 +420,7 @@
- if (g_socket_speaks_ipv4 (socket6))
- need_ipv4_socket = FALSE;
- }
-+#endif
-
- if (need_ipv4_socket)
- /* We are here for exactly one of the following reasons:
-@@ -976,6 +978,7 @@
- GSocketAddress *address;
- gboolean result;
-
-+#ifdef G_SOCKET_FAMILY_IPV6
- g_assert (socket6 == NULL);
- socket6 = g_socket_new (G_SOCKET_FAMILY_IPV6,
- G_SOCKET_TYPE_STREAM,
-@@ -1007,6 +1010,7 @@
- if (g_socket_speaks_ipv4 (socket6))
- break;
- }
-+#endif
-
- g_assert (socket4 == NULL);
- socket4 = g_socket_new (G_SOCKET_FAMILY_IPV4,
-diff -ru -x '*.Po' -x '*.Plo' -x '*.lo' -x '*.la' -x '*.o' glib-2.28.6.orig/gio/gtcpconnection.c glib-2.28.6/gio/gtcpconnection.c
---- glib-2.28.6.orig/gio/gtcpconnection.c 2011-06-09 14:06:00 +0200
-+++ glib-2.28.6/gio/gtcpconnection.c 2011-06-09 13:57:48 +0200
-@@ -36,18 +36,22 @@
- G_SOCKET_FAMILY_IPV4,
- G_SOCKET_TYPE_STREAM,
- G_SOCKET_PROTOCOL_DEFAULT);
-+#ifdef G_SOCKET_FAMILY_IPV6
- g_socket_connection_factory_register_type (g_define_type_id,
- G_SOCKET_FAMILY_IPV6,
- G_SOCKET_TYPE_STREAM,
- G_SOCKET_PROTOCOL_DEFAULT);
-+#endif
- g_socket_connection_factory_register_type (g_define_type_id,
- G_SOCKET_FAMILY_IPV4,
- G_SOCKET_TYPE_STREAM,
- G_SOCKET_PROTOCOL_TCP);
-+#ifdef G_SOCKET_FAMILY_IPV6
- g_socket_connection_factory_register_type (g_define_type_id,
- G_SOCKET_FAMILY_IPV6,
- G_SOCKET_TYPE_STREAM,
- G_SOCKET_PROTOCOL_TCP);
-+#endif
- );
-
- static gboolean g_tcp_connection_close (GIOStream *stream,
-diff -ru -x '*.Po' -x '*.Plo' -x '*.lo' -x '*.la' -x '*.o' glib-2.28.6.orig/gio/gtcpwrapperconnection.c glib-2.28.6/gio/gtcpwrapperconnection.c
---- glib-2.28.6.orig/gio/gtcpwrapperconnection.c 2011-06-09 14:06:00 +0200
-+++ glib-2.28.6/gio/gtcpwrapperconnection.c 2011-06-09 13:57:48 +0200
-@@ -172,8 +172,11 @@
- {
- g_return_val_if_fail (G_IS_IO_STREAM (base_io_stream), NULL);
- g_return_val_if_fail (G_IS_SOCKET (socket), NULL);
-- g_return_val_if_fail (g_socket_get_family (socket) == G_SOCKET_FAMILY_IPV4 ||
-- g_socket_get_family (socket) == G_SOCKET_FAMILY_IPV6, NULL);
-+ g_return_val_if_fail (g_socket_get_family (socket) == G_SOCKET_FAMILY_IPV4
-+#ifdef G_SOCKET_FAMILY_IPV6
-+ || g_socket_get_family (socket) == G_SOCKET_FAMILY_IPV6
-+#endif
-+ , NULL);
- g_return_val_if_fail (g_socket_get_socket_type (socket) == G_SOCKET_TYPE_STREAM, NULL);
-
- return g_object_new (G_TYPE_TCP_WRAPPER_CONNECTION,
-diff -ru -x '*.Po' -x '*.Plo' -x '*.lo' -x '*.la' -x '*.o' glib-2.28.6.orig/gio/gunixfdmessage.c glib-2.28.6/gio/gunixfdmessage.c
---- glib-2.28.6.orig/gio/gunixfdmessage.c 2011-06-09 14:06:00 +0200
-+++ glib-2.28.6/gio/gunixfdmessage.c 2011-06-09 14:13:16 +0200
-@@ -74,7 +72,11 @@
- static int
- g_unix_fd_message_get_msg_type (GSocketControlMessage *message)
- {
-+#ifdef SCM_RIGHTS
- return SCM_RIGHTS;
-+#else
-+ return -1;
-+#endif
- }
-
- static GSocketControlMessage *
-@@ -83,6 +85,7 @@
- gsize size,
- gpointer data)
- {
-+#ifdef SCM_RIGHTS
- GSocketControlMessage *message;
- GUnixFDList *list;
- gint n, s, i;
-@@ -120,6 +123,9 @@
- g_object_unref (list);
-
- return message;
-+#else
-+ return NULL;
-+#endif
- }
-
- static void
-diff -ru -x '*.Po' -x '*.Plo' -x '*.lo' -x '*.la' -x '*.o' glib-2.28.6.orig/gio/libasyncns/asyncns.c glib-2.28.6/gio/libasyncns/asyncns.c
---- glib-2.28.6.orig/gio/libasyncns/asyncns.c 2011-06-09 14:06:00 +0200
-+++ glib-2.28.6/gio/libasyncns/asyncns.c 2011-06-09 13:57:48 +0200
-@@ -75,6 +75,10 @@
- #define MAX_QUERIES 256
- #define BUFSIZE (10240)
-
-+#ifndef HAVE_SOCKADDR_STORAGE
-+# define sockaddr_storage sockaddr
-+#endif
-+
- typedef enum {
- REQUEST_ADDRINFO,
- RESPONSE_ADDRINFO,
-diff -ru -x '*.Po' -x '*.Plo' -x '*.lo' -x '*.la' -x '*.o' glib-2.28.6.orig/glib/gtimer.c glib-2.28.6/glib/gtimer.c
---- glib-2.28.6.orig/glib/gtimer.c 2011-06-09 14:06:00 +0200
-+++ glib-2.28.6/glib/gtimer.c 2011-06-09 13:57:48 +0200
-@@ -247,11 +247,17 @@
- #ifdef G_OS_WIN32
- Sleep (microseconds / 1000);
- #else
-+#ifdef HAVE_NANOSLEEP
- struct timespec request, remaining;
- request.tv_sec = microseconds / G_USEC_PER_SEC;
- request.tv_nsec = 1000 * (microseconds % G_USEC_PER_SEC);
- while (nanosleep (&request, &remaining) == -1 && errno == EINTR)
- request = remaining;
-+#elif defined HAVE_USLEEP
-+ usleep(microseconds);
-+#else
-+ #error no sufficient high resolution timer found!
-+#endif
- #endif
- }
-
diff --git a/dev-libs/glib/files/glib-2.29.18-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.29.18-external-gdbus-codegen.patch
deleted file mode 100644
index abec0dd722..0000000000
--- a/dev-libs/glib/files/glib-2.29.18-external-gdbus-codegen.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 89a3234d52451cadb21c322931adb6e8928eb21d Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Wed, 24 Aug 2011 21:35:59 -0400
-Subject: [PATCH] Use an external gdbus-codegen package
-
----
- configure.ac | 4 +---
- docs/reference/gio/Makefile.am | 3 +--
- gio/Makefile.am | 2 +-
- gio/tests/Makefile.am | 4 +---
- gio/tests/gdbus-object-manager-example/Makefile.am | 4 +---
- 5 files changed, 5 insertions(+), 12 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index dc23b8b..0bb0c4a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -365,7 +365,7 @@ fi
- AC_SUBST(PERL_PATH)
-
- # Need suitable python path for greport
--AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
-+# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
-
-
- dnl ***********************
-@@ -3858,8 +3858,6 @@ gobject/tests/Makefile
- gthread/Makefile
- gthread/tests/Makefile
- gio/Makefile
--gio/gdbus-2.0/codegen/Makefile
--gio/gdbus-2.0/codegen/config.py
- gio/xdgmime/Makefile
- gio/inotify/Makefile
- gio/libasyncns/Makefile
-diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
-index 9eb0fce..511aec9 100644
---- a/docs/reference/gio/Makefile.am
-+++ b/docs/reference/gio/Makefile.am
-@@ -79,8 +79,7 @@ man_MANS = \
- gio-querymodules.1 \
- glib-compile-schemas.1 \
- gsettings.1 \
-- gdbus.1 \
-- gdbus-codegen.1
-+ gdbus.1
-
- if ENABLE_MAN
-
-diff --git a/gio/Makefile.am b/gio/Makefile.am
-index 7803bb2..d4a08e5 100644
---- a/gio/Makefile.am
-+++ b/gio/Makefile.am
-@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
-
- NULL =
-
--SUBDIRS = gdbus-2.0/codegen
-+SUBDIRS =
-
- if OS_UNIX
- SUBDIRS += libasyncns xdgmime
-diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
-index a85ea4f..8fbe8ec 100644
---- a/gio/tests/Makefile.am
-+++ b/gio/tests/Makefile.am
-@@ -261,9 +261,7 @@ gdbus_bz627724_LDADD = $(progs_ldadd)
-
- if OS_UNIX
- gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+ $(AM_V_GEN) gdbus-codegen \
- --interface-prefix org.project. \
- --generate-c-code gdbus-test-codegen-generated \
- --c-generate-object-manager \
-diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
-index 5e6eb9a..8b16926 100644
---- a/gio/tests/gdbus-object-manager-example/Makefile.am
-+++ b/gio/tests/gdbus-object-manager-example/Makefile.am
-@@ -22,9 +22,7 @@ GDBUS_GENERATED = \
- $(NULL)
-
- $(GDBUS_GENERATED) : gdbus-example-objectmanager.xml
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+ $(AM_V_GEN) gdbus-codegen \
- --interface-prefix org.gtk.GDBus.Example.ObjectManager. \
- --c-namespace Example \
- --c-generate-object-manager \
---
-1.7.6.1
-
diff --git a/dev-libs/glib/files/glib-2.30.1-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.30.1-external-gdbus-codegen.patch
deleted file mode 100644
index 916b291d20..0000000000
--- a/dev-libs/glib/files/glib-2.30.1-external-gdbus-codegen.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Use an external gdbus-codegen package
-
---- configure.ac
-+++ configure.ac
-@@ -367,7 +367,7 @@
- AC_SUBST(PERL_PATH)
-
- # Need suitable python path for greport
--AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
-+# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
-
-
- dnl ***********************
-@@ -3857,8 +3857,6 @@
- gthread/Makefile
- gthread/tests/Makefile
- gio/Makefile
--gio/gdbus-2.0/codegen/Makefile
--gio/gdbus-2.0/codegen/config.py
- gio/xdgmime/Makefile
- gio/inotify/Makefile
- gio/libasyncns/Makefile
---- docs/reference/gio/Makefile.am
-+++ docs/reference/gio/Makefile.am
-@@ -138,8 +138,7 @@
- gio-querymodules.1 \
- glib-compile-schemas.1 \
- gsettings.1 \
-- gdbus.1 \
-- gdbus-codegen.1
-+ gdbus.1
-
- if ENABLE_MAN
-
---- gio/Makefile.am
-+++ gio/Makefile.am
-@@ -2,7 +2,7 @@
-
- NULL =
-
--SUBDIRS = gdbus-2.0/codegen
-+SUBDIRS =
-
- if OS_UNIX
- SUBDIRS += libasyncns xdgmime
---- gio/tests/gdbus-object-manager-example/Makefile.am
-+++ gio/tests/gdbus-object-manager-example/Makefile.am
-@@ -21,10 +21,8 @@
- gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \
- $(NULL)
-
--$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile
-+ $(AM_V_GEN) gdbus-codegen \
- --interface-prefix org.gtk.GDBus.Example.ObjectManager. \
- --c-namespace Example \
- --c-generate-object-manager \
---- gio/tests/Makefile.am
-+++ gio/tests/Makefile.am
-@@ -266,10 +266,8 @@
- gdbus_close_pending_LDADD = $(progs_ldadd)
-
- if OS_UNIX
--gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml Makefile
-+ $(AM_V_GEN) gdbus-codegen \
- --interface-prefix org.project. \
- --generate-c-code gdbus-test-codegen-generated \
- --c-generate-object-manager \
diff --git a/dev-libs/glib/files/glib-2.30.1-homedir-env.patch b/dev-libs/glib/files/glib-2.30.1-homedir-env.patch
deleted file mode 100644
index 30d44997c5..0000000000
--- a/dev-libs/glib/files/glib-2.30.1-homedir-env.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Description: Handle the G_HOME environment variable to override the passwd entry
- This will allow to fix various kinds of build failures due to restricted
- build environments.
-Author: Josselin Mouette <joss@debian.org>
-Origin: vendor
-
---- a/docs/reference/glib/running.sgml
-+++ b/docs/reference/glib/running.sgml
-@@ -213,6 +213,22 @@
- </para>
- </formalpara>
-
-+<formalpara id="G_HOME">
-+ <title><envar>G_HOME</envar></title>
-+
-+ <para>
-+ For various reasons, GLib applications ignore the <envar>HOME</envar>
-+ environment variable on Unix systems and will use the user directory
-+ as specified by the <filename>passwd</filename> entry, which is more
-+ reliable.
-+ </para>
-+ <para>
-+ The <envar>G_HOME</envar> environment variable will override any
-+ other setting for the home directory. It is not meant for daily usage,
-+ but it is useful in testing or building environments.
-+ </para>
-+</formalpara>
-+
- </refsect2>
-
- <refsect2 id="setlocale">
---- a/glib/gutils.c
-+++ b/glib/gutils.c
-@@ -1626,11 +1626,14 @@
- }
- #endif /* !G_OS_WIN32 */
-
-+ g_home_dir = g_strdup (g_getenv ("G_HOME"));
-+
- #ifdef G_OS_WIN32
- /* We check $HOME first for Win32, though it is a last resort for Unix
- * where we prefer the results of getpwuid().
- */
-- g_home_dir = g_strdup (g_getenv ("HOME"));
-+ if (!g_home_dir)
-+ g_home_dir = g_strdup (g_getenv ("HOME"));
-
- /* Only believe HOME if it is an absolute path and exists */
- if (g_home_dir)
-@@ -1926,6 +1929,11 @@
- * homedir = g_get_home_dir (<!-- -->);
- * ]|
- *
-+ * However, to allow changing this value for testing and development
-+ * purposes, the value of the <envar>G_HOME</envar> environment
-+ * variable, if set, will override the <filename>passwd</filename>
-+ * entry.
-+ *
- * Returns: the current user's home directory
- */
- G_CONST_RETURN gchar*
diff --git a/dev-libs/glib/files/glib-2.30.2-machine-id.patch b/dev-libs/glib/files/glib-2.30.2-machine-id.patch
deleted file mode 100644
index 863b3b4486..0000000000
--- a/dev-libs/glib/files/glib-2.30.2-machine-id.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 1c9eceaccb6e6c4339cd6951cf53fbd60ae80b8b Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 14 Nov 2011 01:43:22 -0500
-Subject: [PATCH] _g_dbus_get_machine_id(): check /etc/machine-id too
-
-machine-id can be in /etc or in /var/lib/dbus.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=663928
----
- gio/gdbusprivate.c | 6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
-index 55ac883..68c3ddf 100644
---- a/gio/gdbusprivate.c
-+++ b/gio/gdbusprivate.c
-@@ -1985,7 +1985,11 @@ _g_dbus_get_machine_id (GError **error)
- gchar *ret;
- /* TODO: use PACKAGE_LOCALSTATEDIR ? */
- ret = NULL;
-- if (!g_file_get_contents ("/var/lib/dbus/machine-id",
-+ if (!g_file_get_contents ("/etc/machine-id",
-+ &ret,
-+ NULL,
-+ NULL) &&
-+ !g_file_get_contents ("/var/lib/dbus/machine-id",
- &ret,
- NULL,
- error))
---
-1.7.8.rc1
-
diff --git a/dev-libs/glib/files/glib-2.30.2-missing-decls.patch b/dev-libs/glib/files/glib-2.30.2-missing-decls.patch
deleted file mode 100644
index 3641f88504..0000000000
--- a/dev-libs/glib/files/glib-2.30.2-missing-decls.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Fix from upstream for building with C++ compilers:
-https://bugzilla.gnome.org/show_bug.cgi?id=663880
-
-From 5d9f05eef147f17d71e38c9fba2e3f622c9ed21b Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Sat, 12 Nov 2011 10:26:31 -0500
-Subject: [PATCH] glib-unix.h: Add G_BEGIN/END_DECLS
-
-The omission was pointed out in bug 663880.
----
- glib/glib-unix.h | 6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/glib/glib-unix.h b/glib/glib-unix.h
-index 9642b5c..7be37f0 100644
---- a/glib/glib-unix.h
-+++ b/glib/glib-unix.h
-@@ -38,6 +38,8 @@
- #error "This header may only be used on UNIX"
- #endif
-
-+G_BEGIN_DECLS
-+
- /**
- * G_UNIX_ERROR:
- *
-@@ -77,4 +79,6 @@ guint g_unix_signal_add (gint signum,
- GSourceFunc handler,
- gpointer user_data);
-
--#endif
-+G_END_DECLS
-+
-+#endif /* __G_UNIX_H__ */
---
-1.7.7.1
diff --git a/dev-libs/glib/files/glib-2.31.x-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.31.x-external-gdbus-codegen.patch
deleted file mode 100644
index df1378eb12..0000000000
--- a/dev-libs/glib/files/glib-2.31.x-external-gdbus-codegen.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 732f04b55f59b8107a7fbe317317edb5f184ea8f Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Fri, 3 Feb 2012 09:08:28 +0200
-Subject: [PATCH] Split out gdbus codegen
-
----
- configure.ac | 4 +---
- docs/reference/gio/Makefile.am | 3 +--
- gio/Makefile.am | 2 +-
- gio/tests/Makefile.am | 6 ++----
- gio/tests/gdbus-object-manager-example/Makefile.am | 6 ++----
- 5 files changed, 7 insertions(+), 14 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4cf04a1..0bb18c8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -356,7 +356,7 @@ fi
- AC_SUBST(PERL_PATH)
-
- # Need suitable python path for greport
--AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
-+# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
-
-
- dnl ***********************
-@@ -3525,8 +3525,6 @@ gobject/glib-mkenums
- gobject/tests/Makefile
- gthread/Makefile
- gio/Makefile
--gio/gdbus-2.0/codegen/Makefile
--gio/gdbus-2.0/codegen/config.py
- gio/xdgmime/Makefile
- gio/inotify/Makefile
- gio/fen/Makefile
-diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
-index 535aa26..5027dd5 100644
---- a/docs/reference/gio/Makefile.am
-+++ b/docs/reference/gio/Makefile.am
-@@ -144,8 +144,7 @@ man_MANS = \
- glib-compile-resources.1 \
- gsettings.1 \
- gresource.1 \
-- gdbus.1 \
-- gdbus-codegen.1
-+ gdbus.1
-
- if ENABLE_MAN
-
-diff --git a/gio/Makefile.am b/gio/Makefile.am
-index 67eeae6..277931b 100644
---- a/gio/Makefile.am
-+++ b/gio/Makefile.am
-@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
-
- NULL =
-
--SUBDIRS = gdbus-2.0/codegen
-+SUBDIRS =
-
- if OS_UNIX
- SUBDIRS += xdgmime
-diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
-index e987fd1..66af8cf 100644
---- a/gio/tests/Makefile.am
-+++ b/gio/tests/Makefile.am
-@@ -275,10 +275,8 @@ gdbus_close_pending_SOURCES = gdbus-close-pending.c gdbus-sessionbus.c gdbus-ses
- gdbus_close_pending_LDADD = $(progs_ldadd)
-
- if OS_UNIX
--gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml Makefile
-+ $(AM_V_GEN) gdbus-codegen \
- --interface-prefix org.project. \
- --generate-c-code gdbus-test-codegen-generated \
- --c-generate-object-manager \
-diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
-index 9861d0e..9ca6eb9 100644
---- a/gio/tests/gdbus-object-manager-example/Makefile.am
-+++ b/gio/tests/gdbus-object-manager-example/Makefile.am
-@@ -21,10 +21,8 @@ GDBUS_GENERATED = \
- gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \
- $(NULL)
-
--$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile
-+ $(AM_V_GEN) gdbus-codegen \
- --interface-prefix org.gtk.GDBus.Example.ObjectManager. \
- --c-namespace Example \
- --c-generate-object-manager \
---
-1.7.8.4
-
diff --git a/dev-libs/glib/files/glib-2.32.1-fix-libelf-check.patch b/dev-libs/glib/files/glib-2.32.1-fix-libelf-check.patch
deleted file mode 100644
index 936623474d..0000000000
--- a/dev-libs/glib/files/glib-2.32.1-fix-libelf-check.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac 2012-04-13 15:39:41.000000000 +0200
-+++ configure.ac 2012-04-14 20:20:41.814099854 +0200
-@@ -1823,7 +1823,7 @@
-
- if test $have_libelf != no; then
- LIBELF_LIBS=-lelf
-- have_libelf = yes
-+ have_libelf=yes
- fi
- fi
-
diff --git a/dev-libs/glib/files/glib-2.32.1-gnustep-not-cocoa.patch b/dev-libs/glib/files/glib-2.32.1-gnustep-not-cocoa.patch
deleted file mode 100644
index 56014a9e34..0000000000
--- a/dev-libs/glib/files/glib-2.32.1-gnustep-not-cocoa.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 2d59182bfc3a799c140090c83db22a275aa858a0 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 15 Apr 2012 22:57:25 -0400
-Subject: [PATCH] Do not detect GNUstep as Cocoa
-
-GNUstep also installs Foundation/Foundation.h
-
-https://bugzilla.gnome.org/show_bug.cgi?id=674172
----
- configure.ac | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 825d42d..2ae07f1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -179,6 +179,9 @@ glib_have_cocoa=no
- AC_MSG_CHECKING([for Mac OS X Cocoa support])
- AC_TRY_CPP([
- #include <Foundation/Foundation.h>
-+#ifdef GNUSTEP_BASE_VERSION
-+#error "Detected GNUstep, not Cocoa"
-+#endif
- ], glib_have_cocoa=yes)
-
- AC_MSG_RESULT([$glib_have_cocoa])
---
-1.7.8.5
-
diff --git a/dev-libs/glib/files/glib-2.32.1-solaris-FIONREAD.patch b/dev-libs/glib/files/glib-2.32.1-solaris-FIONREAD.patch
deleted file mode 100644
index 55fec26c4e..0000000000
--- a/dev-libs/glib/files/glib-2.32.1-solaris-FIONREAD.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://bugzilla.gnome.org/show_bug.cgi?id=675524
-
---- configure.ac
-+++ configure.ac
-@@ -882,7 +882,7 @@
- AC_CHECK_HEADERS([dirent.h float.h limits.h pwd.h grp.h sys/param.h sys/poll.h sys/resource.h])
- AC_CHECK_HEADERS([sys/time.h sys/times.h sys/wait.h unistd.h values.h])
- AC_CHECK_HEADERS([sys/select.h sys/types.h stdint.h inttypes.h sched.h malloc.h])
--AC_CHECK_HEADERS([sys/vfs.h sys/vmount.h sys/statfs.h sys/statvfs.h])
-+AC_CHECK_HEADERS([sys/vfs.h sys/vmount.h sys/statfs.h sys/statvfs.h sys/filio.h])
- AC_CHECK_HEADERS([mntent.h sys/mnttab.h sys/vfstab.h sys/mntctl.h fstab.h])
- AC_CHECK_HEADERS([sys/uio.h sys/mkdev.h])
- AC_CHECK_HEADERS([linux/magic.h])
---- gio/gsocket.c
-+++ gio/gsocket.c
-@@ -44,6 +44,10 @@
- # include <sys/ioctl.h>
- #endif
-
-+#ifdef HAVE_SYS_FILIO_H
-+# include <sys/filio.h>
-+#endif
-+
- #ifdef HAVE_SYS_UIO_H
- #include <sys/uio.h>
- #endif
diff --git a/dev-libs/glib/files/glib-2.32.1-solaris-nsl.patch b/dev-libs/glib/files/glib-2.32.1-solaris-nsl.patch
deleted file mode 100644
index d405287e70..0000000000
--- a/dev-libs/glib/files/glib-2.32.1-solaris-nsl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugzilla.gnome.org/show_bug.cgi?id=675550
-
---- configure.ac
-+++ configure.ac
-@@ -1089,6 +1089,8 @@
- AC_CHECK_FUNC(socket, :, AC_CHECK_LIB(socket, socket,
- [NETWORK_LIBS="-lsocket $NETWORK_LIBS"],
- [AC_MSG_ERROR(Could not find socket())]))
-+ AC_CHECK_FUNC(inet_ntop, :, AC_SEARCH_LIBS(inet_ntop, nsl,
-+ [NETWORK_LIBS="-lnsl $NETWORK_LIBS"]))
- fi
- AC_SUBST(NETWORK_LIBS)
-
diff --git a/dev-libs/glib/files/glib-2.32.1-solaris-thread.patch b/dev-libs/glib/files/glib-2.32.1-solaris-thread.patch
deleted file mode 100644
index 81d875ac8c..0000000000
--- a/dev-libs/glib/files/glib-2.32.1-solaris-thread.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-* Michael Haubenwallner
- Thing is, one really should not link against both libthread and
- libpthread, but use '-pthread' gcc-flag or '-mt' suncc-flag instead.
-
- Don't know where glib-folks have information from found in that
- comment.
-
-* Fabian Groffen
- patch both configure and configure.in (in the right order) such that a
- sudden autoreconf doesn't wipe out our changes.
-
-Multiple reports for these, but unfortunately all ignored/unfixed, e.g.:
-http://mail-index.netbsd.org/pkgsrc-users/2010/12/02/msg013239.html
-http://mail.gnome.org/archives/gtk-devel-list/2007-July/msg00060.html
-
---- configure.ac
-+++ configure.ac
-@@ -1984,7 +1984,7 @@
- *-*-cygwin*|*-*-darwin*)
- # skip cygwin and darwin -pthread or -pthreads test
- ;;
-- *-solaris*)
-+ xxx*-solaris*)
- # These compiler/linker flags work with both Sun Studio and gcc
- # Sun Studio expands -mt to -D_REENTRANT and -lthread
- # gcc expands -pthreads to -D_REENTRANT -D_PTHREADS -lpthread
---- configure
-+++ configure
-@@ -26362,7 +26362,7 @@
- *-*-cygwin*|*-*-darwin*)
- # skip cygwin and darwin -pthread or -pthreads test
- ;;
-- *-solaris*)
-+ xxx*-solaris*)
- # These compiler/linker flags work with both Sun Studio and gcc
- # Sun Studio expands -mt to -D_REENTRANT and -lthread
- # gcc expands -pthreads to -D_REENTRANT -D_PTHREADS -lpthread
diff --git a/dev-libs/glib/files/glib-2.32.2-solaris-libelf.patch b/dev-libs/glib/files/glib-2.32.2-solaris-libelf.patch
deleted file mode 100644
index 3fbeb4283c..0000000000
--- a/dev-libs/glib/files/glib-2.32.2-solaris-libelf.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugzilla.gnome.org/show_bug.cgi?id=675743
-http://git.gnome.org/browse/glib/commit/?id=431d3adacdd640141f83a6c3496760adc6aba5eb
-
-system libelf is not sufficient for glib (lacks elf_getshdrstrndx and
-elf_getshdrnum) so let's make sure we don't define HAVE_LIBELF
-
---- configure.ac
-+++ configure.ac
-@@ -1821,10 +1821,10 @@
- PKG_CHECK_MODULES([LIBELF], [libelf], [have_libelf=yes], [have_libelf=maybe])
-
- if test $have_libelf = maybe; then
-- AC_CHECK_LIB([elf], [elf_begin], , [have_libelf=no])
-- AC_CHECK_LIB([elf], [elf_getshdrstrndx], , [have_libelf=no])
-- AC_CHECK_LIB([elf], [elf_getshdrnum], , [have_libelf=no])
-- AC_CHECK_HEADER([libelf.h], , [have_libelf=no])
-+ AC_CHECK_LIB([elf], [elf_begin], [:], [have_libelf=no])
-+ AC_CHECK_LIB([elf], [elf_getshdrstrndx], [:], [have_libelf=no])
-+ AC_CHECK_LIB([elf], [elf_getshdrnum], [:], [have_libelf=no])
-+ AC_CHECK_HEADER([libelf.h], [:], [have_libelf=no])
-
- if test $have_libelf != no; then
- LIBELF_LIBS=-lelf
diff --git a/dev-libs/glib/files/glib-2.32.3-solaris-libelf.patch b/dev-libs/glib/files/glib-2.32.3-solaris-libelf.patch
deleted file mode 100644
index df1ff1271e..0000000000
--- a/dev-libs/glib/files/glib-2.32.3-solaris-libelf.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugzilla.gnome.org/show_bug.cgi?id=675743
-http://git.gnome.org/browse/glib/commit/?id=431d3adacdd640141f83a6c3496760adc6aba5eb
-
-system libelf is not sufficient for glib (lacks elf_getshdrstrndx and
-elf_getshdrnum) so let's make sure we don't define HAVE_LIBELF
-
---- glib-2.32.3/configure.ac
-+++ glib-2.32.3/configure.ac
-@@ -1822,10 +1822,10 @@
-
- if test $have_libelf = maybe; then
- glib_save_LIBS=$LIBS
-- AC_CHECK_LIB([elf], [elf_begin], , [have_libelf=no])
-- AC_CHECK_LIB([elf], [elf_getshdrstrndx], , [have_libelf=no])
-- AC_CHECK_LIB([elf], [elf_getshdrnum], , [have_libelf=no])
-- AC_CHECK_HEADER([libelf.h], , [have_libelf=no])
-+ AC_CHECK_LIB([elf], [elf_begin], [:], [have_libelf=no])
-+ AC_CHECK_LIB([elf], [elf_getshdrstrndx], [:], [have_libelf=no])
-+ AC_CHECK_LIB([elf], [elf_getshdrnum], [:], [have_libelf=no])
-+ AC_CHECK_HEADER([libelf.h], [:], [have_libelf=no])
- LIBS=$glib_save_LIBS
-
- if test $have_libelf != no; then
diff --git a/dev-libs/glib/files/glib-2.32.4-CVE-2012-3524.patch b/dev-libs/glib/files/glib-2.32.4-CVE-2012-3524.patch
deleted file mode 100644
index 92e6c8125e..0000000000
--- a/dev-libs/glib/files/glib-2.32.4-CVE-2012-3524.patch
+++ /dev/null
@@ -1,247 +0,0 @@
-From 4c2928a54482913cf236bff0e66650a8f47e17ea Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Wed, 22 Aug 2012 18:26:11 +0000
-Subject: CVE-2012-3524: Hardening for being run in a setuid environment
-
-Some programs attempt to use libglib (or even libgio) when setuid.
-For a long time, GTK+ simply aborted if launched in this
-configuration, but we never had a real policy for GLib.
-
-I'm not sure whether we should advertise such support. However, given
-that there are real-world programs that do this currently, we can make
-them safer with not too much effort.
-
-Better to fix a problem caused by an interaction between two
-components in *both* places if possible.
-
-This patch adds a private function g_check_setuid() which is used to
-first ensure we don't run an external dbus-launch binary if
-DBUS_SESSION_BUS_ADDRESS isn't set.
-
-Second, we also ensure the local VFS is used in this case. The
-gdaemonvfs extension point will end up talking to the session bus
-which is typically undesirable in a setuid context.
-
-Implementing g_check_setuid() is interesting - whether or not we're
-running in a privilege-escalated path is operating system specific.
-Note that GTK+'s code to check euid versus uid worked historically on
-Unix, more modern systems have filesystem capabilities and SELinux
-domain transitions, neither of which are captured by the uid
-comparison.
-
-On Linux/glibc, the way this works is that the kernel sets an
-AT_SECURE flag in the ELF auxiliary vector, and glibc looks for it on
-startup. If found, then glibc sets a public-but-undocumented
-__libc_enable_secure variable which we can use. Unfortunately, while
-it *previously* worked to check this variable, a combination of newer
-binutils and RPM break it:
-http://www.openwall.com/lists/owl-dev/2012/08/14/1
-
-So for now on Linux/glibc, we fall back to the historical Unix version
-until we get glibc fixed.
-
-On some BSD variants, there is a issetugid() function. On other Unix
-variants, we fall back to what GTK+ has been doing.
-
-Reported-By: Sebastian Krahmer <krahmer@suse.de>
-Signed-off-by: Colin Walters <walters@verbum.org>
----
-diff --git a/configure.ac b/configure.ac
-index 584df1d..67ea1a9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -583,9 +583,20 @@ AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
- # Checks for library functions.
- AC_FUNC_VPRINTF
- AC_FUNC_ALLOCA
--AC_CHECK_FUNCS(mmap posix_memalign memalign valloc fsync pipe2)
-+AC_CHECK_FUNCS(mmap posix_memalign memalign valloc fsync pipe2 issetugid)
- AC_CHECK_FUNCS(atexit on_exit timegm gmtime_r)
-
-+AC_CACHE_CHECK([for __libc_enable_secure], glib_cv_have_libc_enable_secure,
-+ [AC_TRY_LINK([#include <unistd.h>
-+ extern int __libc_enable_secure;],
-+ [return __libc_enable_secure;],
-+ glib_cv_have_libc_enable_secure=yes,
-+ glib_cv_have_libc_enable_secure=no)])
-+AS_IF([test x$glib_cv_have_libc_enable_secure = xyes], [
-+ AC_DEFINE(HAVE_LIBC_ENABLE_SECURE, 1,
-+ [Define if you have the __libc_enable_secure variable (GNU libc, eglibc)])
-+])
-+
- AC_CHECK_SIZEOF(char)
- AC_CHECK_SIZEOF(short)
- AC_CHECK_SIZEOF(long)
-@@ -984,7 +995,7 @@ AC_MSG_RESULT(unsigned $glib_size_type)
-
- # Check for some functions
- AC_CHECK_FUNCS(lstat strerror strsignal memmove vsnprintf stpcpy strcasecmp strncasecmp poll getcwd vasprintf setenv unsetenv getc_unlocked readlink symlink fdwalk memmem)
--AC_CHECK_FUNCS(chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid)
-+AC_CHECK_FUNCS(chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid)
- AC_CHECK_FUNCS(getmntent_r setmntent endmntent hasmntopt getfsstat getvfsstat)
- # Check for high-resolution sleep functions
- AC_CHECK_FUNCS(splice)
-diff --git a/gio/gdbusaddress.c b/gio/gdbusaddress.c
-index 4aa13b9..96b6343 100644
---- a/gio/gdbusaddress.c
-+++ b/gio/gdbusaddress.c
-@@ -37,6 +37,7 @@
- #include "giostream.h"
- #include "gasyncresult.h"
- #include "gsimpleasyncresult.h"
-+#include "glib-private.h"
- #include "gdbusprivate.h"
- #include "giomodule-priv.h"
- #include "gdbusdaemon.h"
-@@ -1023,6 +1024,14 @@ get_session_address_dbus_launch (GError **error)
- restore_dbus_verbose = FALSE;
- old_dbus_verbose = NULL;
-
-+ /* Don't run binaries as root if we're setuid. */
-+ if (GLIB_PRIVATE_CALL (g_check_setuid) ())
-+ {
-+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-+ _("Cannot spawn a message bus when setuid"));
-+ goto out;
-+ }
-+
- machine_id = _g_dbus_get_machine_id (error);
- if (machine_id == NULL)
- {
-diff --git a/gio/gvfs.c b/gio/gvfs.c
-index dda8afb..9afbcec 100644
---- a/gio/gvfs.c
-+++ b/gio/gvfs.c
-@@ -23,6 +23,7 @@
- #include "config.h"
- #include <string.h>
- #include "gvfs.h"
-+#include "glib-private.h"
- #include "glocalvfs.h"
- #include "gresourcefile.h"
- #include "giomodule-priv.h"
-@@ -191,6 +192,8 @@ g_vfs_parse_name (GVfs *vfs,
- GVfs *
- g_vfs_get_default (void)
- {
-+ if (GLIB_PRIVATE_CALL (g_check_setuid) ())
-+ return g_vfs_get_local ();
- return _g_io_module_get_default (G_VFS_EXTENSION_POINT_NAME,
- "GIO_USE_VFS",
- (GIOModuleVerifyFunc)g_vfs_is_active);
-diff --git a/glib/genviron.c b/glib/genviron.c
-index 59a8bbe..9525cf0 100644
---- a/glib/genviron.c
-+++ b/glib/genviron.c
-@@ -40,6 +40,7 @@
- #include <windows.h>
- #endif
-
-+#include "glib-private.h"
- #include "gmem.h"
- #include "gmessages.h"
- #include "gstrfuncs.h"
-diff --git a/glib/glib-private.c b/glib/glib-private.c
-index 3946e77..3506782 100644
---- a/glib/glib-private.c
-+++ b/glib/glib-private.c
-@@ -38,7 +38,9 @@ glib__private__ (void)
- g_wakeup_signal,
- g_wakeup_acknowledge,
-
-- g_get_worker_context
-+ g_get_worker_context,
-+
-+ g_check_setuid
- };
-
- return &table;
-diff --git a/glib/glib-private.h b/glib/glib-private.h
-index fde0be8..87da6f3 100644
---- a/glib/glib-private.h
-+++ b/glib/glib-private.h
-@@ -25,6 +25,8 @@
-
- G_GNUC_INTERNAL
- GMainContext * g_get_worker_context (void);
-+G_GNUC_INTERNAL
-+gboolean g_check_setuid (void);
-
- #define GLIB_PRIVATE_CALL(symbol) (glib__private__()->symbol)
-
-@@ -40,6 +42,8 @@ typedef struct {
- /* See gmain.c */
- GMainContext * (* g_get_worker_context) (void);
- /* Add other private functions here, initialize them in glib-private.c */
-+
-+ gboolean (* g_check_setuid) (void);
- } GLibPrivateVTable;
-
- GLibPrivateVTable *glib__private__ (void);
-diff --git a/glib/gutils.c b/glib/gutils.c
-index 38b5e44..f8a38d1 100644
---- a/glib/gutils.c
-+++ b/glib/gutils.c
-@@ -2409,3 +2409,60 @@ g_get_tmp_dir (void)
- }
-
- #endif
-+
-+/* Private API:
-+ *
-+ * Returns %TRUE if the current process was executed as setuid (or an
-+ * equivalent __libc_enable_secure is available). See:
-+ * http://osdir.com/ml/linux.lfs.hardened/2007-04/msg00032.html
-+ */
-+gboolean
-+g_check_setuid (void)
-+{
-+ /* TODO: get __libc_enable_secure exported from glibc.
-+ * See http://www.openwall.com/lists/owl-dev/2012/08/14/1
-+ */
-+#if 0 && defined(HAVE_LIBC_ENABLE_SECURE)
-+ {
-+ /* See glibc/include/unistd.h */
-+ extern int __libc_enable_secure;
-+ return __libc_enable_secure;
-+ }
-+#elif defined(HAVE_ISSETUGID)
-+ /* BSD: http://www.freebsd.org/cgi/man.cgi?query=issetugid&sektion=2 */
-+ return issetugid ();
-+#elif defined(G_OS_UNIX)
-+ uid_t ruid, euid, suid; /* Real, effective and saved user ID's */
-+ gid_t rgid, egid, sgid; /* Real, effective and saved group ID's */
-+
-+ static gsize check_setuid_initialised;
-+ static gboolean is_setuid;
-+
-+ if (g_once_init_enter (&check_setuid_initialised))
-+ {
-+#ifdef HAVE_GETRESUID
-+ /* These aren't in the header files, so we prototype them here.
-+ */
-+ int getresuid(uid_t *ruid, uid_t *euid, uid_t *suid);
-+ int getresgid(gid_t *rgid, gid_t *egid, gid_t *sgid);
-+
-+ if (getresuid (&ruid, &euid, &suid) != 0 ||
-+ getresgid (&rgid, &egid, &sgid) != 0)
-+#endif /* HAVE_GETRESUID */
-+ {
-+ suid = ruid = getuid ();
-+ sgid = rgid = getgid ();
-+ euid = geteuid ();
-+ egid = getegid ();
-+ }
-+
-+ is_setuid = (ruid != euid || ruid != suid ||
-+ rgid != egid || rgid != sgid);
-+
-+ g_once_init_leave (&check_setuid_initialised, 1);
-+ }
-+ return is_setuid;
-+#else
-+ return FALSE;
-+#endif
-+}
---
-cgit v0.9.0.2
diff --git a/dev-libs/glib/files/glib-2.32.4-bashcomp.patch b/dev-libs/glib/files/glib-2.32.4-bashcomp.patch
deleted file mode 100644
index 33abffcf7d..0000000000
--- a/dev-libs/glib/files/glib-2.32.4-bashcomp.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 6d032421b4871105e1f37bb75a5ec7b012f19f61 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 15 Jul 2012 22:30:07 -0400
-Subject: [PATCH] gio: use /usr/share/bash-completion for bashcomp
-
-In Gentoo, we use /usr/share/bash-completion, not
-/usr/share/bash-completion/completions.
----
- gio/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/gio/Makefile.am b/gio/Makefile.am
-index 704367c..bee9dc6 100644
---- a/gio/Makefile.am
-+++ b/gio/Makefile.am
-@@ -715,7 +715,7 @@ gdbus_LDADD = libgio-2.0.la \
- $(top_builddir)/glib/libglib-2.0.la \
- $(top_builddir)/gobject/libgobject-2.0.la
-
--completiondir = $(datadir)/bash-completion/completions
-+completiondir = $(datadir)/bash-completion
- completion_DATA = \
- completion/gdbus \
- completion/gsettings \
---
-1.7.8.6
-
diff --git a/dev-libs/glib/files/glib-2.32.4-interix.patch b/dev-libs/glib/files/glib-2.32.4-interix.patch
deleted file mode 100644
index da854d6234..0000000000
--- a/dev-libs/glib/files/glib-2.32.4-interix.patch
+++ /dev/null
@@ -1,713 +0,0 @@
-https://bugzilla.gnome.org/show_bug.cgi?id=652285
-
-refreshed by David Holm in bug #435382
-
-diff -Naur glib-2.32.4.orig/acinclude.m4 glib-2.32.4/acinclude.m4
---- glib-2.32.4.orig/acinclude.m4 2012-09-15 21:56:20 +0200
-+++ glib-2.32.4/acinclude.m4 2012-09-15 21:57:49 +0200
-@@ -254,9 +254,13 @@
-
- AC_DEFUN([gt_TYPE_LONGDOUBLE],
- [
-+ AC_REQUIRE([AC_CANONICAL_HOST])
- AC_CACHE_CHECK([for long double], gt_cv_c_long_double,
- [if test "$GCC" = yes; then
-- gt_cv_c_long_double=yes
-+ case "$host" in
-+ *-interix*) gt_cv_c_long_double=no ;;
-+ *) gt_cv_c_long_double=yes ;;
-+ esac
- else
- AC_TRY_COMPILE([
- /* The Stardent Vistra knows sizeof(long double), but does not support it. */
-diff -Naur glib-2.32.4.orig/configure.ac glib-2.32.4/configure.ac
---- glib-2.32.4.orig/configure.ac 2012-09-15 21:56:23 +0200
-+++ glib-2.32.4/configure.ac 2012-09-15 22:00:07 +0200
-@@ -989,6 +989,10 @@
- # Check for high-resolution sleep functions
- AC_CHECK_FUNCS(splice)
- AC_CHECK_FUNCS(prlimit)
-+AC_CHECK_FUNCS(nanosleep usleep)
-+AC_CHECK_FUNCS(sendmsg recvmsg)
-+
-+AC_CHECK_TYPE([struct sockaddr_storage])
-
- # To avoid finding a compatibility unusable statfs, which typically
- # successfully compiles, but warns to use the newer statvfs interface:
-@@ -1039,8 +1043,10 @@
- fi
-
- glib_failed=false
-+glib_def_af_inet6=1
- GLIB_CHECK_VALUE(AF_INET, $glib_inet_includes, glib_failed=true)
--GLIB_CHECK_VALUE(AF_INET6, $glib_inet_includes, glib_failed=true)
-+# support systems without AF_INET6 (for example Interix 3.5 and 5.2)
-+GLIB_CHECK_VALUE(AF_INET6, $glib_inet_includes, glib_def_af_inet6=0)
- # winsock defines this even though it doesn't support it
- GLIB_CHECK_VALUE(AF_UNIX, $glib_inet_includes, glib_failed=true)
- if $glib_failed ; then
-@@ -1991,6 +1997,10 @@
- *-*-cygwin*|*-*-darwin*)
- # skip cygwin and darwin -pthread or -pthreads test
- ;;
-+ *-interix*)
-+ G_THREAD_CFLAGS="-D_REENTRANT"
-+ G_THREAD_LIBS="-lpthread"
-+ ;;
- xxx*-solaris*)
- # These compiler/linker flags work with both Sun Studio and gcc
- # Sun Studio expands -mt to -D_REENTRANT and -lthread
-@@ -3060,7 +3070,9 @@
-
- #define GLIB_SYSDEF_AF_UNIX $g_af_unix
- #define GLIB_SYSDEF_AF_INET $g_af_inet
--#define GLIB_SYSDEF_AF_INET6 $g_af_inet6
-+#if $g_def_af_inet6
-+# define GLIB_SYSDEF_AF_INET6 $g_af_inet6
-+#endif
-
- #define GLIB_SYSDEF_MSG_OOB $g_msg_oob
- #define GLIB_SYSDEF_MSG_PEEK $g_msg_peek
-@@ -3378,6 +3390,7 @@
- fi
- g_af_inet=$glib_cv_value_AF_INET
- g_af_inet6=$glib_cv_value_AF_INET6
-+g_def_af_inet6=$glib_def_af_inet6
-
- g_msg_peek=$glib_cv_value_MSG_PEEK
- g_msg_oob=$glib_cv_value_MSG_OOB
-diff -Naur glib-2.32.4.orig/gio/ginetaddress.c glib-2.32.4/gio/ginetaddress.c
---- glib-2.32.4.orig/gio/ginetaddress.c 2012-09-15 21:56:30 +0200
-+++ glib-2.32.4/gio/ginetaddress.c 2012-09-15 21:57:49 +0200
-@@ -77,7 +77,9 @@
- GSocketFamily family;
- union {
- struct in_addr ipv4;
-+#ifdef AF_INET6
- struct in6_addr ipv6;
-+#endif
- } addr;
- };
-
-@@ -114,9 +116,11 @@
-
- case PROP_BYTES:
- memcpy (&address->priv->addr, g_value_get_pointer (value),
-- address->priv->family == AF_INET ?
-- sizeof (address->priv->addr.ipv4) :
-- sizeof (address->priv->addr.ipv6));
-+#ifdef AF_INET6
-+ address->priv->family == AF_INET6 ?
-+ sizeof (address->priv->addr.ipv6) :
-+#endif
-+ sizeof (address->priv->addr.ipv4));
- break;
-
- default:
-@@ -409,7 +413,9 @@
- gint len;
- #else /* !G_OS_WIN32 */
- struct in_addr in_addr;
-+#ifdef AF_INET6
- struct in6_addr in6_addr;
-+#endif /* AF_INET6 */
- #endif
-
- /* Make sure _g_networking_init() has been called */
-@@ -428,14 +434,20 @@
-
- if (inet_pton (AF_INET, string, &in_addr) > 0)
- return g_inet_address_new_from_bytes ((guint8 *)&in_addr, AF_INET);
-+#ifdef AF_INET6
- else if (inet_pton (AF_INET6, string, &in6_addr) > 0)
- return g_inet_address_new_from_bytes ((guint8 *)&in6_addr, AF_INET6);
-+#endif /* AF_INET6 */
- #endif
-
- return NULL;
- }
-
--#define G_INET_ADDRESS_FAMILY_IS_VALID(family) ((family) == AF_INET || (family) == AF_INET6)
-+#ifdef AF_INET6
-+# define G_INET_ADDRESS_FAMILY_IS_VALID(family) ((family) == AF_INET || (family) == AF_INET6)
-+#else
-+# define G_INET_ADDRESS_FAMILY_IS_VALID(family) ((family) == AF_INET)
-+#endif
-
- /**
- * g_inet_address_new_from_bytes:
-@@ -478,14 +490,16 @@
- {
- g_return_val_if_fail (G_INET_ADDRESS_FAMILY_IS_VALID (family), NULL);
-
-- if (family == AF_INET)
-+#ifdef AF_INET6
-+ if (family == AF_INET6)
-+ return g_inet_address_new_from_bytes (in6addr_loopback.s6_addr, family);
-+ else
-+#endif
- {
- guint8 addr[4] = {127, 0, 0, 1};
-
- return g_inet_address_new_from_bytes (addr, family);
- }
-- else
-- return g_inet_address_new_from_bytes (in6addr_loopback.s6_addr, family);
- }
-
- /**
-@@ -505,14 +519,16 @@
- {
- g_return_val_if_fail (G_INET_ADDRESS_FAMILY_IS_VALID (family), NULL);
-
-- if (family == AF_INET)
-+#ifdef AF_INET6
-+ if (family == AF_INET6)
-+ return g_inet_address_new_from_bytes (in6addr_any.s6_addr, family);
-+ else
-+#endif
- {
- guint8 addr[4] = {0, 0, 0, 0};
-
- return g_inet_address_new_from_bytes (addr, family);
- }
-- else
-- return g_inet_address_new_from_bytes (in6addr_any.s6_addr, family);
- }
-
-
-@@ -561,10 +577,12 @@
-
- #else /* !G_OS_WIN32 */
-
-- if (address->priv->family == AF_INET)
-- inet_ntop (AF_INET, &address->priv->addr.ipv4, buffer, sizeof (buffer));
-- else
-+#ifdef AF_INET6
-+ if (address->priv->family == AF_INET6)
- inet_ntop (AF_INET6, &address->priv->addr.ipv6, buffer, sizeof (buffer));
-+ else
-+#endif /* AF_INET6 */
-+ inet_ntop (AF_INET, &address->priv->addr.ipv4, buffer, sizeof (buffer));
- #endif
-
- return g_strdup (buffer);
-@@ -604,9 +622,11 @@
- gsize
- g_inet_address_get_native_size (GInetAddress *address)
- {
-- if (address->priv->family == AF_INET)
-- return sizeof (address->priv->addr.ipv4);
-- return sizeof (address->priv->addr.ipv6);
-+#ifdef AF_INET6
-+ if (address->priv->family == AF_INET6)
-+ return sizeof (address->priv->addr.ipv6);
-+#endif
-+ return sizeof (address->priv->addr.ipv4);
- }
-
- /**
-@@ -642,14 +662,16 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-- if (address->priv->family == AF_INET)
-+#ifdef AF_INET6
-+ if (address->priv->family == AF_INET6)
-+ return IN6_IS_ADDR_UNSPECIFIED (&address->priv->addr.ipv6);
-+ else
-+#endif
- {
- guint32 addr4 = g_ntohl (address->priv->addr.ipv4.s_addr);
-
- return addr4 == INADDR_ANY;
- }
-- else
-- return IN6_IS_ADDR_UNSPECIFIED (&address->priv->addr.ipv6);
- }
-
- /**
-@@ -667,15 +689,17 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-- if (address->priv->family == AF_INET)
-+#ifdef AF_INET6
-+ if (address->priv->family == AF_INET6)
-+ return IN6_IS_ADDR_LOOPBACK (&address->priv->addr.ipv6);
-+ else
-+#endif
- {
- guint32 addr4 = g_ntohl (address->priv->addr.ipv4.s_addr);
-
- /* 127.0.0.0/8 */
- return ((addr4 & 0xff000000) == 0x7f000000);
- }
-- else
-- return IN6_IS_ADDR_LOOPBACK (&address->priv->addr.ipv6);
- }
-
- /**
-@@ -695,15 +719,17 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-- if (address->priv->family == AF_INET)
-+#ifdef AF_INET6
-+ if (address->priv->family == AF_INET6)
-+ return IN6_IS_ADDR_LINKLOCAL (&address->priv->addr.ipv6);
-+ else
-+#endif
- {
- guint32 addr4 = g_ntohl (address->priv->addr.ipv4.s_addr);
-
- /* 169.254.0.0/16 */
- return ((addr4 & 0xffff0000) == 0xa9fe0000);
- }
-- else
-- return IN6_IS_ADDR_LINKLOCAL (&address->priv->addr.ipv6);
- }
-
- /**
-@@ -724,7 +750,11 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-- if (address->priv->family == AF_INET)
-+#ifdef AF_INET6
-+ if (address->priv->family == AF_INET6)
-+ return IN6_IS_ADDR_SITELOCAL (&address->priv->addr.ipv6);
-+ else
-+#endif
- {
- guint32 addr4 = g_ntohl (address->priv->addr.ipv4.s_addr);
-
-@@ -733,8 +763,6 @@
- (addr4 & 0xfff00000) == 0xac100000 ||
- (addr4 & 0xffff0000) == 0xc0a80000);
- }
-- else
-- return IN6_IS_ADDR_SITELOCAL (&address->priv->addr.ipv6);
- }
-
- /**
-@@ -752,14 +780,16 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-- if (address->priv->family == AF_INET)
-+#ifdef AF_INET6
-+ if (address->priv->family == AF_INET6)
-+ return IN6_IS_ADDR_MULTICAST (&address->priv->addr.ipv6);
-+ else
-+#endif
- {
- guint32 addr4 = g_ntohl (address->priv->addr.ipv4.s_addr);
-
- return IN_MULTICAST (addr4);
- }
-- else
-- return IN6_IS_ADDR_MULTICAST (&address->priv->addr.ipv6);
- }
-
- /**
-@@ -777,10 +807,12 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-- if (address->priv->family == AF_INET)
-- return FALSE;
-- else
-+#ifdef AF_INET6
-+ if (address->priv->family == AF_INET6)
- return IN6_IS_ADDR_MC_GLOBAL (&address->priv->addr.ipv6);
-+ else
-+#endif
-+ return FALSE;
- }
-
- /**
-@@ -798,10 +830,12 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-- if (address->priv->family == AF_INET)
-- return FALSE;
-- else
-+#ifdef AF_INET6
-+ if (address->priv->family == AF_INET6)
- return IN6_IS_ADDR_MC_LINKLOCAL (&address->priv->addr.ipv6);
-+ else
-+#endif
-+ return FALSE;
- }
-
- /**
-@@ -819,10 +853,12 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-- if (address->priv->family == AF_INET)
-- return FALSE;
-- else
-+#ifdef AF_INET6
-+ if (address->priv->family == AF_INET6)
- return IN6_IS_ADDR_MC_NODELOCAL (&address->priv->addr.ipv6);
-+ else
-+#endif
-+ return FALSE;
- }
-
- /**
-@@ -840,10 +876,12 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-- if (address->priv->family == AF_INET)
-- return FALSE;
-- else
-+#ifdef AF_INET6
-+ if (address->priv->family == AF_INET6)
- return IN6_IS_ADDR_MC_ORGLOCAL (&address->priv->addr.ipv6);
-+ else
-+#endif
-+ return FALSE;
- }
-
- /**
-@@ -861,10 +899,12 @@
- {
- g_return_val_if_fail (G_IS_INET_ADDRESS (address), FALSE);
-
-- if (address->priv->family == AF_INET)
-- return FALSE;
-- else
-+#ifdef AF_INET6
-+ if (address->priv->family == AF_INET6)
- return IN6_IS_ADDR_MC_SITELOCAL (&address->priv->addr.ipv6);
-+ else
-+#endif
-+ return FALSE;
- }
-
- /**
-diff -Naur glib-2.32.4.orig/gio/ginetsocketaddress.c glib-2.32.4/gio/ginetsocketaddress.c
---- glib-2.32.4.orig/gio/ginetsocketaddress.c 2012-09-15 21:56:30 +0200
-+++ glib-2.32.4/gio/ginetsocketaddress.c 2012-09-15 21:57:49 +0200
-@@ -176,8 +176,10 @@
-
- if (family == AF_INET)
- return sizeof (struct sockaddr_in);
-+#ifdef AF_INET6
- else if (family == AF_INET6)
- return sizeof (struct sockaddr_in6);
-+#endif
- else
- return -1;
- }
-@@ -213,6 +215,7 @@
- memset (sock->sin_zero, 0, sizeof (sock->sin_zero));
- return TRUE;
- }
-+#ifdef AF_INET6
- else if (family == AF_INET6)
- {
- struct sockaddr_in6 *sock = (struct sockaddr_in6 *) dest;
-@@ -232,6 +235,7 @@
- memcpy (&(sock->sin6_addr.s6_addr), g_inet_address_to_bytes (addr->priv->address), sizeof (sock->sin6_addr));
- return TRUE;
- }
-+#endif
- else
- {
- g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-diff -Naur glib-2.32.4.orig/gio/gioenums.h glib-2.32.4/gio/gioenums.h
---- glib-2.32.4.orig/gio/gioenums.h 2012-09-15 21:56:30 +0200
-+++ glib-2.32.4/gio/gioenums.h 2012-09-15 21:57:49 +0200
-@@ -689,7 +689,9 @@
- G_SOCKET_FAMILY_INVALID,
- G_SOCKET_FAMILY_UNIX = GLIB_SYSDEF_AF_UNIX,
- G_SOCKET_FAMILY_IPV4 = GLIB_SYSDEF_AF_INET,
-+#ifdef GLIB_SYSDEF_AF_INET6
- G_SOCKET_FAMILY_IPV6 = GLIB_SYSDEF_AF_INET6
-+#endif
- } GSocketFamily;
-
- /**
-diff -Naur glib-2.32.4.orig/gio/gioenumtypes.c glib-2.32.4/gio/gioenumtypes.c
---- glib-2.32.4.orig/gio/gioenumtypes.c 2012-09-15 21:56:30 +0200
-+++ glib-2.32.4/gio/gioenumtypes.c 2012-09-15 21:57:49 +0200
-@@ -705,7 +705,9 @@
- { G_SOCKET_FAMILY_INVALID, "G_SOCKET_FAMILY_INVALID", "invalid" },
- { G_SOCKET_FAMILY_UNIX, "G_SOCKET_FAMILY_UNIX", "unix" },
- { G_SOCKET_FAMILY_IPV4, "G_SOCKET_FAMILY_IPV4", "ipv4" },
-+#ifdef G_SOCKET_FAMILY_IPV6
- { G_SOCKET_FAMILY_IPV6, "G_SOCKET_FAMILY_IPV6", "ipv6" },
-+#endif
- { 0, NULL, NULL }
- };
- GType g_define_type_id =
-diff -Naur glib-2.32.4.orig/gio/gnetworkingprivate.h glib-2.32.4/gio/gnetworkingprivate.h
---- glib-2.32.4.orig/gio/gnetworkingprivate.h 2012-09-15 21:56:31 +0200
-+++ glib-2.32.4/gio/gnetworkingprivate.h 2012-09-15 21:57:49 +0200
-@@ -41,6 +41,7 @@
- #else /* !G_OS_WIN32 */
-
- #include <sys/types.h>
-+#include <netinet/in.h>
-
- #include <netdb.h>
- #include <netinet/in.h>
-@@ -59,10 +60,19 @@
- #define T_SRV 33
- #endif
-
-+#ifndef INET6_ADDRSTRLEN
-+#define INET6_ADDRSTRLEN 46
-+#endif
-+
- #ifndef _PATH_RESCONF
- #define _PATH_RESCONF "/etc/resolv.conf"
- #endif
-
-+#ifndef HAVE_SOCKADDR_STORAGE
-+# define sockaddr_storage sockaddr
-+# define ss_family sa_family
-+#endif
-+
- #ifndef CMSG_LEN
- /* CMSG_LEN and CMSG_SPACE are defined by RFC 2292, but missing on
- * some older platforms.
-diff -Naur glib-2.32.4.orig/gio/gsocket.c glib-2.32.4/gio/gsocket.c
---- glib-2.32.4.orig/gio/gsocket.c 2012-09-15 21:56:31 +0200
-+++ glib-2.32.4/gio/gsocket.c 2012-09-15 21:57:49 +0200
-@@ -410,7 +410,9 @@
- switch (family)
- {
- case G_SOCKET_FAMILY_IPV4:
-+#ifdef G_SOCKET_FAMILY_IPV6
- case G_SOCKET_FAMILY_IPV6:
-+#endif
- socket->priv->family = address.ss_family;
- switch (socket->priv->type)
- {
-@@ -2086,6 +2088,7 @@
- case G_SOCKET_FAMILY_IPV4:
- return TRUE;
-
-+#ifdef G_SOCKET_FAMILY_IPV6
- case G_SOCKET_FAMILY_IPV6:
- #if defined (IPPROTO_IPV6) && defined (IPV6_V6ONLY)
- {
-@@ -2102,6 +2105,7 @@
- #else
- return FALSE;
- #endif
-+#endif /* G_SOCKET_FAMILY_IPV6 */
-
- default:
- return FALSE;
-@@ -3697,6 +3701,7 @@
- }
-
- #ifndef G_OS_WIN32
-+#ifdef HAVE_SENDMSG
- {
- struct msghdr msg;
- gssize result;
-@@ -3808,6 +3813,13 @@
-
- return result;
- }
-+#else /* HAVE_SENDMSG */
-+ {
-+ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-+ _("g_socket_send_message not supported"));
-+ return -1;
-+ }
-+#endif /* !HAVE_SENDMSG */
- #else
- {
- struct sockaddr_storage addr;
-@@ -4009,6 +4021,7 @@
- }
-
- #ifndef G_OS_WIN32
-+#ifdef HAVE_RECVMSG
- {
- struct msghdr msg;
- gssize result;
-@@ -4181,6 +4194,13 @@
-
- return result;
- }
-+#else /* HAVE_RECVMSG */
-+ {
-+ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-+ _("g_socket_receive_message not supported"));
-+ return -1;
-+ }
-+#endif /* !HAVE_RECVMSG */
- #else
- {
- struct sockaddr_storage addr;
-diff -Naur glib-2.32.4.orig/gio/gsocketaddress.c glib-2.32.4/gio/gsocketaddress.c
---- glib-2.32.4.orig/gio/gsocketaddress.c 2012-09-15 21:56:31 +0200
-+++ glib-2.32.4/gio/gsocketaddress.c 2012-09-15 21:57:49 +0200
-@@ -233,6 +233,7 @@
- return sockaddr;
- }
-
-+#ifdef AF_INET6
- if (family == AF_INET6)
- {
- struct sockaddr_in6 *addr = (struct sockaddr_in6 *) native;
-@@ -265,6 +266,7 @@
- g_object_unref (iaddr);
- return sockaddr;
- }
-+#endif
-
- #ifdef G_OS_UNIX
- if (family == AF_UNIX)
-diff -Naur glib-2.32.4.orig/gio/gsocketlistener.c glib-2.32.4/gio/gsocketlistener.c
---- glib-2.32.4.orig/gio/gsocketlistener.c 2012-09-15 21:56:31 +0200
-+++ glib-2.32.4/gio/gsocketlistener.c 2012-09-15 21:57:49 +0200
-@@ -368,7 +368,7 @@
- {
- gboolean need_ipv4_socket = TRUE;
- GSocket *socket4 = NULL;
-- GSocket *socket6;
-+ GSocket *socket6 = NULL;
-
- g_return_val_if_fail (listener != NULL, FALSE);
- g_return_val_if_fail (port != 0, FALSE);
-@@ -376,6 +376,7 @@
- if (!check_listener (listener, error))
- return FALSE;
-
-+#ifdef G_SOCKET_FAMILY_IPV6
- /* first try to create an IPv6 socket */
- socket6 = g_socket_new (G_SOCKET_FAMILY_IPV6,
- G_SOCKET_TYPE_STREAM,
-@@ -419,6 +420,7 @@
- if (g_socket_speaks_ipv4 (socket6))
- need_ipv4_socket = FALSE;
- }
-+#endif
-
- if (need_ipv4_socket)
- /* We are here for exactly one of the following reasons:
-@@ -976,6 +978,7 @@
- GSocketAddress *address;
- gboolean result;
-
-+#ifdef G_SOCKET_FAMILY_IPV6
- g_assert (socket6 == NULL);
- socket6 = g_socket_new (G_SOCKET_FAMILY_IPV6,
- G_SOCKET_TYPE_STREAM,
-@@ -1007,6 +1010,7 @@
- if (g_socket_speaks_ipv4 (socket6))
- break;
- }
-+#endif
-
- g_assert (socket4 == NULL);
- socket4 = g_socket_new (G_SOCKET_FAMILY_IPV4,
-diff -Naur glib-2.32.4.orig/gio/gtcpconnection.c glib-2.32.4/gio/gtcpconnection.c
---- glib-2.32.4.orig/gio/gtcpconnection.c 2012-09-15 21:56:31 +0200
-+++ glib-2.32.4/gio/gtcpconnection.c 2012-09-15 21:57:49 +0200
-@@ -36,18 +36,22 @@
- G_SOCKET_FAMILY_IPV4,
- G_SOCKET_TYPE_STREAM,
- G_SOCKET_PROTOCOL_DEFAULT);
-+#ifdef G_SOCKET_FAMILY_IPV6
- g_socket_connection_factory_register_type (g_define_type_id,
- G_SOCKET_FAMILY_IPV6,
- G_SOCKET_TYPE_STREAM,
- G_SOCKET_PROTOCOL_DEFAULT);
-+#endif
- g_socket_connection_factory_register_type (g_define_type_id,
- G_SOCKET_FAMILY_IPV4,
- G_SOCKET_TYPE_STREAM,
- G_SOCKET_PROTOCOL_TCP);
-+#ifdef G_SOCKET_FAMILY_IPV6
- g_socket_connection_factory_register_type (g_define_type_id,
- G_SOCKET_FAMILY_IPV6,
- G_SOCKET_TYPE_STREAM,
- G_SOCKET_PROTOCOL_TCP);
-+#endif
- );
-
- static gboolean g_tcp_connection_close (GIOStream *stream,
-diff -Naur glib-2.32.4.orig/gio/gtcpwrapperconnection.c glib-2.32.4/gio/gtcpwrapperconnection.c
---- glib-2.32.4.orig/gio/gtcpwrapperconnection.c 2012-09-15 21:56:31 +0200
-+++ glib-2.32.4/gio/gtcpwrapperconnection.c 2012-09-15 21:57:49 +0200
-@@ -172,8 +172,11 @@
- {
- g_return_val_if_fail (G_IS_IO_STREAM (base_io_stream), NULL);
- g_return_val_if_fail (G_IS_SOCKET (socket), NULL);
-- g_return_val_if_fail (g_socket_get_family (socket) == G_SOCKET_FAMILY_IPV4 ||
-- g_socket_get_family (socket) == G_SOCKET_FAMILY_IPV6, NULL);
-+ g_return_val_if_fail (g_socket_get_family (socket) == G_SOCKET_FAMILY_IPV4
-+#ifdef G_SOCKET_FAMILY_IPV6
-+ || g_socket_get_family (socket) == G_SOCKET_FAMILY_IPV6
-+#endif
-+ , NULL);
- g_return_val_if_fail (g_socket_get_socket_type (socket) == G_SOCKET_TYPE_STREAM, NULL);
-
- return g_object_new (G_TYPE_TCP_WRAPPER_CONNECTION,
-diff -Naur glib-2.32.4.orig/gio/gunixfdmessage.c glib-2.32.4/gio/gunixfdmessage.c
---- glib-2.32.4.orig/gio/gunixfdmessage.c 2012-09-15 21:56:32 +0200
-+++ glib-2.32.4/gio/gunixfdmessage.c 2012-09-15 21:57:49 +0200
-@@ -74,7 +74,11 @@
- static int
- g_unix_fd_message_get_msg_type (GSocketControlMessage *message)
- {
-+#ifdef SCM_RIGHTS
- return SCM_RIGHTS;
-+#else
-+ return -1;
-+#endif
- }
-
- static GSocketControlMessage *
-@@ -83,6 +87,7 @@
- gsize size,
- gpointer data)
- {
-+#ifdef SCM_RIGHTS
- GSocketControlMessage *message;
- GUnixFDList *list;
- gint n, s, i;
-@@ -124,6 +129,9 @@
- g_object_unref (list);
-
- return message;
-+#else
-+ return NULL;
-+#endif
- }
-
- static void
-diff -Naur glib-2.32.4.orig/glib/gtimer.c glib-2.32.4/glib/gtimer.c
---- glib-2.32.4.orig/glib/gtimer.c 2012-09-15 21:56:37 +0200
-+++ glib-2.32.4/glib/gtimer.c 2012-09-15 21:57:49 +0200
-@@ -253,11 +253,17 @@
- #ifdef G_OS_WIN32
- Sleep (microseconds / 1000);
- #else
-+#ifdef HAVE_NANOSLEEP
- struct timespec request, remaining;
- request.tv_sec = microseconds / G_USEC_PER_SEC;
- request.tv_nsec = 1000 * (microseconds % G_USEC_PER_SEC);
- while (nanosleep (&request, &remaining) == -1 && errno == EINTR)
- request = remaining;
-+#elif defined HAVE_USLEEP
-+ usleep(microseconds);
-+#else
-+ #error no sufficient high resolution timer found!
-+#endif
- #endif
- }
-
diff --git a/dev-libs/glib/files/glib-2.32.4-solaris-nsl.patch b/dev-libs/glib/files/glib-2.32.4-solaris-nsl.patch
deleted file mode 100644
index 7fade3e262..0000000000
--- a/dev-libs/glib/files/glib-2.32.4-solaris-nsl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugzilla.gnome.org/show_bug.cgi?id=675550
-
---- glib-2.32.4/configure.ac
-+++ glib-2.32.4/configure.ac
-@@ -1096,6 +1096,8 @@
- AC_CHECK_FUNC(socket, :, AC_CHECK_LIB(socket, socket,
- [NETWORK_LIBS="-lsocket $NETWORK_LIBS"],
- [AC_MSG_ERROR(Could not find socket())]))
-+ AC_CHECK_FUNC(inet_ntop, :, AC_SEARCH_LIBS(inet_ntop, nsl,
-+ [NETWORK_LIBS="-lnsl $NETWORK_LIBS"]))
- ])
- AC_SUBST(NETWORK_LIBS)
-
diff --git a/dev-libs/glib/files/glib-2.34.0-testsuite-skip-gdbus-auth-tests.patch b/dev-libs/glib/files/glib-2.34.0-testsuite-skip-gdbus-auth-tests.patch
deleted file mode 100644
index aff75cbeff..0000000000
--- a/dev-libs/glib/files/glib-2.34.0-testsuite-skip-gdbus-auth-tests.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 6e6aa7de746b78bc5fc6d2cad1cac762f6d2205f Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Tue, 3 Jul 2012 12:50:44 +0300
-Subject: [PATCH] Gentoo: skip over gdbus-auth /gdbus/auth/*/DBUS_COOKIE_SHA1
- tests
-
-https://bugzilla.gnome.org/show_bug.cgi?id=679308
----
- gio/tests/gdbus-auth.c | 9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/gio/tests/gdbus-auth.c b/gio/tests/gdbus-auth.c
-index 737770e..9f42c24 100644
---- a/gio/tests/gdbus-auth.c
-+++ b/gio/tests/gdbus-auth.c
-@@ -89,11 +89,14 @@ auth_client_external (void)
- auth_client_mechanism ("EXTERNAL");
- }
-
-+#if 0
-+// https://bugzilla.gnome.org/show_bug.cgi?id=679308
- static void
- auth_client_dbus_cookie_sha1 (void)
- {
- auth_client_mechanism ("DBUS_COOKIE_SHA1");
- }
-+#endif
-
- /* ---------------------------------------------------------------------------------------------------- */
-
-@@ -250,11 +253,13 @@ auth_server_external (void)
- auth_server_mechanism ("EXTERNAL");
- }
-
-+#if 0
- static void
- auth_server_dbus_cookie_sha1 (void)
- {
- auth_server_mechanism ("DBUS_COOKIE_SHA1");
- }
-+#endif
-
- /* ---------------------------------------------------------------------------------------------------- */
-
-@@ -272,10 +277,14 @@ main (int argc,
- session_bus_up ();
-
- g_test_add_func ("/gdbus/auth/client/EXTERNAL", auth_client_external);
-+#if 0
- g_test_add_func ("/gdbus/auth/client/DBUS_COOKIE_SHA1", auth_client_dbus_cookie_sha1);
-+#endif
- g_test_add_func ("/gdbus/auth/server/ANONYMOUS", auth_server_anonymous);
- g_test_add_func ("/gdbus/auth/server/EXTERNAL", auth_server_external);
-+#if 0
- g_test_add_func ("/gdbus/auth/server/DBUS_COOKIE_SHA1", auth_server_dbus_cookie_sha1);
-+#endif
-
- ret = g_test_run();
-
---
-1.7.8.6
-
diff --git a/dev-libs/glib/files/glib-2.34.0-testsuite-skip-thread4.patch b/dev-libs/glib/files/glib-2.34.0-testsuite-skip-thread4.patch
deleted file mode 100644
index 584b56f41c..0000000000
--- a/dev-libs/glib/files/glib-2.34.0-testsuite-skip-thread4.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 4881b5d303512208b55f5bf78b91cd6a85e5034c Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Tue, 3 Jul 2012 11:21:56 +0300
-Subject: [PATCH 2/4] Gentoo: skip over thread/thread4 test failure
-
-https://bugzilla.gnome.org/show_bug.cgi?id=679306
----
- glib/tests/thread.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/glib/tests/thread.c b/glib/tests/thread.c
-index 539782e..179ec06 100644
---- a/glib/tests/thread.c
-+++ b/glib/tests/thread.c
-@@ -124,6 +124,8 @@ test_thread3 (void)
- g_assert_cmpint (GPOINTER_TO_INT(result), ==, 9);
- }
-
-+#if 0
-+// https://bugzilla.gnome.org/show_bug.cgi?id=679306
- /* test that thread creation fails as expected,
- * by setting RLIMIT_NPROC ridiculously low
- */
-@@ -158,6 +160,7 @@ test_thread4 (void)
- g_error ("resetting RLIMIT_NPROC failed: %s\n", g_strerror (ret));
- #endif
- }
-+#endif
-
- static void
- test_thread5 (void)
-@@ -203,7 +206,9 @@ main (int argc, char *argv[])
- g_test_add_func ("/thread/thread1", test_thread1);
- g_test_add_func ("/thread/thread2", test_thread2);
- g_test_add_func ("/thread/thread3", test_thread3);
-+#if 0
- g_test_add_func ("/thread/thread4", test_thread4);
-+#endif
- g_test_add_func ("/thread/thread5", test_thread5);
- g_test_add_func ("/thread/thread6", test_thread6);
-
---
-1.8.3.2
-
diff --git a/dev-libs/glib/files/glib-2.34.3-automake-1.13.patch b/dev-libs/glib/files/glib-2.34.3-automake-1.13.patch
deleted file mode 100644
index 5f4e7b6bbd..0000000000
--- a/dev-libs/glib/files/glib-2.34.3-automake-1.13.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Replace macros deprecated in automake-1.13; fixed upstream in glib-2.36
-
-diff --git a/configure.ac b/configure.ac
-index a3567b3..3e3d697 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -56,7 +56,7 @@ m4_define([glib_debug_default],
- AC_INIT(glib, [glib_version],
- [http://bugzilla.gnome.org/enter_bug.cgi?product=glib])
-
--AC_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_SRCDIR([glib/glib.h])
- AC_CONFIG_MACRO_DIR([m4macros])
-
-@@ -291,7 +291,6 @@ AC_TRY_COMPILE(,[class a { int b; } c;], ,CXX=)
- AM_CONDITIONAL(HAVE_CXX, [test "$CXX" != ""])
- AC_LANG_RESTORE
-
--AM_PROG_CC_STDC
- AM_PROG_CC_C_O
- AC_PROG_INSTALL
-
diff --git a/dev-libs/glib/files/glib-2.35.x-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.35.x-external-gdbus-codegen.patch
deleted file mode 100644
index a7fb01986e..0000000000
--- a/dev-libs/glib/files/glib-2.35.x-external-gdbus-codegen.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 4a74adf19d7e46aef7c9ede87ffb0264193311dc Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Thu, 28 Feb 2013 08:28:01 +0200
-Subject: [PATCH] Split out gdbus codegen
-
----
- configure.ac | 17 ++++++++---------
- docs/reference/gio/Makefile.am | 3 +--
- gio/Makefile.am | 2 +-
- gio/tests/Makefile.am | 6 ++----
- gio/tests/gdbus-object-manager-example/Makefile.am | 6 ++----
- 5 files changed, 14 insertions(+), 20 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f734b7c..8076e7f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -374,14 +374,14 @@ AC_SUBST(PERL_PATH)
- # option to specify python interpreter to use; this just sets $PYTHON, so that
- # we will fallback to reading $PYTHON if --with-python is not given, and
- # python.m4 will get the expected input
--AC_ARG_WITH(python,
-- AS_HELP_STRING([--with-python=PATH],
-- [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]),
-- [PYTHON="$withval"], [])
--if test x"$PYTHON" = xyes; then
-- AC_MSG_ERROR([--with-python option requires a path or program argument])
--fi
--AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
-+# AC_ARG_WITH(python,
-+# AS_HELP_STRING([--with-python=PATH],
-+# [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]),
-+# [PYTHON="$withval"], [])
-+# if test x"$PYTHON" = xyes; then
-+# AC_MSG_ERROR([--with-python option requires a path or program argument])
-+# fi
-+# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
-
-
- dnl ***********************
-@@ -3697,7 +3697,6 @@ gobject/glib-mkenums
- gobject/tests/Makefile
- gthread/Makefile
- gio/Makefile
--gio/gdbus-2.0/codegen/Makefile
- gio/gdbus-2.0/codegen/config.py
- gio/gnetworking.h
- gio/xdgmime/Makefile
-diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
-index 99606d3..067cd50 100644
---- a/docs/reference/gio/Makefile.am
-+++ b/docs/reference/gio/Makefile.am
-@@ -152,8 +152,7 @@ man_MANS += \
- glib-compile-resources.1 \
- gsettings.1 \
- gresource.1 \
-- gdbus.1 \
-- gdbus-codegen.1
-+ gdbus.1
-
- XSLTPROC_FLAGS = \
- --nonet \
-diff --git a/gio/Makefile.am b/gio/Makefile.am
-index 94d7f59..c07d00d 100644
---- a/gio/Makefile.am
-+++ b/gio/Makefile.am
-@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
-
- NULL =
-
--SUBDIRS = gdbus-2.0/codegen
-+SUBDIRS =
-
- if OS_UNIX
- SUBDIRS += xdgmime
-diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
-index c8a4090..feece02 100644
---- a/gio/tests/Makefile.am
-+++ b/gio/tests/Makefile.am
-@@ -212,10 +212,8 @@ gdbus_bz627724_SOURCES = gdbus-bz627724.c gdbus-sessionbus.c gdbus-sessionbus.h
- gdbus_close_pending_SOURCES = gdbus-close-pending.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c
-
- if OS_UNIX
--gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml Makefile
-+ $(AM_V_GEN) gdbus-codegen \
- --interface-prefix org.project. \
- --generate-c-code gdbus-test-codegen-generated \
- --c-generate-object-manager \
-diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
-index 6875210..264c3c1 100644
---- a/gio/tests/gdbus-object-manager-example/Makefile.am
-+++ b/gio/tests/gdbus-object-manager-example/Makefile.am
-@@ -21,10 +21,8 @@ GDBUS_GENERATED = \
- gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \
- $(NULL)
-
--$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile
-+ $(AM_V_GEN) gdbus-codegen \
- --interface-prefix org.gtk.GDBus.Example.ObjectManager. \
- --c-namespace Example \
- --c-generate-object-manager \
---
-1.8.1.2
-
diff --git a/dev-libs/glib/files/glib-2.36.3-solaris.patch b/dev-libs/glib/files/glib-2.36.3-solaris.patch
deleted file mode 100644
index 06f8e69cc8..0000000000
--- a/dev-libs/glib/files/glib-2.36.3-solaris.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://bug698348.bugzilla-attachments.gnome.org/attachment.cgi?id=245784
-(https://bugzilla.gnome.org/show_bug.cgi?id=697166)
-
-From 4b70977f478289df3ed8368a1b0603ca5ba16c5c Mon Sep 17 00:00:00 2001
-From: Patrick Welche <prlw1@cam.ac.uk>
-Date: Fri, 31 May 2013 23:15:44 +0100
-Subject: [PATCH] In is_remote_fs(), statfs_result is also used in the
- USE_STATVFS case.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=698348
----
- gio/glocalfile.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/gio/glocalfile.c b/gio/glocalfile.c
-index 9007faa..973ee3d 100644
---- a/gio/glocalfile.c
-+++ b/gio/glocalfile.c
-@@ -2435,6 +2435,7 @@ is_remote_fs (const gchar *filename)
-
- #elif defined(USE_STATVFS)
- struct statvfs statfs_buffer;
-+ int statfs_result = 0;
-
- statfs_result = statvfs (filename, &statfs_buffer);
- #else
---
-1.8.2.3
-
diff --git a/dev-libs/glib/files/glib-2.36.4-aix.patch b/dev-libs/glib/files/glib-2.36.4-aix.patch
deleted file mode 100644
index 4d3885e5db..0000000000
--- a/dev-libs/glib/files/glib-2.36.4-aix.patch
+++ /dev/null
@@ -1,247 +0,0 @@
-https://git.gnome.org/browse/glib/commit/?id=c0e0c6a4201c879b5d8d7f5314d42f268a317f4c
-https://bugzilla.gnome.org/show_bug.cgi?id=712314
-
-diff -ru glib-2.36.4.orig/gobject/gobject.c glib-2.36.4/gobject/gobject.c
---- glib-2.36.4.orig/gobject/gobject.c 2013-08-07 16:36:32.000000000 +0200
-+++ glib-2.36.4/gobject/gobject.c 2013-11-15 09:56:16.417354713 +0100
-@@ -176,7 +176,7 @@
- static guint object_floating_flag_handler (GObject *object,
- gint job);
-
--static void object_interface_check_properties (gpointer func_data,
-+static void object_interface_check_properties (gpointer check_data,
- gpointer g_iface);
-
- /* --- typedefs --- */
-@@ -1366,7 +1366,7 @@
- }
-
- static void
--object_interface_check_properties (gpointer func_data,
-+object_interface_check_properties (gpointer check_data,
- gpointer g_iface)
- {
- GTypeInterface *iface_class = g_iface;
-diff -ru glib-2.36.4.orig/configure.ac glib-2.36.4/configure.ac
---- glib-2.36.4.orig/configure.ac 2013-08-07 16:36:32.000000000 +0200
-+++ glib-2.36.4/configure.ac 2013-11-15 09:55:49.870738679 +0100
-@@ -890,7 +890,7 @@
- AC_CHECK_HEADERS([sys/select.h sys/types.h stdint.h inttypes.h sched.h malloc.h])
- AC_CHECK_HEADERS([sys/vfs.h sys/vmount.h sys/statfs.h sys/statvfs.h sys/filio.h])
- AC_CHECK_HEADERS([mntent.h sys/mnttab.h sys/vfstab.h sys/mntctl.h fstab.h])
--AC_CHECK_HEADERS([sys/uio.h sys/mkdev.h])
-+AC_CHECK_HEADERS([sys/uio.h])
- AC_CHECK_HEADERS([linux/magic.h])
- AC_CHECK_HEADERS([sys/prctl.h])
-
-@@ -901,6 +901,7 @@
- ])
- AC_CHECK_FUNCS(sysctlbyname)
-
-+AC_HEADER_MAJOR
- AC_CHECK_HEADERS([xlocale.h])
-
- # check for structure fields
-@@ -994,6 +995,7 @@
- AC_CHECK_FUNCS(chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid)
- AC_CHECK_FUNCS(getmntent_r setmntent endmntent hasmntopt getfsstat getvfsstat fallocate)
- # Check for high-resolution sleep functions
-+case $host_os in aix*) ac_cv_func_splice=no ;; esac # AIX splice() is something else
- AC_CHECK_FUNCS(splice)
- AC_CHECK_FUNCS(prlimit)
-
-diff -ru glib-2.36.4.orig/gio/gdbusmessage.c glib-2.36.4/gio/gdbusmessage.c
---- glib-2.36.4.orig/gio/gdbusmessage.c 2013-08-07 16:36:32.000000000 +0200
-+++ glib-2.36.4/gio/gdbusmessage.c 2013-11-15 09:55:49.877405332 +0100
-@@ -29,13 +29,16 @@
- #include <errno.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#ifdef HAVE_SYS_MKDEV_H
--#include <sys/mkdev.h>
--#endif
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-
-+#if MAJOR_IN_MKDEV
-+#include <sys/mkdev.h>
-+#elif MAJOR_IN_SYSMACROS
-+#include <sys/sysmacros.h>
-+#endif
-+
- #include "gdbusutils.h"
- #include "gdbusmessage.h"
- #include "gdbuserror.h"
-diff -ru glib-2.36.4.orig/gio/Makefile.am glib-2.36.4/gio/Makefile.am
---- glib-2.36.4.orig/gio/Makefile.am 2013-08-07 16:34:32.000000000 +0200
-+++ glib-2.36.4/gio/Makefile.am 2013-11-15 09:55:49.877405332 +0100
-@@ -669,10 +669,10 @@
-
- bin_PROGRAMS = gio-querymodules glib-compile-schemas glib-compile-resources gsettings
-
--glib_compile_resources_LDADD = \
-- $(top_builddir)/glib/libglib-2.0.la \
-+glib_compile_resources_LDADD = libgio-2.0.la \
- $(top_builddir)/gobject/libgobject-2.0.la \
-- libgio-2.0.la
-+ $(top_builddir)/glib/libglib-2.0.la \
-+ $(NULL)
-
- glib_compile_resources_SOURCES = \
- gvdb/gvdb-format.h \
-@@ -681,11 +681,10 @@
- glib-compile-resources.c
-
- gio_querymodules_SOURCES = gio-querymodules.c
--gio_querymodules_LDADD = \
-- $(top_builddir)/glib/libglib-2.0.la \
-+gio_querymodules_LDADD = libgio-2.0.la \
- $(top_builddir)/gobject/libgobject-2.0.la \
- $(top_builddir)/gmodule/libgmodule-2.0.la \
-- libgio-2.0.la \
-+ $(top_builddir)/glib/libglib-2.0.la \
- $(NULL)
-
- gconstructor_as_data.h: $(top_srcdir)/glib/gconstructor.h data-to-c.pl
-@@ -699,10 +698,11 @@
- gvdb/gvdb-builder.c \
- glib-compile-schemas.c
-
--gsettings_LDADD = \
-- $(top_builddir)/glib/libglib-2.0.la \
-+gsettings_LDADD = libgio-2.0.la \
- $(top_builddir)/gobject/libgobject-2.0.la \
-- libgio-2.0.la
-+ $(top_builddir)/glib/libglib-2.0.la \
-+ $(NULL)
-+
- gsettings_SOURCES = gsettings-tool.c
-
- schemadir = $(datadir)/glib-2.0/schemas
-@@ -714,8 +714,9 @@
- bin_PROGRAMS += gdbus
- gdbus_SOURCES = gdbus-tool.c
- gdbus_LDADD = libgio-2.0.la \
-+ $(top_builddir)/gobject/libgobject-2.0.la \
- $(top_builddir)/glib/libglib-2.0.la \
-- $(top_builddir)/gobject/libgobject-2.0.la
-+ $(NULL)
-
- completiondir = $(datadir)/bash-completion/completions
- completion_DATA = \
-@@ -730,9 +731,9 @@
- bin_PROGRAMS += gresource
- gresource_SOURCES = gresource-tool.c
- gresource_CPPFLAGS = $(LIBELF_CFLAGS) $(AM_CPPFLAGS)
--gresource_LDADD = libgio-2.0.la \
-+gresource_LDADD = libgio-2.0.la \
-+ $(top_builddir)/gobject/libgobject-2.0.la \
- $(top_builddir)/glib/libglib-2.0.la \
-- $(top_builddir)/gobject/libgobject-2.0.la \
- $(LIBELF_LIBS)
-
- # ------------------------------------------------------------------------
-diff -ru glib-2.36.4.orig/gio/tests/Makefile.am glib-2.36.4/gio/tests/Makefile.am
---- glib-2.36.4.orig/gio/tests/Makefile.am 2013-08-07 16:34:32.000000000 +0200
-+++ glib-2.36.4/gio/tests/Makefile.am 2013-11-15 09:55:49.877405332 +0100
-@@ -21,12 +21,13 @@
- noinst_PROGRAMS = $(TEST_PROGS) $(SAMPLE_PROGS)
- noinst_DATA = $(MISC_STUFF)
-
--LDADD = \
-- $(top_builddir)/glib/libglib-2.0.la \
-+LDADD = \
-+ $(top_builddir)/gio/libgio-2.0.la \
- $(top_builddir)/gthread/libgthread-2.0.la \
- $(top_builddir)/gobject/libgobject-2.0.la \
- $(top_builddir)/gmodule/libgmodule-2.0.la \
-- $(top_builddir)/gio/libgio-2.0.la
-+ $(top_builddir)/glib/libglib-2.0.la \
-+ $(NULL)
-
- TEST_PROGS += \
- io-stream \
-@@ -162,35 +163,26 @@
-
- actions_SOURCES = actions.c gdbus-sessionbus.c gdbus-sessionbus.h
-
--unix_streams_LDADD = $(LDADD) \
-- $(top_builddir)/gthread/libgthread-2.0.la
-+unix_streams_LDADD = $(LDADD)
-
--win32_streams_LDADD = $(LDADD) \
-- $(top_builddir)/gthread/libgthread-2.0.la
-+win32_streams_LDADD = $(LDADD)
-
--resolver_LDADD = $(LDADD) \
-- $(top_builddir)/gthread/libgthread-2.0.la
-+resolver_LDADD = $(LDADD)
-
--socket_server_LDADD = $(LDADD) \
-- $(top_builddir)/gthread/libgthread-2.0.la
-+socket_server_LDADD = $(LDADD)
-
- socket_client_SOURCES = socket-client.c \
- gtlsconsoleinteraction.c \
- gtlsconsoleinteraction.h
--socket_client_LDADD = $(LDADD) \
-- $(top_builddir)/gthread/libgthread-2.0.la
-+socket_client_LDADD = $(LDADD)
-
--echo_server_LDADD = $(LDADD) \
-- $(top_builddir)/gthread/libgthread-2.0.la
-+echo_server_LDADD = $(LDADD)
-
--httpd_LDADD = $(LDADD) \
-- $(top_builddir)/gthread/libgthread-2.0.la
-+httpd_LDADD = $(LDADD)
-
--send_data_LDADD = $(LDADD) \
-- $(top_builddir)/gthread/libgthread-2.0.la
-+send_data_LDADD = $(LDADD)
-
--contexts_LDADD = $(LDADD) \
-- $(top_builddir)/gthread/libgthread-2.0.la
-+contexts_LDADD = $(LDADD)
-
- gdbus_daemon_SOURCES = gdbus-daemon.c $(top_srcdir)/gio/gdbusdaemon.c $(top_builddir)/gio/gdbus-daemon-generated.c
-
-@@ -361,8 +353,7 @@
- schema-tests/range.gschema.xml \
- schema-tests/wrong-category.gschema.xml
-
--proxy_LDADD = $(LDADD) \
-- $(top_builddir)/gthread/libgthread-2.0.la
-+proxy_LDADD = $(LDADD)
-
- tls_certificate_SOURCES = tls-certificate.c gtesttlsbackend.c gtesttlsbackend.h
-
-diff -ru glib-2.36.4.orig/tests/Makefile.am glib-2.36.4/tests/Makefile.am
---- glib-2.36.4.orig/tests/Makefile.am 2013-08-07 16:34:32.000000000 +0200
-+++ glib-2.36.4/tests/Makefile.am 2013-11-15 09:55:49.877405332 +0100
-@@ -80,10 +80,10 @@
- assert_msg_test_LDADD = $(libglib)
- if ENABLE_TIMELOOP
- timeloop_LDADD = $(libglib)
--timeloop_closure_LDADD = $(libglib) $(libgobject)
-+timeloop_closure_LDADD = $(libgobject) $(libglib)
- endif
- datetime_LDADD = $(libglib)
--testgobject_LDADD = $(libglib) $(libgobject)
-+testgobject_LDADD = $(libgobject) $(libglib)
-
- test_programs = \
- atomic-test \
-diff -ru glib-2.36.4.orig/tests/refcount/Makefile.am glib-2.36.4/tests/refcount/Makefile.am
---- glib-2.36.4.orig/tests/refcount/Makefile.am 2013-08-07 16:34:32.000000000 +0200
-+++ glib-2.36.4/tests/refcount/Makefile.am 2013-11-15 09:55:49.877405332 +0100
-@@ -9,7 +9,7 @@
- libgmodule = $(top_builddir)/gmodule/libgmodule-2.0.la
- libgobject = $(top_builddir)/gobject/libgobject-2.0.la
-
--LDADD = $(libglib) $(libgobject)
-+LDADD = $(libgobject) $(libglib)
-
- test_programs = \
- closures \
diff --git a/dev-libs/glib/files/glib-2.36.4-znodelete.patch b/dev-libs/glib/files/glib-2.36.4-znodelete.patch
deleted file mode 100644
index b936fbd8de..0000000000
--- a/dev-libs/glib/files/glib-2.36.4-znodelete.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 196ea5ab614e5357da48acf73a373f103e61ee0b Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 2 Sep 2013 13:59:18 -0400
-Subject: [PATCH 4/4] gobject: try to link with -Wl,-z,nodelete
-
-Since the type system does not support reloading its data and assumes
-that libgobject remains loaded for the lifetime of the process, we
-should link libgobject with a flag indicating that it can't be unloaded.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=707298
----
- configure.ac | 24 ++++++++++++++++++++++++
- gobject/Makefile.am | 1 +
- 2 files changed, 25 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 907c534..266c45d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3669,6 +3669,30 @@ fi
- AC_SUBST(GLIB_LINK_FLAGS)
-
- dnl
-+dnl Check for -z,nodelete linker flag: the type system assumes that
-+dnl libgobject stays loaded for the lifetime of the process
-+dnl
-+
-+AC_ARG_ENABLE([znodelete],
-+ [AS_HELP_STRING([--disable-znodelete],
-+ [avoid linking with -z,nodelete])],,
-+ [SAVED_LDFLAGS="${LDFLAGS}"
-+ AC_MSG_CHECKING([for -z,nodelete linker flag])
-+ LDFLAGS=-Wl,-z,nodelete
-+ AC_TRY_LINK([], [int main (void) { return 0; }],
-+ AC_MSG_RESULT(yes)
-+ enable_znodelete=yes,
-+ AC_MSG_RESULT(no)
-+ enable_znodelete=no)
-+ LDFLAGS="${SAVED_LDFLAGS}"])
-+
-+if test "x${enable_znodelete}" = "xyes"; then
-+ GOBJECT_LINK_FLAGS=-Wl,-z,nodelete
-+fi
-+
-+AC_SUBST(GOBJECT_LINK_FLAGS)
-+
-+dnl
- dnl Check for -fvisibility=hidden to determine if we can do GNU-style
- dnl visibility attributes for symbol export control
- dnl
-diff --git a/gobject/Makefile.am b/gobject/Makefile.am
-index 1509616..181ad7d 100644
---- a/gobject/Makefile.am
-+++ b/gobject/Makefile.am
-@@ -45,6 +45,7 @@ endif
-
- libgobjectincludedir = $(includedir)/glib-2.0/gobject
- libgobject_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
-+ $(GOBJECT_LINK_FLAGS) \
- $(gobject_win32_res_ldflag) \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- -export-dynamic $(no_undefined)
---
-1.8.3.2
-
diff --git a/dev-libs/glib/files/glib-2.37.x-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.37.x-external-gdbus-codegen.patch
deleted file mode 100644
index f87c146570..0000000000
--- a/dev-libs/glib/files/glib-2.37.x-external-gdbus-codegen.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 81f037771e2992834961cb5db08aece53a02b8ae Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Thu, 28 Feb 2013 08:28:01 +0200
-Subject: [PATCH 3/4] Split out gdbus codegen
-
----
- configure.ac | 17 ++++++++---------
- docs/reference/gio/Makefile.am | 3 +--
- gio/Makefile.am | 2 +-
- gio/tests/Makefile.am | 6 ++----
- gio/tests/gdbus-object-manager-example/Makefile.am | 6 ++----
- 5 files changed, 14 insertions(+), 20 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 797cb92..907c534 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -378,14 +378,14 @@ AC_SUBST(PERL_PATH)
- # option to specify python interpreter to use; this just sets $PYTHON, so that
- # we will fallback to reading $PYTHON if --with-python is not given, and
- # python.m4 will get the expected input
--AC_ARG_WITH(python,
-- AS_HELP_STRING([--with-python=PATH],
-- [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]),
-- [PYTHON="$withval"], [])
--if test x"$PYTHON" = xyes; then
-- AC_MSG_ERROR([--with-python option requires a path or program argument])
--fi
--AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
-+# AC_ARG_WITH(python,
-+# AS_HELP_STRING([--with-python=PATH],
-+# [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]),
-+# [PYTHON="$withval"], [])
-+# if test x"$PYTHON" = xyes; then
-+# AC_MSG_ERROR([--with-python option requires a path or program argument])
-+# fi
-+# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
-
-
- dnl ***********************
-@@ -3784,7 +3784,6 @@ gobject/glib-mkenums
- gobject/tests/Makefile
- gthread/Makefile
- gio/Makefile
--gio/gdbus-2.0/codegen/Makefile
- gio/gdbus-2.0/codegen/config.py
- gio/gnetworking.h
- gio/xdgmime/Makefile
-diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
-index 112626b..8ddcdbc 100644
---- a/docs/reference/gio/Makefile.am
-+++ b/docs/reference/gio/Makefile.am
-@@ -151,8 +151,7 @@ man_MANS += \
- glib-compile-resources.1 \
- gsettings.1 \
- gresource.1 \
-- gdbus.1 \
-- gdbus-codegen.1
-+ gdbus.1
-
- XSLTPROC_FLAGS = \
- --nonet \
-diff --git a/gio/Makefile.am b/gio/Makefile.am
-index 717419f..808b5dd 100644
---- a/gio/Makefile.am
-+++ b/gio/Makefile.am
-@@ -1,6 +1,6 @@
- include $(top_srcdir)/glib.mk
-
--SUBDIRS = gdbus-2.0/codegen
-+SUBDIRS =
-
- if OS_UNIX
- SUBDIRS += xdgmime
-diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
-index 7224124..5c8baaa 100644
---- a/gio/tests/Makefile.am
-+++ b/gio/tests/Makefile.am
-@@ -359,10 +359,8 @@ gmenumodel_SOURCES = $(gdbus_sessionbus_sources) gmenumode
- nodist_gdbus_test_codegen_SOURCES = gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
-
- gdbus-test-codegen.o: gdbus-test-codegen-generated.h
--gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c: test-codegen.xml Makefile
-+ $(AM_V_GEN) gdbus-codegen \
- --interface-prefix org.project. \
- --generate-c-code gdbus-test-codegen-generated \
- --c-generate-object-manager \
-diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
-index d6d1412..62ef706 100644
---- a/gio/tests/gdbus-object-manager-example/Makefile.am
-+++ b/gio/tests/gdbus-object-manager-example/Makefile.am
-@@ -11,10 +11,8 @@ GDBUS_GENERATED = \
- gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \
- $(NULL)
-
--$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile
-+ $(AM_V_GEN) gdbus-codegen \
- --interface-prefix org.gtk.GDBus.Example.ObjectManager. \
- --c-namespace Example \
- --c-generate-object-manager \
---
-1.8.3.2
-
diff --git a/dev-libs/glib/files/glib-2.38.2-O_DIRECTORY-solaris.patch b/dev-libs/glib/files/glib-2.38.2-O_DIRECTORY-solaris.patch
deleted file mode 100644
index 0504965bee..0000000000
--- a/dev-libs/glib/files/glib-2.38.2-O_DIRECTORY-solaris.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 7eb1e5fc5bc5aa6744bd516463ca2d65104c5a4e Mon Sep 17 00:00:00 2001
-From: William Orr <will@worrbase.com>
-Date: Thu, 26 Sep 2013 18:02:06 +0000
-Subject: glocalfile: Only use O_DIRECTORY if available
-
-Solaris 10 for example doesn't have it.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=708860
----
-diff --git a/configure.ac b/configure.ac
-index ee76daf..9e55ff5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1224,6 +1224,18 @@ AS_IF([test "$ac_cv_func_statfs" = yes], [
- AC_MSG_ERROR([unable to determine number of arguments to statfs()])])])
- ])
-
-+dnl
-+dnl open takes O_DIRECTORY as an option
-+dnl
-+AC_MSG_CHECKING([open() option O_DIRECTORY])
-+AC_TRY_COMPILE([#include <fcntl.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>],
-+[open(0, O_DIRECTORY, 0);],[
-+ AC_MSG_RESULT([yes])
-+ AC_DEFINE(HAVE_OPEN_O_DIRECTORY, 1, [open option O_DIRECTORY])],[
-+ AC_MSG_RESULT([no])])
-+
- #
- # Check whether to use an included printf
- #
-diff --git a/gio/glocalfile.c b/gio/glocalfile.c
-index 345214d..3763a46 100644
---- a/gio/glocalfile.c
-+++ b/gio/glocalfile.c
-@@ -2699,7 +2699,11 @@ g_local_file_measure_size_of_file (gint parent_fd,
- return FALSE;
-
- #ifdef AT_FDCWD
-- dir_fd = openat (parent_fd, name->data, O_RDONLY | O_DIRECTORY);
-+#ifdef HAVE_OPEN_O_DIRECTORY
-+ dir_fd = openat (parent_fd, name->data, O_RDONLY|O_DIRECTORY);
-+#else
-+ dir_fd = openat (parent_fd, name->data, O_RDONLY);
-+#endif
- if (dir_fd < 0)
- return g_local_file_measure_size_error (state->flags, errno, name, error);
- #endif
---
-cgit v0.9.2
diff --git a/dev-libs/glib/files/glib-2.38.2-aix.patch b/dev-libs/glib/files/glib-2.38.2-aix.patch
deleted file mode 100644
index d36a609f9c..0000000000
--- a/dev-libs/glib/files/glib-2.38.2-aix.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-https://bugzilla.gnome.org/show_bug.cgi?id=712314
-
-part of glib-2.39.2:
-https://git.gnome.org/browse/glib/commit/?id=efb1701bf3baf6f5b05fd1a7a5a4ff990a7dc460
-https://git.gnome.org/browse/glib/commit/?id=1f0573d2e6605d657cdf2884cc4dcd646f8a214f
-https://git.gnome.org/browse/glib/commit/?id=b1af471a3f08c3afa4eb61f0791998aac5da80a8
-
-diff -ru glib-2.38.2.orig/configure.ac glib-2.38.2/configure.ac
---- glib-2.38.2.orig/configure.ac 2013-08-07 16:36:32.000000000 +0200
-+++ glib-2.38.2/configure.ac 2013-11-15 09:55:49.870738679 +0100
-@@ -840,7 +840,7 @@
- AC_CHECK_HEADERS([sys/select.h sys/types.h stdint.h inttypes.h sched.h malloc.h])
- AC_CHECK_HEADERS([sys/vfs.h sys/vmount.h sys/statfs.h sys/statvfs.h sys/filio.h])
- AC_CHECK_HEADERS([mntent.h sys/mnttab.h sys/vfstab.h sys/mntctl.h fstab.h])
--AC_CHECK_HEADERS([sys/uio.h sys/mkdev.h])
-+AC_CHECK_HEADERS([sys/uio.h])
- AC_CHECK_HEADERS([linux/magic.h])
- AC_CHECK_HEADERS([sys/prctl.h])
-
-@@ -851,6 +851,7 @@
- ])
- AC_CHECK_FUNCS(sysctlbyname)
-
-+AC_HEADER_MAJOR
- AC_CHECK_HEADERS([xlocale.h])
-
- # check for structure fields
-@@ -1028,6 +1029,7 @@
- AC_CHECK_FUNCS(chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid)
- AC_CHECK_FUNCS(getmntent_r setmntent endmntent hasmntopt getfsstat getvfsstat fallocate)
- # Check for high-resolution sleep functions
-+case $host_os in aix*) ac_cv_func_splice=no ;; esac # AIX splice() is something else
- AC_CHECK_FUNCS(splice)
- AC_CHECK_FUNCS(prlimit)
-
-diff -ru glib-2.38.2.orig/gio/gdbusmessage.c glib-2.38.2/gio/gdbusmessage.c
---- glib-2.38.2.orig/gio/gdbusmessage.c 2013-08-07 16:36:32.000000000 +0200
-+++ glib-2.38.2/gio/gdbusmessage.c 2013-11-15 09:55:49.877405332 +0100
-@@ -29,13 +29,16 @@
- #include <errno.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#ifdef HAVE_SYS_MKDEV_H
--#include <sys/mkdev.h>
--#endif
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-
-+#if MAJOR_IN_MKDEV
-+#include <sys/mkdev.h>
-+#elif MAJOR_IN_SYSMACROS
-+#include <sys/sysmacros.h>
-+#endif
-+
- #include "gdbusutils.h"
- #include "gdbusmessage.h"
- #include "gdbuserror.h"
-diff -ru glib-2.38.2.orig/gio/Makefile.am glib-2.38.2/gio/Makefile.am
---- glib-2.38.2.orig/gio/Makefile.am 2013-08-07 16:34:32.000000000 +0200
-+++ glib-2.38.2/gio/Makefile.am 2013-11-15 09:55:49.877405332 +0100
-@@ -466,9 +466,9 @@
- EXTRA_DIST += strinfo.c
-
- libgio_2_0_la_LIBADD = \
-- $(top_builddir)/glib/libglib-2.0.la \
- $(top_builddir)/gobject/libgobject-2.0.la \
- $(top_builddir)/gmodule/libgmodule-2.0.la \
-+ $(top_builddir)/glib/libglib-2.0.la \
- $(platform_libadd) \
- $(ZLIB_LIBS) \
- $(SELINUX_LIBS) \
-@@ -670,10 +670,10 @@
-
- bin_PROGRAMS = gio-querymodules glib-compile-schemas glib-compile-resources gsettings
-
--glib_compile_resources_LDADD = \
-- $(top_builddir)/glib/libglib-2.0.la \
-+glib_compile_resources_LDADD = libgio-2.0.la \
- $(top_builddir)/gobject/libgobject-2.0.la \
-- libgio-2.0.la
-+ $(top_builddir)/glib/libglib-2.0.la \
-+ $(NULL)
-
- glib_compile_resources_SOURCES = \
- gvdb/gvdb-format.h \
-@@ -682,11 +682,10 @@
- glib-compile-resources.c
-
- gio_querymodules_SOURCES = gio-querymodules.c
--gio_querymodules_LDADD = \
-- $(top_builddir)/glib/libglib-2.0.la \
-+gio_querymodules_LDADD = libgio-2.0.la \
- $(top_builddir)/gobject/libgobject-2.0.la \
- $(top_builddir)/gmodule/libgmodule-2.0.la \
-- libgio-2.0.la \
-+ $(top_builddir)/glib/libglib-2.0.la \
- $(NULL)
-
- gconstructor_as_data.h: $(top_srcdir)/glib/gconstructor.h data-to-c.pl
-@@ -700,10 +699,11 @@
- gvdb/gvdb-builder.c \
- glib-compile-schemas.c
-
--gsettings_LDADD = \
-- $(top_builddir)/glib/libglib-2.0.la \
-+gsettings_LDADD = libgio-2.0.la \
- $(top_builddir)/gobject/libgobject-2.0.la \
-- libgio-2.0.la
-+ $(top_builddir)/glib/libglib-2.0.la \
-+ $(NULL)
-+
- gsettings_SOURCES = gsettings-tool.c
-
- schemadir = $(datadir)/glib-2.0/schemas
-@@ -715,8 +715,9 @@
- bin_PROGRAMS += gdbus
- gdbus_SOURCES = gdbus-tool.c
- gdbus_LDADD = libgio-2.0.la \
-+ $(top_builddir)/gobject/libgobject-2.0.la \
- $(top_builddir)/glib/libglib-2.0.la \
-- $(top_builddir)/gobject/libgobject-2.0.la
-+ $(NULL)
-
- completiondir = $(datadir)/bash-completion/completions
- completion_DATA = \
-@@ -731,9 +732,9 @@
- bin_PROGRAMS += gresource
- gresource_SOURCES = gresource-tool.c
- gresource_CPPFLAGS = $(LIBELF_CFLAGS) $(AM_CPPFLAGS)
--gresource_LDADD = libgio-2.0.la \
-+gresource_LDADD = libgio-2.0.la \
-+ $(top_builddir)/gobject/libgobject-2.0.la \
- $(top_builddir)/glib/libglib-2.0.la \
-- $(top_builddir)/gobject/libgobject-2.0.la \
- $(LIBELF_LIBS)
-
- # ------------------------------------------------------------------------
-diff -ru glib-2.38.2.orig/gio/tests/Makefile.am glib-2.38.2/gio/tests/Makefile.am
---- glib-2.38.2.orig/gio/tests/Makefile.am 2013-08-07 16:34:32.000000000 +0200
-+++ glib-2.38.2/gio/tests/Makefile.am 2013-11-15 09:55:49.877405332 +0100
-@@ -6,10 +6,10 @@
- SUBDIRS = gdbus-object-manager-example services
-
- LDADD = \
-- $(top_builddir)/glib/libglib-2.0.la \
-+ $(top_builddir)/glib/libgio-2.0.la \
- $(top_builddir)/gobject/libgobject-2.0.la \
- $(top_builddir)/gmodule/libgmodule-2.0.la \
-- $(top_builddir)/gio/libgio-2.0.la
-+ $(top_builddir)/gio/libglib-2.0.la
- AM_CPPFLAGS = $(gio_INCLUDES) $(GLIB_DEBUG_FLAGS) -I$(top_builddir)/gio -I$(top_srcdir)/gio
- DEFS = -DG_LOG_DOMAIN=\"GLib-GIO\" -DTEST_SERVICES=\""$(abs_top_builddir)/gio/tests/services"\"
- AM_CFLAGS = $(GLIB_WARN_CFLAGS)
-diff -ru glib-2.38.2.orig/tests/Makefile.am glib-2.38.2/tests/Makefile.am
---- glib-2.38.2.orig/tests/Makefile.am 2013-08-07 16:34:32.000000000 +0200
-+++ glib-2.38.2/tests/Makefile.am 2013-11-15 09:55:49.877405332 +0100
-@@ -88,11 +88,11 @@
-
- test_programs += module-test
- module_test_DEPENDENCIES = libmoduletestplugin_a.la libmoduletestplugin_b.la
--module_test_LDADD = $(LDADD) $(top_builddir)/gmodule/libgmodule-2.0.la
-+module_test_LDADD = $(top_builddir)/gmodule/libgmodule-2.0.la $(LDADD)
- module_test_LDFLAGS = $(G_MODULE_LDFLAGS)
- slice_test_SOURCES = slice-test.c memchunks.c
- slice_color_SOURCES = slice-color.c memchunks.c
--slice_threadinit_LDADD = $(LDADD) $(top_builddir)/gthread/libgthread-2.0.la
-+slice_threadinit_LDADD = $(top_builddir)/gthread/libgthread-2.0.la $(LDADD)
-
- test_ltlibraries = libmoduletestplugin_a.la libmoduletestplugin_b.la
-
---- glib-2.38.2/tests/gobject/Makefile.am.orig
-+++ glib-2.38.2/tests/gobject/Makefile.am
-@@ -1,6 +1,6 @@
- include $(top_srcdir)/glib.mk
-
--LDADD = $(top_builddir)/glib/libglib-2.0.la $(top_builddir)/gobject/libgobject-2.0.la
-+LDADD = $(top_builddir)/gobject/libgobject-2.0.la $(top_builddir)/glib/libglib-2.0.la
- AM_CPPFLAGS = $(gmodule_INCLUDES) $(GLIB_DEBUG_FLAGS)
- DEFS = -DGLIB_DISABLE_DEPRECATION_WARNINGS -DG_LOG_DOMAIN=\"GLib\"
- AM_CFLAGS = -g
diff --git a/dev-libs/glib/files/glib-2.38.2-configure.patch b/dev-libs/glib/files/glib-2.38.2-configure.patch
deleted file mode 100644
index 8f08ca0faf..0000000000
--- a/dev-libs/glib/files/glib-2.38.2-configure.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 838b49ead77c35d94fa16d48a6d7271bab082a71 Mon Sep 17 00:00:00 2001
-From: Patrick Welche <prlw1@cam.ac.uk>
-Date: Thu, 07 Nov 2013 10:58:46 +0000
-Subject: configure: test(1) uses = to test for string equality
-
-https://bugzilla.gnome.org/show_bug.cgi?id=711600
----
-(limited to 'm4macros/glibtests.m4')
-
-diff --git a/m4macros/glibtests.m4 b/m4macros/glibtests.m4
-index 27e9024..7d5920a 100644
---- a/m4macros/glibtests.m4
-+++ b/m4macros/glibtests.m4
-@@ -21,7 +21,7 @@ AC_DEFUN([GLIB_TESTS],
- *) AC_MSG_ERROR([bad value ${enableval} for --enable-always-build-tests]) ;;
- esac])
- AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS], test "$ENABLE_ALWAYS_BUILD_TESTS" = "1")
-- if test "$ENABLE_INSTALLED_TESTS" == "1"; then
-+ if test "$ENABLE_INSTALLED_TESTS" = "1"; then
- AC_SUBST(installed_test_metadir, [${datadir}/installed-tests/]AC_PACKAGE_NAME)
- AC_SUBST(installed_testdir, [${libexecdir}/installed-tests/]AC_PACKAGE_NAME)
- fi
---
-cgit v0.9.2
diff --git a/dev-libs/glib/files/glib-2.38.2-sigaction.patch b/dev-libs/glib/files/glib-2.38.2-sigaction.patch
deleted file mode 100644
index f87e224ce7..0000000000
--- a/dev-libs/glib/files/glib-2.38.2-sigaction.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 81d0ebe29ccd852e969acda7394969e3f13eb136 Mon Sep 17 00:00:00 2001
-From: Stef Walter <stefw@gnome.org>
-Date: Thu, 31 Oct 2013 11:43:14 +0100
-Subject: [PATCH] gmain: Fix use of uninitialized memory in sigaction structure
-
-https://bugzilla.gnome.org/show_bug.cgi?id=711754
-
-
-diff --git a/glib/gmain.c b/glib/gmain.c
-index 9c37bb2..608c1a5 100644
---- a/glib/gmain.c
-+++ b/glib/gmain.c
-@@ -4978,6 +4978,7 @@ unref_unix_signal_handler_unlocked (int signum)
- if (unix_signal_refcount[signum] == 0)
- {
- struct sigaction action;
-+ memset (&action, 0, sizeof (action));
- action.sa_handler = SIG_DFL;
- sigemptyset (&action.sa_mask);
- sigaction (signum, &action, NULL);
---
-Gitg
-
diff --git a/dev-libs/glib/files/glib-2.39.2-aix.patch b/dev-libs/glib/files/glib-2.39.2-aix.patch
deleted file mode 100644
index 4a6bd8b6cb..0000000000
--- a/dev-libs/glib/files/glib-2.39.2-aix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugzilla.gnome.org/show_bug.cgi?id=712314
-
---- glib-2.38.2.orig/tests/refcount/Makefile.am 2013-08-07 16:34:32.000000000 +0200
-+++ glib-2.38.2/tests/refcount/Makefile.am 2013-11-15 09:55:49.877405332 +0100
-@@ -1,6 +1,6 @@
- include $(top_srcdir)/glib.mk
-
--LDADD = $(top_builddir)/glib/libglib-2.0.la $(top_builddir)/gobject/libgobject-2.0.la
-+LDADD = $(top_builddir)/gobject/libgobject-2.0.la $(top_builddir)/glib/libglib-2.0.la
- AM_CPPFLAGS = $(gmodule_INCLUDES) $(GLIB_DEBUG_FLAGS)
- DEFS = -DGLIB_DISABLE_DEPRECATION_WARNINGS
- AM_CFLAGS = -g
diff --git a/dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch
deleted file mode 100644
index 50a9370e36..0000000000
--- a/dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index a01e58d..59d4527 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -367,14 +367,14 @@ AC_SUBST(PERL_PATH)
- # option to specify python interpreter to use; this just sets $PYTHON, so that
- # we will fallback to reading $PYTHON if --with-python is not given, and
- # python.m4 will get the expected input
--AC_ARG_WITH(python,
-- AS_HELP_STRING([--with-python=PATH],
-- [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]),
-- [PYTHON="$withval"], [])
--if test x"$PYTHON" = xyes; then
-- AC_MSG_ERROR([--with-python option requires a path or program argument])
--fi
--AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
-+# AC_ARG_WITH(python,
-+# AS_HELP_STRING([--with-python=PATH],
-+# [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]),
-+# [PYTHON="$withval"], [])
-+# if test x"$PYTHON" = xyes; then
-+# AC_MSG_ERROR([--with-python option requires a path or program argument])
-+# fi
-+# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
-
-
- dnl ***********************
-@@ -3580,7 +3580,6 @@ gobject/glib-mkenums
- gobject/tests/Makefile
- gthread/Makefile
- gio/Makefile
--gio/gdbus-2.0/codegen/Makefile
- gio/gdbus-2.0/codegen/config.py
- gio/gnetworking.h
- gio/xdgmime/Makefile
-diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
-index 47fdd38..c7eb136 100644
---- a/docs/reference/gio/Makefile.am
-+++ b/docs/reference/gio/Makefile.am
-@@ -157,8 +157,7 @@ man_MANS += \
- glib-compile-resources.1 \
- gsettings.1 \
- gresource.1 \
-- gdbus.1 \
-- gdbus-codegen.1
-+ gdbus.1
-
- XSLTPROC_FLAGS = \
- --nonet \
-diff --git a/gio/Makefile.am b/gio/Makefile.am
-index e993e2f..025ad94 100644
---- a/gio/Makefile.am
-+++ b/gio/Makefile.am
-@@ -1,6 +1,6 @@
- include $(top_srcdir)/glib.mk
-
--SUBDIRS = gdbus-2.0/codegen
-+SUBDIRS =
-
- if OS_UNIX
- SUBDIRS += xdgmime
-diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
-index 2c54e59..3cd3c5a 100644
---- a/gio/tests/Makefile.am
-+++ b/gio/tests/Makefile.am
-@@ -437,10 +437,8 @@ gnotification_SOURCES = $(gdbus_sessionbus_sources) gnotifica
-
- BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
- gdbus-test-codegen.o: gdbus-test-codegen-generated.h
--gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+gdbus-test-codegen-generated.h: test-codegen.xml Makefile
-+ $(AM_V_GEN) gdbus-codegen \
- --interface-prefix org.project. \
- --generate-c-code gdbus-test-codegen-generated \
- --c-generate-object-manager \
-diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
-index d6d1412..62ef706 100644
---- a/gio/tests/gdbus-object-manager-example/Makefile.am
-+++ b/gio/tests/gdbus-object-manager-example/Makefile.am
-@@ -11,10 +11,8 @@ GDBUS_GENERATED = \
- gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \
- $(NULL)
-
--$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile
-+ $(AM_V_GEN) gdbus-codegen \
- --interface-prefix org.gtk.GDBus.Example.ObjectManager. \
- --c-namespace Example \
- --c-generate-object-manager \
diff --git a/dev-libs/glib/files/glib-2.50.0-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.50.0-external-gdbus-codegen.patch
deleted file mode 100644
index 2c942d559f..0000000000
--- a/dev-libs/glib/files/glib-2.50.0-external-gdbus-codegen.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index e8e7553..216e59d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -385,14 +385,14 @@ AC_SUBST(PERL_PATH)
- # option to specify python interpreter to use; this just sets $PYTHON, so that
- # we will fallback to reading $PYTHON if --with-python is not given, and
- # python.m4 will get the expected input
--AC_ARG_WITH(python,
-- AS_HELP_STRING([--with-python=PATH],
-- [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]),
-- [PYTHON="$withval"], [])
--if test x"$PYTHON" = xyes; then
-- AC_MSG_ERROR([--with-python option requires a path or program argument])
--fi
--AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
-+# AC_ARG_WITH(python,
-+# AS_HELP_STRING([--with-python=PATH],
-+# [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]),
-+# [PYTHON="$withval"], [])
-+# if test x"$PYTHON" = xyes; then
-+# AC_MSG_ERROR([--with-python option requires a path or program argument])
-+# fi
-+# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
-
-
- dnl ***********************
-@@ -3453,7 +3453,6 @@ gobject/glib-mkenums
- gobject/tests/Makefile
- gthread/Makefile
- gio/Makefile
--gio/gdbus-2.0/codegen/Makefile
- gio/gdbus-2.0/codegen/config.py
- gio/gnetworking.h
- gio/xdgmime/Makefile
-diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
-index 5741a3e..d38e768 100644
---- a/docs/reference/gio/Makefile.am
-+++ b/docs/reference/gio/Makefile.am
-@@ -177,7 +177,6 @@ man_MANS += \
- gsettings.1 \
- gresource.1 \
- gdbus.1 \
-- gdbus-codegen.1 \
- gio.1 \
- $(NULL)
-
-diff --git a/gio/Makefile.am b/gio/Makefile.am
-index ffe5ee2..929d1b5 100644
---- a/gio/Makefile.am
-+++ b/gio/Makefile.am
-@@ -1,6 +1,6 @@
- include $(top_srcdir)/glib.mk
-
--SUBDIRS = gdbus-2.0/codegen
-+SUBDIRS =
-
- if OS_UNIX
- SUBDIRS += xdgmime
-diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
-index 749267b..f2a8c63 100644
---- a/gio/tests/Makefile.am
-+++ b/gio/tests/Makefile.am
-@@ -449,10 +449,8 @@ gnotification_SOURCES = $(gdbus_sessionbus_sources) gnotifica
-
- BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
- gdbus-test-codegen.o: gdbus-test-codegen-generated.h
--gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+gdbus-test-codegen-generated.h: test-codegen.xml Makefile
-+ $(AM_V_GEN) gdbus-codegen \
- --interface-prefix org.project. \
- --generate-c-code gdbus-test-codegen-generated \
- --c-generate-object-manager \
-diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
-index 1d0464c..0603d9b 100644
---- a/gio/tests/gdbus-object-manager-example/Makefile.am
-+++ b/gio/tests/gdbus-object-manager-example/Makefile.am
-@@ -11,10 +11,8 @@ GDBUS_GENERATED = \
- gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \
- $(NULL)
-
--$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile
-+ $(AM_V_GEN) gdbus-codegen \
- --interface-prefix org.gtk.GDBus.Example.ObjectManager. \
- --c-namespace Example \
- --c-generate-object-manager \
diff --git a/dev-libs/glib/files/glib-2.6.3-testglib-ssp.patch b/dev-libs/glib/files/glib-2.6.3-testglib-ssp.patch
deleted file mode 100644
index 9b104dd570..0000000000
--- a/dev-libs/glib/files/glib-2.6.3-testglib-ssp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tests/Makefile.in.orig 2005-04-07 01:05:39.000000000 +0000
-+++ tests/Makefile.in 2005-04-07 01:09:02.000000000 +0000
-@@ -50,7 +50,7 @@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -fno-stack-protector
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@
diff --git a/dev-libs/glib/glib-2.56.2.ebuild b/dev-libs/glib/glib-2.56.2.ebuild
index b25d240cda..518a1bca64 100644
--- a/dev-libs/glib/glib-2.56.2.ebuild
+++ b/dev-libs/glib/glib-2.56.2.ebuild
@@ -27,7 +27,7 @@ LICENSE="LGPL-2.1+"
SLOT="2"
IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
-KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
# Added util-linux multilib dependency to have libmount support (which
# is always turned on on linux systems, unless explicitly disabled, but
diff --git a/dev-libs/glib/glib-2.66.2.ebuild b/dev-libs/glib/glib-2.66.2.ebuild
index 7cb2271077..f5f3305263 100644
--- a/dev-libs/glib/glib-2.66.2.ebuild
+++ b/dev-libs/glib/glib-2.66.2.ebuild
@@ -16,7 +16,7 @@ RESTRICT="!test? ( test )"
# meson/ninja buildsystem, breaks of course (at least on Solaris), most
# likely will introduce problems during bootstrap too
-#KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+#KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
# * libelf isn't strictly necessary, but makes gresource tool more useful, and
# the check is automagic in gio/meson.build. gresource is not a multilib tool
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/glib/, dev-libs/glib/files/
@ 2020-12-04 13:17 Fabian Groffen
0 siblings, 0 replies; 4+ messages in thread
From: Fabian Groffen @ 2020-12-04 13:17 UTC (permalink / raw
To: gentoo-commits
commit: 1b012fcb045b492580be5f33bc751537c7966dae
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 4 13:17:53 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec 4 13:17:53 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1b012fcb
dev-libs/glib: try to sync somewhat with gx86
- glib-2.56.2: old, no longer in gx86, add python 3.8 and 3.9 to
supported versions, not really changing anything, used in tests only,
will allow depcleaning python 3.7 on Prefix systems though
- glib-2.66.2: latest, but meson/ninja based, of course completely
broken, needs work, de-keyworded for now
Package-Manager: Portage-3.0.10.3-prefix, Repoman-3.0.2
RepoMan-Options: --force
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
dev-libs/glib/Manifest | 4 +-
...-2.64.1-mark-gdbus-server-auth-test-flaky.patch | 32 ++
dev-libs/glib/glib-2.50.2.ebuild | 326 --------------------
dev-libs/glib/glib-2.52.3.ebuild | 341 ---------------------
dev-libs/glib/glib-2.56.2.ebuild | 2 +-
dev-libs/glib/glib-2.66.2.ebuild | 300 ++++++++++++++++++
dev-libs/glib/metadata.xml | 50 +--
7 files changed, 365 insertions(+), 690 deletions(-)
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 654849c16b..0b4341f360 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,6 +1,4 @@
-DIST 07d4a86e74b9b12a562b57ce5fa3a275bf0fe774.zip 13852 BLAKE2B a272281e4850b11b1632593155ed6bcbea73ccae4e6a7083c70dfd1ba207b5ae66d981445e08aca34287a6631ddcee7c832be152a9a3f62f470b17819c7949b6 SHA512 971a0519b53e066adcce27176bc134f6ccd6660d85113d5be10fa7cd421ef1e089a1780459de63234de618abd68df62d308f409a7097fe6a9e91e20510af40b9
-DIST glib-2.50.2.tar.xz 7582312 BLAKE2B 1faa4bec57b0dc9538a5d86b6530b5b60c37d01c6b1e3d3667c1e0204bb78fa5890699456425f302f33b48792af0fe448c17760614895d10b27358a5c187a518 SHA512 63d7b5ece8d7d15b10e06ef10a8e0a4446f30a8d9c97daa3352ec00dfef622728bd42ed24cbf67e553166a0f9e29a3e3d024d1d085b9804fd67608db438b6771
-DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017
DIST glib-2.56.2.tar.xz 8041756 BLAKE2B 1af5bb37378856e959602bcb9299266bba46b990839c923f6b9881624aed306af0779005281b3e3a46b5994c54812edc86aade9cb782c596fd63b6fd91baba51 SHA512 8201ea82d3613d2e879284abe01520b766da30957c5a1a22f3e6019b0cce6bf95d25beae78867b6a133401c4165153c0c92974dd459ab12f9e0e9dd0c95df5d4
+DIST glib-2.66.2.tar.xz 4836456 BLAKE2B 5484a7fe497dbe06df7ce11dbc8836c95dbb01e6e309516b82158f2915eeee36ccbe6e904cb6ae9a5a0223ccc0b52f6e64d61a418bf790538bc90388430977b2 SHA512 30278c066c6b209f45fcfdb9ffc4732236451464506b93c0fff0964ff8aac58c15be85c3793c686d4740d9d97857984bc0ab71e38d5da11c5fd860e569fb6cb9
DIST glib-cygwinports-3a873fdd1b9a9e649563fe8e6b8ae6951b0dd3be.zip 13038 BLAKE2B 08f217e204c8518137722dcd535c100cbdc56e43dcf3d16a339c93353c594287670215c130b2c7f83235145632fad6d30903ae099f5999bf72ec070a12da4484 SHA512 fd4925d6a2380c5ff551e812a182de20f7b59e5d134a2c54b985efe85ab334499b0050097ca5c3271f14e2c3c5e89650e134a01e4c5be06bad05a12eaaf9fe53
DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
diff --git a/dev-libs/glib/files/glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch b/dev-libs/glib/files/glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch
new file mode 100644
index 0000000000..d1a41ecb79
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch
@@ -0,0 +1,32 @@
+From 95b22035f6151ab465c37fe5e3e340713cb74e23 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Tue, 24 Mar 2020 18:44:54 -0700
+Subject: [PATCH] Mark gdbus-server-auth test flaky
+
+See https://gitlab.gnome.org/GNOME/glib/-/issues/1954
+---
+ gio/tests/meson.build | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/gio/tests/meson.build b/gio/tests/meson.build
+index 788cf978b..7f45d0191 100644
+--- a/gio/tests/meson.build
++++ b/gio/tests/meson.build
+@@ -122,12 +122,13 @@ if dbus1_dep.found()
+ },
+ 'gdbus-server-auth' : {
+ 'dependencies' : [dbus1_dep],
++ 'suite' : ['flaky'],
+ },
+ }
+ else
+ # We can build a cut-down version of this test without libdbus
+ gio_tests += {
+- 'gdbus-server-auth' : {},
++ 'gdbus-server-auth' : {'suite' : ['flaky']},
+ }
+ endif
+
+--
+2.24.1
+
diff --git a/dev-libs/glib/glib-2.50.2.ebuild b/dev-libs/glib/glib-2.50.2.ebuild
deleted file mode 100644
index e6d26981a0..0000000000
--- a/dev-libs/glib/glib-2.50.2.ebuild
+++ /dev/null
@@ -1,326 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
-# adding new dependencies end up making stage3 to grow. Every addition needs
-# then to be think very closely.
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-# Completely useless with or without USE static-libs, people need to use
-# pkg-config
-GNOME2_LA_PUNT="yes"
-
-inherit autotools bash-completion-r1 eutils flag-o-matic gnome2 libtool linux-info \
- multilib multilib-minimal pax-utils python-r1 toolchain-funcs versionator virtualx
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="${SRC_URI}
- https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
-CYGWINPORTS_GITREV="07d4a86e74b9b12a562b57ce5fa3a275bf0fe774"
-
-[[ -n ${CYGWINPORTS_GITREV} ]] &&
-SRC_URI+=" elibc_Cygwin? ( https://github.com/cygwinports/glib2.0/archive/${CYGWINPORTS_GITREV}.zip )"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="dbus +doc debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
-REQUIRED_USE="
- utils? ( ${PYTHON_REQUIRED_USE} )
- test? ( ${PYTHON_REQUIRED_USE} )
-"
-
-KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-RDEPEND="
- !<dev-util/gdbus-codegen-${PV}
- >=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?]
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- >=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
- >=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
- xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
- fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
- utils? (
- ${PYTHON_DEPS}
- >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
- virtual/libelf:0=
- )
-"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.1.2
- >=dev-libs/libxslt-1.0
- >=sys-devel/gettext-0.11
- >=dev-util/gtk-doc-am-1.20
- systemtap? ( >=dev-util/systemtap-1.3 )
- test? (
- sys-devel/gdb
- ${PYTHON_DEPS}
- >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
- >=sys-apps/dbus-1.2.14 )
- !<dev-util/gtk-doc-1.15-r2
-"
-PDEPEND="!<gnome-base/gvfs-1.6.4-r990
- dbus? ( gnome-base/dconf )
- mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# dconf is needed to be able to save settings, bug #498436
-# Earlier versions of gvfs do not work with glib
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/gio-querymodules$(get_exeext)
-)
-
-pkg_setup() {
- if use kernel_linux ; then
- CONFIG_CHECK="~INOTIFY_USER"
- if use test ; then
- CONFIG_CHECK="~IPV6"
- WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
- fi
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- # Prevent build failure in stage3 where pkgconfig is not available, bug #481056
- mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
-
- if use test; then
- # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
- if ! has_version dev-util/desktop-file-utils ; then
- ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
- ewarn "think on installing it to get these tests run."
- sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
- sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
- fi
-
- # gdesktopappinfo requires existing terminal (gnome-terminal or any
- # other), falling back to xterm if one doesn't exist
- if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
- ewarn "Some tests will be skipped due to missing terminal program"
- sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
- fi
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=722604
- sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
- sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
-
- ewarn "Tests for search-utils have been skipped"
- sed -i -e "/search-utils/d" glib/tests/Makefile.am || die
- else
- # Don't build tests, also prevents extra deps, bug #512022
- sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
- fi
-
- # gdbus-codegen is a separate package
- eapply "${FILESDIR}"/${PN}-2.50.0-external-gdbus-codegen.patch
-
- # Leave python shebang alone - handled by python_replicate_script
- # We could call python_setup and give configure a valid --with-python
- # arg, but that would mean a build dep on python when USE=utils.
- sed -e '/${PYTHON}/d' \
- -i glib/Makefile.{am,in} || die
-
- if [[ -n ${CYGWINPORTS_GITREV} ]] && use elibc_Cygwin; then
- local p d="${WORKDIR}/glib2.0-${CYGWINPORTS_GITREV}"
- for p in $(
- eval "$(sed -ne '/PATCH_URI="/,/"/p' < "${d}"/glib2.0.cygport)"
- echo ${PATCH_URI}
- ); do
- # Cygwin hasn't updated to 2.50.2 yet, which has patches merged.
- [[ ${p} == 2.46-glocalfilemonitor.patch ]] && continue
- epatch "${d}/${p}"
- done
- fi
-
- eapply_user
-
- # make default sane for us
- if use prefix ; then
- sed -i -e "s:/usr/local:${EPREFIX}/usr:" gio/xdgmime/xdgmime.c || die
- # bug #308609, without path, bug #314057
- export PERL=perl
- fi
-
- if [[ ${CHOST} == *-solaris* ]] ; then
- # fix standards conflicts
- sed -i \
- -e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/\1_DISABLED/' \
- -e '/\<_XOPEN_SOURCE\>/s/ 2,/600,/' \
- configure.ac || die
- sed -i -e '/#define\s\+_POSIX_SOURCE/d' \
- glib/giounix.c || die
- fi
-
- # Also needed to prevent cross-compile failures, see bug #267603
- eautoreconf
-
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- # Avoid circular depend with dev-util/pkgconfig and
- # native builds (cross-compiles won't need pkg-config
- # in the target ROOT to work here)
- if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
- if has_version sys-apps/dbus; then
- export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
- export DBUS1_LIBS="-ldbus-1"
- fi
- export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
- export LIBFFI_LIBS="-lffi"
- fi
-
- # These configure tests don't work when cross-compiling.
- if tc-is-cross-compiler ; then
- # https://bugzilla.gnome.org/show_bug.cgi?id=756473
- case ${CHOST} in
- hppa*|metag*) export glib_cv_stack_grows=yes ;;
- *) export glib_cv_stack_grows=no ;;
- esac
- # https://bugzilla.gnome.org/show_bug.cgi?id=756474
- export glib_cv_uscore=no
- # https://bugzilla.gnome.org/show_bug.cgi?id=756475
- export ac_cv_func_posix_get{pwuid,grgid}_r=yes
- fi
-
- local myconf
-
- case "${CHOST}" in
- *-mingw*) myconf="${myconf} --with-threads=win32" ;;
- *) myconf="${myconf} --with-threads=posix" ;;
- esac
-
- # non-glibc platforms use GNU libiconv, but configure needs to know about
- # that not to get confused when it finds something outside the prefix too
- if use !elibc_glibc ; then
- myconf="${myconf} --with-libiconv=gnu"
- # add the libdir for libtool, otherwise it'll make love with system
- # installed libiconv. Automake passes LDFLAGS before local libs,
- # add this to LIBS instead to come after local lib dirs.
- append-libs "-L${EPREFIX}/usr/$(get_libdir)"
- fi
-
- # FIXME: Always use internal libpcre, bug #254659
- # (maybe consider going back to system lib)
- # libelf used only by the gresource bin
- ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
- $(usex debug --enable-debug=yes ' ') \
- $(use_enable xattr) \
- $(use_enable fam) \
- $(use_enable selinux) \
- $(use_enable static-libs static) \
- $(use_enable systemtap dtrace) \
- $(use_enable systemtap systemtap) \
- $(multilib_native_use_enable utils libelf) \
- --disable-compile-warnings \
- $(use_enable doc man) \
- --with-pcre=system \
- --with-xml-catalog="${EPREFIX}/etc/xml/catalog"
-
- if multilib_is_native_abi; then
- local d
- for d in glib gio gobject; do
- ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
- done
- fi
-}
-
-multilib_src_test() {
- export XDG_CONFIG_DIRS="${EPREFIX}"/etc/xdg
- export XDG_DATA_DIRS="${EPREFIX}"/usr/local/share:"${EPREFIX}"/usr/share
- export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
- export LC_TIME=C # bug #411967
- python_setup
-
- # Related test is a bit nitpicking
- mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
- chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
- # Hardened: gdb needs this, bug #338891
- if host-is-pax ; then
- pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
- || die "Hardened adjustment failed"
- fi
-
- # Need X for dbus-launch session X11 initialization
- virtx emake check
-}
-
-multilib_src_install() {
- gnome2_src_install completiondir="$(get_bashcompdir)"
- keepdir /usr/$(get_libdir)/gio/modules
-}
-
-multilib_src_install_all() {
- use doc && einstalldocs
-
- if use utils ; then
- python_replicate_script "${ED}"/usr/bin/gtester-report
- else
- rm "${ED}usr/bin/gtester-report"
- rm "${ED}usr/share/man/man1/gtester-report.1"
- fi
-
- # Do not install charset.alias even if generated, leave it to libiconv
- rm -f "${ED}/usr/lib/charset.alias"
-
- # Don't install gdb python macros, bug 291328
- rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
-}
-
-pkg_preinst() {
- gnome2_pkg_preinst
-
- # Make gschemas.compiled belong to glib alone
- local cache="usr/share/glib-2.0/schemas/gschemas.compiled"
-
- if [[ -e ${EROOT}${cache} ]]; then
- cp "${EROOT}"${cache} "${ED}"/${cache} || die
- else
- touch "${ED}"/${cache} || die
- fi
-
- multilib_pkg_preinst() {
- # Make giomodule.cache belong to glib alone
- local cache="usr/$(get_libdir)/gio/giomodule.cache"
-
- if [[ -e ${EROOT}${cache} ]]; then
- cp "${EROOT}"${cache} "${ED}"/${cache} || die
- else
- touch "${ED}"/${cache} || die
- fi
- }
-
- multilib_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
- # force (re)generation of gschemas.compiled
- GNOME2_ECLASS_GLIB_SCHEMAS="force"
-
- gnome2_pkg_postinst
-
- multilib_pkg_postinst() {
- gnome2_giomodule_cache_update \
- || die "Update GIO modules cache failed (for ${ABI})"
- }
- multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-
- if [[ -z ${REPLACED_BY_VERSION} ]]; then
- multilib_pkg_postrm() {
- rm -f "${EROOT}"usr/$(get_libdir)/gio/giomodule.cache
- }
- multilib_foreach_abi multilib_pkg_postrm
- rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled
- fi
-}
diff --git a/dev-libs/glib/glib-2.52.3.ebuild b/dev-libs/glib/glib-2.52.3.ebuild
deleted file mode 100644
index b650356604..0000000000
--- a/dev-libs/glib/glib-2.52.3.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
-# adding new dependencies end up making stage3 to grow. Every addition needs
-# then to be think very closely.
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-# Completely useless with or without USE static-libs, people need to use
-# pkg-config
-GNOME2_LA_PUNT="yes"
-
-inherit autotools bash-completion-r1 flag-o-matic gnome2 libtool linux-info \
- multilib multilib-minimal pax-utils python-r1 toolchain-funcs versionator virtualx
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="https://www.gtk.org/"
-SRC_URI="${SRC_URI}
- https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
-CYGWINPORTS_GITREV="07d4a86e74b9b12a562b57ce5fa3a275bf0fe774"
-
-[[ -n ${CYGWINPORTS_GITREV} ]] &&
-SRC_URI+=" elibc_Cygwin? ( https://github.com/cygwinports/glib2.0/archive/${CYGWINPORTS_GITREV}.zip )"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
-REQUIRED_USE="
- utils? ( ${PYTHON_REQUIRED_USE} )
- test? ( ${PYTHON_REQUIRED_USE} )
-"
-
-KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-# Added util-linux multilib dependency to have libmount support (which
-# is always turned on on linux systems, unless explicitly disabled, but
-# this ebuild does not do that anyway) (bug #599586)
-
-RDEPEND="
- !<dev-util/gdbus-codegen-${PV}
- >=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?]
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- >=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
- >=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
- selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
- xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
- fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
- utils? (
- ${PYTHON_DEPS}
- >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
- virtual/libelf:0=
- )
-"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.1.2
- >=dev-libs/libxslt-1.0
- >=sys-devel/gettext-0.11
- >=dev-util/gtk-doc-am-1.20
- systemtap? ( >=dev-util/systemtap-1.3 )
- test? (
- sys-devel/gdb
- ${PYTHON_DEPS}
- >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
- >=sys-apps/dbus-1.2.14 )
- !<dev-util/gtk-doc-1.15-r2
-"
-PDEPEND="!<gnome-base/gvfs-1.6.4-r990
- dbus? ( gnome-base/dconf )
- mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# dconf is needed to be able to save settings, bug #498436
-# Earlier versions of gvfs do not work with glib
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/gio-querymodules$(get_exeext)
-)
-
-pkg_setup() {
- if use kernel_linux ; then
- CONFIG_CHECK="~INOTIFY_USER"
- if use test ; then
- CONFIG_CHECK="~IPV6"
- WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
- fi
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- # Prevent build failure in stage3 where pkgconfig is not available, bug #481056
- mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
-
- if use test; then
- # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
- if ! has_version dev-util/desktop-file-utils ; then
- ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
- ewarn "think on installing it to get these tests run."
- sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
- sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
- fi
-
- # gdesktopappinfo requires existing terminal (gnome-terminal or any
- # other), falling back to xterm if one doesn't exist
- if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
- ewarn "Some tests will be skipped due to missing terminal program"
- sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
- fi
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=722604
- sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
- sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
-
- ewarn "Tests for search-utils have been skipped"
- sed -i -e "/search-utils/d" glib/tests/Makefile.am || die
- else
- # Don't build tests, also prevents extra deps, bug #512022
- sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
- fi
-
- # gdbus-codegen is a separate package
- eapply "${FILESDIR}"/${PN}-2.50.0-external-gdbus-codegen.patch
-
- # Leave python shebang alone - handled by python_replicate_script
- # We could call python_setup and give configure a valid --with-python
- # arg, but that would mean a build dep on python when USE=utils.
- sed -e '/${PYTHON}/d' \
- -i glib/Makefile.{am,in} || die
-
- if [[ -n ${CYGWINPORTS_GITREV} ]] && use elibc_Cygwin; then
- local p d="${WORKDIR}/glib2.0-${CYGWINPORTS_GITREV}"
- for p in $(
- eval "$(sed -ne '/PATCH_URI="/,/"/p' < "${d}"/glib2.0.cygport)"
- echo ${PATCH_URI}
- ); do
- # Cygwin hasn't updated to 2.50.2 yet, which has patches merged.
- [[ ${p} == 2.46-glocalfilemonitor.patch ]] && continue
- epatch "${d}/${p}"
- done
- fi
-
- # make default sane for us
- if use prefix ; then
- sed -i -e "s:/usr/local:${EPREFIX}/usr:" gio/xdgmime/xdgmime.c || die
- # bug #308609, without path, bug #314057
- export PERL=perl
- fi
-
- if [[ ${CHOST} == *-solaris* ]] ; then
- # fix standards conflicts
- sed -i \
- -e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/\1_DISABLED/' \
- -e '/\<_XOPEN_SOURCE\>/s/ 2,/600,/' \
- configure.ac || die
- sed -i -e '/#define\s\+_POSIX_SOURCE/d' \
- glib/giounix.c || die
- fi
-
- # Also needed to prevent cross-compile failures, see bug #267603
- eautoreconf
-
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- # Avoid circular depend with dev-util/pkgconfig and
- # native builds (cross-compiles won't need pkg-config
- # in the target ROOT to work here)
- if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
- if has_version sys-apps/dbus; then
- export DBUS1_CFLAGS="-I${EPREFIX}/usr/include/dbus-1.0 -I${EPREFIX}/usr/$(get_libdir)/dbus-1.0/include"
- export DBUS1_LIBS="-ldbus-1"
- fi
- export LIBFFI_CFLAGS="-I$(echo ${EPREFIX}/usr/$(get_libdir)/libffi-*/include)"
- export LIBFFI_LIBS="-lffi"
- export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass
- export PCRE_LIBS="-lpcre"
- fi
-
- # These configure tests don't work when cross-compiling.
- if tc-is-cross-compiler ; then
- # https://bugzilla.gnome.org/show_bug.cgi?id=756473
- case ${CHOST} in
- hppa*|metag*) export glib_cv_stack_grows=yes ;;
- *) export glib_cv_stack_grows=no ;;
- esac
- # https://bugzilla.gnome.org/show_bug.cgi?id=756474
- export glib_cv_uscore=no
- # https://bugzilla.gnome.org/show_bug.cgi?id=756475
- export ac_cv_func_posix_get{pwuid,grgid}_r=yes
- fi
-
- local myconf
-
- case "${CHOST}" in
- *-mingw*) myconf="${myconf} --with-threads=win32" ;;
- *) myconf="${myconf} --with-threads=posix" ;;
- esac
-
- # non-glibc platforms use GNU libiconv, but configure needs to know about
- # that not to get confused when it finds something outside the prefix too
- if use !elibc_glibc ; then
- myconf="${myconf} --with-libiconv=gnu"
- # add the libdir for libtool, otherwise it'll make love with system
- # installed libiconv. Automake passes LDFLAGS before local libs,
- # add this to LIBS instead to come after local lib dirs.
- append-libs "-L${EPREFIX}/usr/$(get_libdir)"
- fi
-
- # libelf used only by the gresource bin
- ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
- $(usex debug --enable-debug=yes ' ') \
- $(use_enable xattr) \
- $(use_enable fam) \
- $(use_enable kernel_linux libmount) \
- $(use_enable selinux) \
- $(use_enable static-libs static) \
- $(use_enable systemtap dtrace) \
- $(use_enable systemtap systemtap) \
- $(multilib_native_use_enable utils libelf) \
- --disable-compile-warnings \
- --enable-man \
- --with-pcre=system \
- --with-xml-catalog="${EPREFIX}/etc/xml/catalog"
-
- if multilib_is_native_abi; then
- local d
- for d in glib gio gobject; do
- ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
- done
- fi
-}
-
-multilib_src_test() {
- export XDG_CONFIG_DIRS="${EPREFIX}"/etc/xdg
- export XDG_DATA_DIRS="${EPREFIX}"/usr/local/share:/usr/share
- export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
- export LC_TIME=C # bug #411967
- unset GSETTINGS_BACKEND # bug #596380
- python_setup
-
- # Related test is a bit nitpicking
- mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
- chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
- # Hardened: gdb needs this, bug #338891
- if host-is-pax ; then
- pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
- || die "Hardened adjustment failed"
- fi
-
- # Need X for dbus-launch session X11 initialization
- virtx emake check
-}
-
-multilib_src_install() {
- gnome2_src_install completiondir="$(get_bashcompdir)"
- keepdir /usr/$(get_libdir)/gio/modules
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- if use utils ; then
- python_replicate_script "${ED}"/usr/bin/gtester-report
- else
- rm "${ED}usr/bin/gtester-report"
- rm "${ED}usr/share/man/man1/gtester-report.1"
- fi
-
- # Do not install charset.alias even if generated, leave it to libiconv
- rm -f "${ED}/usr/lib/charset.alias"
-
- # Don't install gdb python macros, bug 291328
- rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
-}
-
-pkg_preinst() {
- gnome2_pkg_preinst
-
- # Make gschemas.compiled belong to glib alone
- local cache="usr/share/glib-2.0/schemas/gschemas.compiled"
-
- if [[ -e ${EROOT}${cache} ]]; then
- cp "${EROOT}"${cache} "${ED}"/${cache} || die
- else
- touch "${ED}"/${cache} || die
- fi
-
- multilib_pkg_preinst() {
- # Make giomodule.cache belong to glib alone
- local cache="usr/$(get_libdir)/gio/modules/giomodule.cache"
-
- if [[ -e ${EROOT}${cache} ]]; then
- cp "${EROOT}"${cache} "${ED}"/${cache} || die
- else
- touch "${ED}"/${cache} || die
- fi
- }
-
- # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
- # file due to inability to create it and GIO might not look at any of the modules there
- if ! tc-is-cross-compiler ; then
- multilib_foreach_abi multilib_pkg_preinst
- fi
-}
-
-pkg_postinst() {
- # force (re)generation of gschemas.compiled
- GNOME2_ECLASS_GLIB_SCHEMAS="force"
-
- gnome2_pkg_postinst
-
- multilib_pkg_postinst() {
- gnome2_giomodule_cache_update \
- || die "Update GIO modules cache failed (for ${ABI})"
- }
- if ! tc-is-cross-compiler ; then
- multilib_foreach_abi multilib_pkg_postinst
- else
- ewarn "Updating of GIO modules cache skipped due to cross-compilation."
- ewarn "You might want to run gio-querymodules manually on the target for"
- ewarn "your final image for performance reasons and re-run it when packages"
- ewarn "installing GIO modules get upgraded or added to the image."
- fi
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-
- if [[ -z ${REPLACED_BY_VERSION} ]]; then
- multilib_pkg_postrm() {
- rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache
- }
- multilib_foreach_abi multilib_pkg_postrm
- rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled
- fi
-}
diff --git a/dev-libs/glib/glib-2.56.2.ebuild b/dev-libs/glib/glib-2.56.2.ebuild
index 791f5bf75b..b25d240cda 100644
--- a/dev-libs/glib/glib-2.56.2.ebuild
+++ b/dev-libs/glib/glib-2.56.2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8,3_9} ) # only for tests
GNOME2_EAUTORECONF=yes
inherit autotools bash-completion-r1 flag-o-matic gnome2 libtool linux-info \
diff --git a/dev-libs/glib/glib-2.66.2.ebuild b/dev-libs/glib/glib-2.66.2.ebuild
new file mode 100644
index 0000000000..7cb2271077
--- /dev/null
+++ b/dev-libs/glib/glib-2.66.2.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit flag-o-matic gnome.org gnome2-utils linux-info meson multilib multilib-minimal python-any-r1 toolchain-funcs xdg
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs sysprof systemtap test utils xattr"
+RESTRICT="!test? ( test )"
+
+# meson/ninja buildsystem, breaks of course (at least on Solaris), most
+# likely will introduce problems during bootstrap too
+#KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+
+# * libelf isn't strictly necessary, but makes gresource tool more useful, and
+# the check is automagic in gio/meson.build. gresource is not a multilib tool
+# right now, thus it doesn't matter if non-native ABI libelf exists or not
+# (non-native binary is overwritten, it doesn't matter if libelf was linked to).
+# * elfutils (via libelf) does not build on Windows. gresources are not embedded
+# within ELF binaries on that platform anyway and inspecting ELF binaries from
+# other platforms is not that useful so exclude the dependency in this case.
+# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
+# these are used by GIO, which glib[static-libs] consumers don't really seem
+# to need at all, thus not imposing the deps for now and once some consumers
+# are actually found to static link libgio-2.0.a, we can revisit and either add
+# them or just put the (build) deps in that rare consumer instead of recursive
+# RDEPEND here (due to lack of recursive DEPEND).
+RDEPEND="
+ !<dev-util/gdbus-codegen-2.66.0
+ >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+ >=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
+ >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ >=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+ !prefix-stack? ( kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] ) )
+ selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
+ xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
+ kernel_linux? ( virtual/libelf:0= )
+ fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ sysprof? ( >=dev-util/sysprof-capture-3.38:4[${MULTILIB_USEDEP}] )
+"
+# libxml2 used for optional tests that get automatically skipped
+BDEPEND="
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ >=sys-devel/gettext-0.19.8
+ gtk-doc? ( >=dev-util/gtk-doc-1.32-r2
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5 )
+ systemtap? ( >=dev-util/systemtap-1.3 )
+ ${PYTHON_DEPS}
+ test? ( >=sys-apps/dbus-1.2.14 )
+ virtual/pkgconfig
+"
+# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
+
+PDEPEND="
+ dbus? ( gnome-base/dconf )
+ mime? ( x11-misc/shared-mime-info )
+"
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# dconf is needed to be able to save settings, bug #498436
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/gio-querymodules$(get_exeext)
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
+)
+
+pkg_setup() {
+ if use kernel_linux ; then
+ CONFIG_CHECK="~INOTIFY_USER"
+ if use test ; then
+ CONFIG_CHECK="~IPV6"
+ WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
+ fi
+ linux-info_pkg_setup
+ fi
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ if use test; then
+ # TODO: Review the test exclusions, especially now with meson
+ # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
+ if ! has_version dev-util/desktop-file-utils ; then
+ ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
+ ewarn "think on installing it to get these tests run."
+ sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
+ sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
+ fi
+
+ # gdesktopappinfo requires existing terminal (gnome-terminal or any
+ # other), falling back to xterm if one doesn't exist
+ #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
+ # ewarn "Some tests will be skipped due to missing terminal program"
+ # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
+ # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
+ sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
+ # desktop-app-info/launch* might fail similarly
+ sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
+ #fi
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=722604
+ sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
+ sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
+
+ ewarn "Tests for search-utils have been skipped"
+ sed -i -e "/search-utils/d" glib/tests/meson.build || die
+
+ # Play nice with network-sandbox, but this approach would defeat the purpose of the test
+ #sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
+ else
+ # Don't build tests, also prevents extra deps, bug #512022
+ sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
+ fi
+
+ # Don't build fuzzing binaries - not used
+ sed -i -e '/subdir.*fuzzing/d' meson.build || die
+
+ # gdbus-codegen is a separate package
+ sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
+
+ # Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
+ sed -i -e '/install_dir/d' gio/tests/meson.build || die
+
+ cat > "${T}/glib-test-ld-wrapper" <<-EOF
+ #!/usr/bin/env sh
+ exec \${LD:-ld} "\$@"
+ EOF
+ chmod a+x "${T}/glib-test-ld-wrapper" || die
+ sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
+
+ # make default sane for us
+ if use prefix ; then
+ sed -i -e "s:/usr/local:${EPREFIX}/usr:" gio/xdgmime/xdgmime.c || die
+ # bug #308609, without path, bug #314057
+ export PERL=perl
+ fi
+
+ xdg_src_prepare
+ gnome2_environment_reset
+ # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
+}
+
+multilib_src_configure() {
+ if use debug; then
+ append-cflags -DG_ENABLE_DEBUG
+ else
+ append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
+ fi
+
+ # TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
+ #if tc-is-cross-compiler ; then
+ # https://bugzilla.gnome.org/show_bug.cgi?id=756473
+ # TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
+ #case ${CHOST} in
+ #hppa*|metag*) export glib_cv_stack_grows=yes ;;
+ #*) export glib_cv_stack_grows=no ;;
+ #esac
+ #fi
+
+ local emesonargs=(
+ -Ddefault_library=$(usex static-libs both shared)
+ $(meson_feature selinux)
+ $(meson_use xattr)
+ -Dlibmount=enabled # only used if host_system == 'linux'
+ -Dinternal_pcre=false
+ -Dman=true
+ $(meson_use systemtap dtrace)
+ $(meson_use systemtap)
+ $(meson_feature sysprof)
+ -Dgtk_doc=$(multilib_native_usex gtk-doc true false)
+ $(meson_use fam)
+ -Dinstalled_tests=false
+ -Dnls=enabled
+ -Doss_fuzz=disabled
+ )
+ meson_src_configure
+}
+
+multilib_src_compile() {
+ meson_src_compile
+}
+
+multilib_src_test() {
+ export XDG_CONFIG_DIRS="${EPREFIX}"/etc/xdg
+ export XDG_DATA_DIRS="${EPREFIX}"/usr/local/share:/usr/share
+ export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+ export LC_TIME=C # bug #411967
+ unset GSETTINGS_BACKEND # bug #596380
+ python_setup
+
+ # Related test is a bit nitpicking
+ mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+ chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+
+ meson_src_test --timeout-multiplier 2 --no-suite flaky
+}
+
+multilib_src_install() {
+ meson_src_install
+ keepdir /usr/$(get_libdir)/gio/modules
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ # These are installed by dev-util/glib-utils
+ # TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
+ rm "${ED}/usr/bin/glib-genmarshal" || die
+ rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
+ rm "${ED}/usr/bin/glib-mkenums" || die
+ rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
+ rm "${ED}/usr/bin/gtester-report" || die
+ rm "${ED}/usr/share/man/man1/gtester-report.1" || die
+ # gdbus-codegen manpage installed by dev-util/gdbus-codegen
+ rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
+}
+
+pkg_preinst() {
+ xdg_pkg_preinst
+
+ # Make gschemas.compiled belong to glib alone
+ local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
+
+ if [[ -e ${EROOT}${cache} ]]; then
+ cp "${EROOT}"${cache} "${ED}"/${cache} || die
+ else
+ touch "${ED}"${cache} || die
+ fi
+
+ multilib_pkg_preinst() {
+ # Make giomodule.cache belong to glib alone
+ local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
+
+ if [[ -e ${EROOT}${cache} ]]; then
+ cp "${EROOT}"${cache} "${ED}"${cache} || die
+ else
+ touch "${ED}"${cache} || die
+ fi
+ }
+
+ # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
+ # file due to inability to create it and GIO might not look at any of the modules there
+ if ! tc-is-cross-compiler ; then
+ multilib_foreach_abi multilib_pkg_preinst
+ fi
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ # glib installs no schemas itself, but we force update for fresh install in case
+ # something has dropped in a schemas file without direct glib dep; and for upgrades
+ # in case the compiled schema format could have changed
+ gnome2_schemas_update
+
+ multilib_pkg_postinst() {
+ gnome2_giomodule_cache_update \
+ || die "Update GIO modules cache failed (for ${ABI})"
+ }
+ if ! tc-is-cross-compiler ; then
+ multilib_foreach_abi multilib_pkg_postinst
+ else
+ ewarn "Updating of GIO modules cache skipped due to cross-compilation."
+ ewarn "You might want to run gio-querymodules manually on the target for"
+ ewarn "your final image for performance reasons and re-run it when packages"
+ ewarn "installing GIO modules get upgraded or added to the image."
+ fi
+
+ for v in ${REPLACING_VERSIONS}; do
+ if ver_test "$v" "-lt" "2.63.6"; then
+ ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
+ ewarn "to restart your session for \"Open With\" dialogs to work."
+ fi
+ done
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+
+ if [[ -z ${REPLACED_BY_VERSION} ]]; then
+ multilib_pkg_postrm() {
+ rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
+ }
+ multilib_foreach_abi multilib_pkg_postrm
+ rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
+ fi
+}
diff --git a/dev-libs/glib/metadata.xml b/dev-libs/glib/metadata.xml
index b73f9ed910..c1bb61a327 100644
--- a/dev-libs/glib/metadata.xml
+++ b/dev-libs/glib/metadata.xml
@@ -1,23 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
- <use>
- <flag name="dbus">Enable dependencies required by glib libraries
- using dbus service to manage settings saving</flag>
- <flag name="mime">Pull in shared MIME database that many glib-based
- applications require at runtime to detect or open files. Warning:
- do not disable this flag unless installing on a headless server.</flag>
- <flag name="systemtap">Build support for profiling and tracing using
- <pkg>dev-util/systemtap</pkg></flag>
- <flag name="utils">Install gtester-report utility to generate test
- report files for your software; build gresource utility with
- ELF support.</flag>
- </use>
- <upstream>
- <remote-id type="cpe">cpe:/a:gnome:glib</remote-id>
- </upstream>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <use>
+ <flag name="dbus">
+ Enable dependencies required by glib libraries
+ using dbus service to manage settings saving
+ </flag>
+ <flag name="mime">
+ Pull in shared MIME database that many glib-based
+ applications require at runtime to detect or open files. Warning:
+ do not disable this flag unless installing on a headless server.
+ </flag>
+ <flag name="systemtap">
+ Build support for profiling and tracing using
+ <pkg>dev-util/systemtap</pkg>
+ </flag>
+ <flag name="sysprof">
+ Enable profiling data capture support using
+ <pkg>dev-util/sysprof-capture</pkg>
+ </flag>
+ <flag name="utils">
+ Install gtester-report utility to generate test
+ report files for your software; build gresource utility with
+ ELF support.
+ </flag>
+ </use>
+ <upstream>
+ <remote-id type="cpe">cpe:/a:gnome:glib</remote-id>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-05-03 11:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-03 11:49 [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/glib/, dev-libs/glib/files/ Fabian Groffen
-- strict thread matches above, loose matches on Subject: below --
2022-12-27 18:32 Fabian Groffen
2020-12-15 19:43 Fabian Groffen
2020-12-04 13:17 Fabian Groffen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox