rebuild with pkg-config instead of imlib2-config

3 files changed, 28 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 16aa88b87816..cdcf6fc4ed16 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ipager
 	pkgdesc = a lightweight beautiful pager from Fluxbox
 	pkgver = 1.1.0
-	pkgrel = 12
+	pkgrel = 13
 	url = http://fluxbox.org/screenshots/
 	install = ipager.install
 	arch = x86_64
@@ -10,12 +10,13 @@ pkgbase = ipager
 	makedepends = scons
 	depends = imlib2
 	depends = libxmu
-	source = http://slackware.uk/slacky/slackware-13.0/desktop/ipager/1.1.0/src/ipager-1.1.0.tar.gz
+	source = https://slackware.uk/slacky/slackware-13.0/desktop/ipager/1.1.0/src/ipager-1.1.0.tar.gz
 	source = ipager-1.1.0-20120429.patch
 	source = ipager-1.1.0-20190902.patch
+	source = ipager-1.1.0-20220521.patch
 	md5sums = d74409836f5c31eb55a55f00783b1f6f
 	md5sums = 073682d8f76e1e91b9d3f2415f4a6c52
 	md5sums = 3ca6f620f8897122d07e966c10571673
+	md5sums = e731af2f64ffa6a1c394b3c6e0ff5b17
 
 pkgname = ipager
-
diff --git a/PKGBUILD b/PKGBUILD
index 394aaf6704c0..c146c52233f5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=ipager
 pkgver=1.1.0
-pkgrel=12
+pkgrel=13
 pkgdesc="a lightweight beautiful pager from Fluxbox"
 arch=('x86_64')
 license=('MIT')
@@ -12,15 +12,17 @@ url="http://fluxbox.org/screenshots/"
 depends=('imlib2' 'libxmu')
 makedepends=('patch' 'scons')
 #source=(http://www.useperl.ru/ipager/src/ipager-$pkgver.tar.gz ipager-1.1.0-20120429.patch)
-source=(http://slackware.uk/slacky/slackware-13.0/desktop/ipager/1.1.0/src/ipager-1.1.0.tar.gz
-        ipager-1.1.0-20120429.patch ipager-1.1.0-20190902.patch)
+source=(https://slackware.uk/slacky/slackware-13.0/desktop/ipager/1.1.0/src/ipager-1.1.0.tar.gz
+        ipager-1.1.0-20120429.patch ipager-1.1.0-20190902.patch ipager-1.1.0-20220521.patch)
 install=$pkgname.install
-md5sums=('d74409836f5c31eb55a55f00783b1f6f' '073682d8f76e1e91b9d3f2415f4a6c52' '3ca6f620f8897122d07e966c10571673')
+md5sums=('d74409836f5c31eb55a55f00783b1f6f' '073682d8f76e1e91b9d3f2415f4a6c52'
+         '3ca6f620f8897122d07e966c10571673' 'e731af2f64ffa6a1c394b3c6e0ff5b17')
 
 prepare() {
 cd $srcdir/$pkgname-$pkgver
 patch -p0 < $srcdir/ipager-1.1.0-20120429.patch
 patch -p0 < $srcdir/ipager-1.1.0-20190902.patch
+patch -p0 < $srcdir/ipager-1.1.0-20220521.patch
 }
 
 build() {
diff --git a/ipager-1.1.0-20220521.patch b/ipager-1.1.0-20220521.patch
new file mode 100644
index 000000000000..437a6545eb02
--- /dev/null
+++ b/ipager-1.1.0-20220521.patch
@@ -0,0 +1,18 @@
+--- SConstruct.ORIG 2022-05-21 10:52:59.214228851 -0400
++++ SConstruct  2022-05-21 10:54:31.294226321 -0400
+@@ -104,12 +104,12 @@
+
+ # imlib2
+ print ("Checking for Imlib2... ",)
+-if not conf.env.WhereIs('imlib2-config'):
+-    print ("cant find 'imlib2-config.")
++if not conf.env.WhereIs('pkg-config'):
++    print ("cant find 'pkg-config.")
+     exit(1)
+ else:
+     imlib2_env = Environment()
+-    imlib2_env.ParseConfig('imlib2-config --cflags --libs')
++    imlib2_env.ParseConfig('pkg-config --cflags --libs imlib2')
+     if not imlib2_env.Dictionary()['LIBS']:
+         print ("missing imlib2, install it.")
+         exit(1)