summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2014-06-02 01:28:03 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2014-06-02 01:28:03 +0800
commitaa59fb149f767ba0ee8d7033eb80d144118e4da9 (patch)
tree5b4484488f360b75f25fb59fce5f52011633acde
parent5db6ebed5bb422bc0e8b8c2335a20831a57cf4fb (diff)
downloadmarcuscom-ports-aa59fb149f767ba0ee8d7033eb80d144118e4da9.tar
marcuscom-ports-aa59fb149f767ba0ee8d7033eb80d144118e4da9.tar.gz
marcuscom-ports-aa59fb149f767ba0ee8d7033eb80d144118e4da9.tar.bz2
marcuscom-ports-aa59fb149f767ba0ee8d7033eb80d144118e4da9.tar.lz
marcuscom-ports-aa59fb149f767ba0ee8d7033eb80d144118e4da9.tar.xz
marcuscom-ports-aa59fb149f767ba0ee8d7033eb80d144118e4da9.tar.zst
marcuscom-ports-aa59fb149f767ba0ee8d7033eb80d144118e4da9.zip
Fix a run time issue in vlc. Fixed upstream.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19719 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--devel/glib20/Makefile2
-rw-r--r--devel/glib20/files/patch-gobject_Makefile.in14
2 files changed, 15 insertions, 1 deletions
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 4c3dbf956..1960a7959 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -4,7 +4,7 @@
PORTNAME= glib
PORTVERSION= 2.40.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/glib20/files/patch-gobject_Makefile.in b/devel/glib20/files/patch-gobject_Makefile.in
new file mode 100644
index 000000000..d12c065cd
--- /dev/null
+++ b/devel/glib20/files/patch-gobject_Makefile.in
@@ -0,0 +1,14 @@
+https://bugzilla.gnome.org/show_bug.cgi?id=707298
+https://git.gnome.org/browse/glib/commit/?h=glib-2-40&id=3662eb9759fe225d1c214db6927c667a1b733e8a
+
+--- gobject/Makefile.in.orig 2014-06-01 21:22:14.000000000 +0200
++++ gobject/Makefile.in 2014-06-01 21:22:48.000000000 +0200
+@@ -869,7 +869,7 @@
+ @OS_WIN32_AND_DLL_COMPILATION_TRUE@gobject_win32_res = gobject-win32-res.o
+ @OS_WIN32_AND_DLL_COMPILATION_TRUE@gobject_win32_res_ldflag = -Wl,$(gobject_win32_res)
+ libgobjectincludedir = $(includedir)/glib-2.0/gobject
+-libgobject_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
++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)