[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/, dev-libs/glib/files/

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     06ecfcba3535fabeec3e0062f59ebc4c863c7f0f
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  8 21:53:09 2015 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Jun  8 21:53:09 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=06ecfcba

dev-libs/glib: WIP

 dev-libs/glib/files/glib-2.12.12-fbsd.patch | 35 -----------------------------
 dev-libs/glib/glib-9999.ebuild              |  5 -----
 2 files changed, 40 deletions(-)

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 5aca695..0000000
--- 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/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild
index 3e26c7b..7b04ea7 100644
--- a/dev-libs/glib/glib-9999.ebuild
+++ b/dev-libs/glib/glib-9999.ebuild
@@ -110,11 +110,6 @@ src_prepare() {
 	# Prevent build failure in stage3 where pkgconfig is not available, bug #481056
 	mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
 
-	# Fix gmodule issues on fbsd; bug #184301, upstream bug #107626
-	# Upstream doesn't even know if this is needed, looks like openBSD
-	# people is not needing it
-	#epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
-
 	if use test; then
 		# Do not try to remove files on live filesystem, upstream bug #619274
 		sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \