Date: Wednesday, September 27, 2017 @ 11:31:31 Author: heftig Revision: 306272
2.54.0+15+g20364bbdf-1 Added: glib2/trunk/libs.diff Modified: glib2/trunk/PKGBUILD -----------+ PKGBUILD | 10 ++++++-- libs.diff | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-09-27 10:29:47 UTC (rev 306271) +++ PKGBUILD 2017-09-27 11:31:31 UTC (rev 306272) @@ -3,7 +3,7 @@ pkgbase=glib2 pkgname=(glib2 glib2-docs) -pkgver=2.54.0 +pkgver=2.54.0+15+g20364bbdf pkgrel=1 pkgdesc="Low level core library" url="https://wiki.gnome.org/Projects/GLib"; @@ -15,15 +15,17 @@ optdepends=('python: for gdbus-codegen and gtester-report' 'libelf: gresource inspection tool') options=(!emptydirs) -_commit=738eff5decf0e354e692c36a0b9d466fc5775e3c # tags/2.54.0^0 +_commit=20364bbdf55a7662b657ad50e16c6b121463809b # glib-2-54 source=("git+https://git.gnome.org/browse/glib#commit=$_commit"; 0001-docs-Fix-building-with-meson.patch 0001-meson-Fix-permissions-of-installed-scripts.patch + libs.diff noisy-glib-compile-schemas.diff glib-compile-schemas.hook gio-querymodules.hook) sha256sums=('SKIP' '8b289f3e1a5a3b29d310d45610468199acfe6f2b38a0d1be38c9224437a0e40c' '12b1a2f4e304e4c03e48ae9564d73ae38619bbb7711a013138939ff8e5cc2327' + '05cce54fa4a728e2f0db45326ba3d4f303c2cc4d0cc68506e338906ad17ea7f0' '81a4df0b638730cffb7fa263c04841f7ca6b9c9578ee5045db6f30ff0c3fc531' 'e1123a5d85d2445faac33f6dae1085fdd620d83279a4e130a83fe38db52b62b3' '5ba204a2686304b1454d401a39a9d27d09dd25e4529664e3fd565be3d439f8b6') @@ -43,6 +45,10 @@ # https://bugzilla.gnome.org/show_bug.cgi?id=787671 patch -Np1 -i ../0001-meson-Fix-permissions-of-installed-scripts.patch + # Unbreak .pc files when built with meson + # Fix gdb scripts install + patch -Np1 -i ../libs.diff + # Suppress noise from glib-compile-schemas.hook patch -Np1 -i ../noisy-glib-compile-schemas.diff } Added: libs.diff =================================================================== --- libs.diff (rev 0) +++ libs.diff 2017-09-27 11:31:31 UTC (rev 306272) @@ -0,0 +1,69 @@ +diff --git i/glib/meson.build w/glib/meson.build +index 1da0bcd3cc601b9e..5cf8f747e8b15038 100644 +--- i/glib/meson.build ++++ w/glib/meson.build +@@ -284,7 +284,7 @@ configure_file( + output: 'libglib-2.0.so.@[email protected]'.format(library_version), + configuration: gdb_conf, + install: true, +- install_dir: join_paths(get_option('datadir'), 'gdb/auto-load' + get_option('libdir')) ++ install_dir: join_paths(get_option('datadir'), 'gdb/auto-load' + glib_libdir) + ) + + if enable_systemtap +diff --git i/gmodule/meson.build w/gmodule/meson.build +index 191bca2446f9977e..551956599a616157 100644 +--- i/gmodule/meson.build ++++ w/gmodule/meson.build +@@ -37,7 +37,7 @@ elif cc.has_function('NSLinkModule') + elif cc.links(dlopen_dlsym_test_code, args : '-ldl', name : 'dlopen() and dlsym() in libdl') + g_module_impl = 'G_MODULE_IMPL_DL' + libdl_dep = cc.find_library('dl') +- g_module_lib_args = '-ldl' ++ g_module_lib_args = ['-ldl'] + endif + + # additional checks for G_MODULE_IMPL_DL +@@ -72,8 +72,11 @@ if g_module_impl == '' + message('WARNING: No suitable GModule implementation found!') + endif + ++# For pc files ++glib_conf.set('G_MODULE_SUPPORTED', g_module_impl == '0' ? 'false' : 'true') ++glib_conf.set('G_MODULE_LIBS', ' '.join(g_module_lib_args)) ++ + gmoduleconf_conf.set('G_MODULE_IMPL', g_module_impl) +-gmoduleconf_conf.set('G_MODULE_SUPPORTED', g_module_impl != '0') + 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) +diff --git i/gobject/meson.build w/gobject/meson.build +index aecca57c743d5956..0d39f2bbc36f816e 100644 +--- i/gobject/meson.build ++++ w/gobject/meson.build +@@ -102,7 +102,7 @@ configure_file( + output: 'libgobject-2.0.so.@[email protected]'.format(library_version), + configuration: gdb_conf, + install: true, +- install_dir: join_paths(get_option('datadir'), 'gdb/auto-load/' + get_option('libdir')) ++ install_dir: join_paths(get_option('datadir'), 'gdb/auto-load/' + glib_libdir) + ) + + if enable_systemtap +diff --git i/meson.build w/meson.build +index 65ab92f023257aef..ea3f64c5e8c47bcc 100644 +--- i/meson.build ++++ w/meson.build +@@ -1533,6 +1533,12 @@ 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@ + ++# HACK ++glib_conf.set('G_THREAD_LIBS', '-pthread') ++glib_conf.set('G_THREAD_CFLAGS', '-pthread') ++glib_conf.set('G_MODULE_LDFLAGS', '-Wl,--export-dynamic') ++glib_conf.set('PCRE_REQUIRES', 'libpcre') ++ + # Tracing: dtrace + want_dtrace = get_option('enable-dtrace') + enable_dtrace = false
