[arch-commits] Commit in glib2/trunk (PKGBUILD libs.diff)

[Jan Steffens]

    Date: Sunday, October 8, 2017 @ 21:31:23
  Author: heftig
Revision: 307202

2.54.1-2: Restore NODELETE

Modified:
  glib2/trunk/PKGBUILD
  glib2/trunk/libs.diff

-----------+
 PKGBUILD  |    4 +--
 libs.diff |   73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 68 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-08 21:16:44 UTC (rev 307201)
+++ PKGBUILD	2017-10-08 21:31:23 UTC (rev 307202)
@@ -4,7 +4,7 @@
 pkgbase=glib2
 pkgname=(glib2 glib2-docs)
 pkgver=2.54.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Low level core library"
 url="https://wiki.gnome.org/Projects/GLib"
 license=(LGPL2.1)
@@ -25,7 +25,7 @@
 sha256sums=('SKIP'
             '8b289f3e1a5a3b29d310d45610468199acfe6f2b38a0d1be38c9224437a0e40c'
             '12b1a2f4e304e4c03e48ae9564d73ae38619bbb7711a013138939ff8e5cc2327'
-            '05cce54fa4a728e2f0db45326ba3d4f303c2cc4d0cc68506e338906ad17ea7f0'
+            '54c43d5d4d4b5fa591eb639e63050ce5eac30aff6691fa9cf56631782b2aad33'
             '81a4df0b638730cffb7fa263c04841f7ca6b9c9578ee5045db6f30ff0c3fc531'
             'e1123a5d85d2445faac33f6dae1085fdd620d83279a4e130a83fe38db52b62b3'
             '5ba204a2686304b1454d401a39a9d27d09dd25e4529664e3fd565be3d439f8b6')

