summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Biermann <tbier@posteo.de>2022-10-20 18:45:00 +0200
committerTim Biermann <tbier@posteo.de>2022-10-20 18:45:00 +0200
commit4f0cd935263d92dfedefef8e4c1a20cf65e94d73 (patch)
treedcccf796d74bad4648eeef4505e3be185a9317f2
parent7bd4f0c93b1773102704f3dec96d21ec607dca9f (diff)
downloadcontrib-4f0cd935263d92dfedefef8e4c1a20cf65e94d73.tar.gz
contrib-4f0cd935263d92dfedefef8e4c1a20cf65e94d73.tar.xz
giblib: fixed build
-rw-r--r--giblib/.signature5
-rw-r--r--giblib/Pkgfile8
-rw-r--r--giblib/fix-configure_ac-imlib2.patch20
3 files changed, 28 insertions, 5 deletions
diff --git a/giblib/.signature b/giblib/.signature
index 3afaf718c..fe8331320 100644
--- a/giblib/.signature
+++ b/giblib/.signature
@@ -1,5 +1,6 @@
untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF355XtYEVolgcVqR/xsNgTni0v5OxrvKRLLVctWo7Wx5fPhX7KswPmF4CgWuwKPrfOwUrDOfSGYKiq2vsVmTicgc=
-SHA256 (Pkgfile) = a1673e8b63256f691f0eba4b37508abd9b9607d807bfa6014277344cc1b23aa7
+RWSagIOpLGJF36QH0jCm1Zy4okfXMzrBlUOx2bIMEN1xsbFs1gPXcQStL2w8aaU1gIdLMkqE689omv/+wtqBCZqaShkvKWimmg4=
+SHA256 (Pkgfile) = 05a397e9caff5d050edd40f6e75079aa3676309e9148c4f205c26164428fc837
SHA256 (.footprint) = 87ecce07dda670bc2eba6df0d26e8b2397afd1fe628886f5b5cc5501c8adbcfa
SHA256 (giblib-1.2.4.tar.gz) = 176611c4d88d742ea4013991ad54c2f9d2feefbc97a28434c0f48922ebaa8bac
+SHA256 (fix-configure_ac-imlib2.patch) = 982df1853b6c47bfdb73b27293e629a06e8b3b431084f20725d700eb8edbaf3c
diff --git a/giblib/Pkgfile b/giblib/Pkgfile
index cfd2d5d06..543ae5859 100644
--- a/giblib/Pkgfile
+++ b/giblib/Pkgfile
@@ -1,16 +1,18 @@
# Description: Library for doubly linked lists and a wrapper for imlib2.
# URL: http://freshmeat.net/projects/giblib/
# Maintainer: Danny Rawlins, crux at romster dot me
-# Packager: Mark Rosenstand, mark at borkware dot net
# Depends on: imlib2
name=giblib
version=1.2.4
-release=1
-source=(http://crux.ster.zone/downloads/$name/$name-$version.tar.gz)
+release=2
+source=(http://crux.ster.zone/downloads/$name/$name-$version.tar.gz
+ fix-configure_ac-imlib2.patch)
build() {
cd giblib-$version
+ patch -Np1 -i $SRC/fix-configure_ac-imlib2.patch
+ autoreconf -fvi
./configure --prefix=/usr
make
make DESTDIR=$PKG install
diff --git a/giblib/fix-configure_ac-imlib2.patch b/giblib/fix-configure_ac-imlib2.patch
new file mode 100644
index 000000000..33e86765c
--- /dev/null
+++ b/giblib/fix-configure_ac-imlib2.patch
@@ -0,0 +1,20 @@
+--- giblib-1.2.4/configure.ac.dist 2022-06-03 02:18:31.377935260 -0400
++++ giblib-1.2.4/configure.ac 2022-06-03 02:19:07.737316688 -0400
+@@ -17,16 +17,7 @@
+ AM_MAINTAINER_MODE
+ 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?) )
+-
+-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)
++PKG_CHECK_MODULES([IMLIB],[imlib2])
+
+ LIBS="$LIBS -lm"
+ CFLAGS="$CFLAGS -Wall"

Generated by cgit