diff options
| author | klaatu <klaatu@member.fsf.org> | 2023-01-11 19:46:11 +1300 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2023-01-14 08:49:57 +0700 |
| commit | 6b19d443ee0ba8fdfdb4de33a443eb4da46b00bf (patch) | |
| tree | 85475156a84db754e6a0026b1cfac7592a9cee37 /libraries | |
| parent | 82eb16a917ab904c48e73c9d36e1e0c0432f3a99 (diff) | |
libraries/giblib: Patch for imlib2 changes.
Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/giblib/fix-configure_ac-imlib2.patch | 20 | ||||
| -rw-r--r-- | libraries/giblib/giblib.SlackBuild | 5 |
2 files changed, 24 insertions, 1 deletions
diff --git a/libraries/giblib/fix-configure_ac-imlib2.patch b/libraries/giblib/fix-configure_ac-imlib2.patch new file mode 100644 index 000000000000..33e86765ccc3 --- /dev/null +++ b/libraries/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" diff --git a/libraries/giblib/giblib.SlackBuild b/libraries/giblib/giblib.SlackBuild index 6a7e8a3fe1ab..35befab08077 100644 --- a/libraries/giblib/giblib.SlackBuild +++ b/libraries/giblib/giblib.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=giblib VERSION=${VERSION:-1.2.4} -BUILD=${BUILD:-5} +BUILD=${BUILD:-6} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -82,6 +82,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ +patch -Np1 -i $CWD/fix-configure_ac-imlib2.patch +autoreconf -fvi + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ |