[arch-commits] Commit in glib/trunk (2 files)

[Jan Steffens]

    Date: Thursday, September 14, 2017 @ 14:07:15
  Author: heftig
Revision: 305551

2.54.0-3

Added:
  glib/trunk/0001-meson-Fix-permissions-of-installed-scripts.patch
Modified:
  glib/trunk/PKGBUILD

-------------------------------------------------------+
 0001-meson-Fix-permissions-of-installed-scripts.patch |   50 ++++++++++++++++
 PKGBUILD                                              |    8 +-
 2 files changed, 56 insertions(+), 2 deletions(-)

Added: 0001-meson-Fix-permissions-of-installed-scripts.patch
===================================================================
--- 0001-meson-Fix-permissions-of-installed-scripts.patch	                        (rev 0)
+++ 0001-meson-Fix-permissions-of-installed-scripts.patch	2017-09-14 14:07:15 UTC (rev 305551)
@@ -0,0 +1,50 @@
+From e36f79439be76f125b67081eb4605b377d738cca Mon Sep 17 00:00:00 2001
+Message-Id: <e36f79439be76f125b67081eb4605b377d738cca.1505389490.git.jan.steffens at gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Thu, 14 Sep 2017 07:36:37 +0200
+Subject: [PATCH] meson: Fix permissions of installed scripts
+
+configure_file preserves the attributes, so the templates need to be
+executable for the (installed) outputs to be executable.
+---
+ gio/gdbus-2.0/codegen/gdbus-codegen.in | 0
+ gio/gdbus-2.0/codegen/meson.build      | 1 -
+ glib-gettextize.in                     | 0
+ gobject/meson.build                    | 1 -
+ 4 files changed, 2 deletions(-)
+ mode change 100644 => 100755 gio/gdbus-2.0/codegen/gdbus-codegen.in
+ mode change 100644 => 100755 glib-gettextize.in
+
+diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
+old mode 100644
+new mode 100755
+diff --git a/gio/gdbus-2.0/codegen/meson.build b/gio/gdbus-2.0/codegen/meson.build
+index 0e9ffbdfade70779..93d9106adba17a89 100644
+--- a/gio/gdbus-2.0/codegen/meson.build
++++ b/gio/gdbus-2.0/codegen/meson.build
+@@ -13,7 +13,6 @@ gdbus_codegen_conf.set('VERSION', glib_version)
+ gdbus_codegen_conf.set('PYTHON', python.path())
+ 
+ # Install gdbus-codegen executable
+-# FIXME: Set permissions
+ gdbus_codegen = configure_file(input : 'gdbus-codegen.in',
+   output : 'gdbus-codegen',
+   install : true,
+diff --git a/glib-gettextize.in b/glib-gettextize.in
+old mode 100644
+new mode 100755
+diff --git a/gobject/meson.build b/gobject/meson.build
+index 0d39f2bbc36f816e..01f37a33a623f4b8 100644
+--- a/gobject/meson.build
++++ b/gobject/meson.build
+@@ -76,7 +76,6 @@ python_tools_conf.set('VERSION', glib_version)
+ python_tools_conf.set('PYTHON', python.path())
+ 
+ foreach tool: python_tools
+-  # FIXME: Ensure we set the appropriate permissions
+   tool_bin = configure_file(
+     input : tool + '.in',
+     output : tool,
+-- 
+2.14.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-09-14 12:42:32 UTC (rev 305550)
+++ PKGBUILD	2017-09-14 14:07:15 UTC (rev 305551)
@@ -4,7 +4,7 @@
 pkgbase=glib
 pkgname=(glib glib-docs)
 pkgver=2.54.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Low level core library"
 url="https://wiki.gnome.org/Projects/GLib"
 license=(LGPL2.1)
@@ -21,10 +21,12 @@
 _commit=738eff5decf0e354e692c36a0b9d466fc5775e3c  # tags/2.54.0^0
 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
         noisy-glib-compile-schemas.diff
         glib-compile-schemas.hook gio-querymodules.hook)
 sha256sums=('SKIP'
             '8b289f3e1a5a3b29d310d45610468199acfe6f2b38a0d1be38c9224437a0e40c'
+            '12b1a2f4e304e4c03e48ae9564d73ae38619bbb7711a013138939ff8e5cc2327'
             '81a4df0b638730cffb7fa263c04841f7ca6b9c9578ee5045db6f30ff0c3fc531'
             'e1123a5d85d2445faac33f6dae1085fdd620d83279a4e130a83fe38db52b62b3'
             '5ba204a2686304b1454d401a39a9d27d09dd25e4529664e3fd565be3d439f8b6')
@@ -41,6 +43,9 @@
   # https://bugzilla.gnome.org/show_bug.cgi?id=786796
   patch -Np1 -i ../0001-docs-Fix-building-with-meson.patch
 
+  # https://bugzilla.gnome.org/show_bug.cgi?id=787671
+  patch -Np1 -i ../0001-meson-Fix-permissions-of-installed-scripts.patch
+
   # Suppress noise from glib-compile-schemas.hook
   patch -Np1 -i ../noisy-glib-compile-schemas.diff
 }
@@ -60,7 +65,6 @@
   cd build
   DESTDIR="$pkgdir" ninja install
   mv "$pkgdir/usr/share/gtk-doc" "$srcdir/glib-docs/usr/share"
-  chmod +x "$pkgdir/usr/bin/gdbus-codegen"
 
   # install hooks
   install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 ../*.hook