[packages/libhandy1] - added pc patch (avoid trailing "/" in .pc Libs field, which caused `pkg-config --libs` output to c
qboosh
qboosh at pld-linux.org
Thu Apr 1 20:35:38 CEST 2021
commit 6bb4510bc48baf5167ef3a8544b1344e0987c403
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Apr 1 20:35:34 2021 +0200
- added pc patch (avoid trailing "/" in .pc Libs field, which caused `pkg-config --libs` output to contain -L/usr/%{_lib}/
- release 2
libhandy1-pc.patch | 24 ++++++++++++++++++++++++
libhandy1.spec | 4 +++-
2 files changed, 27 insertions(+), 1 deletion(-)
---
diff --git a/libhandy1.spec b/libhandy1.spec
index 3bca1f7..24a64bd 100644
--- a/libhandy1.spec
+++ b/libhandy1.spec
@@ -8,11 +8,12 @@ Summary: Library with GTK+ widgets for mobile phones
Summary(pl.UTF-8): Biblioteka z kontrolkami GTK+ dla telefonów komórkowych
Name: libhandy1
Version: 1.2.0
-Release: 1
+Release: 2
License: LGPL v2.1+
Group: Libraries
Source0: https://download.gnome.org/sources/libhandy/1.2/libhandy-%{version}.tar.xz
# Source0-md5: 18d868a77fe846b926e09508e3dce288
+Patch0: %{name}-pc.patch
URL: https://gitlab.gnome.org/GNOME/libhandy/
# -std=gnu11
BuildRequires: gcc >= 6:4.7
@@ -96,6 +97,7 @@ API języka VALA do biblioteki libhandy.
%prep
%setup -q -n libhandy-%{version}
+%patch0 -p1
%build
%meson build \
diff --git a/libhandy1-pc.patch b/libhandy1-pc.patch
new file mode 100644
index 0000000..ab43206
--- /dev/null
+++ b/libhandy1-pc.patch
@@ -0,0 +1,24 @@
+--- libhandy-1.2.0/meson.build.orig 2021-03-12 13:10:27.000000000 +0100
++++ libhandy-1.2.0/meson.build 2021-04-01 20:30:07.815680135 +0200
+@@ -103,13 +103,17 @@
+
+ # 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 != ''
++ 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
++ 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
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libhandy1.git/commitdiff/6bb4510bc48baf5167ef3a8544b1344e0987c403
More information about the pld-cvs-commit
mailing list