svn commit: r356159 - in head/devel/glib20: . files

[Tijl Coosemans]

Author: tijl
Date: Sun Jun  1 17:56:38 2014
New Revision: 356159
URL: http://svnweb.freebsd.org/changeset/ports/356159
QAT: https://qat.redports.org/buildarchive/r356159/

Log:
  Link libgobject with -Wl,-z,nodelete because it cannot be safely dlclosed.
  This fixes a crash in multimedia/vlc with certain combinations of options.
  
  PR:		ports/172185, ports/183683, ports/186629
  Approved by:	gnome (kwm)
  Obtained from:	glib commit 3662eb9759fe225d1c214db6927c667a1b733e8a

Modified:
  head/devel/glib20/Makefile
  head/devel/glib20/files/patch-gobject_Makefile.in

Modified: head/devel/glib20/Makefile
==============================================================================
--- head/devel/glib20/Makefile	Sun Jun  1 17:24:23 2014	(r356158)
+++ head/devel/glib20/Makefile	Sun Jun  1 17:56:38 2014	(r356159)
@@ -4,7 +4,7 @@
 
 PORTNAME=	glib
 PORTVERSION=	2.36.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2

Modified: head/devel/glib20/files/patch-gobject_Makefile.in
==============================================================================
--- head/devel/glib20/files/patch-gobject_Makefile.in	Sun Jun  1 17:24:23 2014	(r356158)
+++ head/devel/glib20/files/patch-gobject_Makefile.in	Sun Jun  1 17:56:38 2014	(r356159)
@@ -1,6 +1,14 @@
 --- gobject/Makefile.in.orig	2012-05-03 11:42:11.000000000 +0200
 +++ gobject/Makefile.in	2012-05-03 11:42:51.000000000 +0200
-@@ -1381,7 +1381,7 @@
+@@ -566,6 +566,7 @@
+ @OS_WIN32_AND_DLL_COMPILATION_TRUE at gobject_win32_res_ldflag = -Wl,$(gobject_win32_res)
+ libgobjectincludedir = $(includedir)/glib-2.0/gobject
+ libgobject_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
++  -Wl,-z,nodelete \
+   $(gobject_win32_res_ldflag) \
+   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+   -export-dynamic $(no_undefined)
+@@ -1331,7 +1332,7 @@
  
  info-am:
  
@@ -9,7 +17,7 @@
  	install-libgobjectincludeHEADERS install-tapsetDATA
  	@$(NORMAL_INSTALL)
  	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-@@ -1649,9 +1649,7 @@
+@@ -1586,9 +1587,7 @@
  uninstall-gdb:
  	-rm -r $(DESTDIR)$(datadir)/gdb