Date: Tuesday, April 13, 2021 @ 21:26:01 Author: heftig Revision: 412417
1.2.1-1 Modified: libhandy/trunk/PKGBUILD Deleted: libhandy/trunk/0001-meson-Avoid-a-trailing-slash-on-libdir-and-datadir.patch ---------------------------------------------------------------+ 0001-meson-Avoid-a-trailing-slash-on-libdir-and-datadir.patch | 42 ---------- PKGBUILD | 15 +-- 2 files changed, 5 insertions(+), 52 deletions(-) Deleted: 0001-meson-Avoid-a-trailing-slash-on-libdir-and-datadir.patch =================================================================== --- 0001-meson-Avoid-a-trailing-slash-on-libdir-and-datadir.patch 2021-04-13 21:10:33 UTC (rev 412416) +++ 0001-meson-Avoid-a-trailing-slash-on-libdir-and-datadir.patch 2021-04-13 21:26:01 UTC (rev 412417) @@ -1,42 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <[email protected]> -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-04-13 21:10:33 UTC (rev 412416) +++ PKGBUILD 2021-04-13 21:26:01 UTC (rev 412417) @@ -2,8 +2,8 @@ # Contributor: Balló György <ballogyor+arch at gmail dot com> pkgname=libhandy -pkgver=1.2.0 -pkgrel=2 +pkgver=1.2.1 +pkgrel=1 pkgdesc="Library full of GTK+ widgets for mobile phones" url="https://gitlab.gnome.org/GNOME/libhandy"; arch=(x86_64) @@ -12,17 +12,12 @@ makedepends=(git gobject-introspection meson vala glade) 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"; - 0001-meson-Avoid-a-trailing-slash-on-libdir-and-datadir.patch) -sha256sums=('SKIP' - 'ac4f3a4501a93dd47a6b7790204b39d4e77d2037452ff114980b106929b764eb') +_commit=e6e5b4f747d43f10ad2af18060bf1c1d034c9c1a # tags/1.2.1^0 +source=("git+https://gitlab.gnome.org/GNOME/libhandy.git#commit=$_commit";) +sha256sums=('SKIP') 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() {
