diff options
| -rw-r--r-- | user/bitlbee/APKBUILD | 8 | ||||
| -rw-r--r-- | user/bitlbee/use-pkg-config.patch | 45 |
2 files changed, 50 insertions, 3 deletions
diff --git a/user/bitlbee/APKBUILD b/user/bitlbee/APKBUILD index 4724191f6..6dbb251ef 100644 --- a/user/bitlbee/APKBUILD +++ b/user/bitlbee/APKBUILD @@ -12,7 +12,8 @@ depends="" checkdepends="check-dev" makedepends="glib-dev gnutls-dev libgcrypt-dev linux-pam-dev python3" subpackages="$pkgname-dev $pkgname-doc" -source="http://get.bitlbee.org/src/bitlbee-$pkgver.tar.gz" +source="http://get.bitlbee.org/src/bitlbee-$pkgver.tar.gz + use-pkg-config.patch" build() { PYTHON=python3 ./configure \ @@ -23,7 +24,7 @@ build() { --mandir=/usr/share/man \ --localstatedir=/var \ --pam=1 - make + make V=1 } check() { @@ -34,4 +35,5 @@ package() { make DESTDIR="$pkgdir" install install-dev } -sha512sums="ccbf0f23e228de2de147241f36f59744b2256cba958e2fabfba0cfa60935e55bbb7d7e20fffa54da9a345e55ffa9ca82cb62e9b99dc738ba35c6e268c6561a8d bitlbee-3.6.tar.gz" +sha512sums="ccbf0f23e228de2de147241f36f59744b2256cba958e2fabfba0cfa60935e55bbb7d7e20fffa54da9a345e55ffa9ca82cb62e9b99dc738ba35c6e268c6561a8d bitlbee-3.6.tar.gz +3f2ddcb4ee6ee5c5cacf41c6d47a063f8a9d9441707dca4326eebad93853172f9ecad39ec6ddf64c148c18637a89eaa32cc87f941b56d0a0fbdd595cc5733084 use-pkg-config.patch" diff --git a/user/bitlbee/use-pkg-config.patch b/user/bitlbee/use-pkg-config.patch new file mode 100644 index 000000000..d0fc25cf1 --- /dev/null +++ b/user/bitlbee/use-pkg-config.patch @@ -0,0 +1,45 @@ +diff '--color=auto' -Nurd bitlbee-3.6/configure bitlbee-3.6.new/configure +--- bitlbee-3.6/configure 2019-02-07 11:53:38.000000000 -0800 ++++ bitlbee-3.6.new/configure 2025-07-26 14:09:52.082709917 -0700 +@@ -402,8 +402,8 @@ + { + if $PKG_CONFIG --exists gnutls; then + cat <<EOF >>Makefile.settings +-EFLAGS+=$($PKG_CONFIG --libs gnutls) $(libgcrypt-config --libs) +-CFLAGS+=$($PKG_CONFIG --cflags gnutls) $(libgcrypt-config --cflags) ++EFLAGS+=$($PKG_CONFIG --libs gnutls) $(pkg-config libgcrypt --libs) ++CFLAGS+=$($PKG_CONFIG --cflags gnutls) $(pkg-config libgcrypt --cflags) + EOF + ssl=gnutls + if ! $PKG_CONFIG gnutls --atleast-version=2.8; then +@@ -413,8 +413,8 @@ + ret=1 + elif libgnutls-config --version > /dev/null 2> /dev/null; then + cat <<EOF >>Makefile.settings +-EFLAGS+=$(libgnutls-config --libs) $(libgcrypt-config --libs) +-CFLAGS+=$(libgnutls-config --cflags) $(libgcrypt-config --cflags) ++EFLAGS+=$(libgnutls-config --libs) $(pkg-config libgcrypt --libs) ++CFLAGS+=$(libgnutls-config --cflags) $(pkg-config libgcrypt --cflags) + EOF + + ssl=gnutls +@@ -762,15 +762,15 @@ + if [ "$otr" = 1 ]; then + # BI == built-in + echo '#define OTR_BI' >> config.h +- echo "EFLAGS+=$($PKG_CONFIG --libs libotr) $(libgcrypt-config --libs)" >> Makefile.settings +- echo "CFLAGS+=$($PKG_CONFIG --cflags libotr) $(libgcrypt-config --cflags)" >> Makefile.settings ++ echo "EFLAGS+=$($PKG_CONFIG --libs libotr) $(pkg-config libgcrypt --libs)" >> Makefile.settings ++ echo "CFLAGS+=$($PKG_CONFIG --cflags libotr) $(pkg-config libgcrypt --cflags)" >> Makefile.settings + echo 'OTR_BI=otr.o' >> Makefile.settings + elif [ "$otr" = "plugin" ]; then + # for some mysterious reason beyond the comprehension of my mortal mind, + # the libgcrypt flags aren't needed when building as plugin. add them anyway. + echo '#define OTR_PI' >> config.h +- echo "OTRFLAGS=$($PKG_CONFIG --libs libotr) $(libgcrypt-config --libs)" >> Makefile.settings +- echo "CFLAGS+=$($PKG_CONFIG --cflags libotr) $(libgcrypt-config --cflags)" >> Makefile.settings ++ echo "OTRFLAGS=$($PKG_CONFIG --libs libotr) $(pkg-config libgcrypt --libs)" >> Makefile.settings ++ echo "CFLAGS+=$($PKG_CONFIG --cflags libotr) $(pkg-config libgcrypt --cflags)" >> Makefile.settings + echo 'OTR_PI=otr.so' >> Makefile.settings + fi + |