[arch-commits] Commit in glib2/trunk (0001-meson-Fix-libmount-support.patch PKGBUILD)

[Jan Steffens]

    Date: Tuesday, October 31, 2017 @ 03:33:07
  Author: heftig
Revision: 308731

2.54.2-2

Added:
  glib2/trunk/0001-meson-Fix-libmount-support.patch
Modified:
  glib2/trunk/PKGBUILD

---------------------------------------+
 0001-meson-Fix-libmount-support.patch |   41 ++++++++++++++++++++++++++++++++
 PKGBUILD                              |   13 +++++++---
 2 files changed, 50 insertions(+), 4 deletions(-)

Added: 0001-meson-Fix-libmount-support.patch
===================================================================
--- 0001-meson-Fix-libmount-support.patch	                        (rev 0)
+++ 0001-meson-Fix-libmount-support.patch	2017-10-31 03:33:07 UTC (rev 308731)
@@ -0,0 +1,41 @@
+From c93756c8f066a1e35fa2f46b231771d78e292600 Mon Sep 17 00:00:00 2001
+Message-Id: <c93756c8f066a1e35fa2f46b231771d78e292600.1509419562.git.jan.steffens at gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 31 Oct 2017 04:11:42 +0100
+Subject: [PATCH] meson: Fix libmount support
+
+The define was still missing.
+---
+ config.h.meson | 3 +++
+ meson.build    | 1 +
+ 2 files changed, 4 insertions(+)
+
+diff --git a/config.h.meson b/config.h.meson
+index c67e1792f4af1ada..3f310b3c960fcb29 100644
+--- a/config.h.meson
++++ b/config.h.meson
+@@ -247,6 +247,9 @@
+ /* Define if libelf is available */
+ #mesondefine HAVE_LIBELF
+ 
++/* Define if libmount is available */
++#mesondefine HAVE_LIBMOUNT
++
+ /* Define to 1 if you have the <linux/magic.h> header file. */
+ #mesondefine HAVE_LINUX_MAGIC_H
+ 
+diff --git a/meson.build b/meson.build
+index 208c23087627de1e..cd9cbf2ce10595c2 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1535,6 +1535,7 @@ if use_system_pcre
+ endif
+ if libmount_dep.length() == 1 and libmount_dep[0].found()
+   glib_conf.set('LIBMOUNT_LIBS', '-lmount')
++  glib_conf.set('HAVE_LIBMOUNT', 1)
+ endif
+ glib_conf.set('GIO_MODULE_DIR', '${libdir}/gio/modules')
+ # FIXME: Missing:
+-- 
+2.15.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-31 00:56:09 UTC (rev 308730)
+++ PKGBUILD	2017-10-31 03:33:07 UTC (rev 308731)
@@ -4,14 +4,14 @@
 pkgbase=glib2
 pkgname=(glib2 glib2-docs)
 pkgver=2.54.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Low level core library"
 url="https://wiki.gnome.org/Projects/GLib"
 license=(LGPL2.1)
 arch=(i686 x86_64)
-depends=(pcre libffi libutil-linux)
-makedepends=(gettext gtk-doc zlib shared-mime-info python libelf git util-linux meson)
-checkdepends=(desktop-file-utils dbus)
+depends=(pcre libffi libutil-linux zlib)
+makedepends=(gettext gtk-doc shared-mime-info python libelf git util-linux meson dbus)
+checkdepends=(desktop-file-utils)
 optdepends=('python: for gdbus-codegen and gtester-report'
             'libelf: gresource inspection tool')
 options=(!emptydirs)
@@ -20,6 +20,7 @@
         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
+        0001-meson-Fix-libmount-support.patch
         libs.diff
         noisy-glib-compile-schemas.diff
         glib-compile-schemas.hook gio-querymodules.hook)
@@ -27,6 +28,7 @@
             '8b289f3e1a5a3b29d310d45610468199acfe6f2b38a0d1be38c9224437a0e40c'
             '12b1a2f4e304e4c03e48ae9564d73ae38619bbb7711a013138939ff8e5cc2327'
             'f53d5acfda4b7141a4813f1e49610e9176dc5bdf8e867d88290e34d91a40ebcb'
+            '14c0dcfb4efb690f7cb44673faf31f5eb40ac68c01974eddb53d5aa7ae366629'
             '2fb828f51727bd9c8b48cfd9d6833c8b4ff82803331f6e2340b0ec8edfe57c52'
             '81a4df0b638730cffb7fa263c04841f7ca6b9c9578ee5045db6f30ff0c3fc531'
             'e1123a5d85d2445faac33f6dae1085fdd620d83279a4e130a83fe38db52b62b3'
@@ -50,6 +52,9 @@
   # https://bugzilla.gnome.org/show_bug.cgi?id=788772
   patch -Np1 -i ../0001-meson-Fix-GDB-scripts-install_dir-for-nix.patch
 
+  # https://bugzilla.gnome.org/show_bug.cgi?id=789681
+  patch -Np1 -i ../0001-meson-Fix-libmount-support.patch
+
   # https://bugzilla.gnome.org/show_bug.cgi?id=788773
   patch -Np1 -i ../libs.diff