Modified: libs.diff
===================================================================
--- libs.diff	2017-10-08 21:16:44 UTC (rev 307201)
+++ libs.diff	2017-10-08 21:31:23 UTC (rev 307202)
@@ -1,7 +1,29 @@
+diff --git i/gio/meson.build w/gio/meson.build
+index 32526362666b5e80..d7030aa29a6f17eb 100644
+--- i/gio/meson.build
++++ w/gio/meson.build
+@@ -727,7 +727,7 @@ libgio = shared_library('gio-2.0',
+                   libgobject_dep, libgmodule_dep] + platform_deps + network_libs,
+   c_args : gio_c_args,
+   # intl.lib is not compatible with SAFESEH
+-  link_args : noseh_link_args,
++  link_args : noseh_link_args + library_link_args,
+ )
+ 
+ libgio_dep = declare_dependency(link_with : libgio,
 diff --git i/glib/meson.build w/glib/meson.build
-index 1da0bcd3cc601b9e..5cf8f747e8b15038 100644
+index 1da0bcd3cc601b9e..4286218c9c8361b2 100644
 --- i/glib/meson.build
 +++ w/glib/meson.build
+@@ -227,7 +227,7 @@ libglib = shared_library('glib-2.0',
+   soversion : soversion,
+   install : true,
+   # intl.lib is not compatible with SAFESEH
+-  link_args : noseh_link_args,
++  link_args : noseh_link_args + library_link_args,
+   include_directories : configinc,
+   link_with : [charset_lib, gnulib_lib],
+   dependencies : [pcre, thread_dep, libintl, librt] + libiconv + platform_deps,
 @@ -284,7 +284,7 @@ configure_file(
    output: 'libglib-2.0.so. at 0@-gdb.py'.format(library_version),
    configuration: gdb_conf,
@@ -12,7 +34,7 @@
  
  if enable_systemtap
 diff --git i/gmodule/meson.build w/gmodule/meson.build
-index 191bca2446f9977e..551956599a616157 100644
+index 191bca2446f9977e..fd0219d9225f2f3f 100644
 --- i/gmodule/meson.build
 +++ w/gmodule/meson.build
 @@ -37,7 +37,7 @@ elif cc.has_function('NSLinkModule')
@@ -24,7 +46,7 @@
  endif
  
  # additional checks for G_MODULE_IMPL_DL
-@@ -72,8 +72,11 @@ if g_module_impl == ''
+@@ -72,25 +72,29 @@ if g_module_impl == ''
    message('WARNING: No suitable GModule implementation found!')
  endif
  
@@ -37,11 +59,37 @@
  gmoduleconf_conf.set('G_MODULE_HAVE_DLERROR', g_module_have_dlerror)
  gmoduleconf_conf.set('G_MODULE_NEED_USCORE', g_module_need_uscore)
  gmoduleconf_conf.set('G_MODULE_BROKEN_RTLD_GLOBAL', g_module_broken_rtld_global)
+ 
+ gmoduleconf_h = configure_file(input : 'gmoduleconf.h.in',
+                                output : 'gmoduleconf.h',
+                                configuration : gmoduleconf_conf)
+ 
+ install_headers(['gmodule.h'], subdir : 'glib-2.0')
+ 
+ libgmodule = shared_library('gmodule-2.0',
+   sources : ['gmodule.c'],
+   version : library_version,
+   soversion : soversion,
+   install : true,
+   include_directories : [configinc, gmoduleinc],
+   dependencies : [libdl_dep, libglib_dep],
++  link_args : library_link_args,
+   c_args : ['-DG_LOG_DOMAIN="GModule"', '-DG_DISABLE_DEPRECATED'] + glib_hidden_visibility_args)
+ 
+ libgmodule_dep = declare_dependency(link_with : libgmodule,
 diff --git i/gobject/meson.build w/gobject/meson.build
-index aecca57c743d5956..0d39f2bbc36f816e 100644
+index aecca57c743d5956..e033ae15f9c226b5 100644
 --- i/gobject/meson.build
 +++ w/gobject/meson.build
-@@ -102,7 +102,7 @@ configure_file(
+@@ -61,6 +61,7 @@ libgobject = shared_library('gobject-2.0',
+   install : true,
+   include_directories : [configinc],
+   dependencies : [libintl, libffi_dep, libglib_dep],
++  link_args : library_link_args,
+   c_args : ['-DG_LOG_DOMAIN="GLib-GObject"', '-DGOBJECT_COMPILATION'] + glib_hidden_visibility_args)
+ 
+ libgobject_dep = declare_dependency(link_with : libgobject,
+@@ -102,7 +103,7 @@ configure_file(
    output: 'libgobject-2.0.so. at 0@-gdb.py'.format(library_version),
    configuration: gdb_conf,
    install: true,
@@ -50,11 +98,21 @@
  )
  
  if enable_systemtap
+diff --git i/gthread/meson.build w/gthread/meson.build
+index 8ccac3369894bda4..2d5913a91525460f 100644
+--- i/gthread/meson.build
++++ w/gthread/meson.build
+@@ -6,4 +6,5 @@ libgthread = shared_library('gthread-2.0',
+   soversion : soversion,
+   install : true,
+   dependencies : [libglib_dep],
++  link_args : library_link_args,
+   c_args : ['-DG_LOG_DOMAIN="GThread"' ] + glib_hidden_visibility_args)
 diff --git i/meson.build w/meson.build
-index 65ab92f023257aef..ea3f64c5e8c47bcc 100644
+index 0f3f7917899e93ea..12277e8d327b7a83 100644
 --- i/meson.build
 +++ w/meson.build
-@@ -1533,6 +1533,12 @@ glib_conf.set('GIO_MODULE_DIR', '${libdir}/gio/modules')
+@@ -1533,6 +1533,13 @@ glib_conf.set('GIO_MODULE_DIR', '${libdir}/gio/modules')
  # @G_MODULE_LIBS@ @SELINUX_LIBS@ @COCOA_LIBS@ @CARBON_LIBS@ @G_LIBS_EXTRA@
  # @PCRE_REQUIRES@ @GLIB_EXTRA_CFLAGS@ @G_THREAD_CFLAGS@
  
@@ -63,6 +121,7 @@
 +glib_conf.set('G_THREAD_CFLAGS', '-pthread')
 +glib_conf.set('G_MODULE_LDFLAGS', '-Wl,--export-dynamic')
 +glib_conf.set('PCRE_REQUIRES', 'libpcre')
++library_link_args = [ '-Wl,-z,nodelete' ]
 +
  # Tracing: dtrace
  want_dtrace = get_option('enable-dtrace')