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

[Jan Steffens]

    Date: Thursday, March 25, 2021 @ 23:16:26
  Author: heftig
Revision: 411009

1.2.0-2

Added:
  libhandy/trunk/0001-meson-Avoid-a-trailing-slash-on-libdir-and-datadir.patch
Modified:
  libhandy/trunk/PKGBUILD

---------------------------------------------------------------+
 0001-meson-Avoid-a-trailing-slash-on-libdir-and-datadir.patch |   42 ++++++++++
 PKGBUILD                                                      |   11 +-
 2 files changed, 50 insertions(+), 3 deletions(-)

Added: 0001-meson-Avoid-a-trailing-slash-on-libdir-and-datadir.patch
===================================================================
--- 0001-meson-Avoid-a-trailing-slash-on-libdir-and-datadir.patch	                        (rev 0)
+++ 0001-meson-Avoid-a-trailing-slash-on-libdir-and-datadir.patch	2021-03-25 23:16:26 UTC (rev 411009)
@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Thu, 25 Mar 2021 23:09:19 +0000
+Subject: [PATCH] meson: Avoid a trailing slash on libdir and datadir
+
+When package_subdir is empty. This gets passed into the produced
+pkg-config file and then confuses meson.
+
+https://gitlab.gnome.org/GNOME/gnome-characters/-/issues/86
+---
+ meson.build | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 73c07a9..d06ed77 100644
+--- a/meson.build
++++ b/meson.build
+@@ -103,14 +103,18 @@ add_project_arguments(
+ 
+ # Setup various paths that subdirectory meson.build files need
+ package_subdir = get_option('package_subdir') # When used as subproject
+-datadir        = get_option('datadir')  / package_subdir
+-libdir         = get_option('libdir')  / package_subdir
+-girdir         = get_option('datadir') / package_subdir / 'gir-1.0'
+-typelibdir     = get_option('libdir')  / package_subdir / 'girepository-1.0'
+ if package_subdir != ''
+-  vapidir = get_option('datadir') / package_subdir / 'vapi'
++  datadir    = get_option('datadir') / package_subdir
++  libdir     = get_option('libdir')  / package_subdir
++  girdir     = get_option('datadir') / package_subdir / 'gir-1.0'
++  typelibdir = get_option('libdir')  / package_subdir / 'girepository-1.0'
++  vapidir    = get_option('datadir') / package_subdir / 'vapi'
+ else
+-  vapidir = get_option('datadir') / 'vala' / 'vapi'
++  datadir    = get_option('datadir')
++  libdir     = get_option('libdir')
++  girdir     = get_option('datadir') / 'gir-1.0'
++  typelibdir = get_option('libdir')  / 'girepository-1.0'
++  vapidir    = get_option('datadir') / 'vala' / 'vapi'
+ endif
+ 
+ glade_catalog_feature = get_option('glade_catalog')

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-25 23:16:20 UTC (rev 411008)
+++ PKGBUILD	2021-03-25 23:16:26 UTC (rev 411009)
@@ -3,7 +3,7 @@
 
 pkgname=libhandy
 pkgver=1.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Library full of GTK+ widgets for mobile phones"
 url="https://gitlab.gnome.org/GNOME/libhandy"
 arch=(x86_64)
@@ -13,11 +13,16 @@
 checkdepends=(xorg-server-xvfb)
 provides=(libhandy-1.so)
 _commit=7b38a860ffcec6c2ad28153358cc3d037ddb618f  # tags/1.2.0^0
-source=("git+https://gitlab.gnome.org/GNOME/libhandy.git#commit=$_commit")
-sha256sums=('SKIP')
+source=("git+https://gitlab.gnome.org/GNOME/libhandy.git#commit=$_commit"
+        0001-meson-Avoid-a-trailing-slash-on-libdir-and-datadir.patch)
+sha256sums=('SKIP'
+            'ac4f3a4501a93dd47a6b7790204b39d4e77d2037452ff114980b106929b764eb')
 
 prepare() {
   cd libhandy
+
+  # https://gitlab.gnome.org/GNOME/gnome-characters/-/issues/86
+  git apply -3 ../0001-meson-Avoid-a-trailing-slash-on-libdir-and-datadir.patch
 }
 
 pkgver() {