Package: bitlbee
Version: 3.6-1.4
Severity: normal
Tags: patch
User: ametz...@debian.org
Usertags: libgcrypt-config-removal
Control: block 714589 by -1
Hello,
Please switch from using libgcrypt-config to pkg-config to locate
libgcrypt. libgcrypt-config will be dropped in the next libgcrypt major
release.
cu Andreas
--
`What a good friend you are to him, Dr. Maturin. His other friends are
so grateful to you.'
`I sew his ears on from time to time, sure'
diff -Nru bitlbee-3.6/debian/changelog bitlbee-3.6/debian/changelog
--- bitlbee-3.6/debian/changelog 2024-03-23 22:05:25.000000000 +0100
+++ bitlbee-3.6/debian/changelog 2024-05-11 13:42:43.000000000 +0200
@@ -1,3 +1,11 @@
+bitlbee (3.6-1.5) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use pkgconf to locate libgcrypt, libgcrypt-config is scheduled for
+ removal.
+
+ -- Andreas Metzler <ametz...@debian.org> Sat, 11 May 2024 13:42:43 +0200
+
bitlbee (3.6-1.4) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru bitlbee-3.6/debian/patches/bitlbee_locate_gcrypt_with_pkg-config.diff bitlbee-3.6/debian/patches/bitlbee_locate_gcrypt_with_pkg-config.diff
--- bitlbee-3.6/debian/patches/bitlbee_locate_gcrypt_with_pkg-config.diff 1970-01-01 01:00:00.000000000 +0100
+++ bitlbee-3.6/debian/patches/bitlbee_locate_gcrypt_with_pkg-config.diff 2024-05-11 13:42:43.000000000 +0200
@@ -0,0 +1,38 @@
+Description: Use pkgconf to locate libgcrypt.
+ libgcrypt-config is scheduled for removal.
+Author: Andreas Metzler <ametz...@debian.org>
+Last-Update: 2024-05-11
+
+--- bitlbee-3.6.orig/configure
++++ bitlbee-3.6/configure
+@@ -402,8 +402,8 @@ detect_gnutls()
+ {
+ 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 --libs libgcrypt)
++CFLAGS+=$($PKG_CONFIG --cflags gnutls) $($PKG_CONFIG --cflags libgcrypt)
+ EOF
+ ssl=gnutls
+ if ! $PKG_CONFIG gnutls --atleast-version=2.8; then
+@@ -762,15 +762,15 @@ fi
+ 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 --libs libgcrypt)" >> Makefile.settings
++ echo "CFLAGS+=$($PKG_CONFIG --cflags libotr) $($PKG_CONFIG --cflags libgcrypt)" >> 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 --libs libgcrypt)" >> Makefile.settings
++ echo "CFLAGS+=$($PKG_CONFIG --cflags libotr) $($PKG_CONFIG --cflags libgcrypt)" >> Makefile.settings
+ echo 'OTR_PI=otr.so' >> Makefile.settings
+ fi
+
diff -Nru bitlbee-3.6/debian/patches/series bitlbee-3.6/debian/patches/series
--- bitlbee-3.6/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ bitlbee-3.6/debian/patches/series 2024-05-11 13:42:43.000000000 +0200
@@ -0,0 +1 @@
+bitlbee_locate_gcrypt_with_pkg-config.diff
