[arch-commits] Commit in glib2/trunk (3 files)

Jan Steffens heftig at archlinux.org
Tue Oct 24 14:54:20 UTC 2017 

    Date: Tuesday, October 24, 2017 @ 14:54:19
  Author: heftig
Revision: 308388

Split out GDB patch

Added:
  glib2/trunk/0001-meson-Fix-GDB-scripts-install_dir-for-nix.patch
Modified:
  glib2/trunk/PKGBUILD
  glib2/trunk/libs.diff

------------------------------------------------------+
 0001-meson-Fix-GDB-scripts-install_dir-for-nix.patch |   50 +++++++++++++++++
 PKGBUILD                                             |    8 ++
 libs.diff                                            |   30 ++--------
 3 files changed, 62 insertions(+), 26 deletions(-)

Added: 0001-meson-Fix-GDB-scripts-install_dir-for-nix.patch
===================================================================
--- 0001-meson-Fix-GDB-scripts-install_dir-for-nix.patch	                        (rev 0)
+++ 0001-meson-Fix-GDB-scripts-install_dir-for-nix.patch	2017-10-24 14:54:19 UTC (rev 308388)
@@ -0,0 +1,50 @@
+From b454a60bf154332bd5961880700b7d08aec98995 Mon Sep 17 00:00:00 2001
+Message-Id: <b454a60bf154332bd5961880700b7d08aec98995.1508856243.git.jan.steffens at gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 24 Oct 2017 16:29:49 +0200
+Subject: [PATCH] meson: Fix GDB scripts install_dir for *nix
+
+Disable installation on Windows for now as this would use a colon in the
+directory name.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=788772
+---
+ glib/meson.build    | 5 +++--
+ gobject/meson.build | 5 +++--
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/glib/meson.build b/glib/meson.build
+index 1da0bcd3cc601b9e..33ece2d0221c1850 100644
+--- a/glib/meson.build
++++ b/glib/meson.build
+@@ -283,8 +283,9 @@ configure_file(
+   input: 'libglib-gdb.py.in',
+   output: 'libglib-2.0.so. at 0@-gdb.py'.format(library_version),
+   configuration: gdb_conf,
+-  install: true,
+-  install_dir: join_paths(get_option('datadir'), 'gdb/auto-load' + get_option('libdir'))
++  # FIXME: Figure out how to install this on Windows
++  install: host_system != 'windows',
++  install_dir: join_paths(glib_datadir, 'gdb', 'auto-load', './' + glib_libdir)
+ )
+ 
+ if enable_systemtap
+diff --git a/gobject/meson.build b/gobject/meson.build
+index 5a8289e6f054818e..0c8c0cb26f053d1c 100644
+--- a/gobject/meson.build
++++ b/gobject/meson.build
+@@ -100,8 +100,9 @@ configure_file(
+   input: 'libgobject-gdb.py.in',
+   output: 'libgobject-2.0.so. at 0@-gdb.py'.format(library_version),
+   configuration: gdb_conf,
+-  install: true,
+-  install_dir: join_paths(get_option('datadir'), 'gdb/auto-load/' + get_option('libdir'))
++  # FIXME: Figure out how to install this on Windows
++  install: host_system != 'windows',
++  install_dir: join_paths(glib_datadir, 'gdb', 'auto-load', './' + glib_libdir)
+ )
+ 
+ if enable_systemtap
+-- 
+2.14.2
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-24 10:29:00 UTC (rev 308387)
+++ PKGBUILD	2017-10-24 14:54:19 UTC (rev 308388)
@@ -19,6 +19,7 @@
 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
+        0001-meson-Fix-GDB-scripts-install_dir-for-nix.patch
         libs.diff
         noisy-glib-compile-schemas.diff
         glib-compile-schemas.hook gio-querymodules.hook)
@@ -25,7 +26,8 @@
 sha256sums=('SKIP'
             '8b289f3e1a5a3b29d310d45610468199acfe6f2b38a0d1be38c9224437a0e40c'
             '12b1a2f4e304e4c03e48ae9564d73ae38619bbb7711a013138939ff8e5cc2327'
-            '54c43d5d4d4b5fa591eb639e63050ce5eac30aff6691fa9cf56631782b2aad33'
+            'f53d5acfda4b7141a4813f1e49610e9176dc5bdf8e867d88290e34d91a40ebcb'
+            '2fb828f51727bd9c8b48cfd9d6833c8b4ff82803331f6e2340b0ec8edfe57c52'
             '81a4df0b638730cffb7fa263c04841f7ca6b9c9578ee5045db6f30ff0c3fc531'
             'e1123a5d85d2445faac33f6dae1085fdd620d83279a4e130a83fe38db52b62b3'
             '5ba204a2686304b1454d401a39a9d27d09dd25e4529664e3fd565be3d439f8b6')
@@ -45,8 +47,10 @@
   # https://bugzilla.gnome.org/show_bug.cgi?id=787671
   patch -Np1 -i ../0001-meson-Fix-permissions-of-installed-scripts.patch
 
+  # https://bugzilla.gnome.org/show_bug.cgi?id=788772
+  patch -Np1 -i ../0001-meson-Fix-GDB-scripts-install_dir-for-nix.patch
+
   # Unbreak .pc files when built with meson
-  # Fix gdb scripts install
   patch -Np1 -i ../libs.diff
 
   # Suppress noise from glib-compile-schemas.hook

Modified: libs.diff
===================================================================
--- libs.diff	2017-10-24 10:29:00 UTC (rev 308387)
+++ libs.diff	2017-10-24 14:54:19 UTC (rev 308388)
@@ -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 @@
  
  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 @@
    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,
-   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 @@
  
  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 @@
    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,
--  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 @@
 +  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@

More information about the arch-commits mailing list