diff options
| author | dudemanguy | 2017-11-03 14:40:06 -0600 |
|---|---|---|
| committer | dudemanguy | 2017-11-03 14:40:06 -0600 |
| commit | f7bdbbfd3189814f6393fc60e773bf86e5fd5a2c (patch) | |
| tree | 55b7b5d80db75de875a6083d19b443761b05f326 /libs.diff | |
| parent | 4049245e75b3744991b344c3bff6a261f490e082 (diff) | |
| download | aur-f7bdbbfd3189814f6393fc60e773bf86e5fd5a2c.tar.gz | |
update 2.54.2-2
Diffstat (limited to 'libs.diff')
| -rw-r--r-- | libs.diff | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/libs.diff b/libs.diff index 9f9eb799fe90..eef85b814cfe 100644 --- a/libs.diff +++ b/libs.diff @@ -1,8 +1,8 @@ diff --git i/gio/meson.build w/gio/meson.build -index 32526362666b5e80..d7030aa29a6f17eb 100644 +index 4a10d49d7eb3229c..77537a77a26dcb5b 100644 --- i/gio/meson.build +++ w/gio/meson.build -@@ -727,7 +727,7 @@ libgio = shared_library('gio-2.0', +@@ -741,7 +741,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 @@ -12,7 +12,7 @@ index 32526362666b5e80..d7030aa29a6f17eb 100644 libgio_dep = declare_dependency(link_with : libgio, diff --git i/glib/meson.build w/glib/meson.build -index 1da0bcd3cc601b9e..4286218c9c8361b2 100644 +index f12a8b45bbbfec8f..2a505b3dd79ef163 100644 --- i/glib/meson.build +++ w/glib/meson.build @@ -227,7 +227,7 @@ libglib = shared_library('glib-2.0', @@ -24,15 +24,6 @@ index 1da0bcd3cc601b9e..4286218c9c8361b2 100644 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.@0@-gdb.py'.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..fd0219d9225f2f3f 100644 --- i/gmodule/meson.build @@ -78,7 +69,7 @@ index 191bca2446f9977e..fd0219d9225f2f3f 100644 libgmodule_dep = declare_dependency(link_with : libgmodule, diff --git i/gobject/meson.build w/gobject/meson.build -index aecca57c743d5956..e033ae15f9c226b5 100644 +index 65ffef0697b3bad4..32f6f91db12f29b6 100644 --- i/gobject/meson.build +++ w/gobject/meson.build @@ -61,6 +61,7 @@ libgobject = shared_library('gobject-2.0', @@ -89,15 +80,6 @@ index aecca57c743d5956..e033ae15f9c226b5 100644 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.@0@-gdb.py'.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/gthread/meson.build w/gthread/meson.build index 8ccac3369894bda4..2d5913a91525460f 100644 --- i/gthread/meson.build @@ -109,10 +91,10 @@ index 8ccac3369894bda4..2d5913a91525460f 100644 + link_args : library_link_args, c_args : ['-DG_LOG_DOMAIN="GThread"' ] + glib_hidden_visibility_args) diff --git i/meson.build w/meson.build -index 0f3f7917899e93ea..12277e8d327b7a83 100644 +index 208c23087627de1e..dd860592b26c9973 100644 --- i/meson.build +++ w/meson.build -@@ -1533,6 +1533,13 @@ glib_conf.set('GIO_MODULE_DIR', '${libdir}/gio/modules') +@@ -1541,6 +1541,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@ |