commit 05f0ec92ebcabec33f57f0d75f1a0a8ceec6596d
Author: Jakub Bogusz <[email protected]>
Date: Fri Jul 29 19:15:12 2022 +0200
- added imlib2 patch (use pkg-config if imlib2-config does not exist)
giblib-imlib2.patch | 15 +++++++++++++++
giblib.spec | 4 +++-
2 files changed, 18 insertions(+), 1 deletion(-)
---
diff --git a/giblib.spec b/giblib.spec
index b8bf76c..df56c20 100644
--- a/giblib.spec
+++ b/giblib.spec
@@ -2,12 +2,13 @@ Summary: Utility library used in many applications by
LinuxBrit
Summary(pl.UTF-8): Biblioteka narzędziowa używana w wielu aplikacjach
LinuxBrit
Name: giblib
Version: 1.2.4
-Release: 4
+Release: 5
License: MIT
Group: X11/Libraries
Source0: http://www.linuxbrit.co.uk/downloads/%{name}-%{version}.tar.gz
# Source0-md5: c810ef5389baf24882a1caca2954385e
Patch0: %{name}-pc.patch
+Patch1: %{name}-imlib2.patch
URL: http://www.linuxbrit.co.uk/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -60,6 +61,7 @@ Statyczna wersja biblioteki giblib.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%{__libtoolize}
diff --git a/giblib-imlib2.patch b/giblib-imlib2.patch
new file mode 100644
index 0000000..5e6fb36
--- /dev/null
+++ b/giblib-imlib2.patch
@@ -0,0 +1,15 @@
+--- giblib-1.2.4/configure.ac.orig 2004-09-04 16:42:10.000000000 +0200
++++ giblib-1.2.4/configure.ac 2022-07-29 19:11:38.479882042 +0200
+@@ -20,11 +20,9 @@ AM_WITH_DMALLOC
+ AC_PATH_GENERIC(imlib2, 1.0.0, [
+ AC_SUBST(IMLIB_LIBS)
+ AC_SUBST(IMLIB_CFLAGS) ],
+- AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path?) )
++ [PKG_CHECK_MODULES(IMLIB, [imlib2 >= 1.0.0])])
+
+ dnl the above doesn't work for some reason :/
+-IMLIB_LIBS=`imlib2-config --libs`
+-IMLIB_CFLAGS=`imlib2-config --cflags`
+ AC_SUBST(IMLIB_LIBS)
+ AC_SUBST(IMLIB_CFLAGS)
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/giblib.git/commitdiff/05f0ec92ebcabec33f57f0d75f1a0a8ceec6596d
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
