From ccfe1f226304cd7ed60db43084435c5b94009c4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Mon, 27 May 2024 08:15:59 +0200 Subject: [PATCH] =?UTF-8?q?core:=20fix=20detection=20of=20libgcrypt=20?= =?UTF-8?q?=E2=89=A5=201.11=20(debian=20#1071960)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use pkg-config to detect libgcrypt, since command `libgcrypt-config` is not available any more. Remove patches for Debian/Raspbian Buster and Ubuntu Bionic: detection of libgcrypt don't work any more with version 1.8.4 on Debian Buster and 1.8.1 on Ubuntu Bionic (both versions don't provide the file `libgcrypt.pc`). --- CMakeLists.txt | 5 +- ChangeLog.adoc | 4 ++ cmake/FindGCRYPT.cmake | 53 ---------------- src/plugins/irc/CMakeLists.txt | 2 +- src/plugins/relay/CMakeLists.txt | 2 +- src/plugins/xfer/CMakeLists.txt | 2 +- .../patches/weechat_debian_buster.patch | 26 -------- .../patches/weechat_raspbian_buster.patch | 1 - .../patches/weechat_ubuntu_bionic.patch | 62 ------------------- 9 files changed, 10 insertions(+), 147 deletions(-) delete mode 100644 cmake/FindGCRYPT.cmake delete mode 100644 tools/debian/patches/weechat_debian_buster.patch delete mode 120000 tools/debian/patches/weechat_raspbian_buster.patch delete mode 100644 tools/debian/patches/weechat_ubuntu_bionic.patch diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b67ab02c..4f68e0e90 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -184,9 +184,10 @@ if(ENABLE_NLS) endif() # Check for libgcrypt -find_package(GCRYPT REQUIRED) +pkg_check_modules(LIBGCRYPT REQUIRED libgcrypt) add_definitions(-DHAVE_GCRYPT) -list(APPEND EXTRA_LIBS ${GCRYPT_LDFLAGS}) +include_directories(${LIBGCRYPT_INCLUDE_DIRS}) +list(APPEND EXTRA_LIBS ${LIBGCRYPT_LDFLAGS}) # Check for GnuTLS find_package(GnuTLS REQUIRED) diff --git a/ChangeLog.adoc b/ChangeLog.adoc index ee3c99723..d152a4e39 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -22,6 +22,10 @@ Bug fixes:: * core, plugins: fix integer overflow in loops (issue #2178) +Build:: + + * core: fix detection of libgcrypt ≥ 1.11 (debian #1071960) + [[v3.8]] == Version 3.8 (2023-01-08) diff --git a/cmake/FindGCRYPT.cmake b/cmake/FindGCRYPT.cmake deleted file mode 100644 index 21a878fa7..000000000 --- a/cmake/FindGCRYPT.cmake +++ /dev/null @@ -1,53 +0,0 @@ -# -# Copyright (C) 2003-2023 Sébastien Helleu -# -# This file is part of WeeChat, the extensible chat client. -# -# WeeChat is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# WeeChat is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with WeeChat. If not, see . -# - -# - Find Gcrypt -# This module finds if libgcrypt is installed and determines where -# the include files and libraries are. -# -# This code sets the following variables: -# -# GCRYPT_CFLAGS = cflags to use to compile -# GCRYPT_LDFLAGS = ldflags to use to compile -# - -find_program(LIBGCRYPT_CONFIG_EXECUTABLE NAMES libgcrypt-config) - -set(GCRYPT_LDFLAGS) -set(GCRYPT_CFLAGS) - -if(LIBGCRYPT_CONFIG_EXECUTABLE) - - execute_process(COMMAND ${LIBGCRYPT_CONFIG_EXECUTABLE} --libs RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE GCRYPT_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET) - execute_process(COMMAND ${LIBGCRYPT_CONFIG_EXECUTABLE} --cflags RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE GCRYPT_CFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET) - - if(NOT DEFINED ${GCRYPT_CFLAGS}) - set(GCRYPT_CFLAGS " ") - endif() - -endif() - -# handle the QUIETLY and REQUIRED arguments and set GCRYPT_FOUND to TRUE if -# all listed variables are TRUE -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(GCRYPT REQUIRED_VARS GCRYPT_LDFLAGS GCRYPT_CFLAGS) - -if(GCRYPT_FOUND) - mark_as_advanced(GCRYPT_CFLAGS GCRYPT_LDFLAGS) -endif() diff --git a/src/plugins/irc/CMakeLists.txt b/src/plugins/irc/CMakeLists.txt index a0a853e9c..42b450fd4 100644 --- a/src/plugins/irc/CMakeLists.txt +++ b/src/plugins/irc/CMakeLists.txt @@ -54,7 +54,7 @@ set(LINK_LIBS) include_directories(${GNUTLS_INCLUDE_PATH}) list(APPEND LINK_LIBS ${GNUTLS_LIBRARY}) -list(APPEND LINK_LIBS ${GCRYPT_LDFLAGS}) +list(APPEND LINK_LIBS ${LIBGCRYPT_LDFLAGS}) if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") # link with resolv lib on macOS diff --git a/src/plugins/relay/CMakeLists.txt b/src/plugins/relay/CMakeLists.txt index 2f5cba66a..a6d6db1d3 100644 --- a/src/plugins/relay/CMakeLists.txt +++ b/src/plugins/relay/CMakeLists.txt @@ -46,7 +46,7 @@ set(LINK_LIBS) include_directories(${GNUTLS_INCLUDE_PATH}) list(APPEND LINK_LIBS ${GNUTLS_LIBRARY}) -list(APPEND LINK_LIBS ${GCRYPT_LDFLAGS}) +list(APPEND LINK_LIBS ${LIBGCRYPT_LDFLAGS}) list(APPEND LINK_LIBS ${ZLIB_LIBRARY}) diff --git a/src/plugins/xfer/CMakeLists.txt b/src/plugins/xfer/CMakeLists.txt index 4d1d77c3a..ce045483b 100644 --- a/src/plugins/xfer/CMakeLists.txt +++ b/src/plugins/xfer/CMakeLists.txt @@ -34,7 +34,7 @@ set_target_properties(xfer PROPERTIES PREFIX "") set(LINK_LIBS) -list(APPEND LINK_LIBS ${GCRYPT_LDFLAGS}) +list(APPEND LINK_LIBS ${LIBGCRYPT_LDFLAGS}) if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") # link with resolv lib on macOS diff --git a/tools/debian/patches/weechat_debian_buster.patch b/tools/debian/patches/weechat_debian_buster.patch deleted file mode 100644 index ecb3483ff..000000000 --- a/tools/debian/patches/weechat_debian_buster.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/debian-devel/control b/debian-devel/control -index 1abbda247..0db73f390 100644 ---- a/debian-devel/control -+++ b/debian-devel/control -@@ -14,7 +14,7 @@ Build-Depends: - libaspell-dev, - liblua5.3-dev, - tcl8.6-dev, -- guile-3.0-dev, -+ guile-2.2-dev, - php-dev, libphp-embed, libargon2-dev, libsodium-dev, - libxml2-dev, - libcurl4-gnutls-dev, -diff --git a/debian-stable/control b/debian-stable/control -index 428f11ce9..dcf71da3e 100644 ---- a/debian-stable/control -+++ b/debian-stable/control -@@ -14,7 +14,7 @@ Build-Depends: - libaspell-dev, - liblua5.3-dev, - tcl8.6-dev, -- guile-3.0-dev, -+ guile-2.2-dev, - php-dev, libphp-embed, libargon2-dev, libsodium-dev, - libxml2-dev, - libcurl4-gnutls-dev, diff --git a/tools/debian/patches/weechat_raspbian_buster.patch b/tools/debian/patches/weechat_raspbian_buster.patch deleted file mode 120000 index 3b84ccec9..000000000 --- a/tools/debian/patches/weechat_raspbian_buster.patch +++ /dev/null @@ -1 +0,0 @@ -weechat_debian_buster.patch \ No newline at end of file diff --git a/tools/debian/patches/weechat_ubuntu_bionic.patch b/tools/debian/patches/weechat_ubuntu_bionic.patch deleted file mode 100644 index f7df304f2..000000000 --- a/tools/debian/patches/weechat_ubuntu_bionic.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/debian-devel/compat b/debian-devel/compat -index 48082f72f..b4de39476 100644 ---- a/debian-devel/compat -+++ b/debian-devel/compat -@@ -1 +1 @@ --12 -+11 -diff --git a/debian-devel/control b/debian-devel/control -index 1abbda247..41addd80b 100644 ---- a/debian-devel/control -+++ b/debian-devel/control -@@ -5,7 +5,7 @@ Maintainer: Sébastien Helleu - Build-Depends: - asciidoctor (>= 1.5.4), - ruby-pygments.rb, -- debhelper (>= 12), -+ debhelper (>= 11), - cmake, pkg-config, - libncursesw5-dev, - gem2deb, -@@ -14,8 +14,8 @@ Build-Depends: - libaspell-dev, - liblua5.3-dev, - tcl8.6-dev, -- guile-3.0-dev, -- php-dev, libphp-embed, libargon2-dev, libsodium-dev, -+ guile-2.2-dev, -+ php-dev, libphp-embed, libargon2-0-dev, libsodium-dev, - libxml2-dev, - libcurl4-gnutls-dev, - libgcrypt20-dev, -diff --git a/debian-stable/compat b/debian-stable/compat -index 48082f72f..b4de39476 100644 ---- a/debian-stable/compat -+++ b/debian-stable/compat -@@ -1 +1 @@ --12 -+11 -diff --git a/debian-stable/control b/debian-stable/control -index 428f11ce9..e88f167b8 100644 ---- a/debian-stable/control -+++ b/debian-stable/control -@@ -5,7 +5,7 @@ Maintainer: Emmanuel Bouthenot - Build-Depends: - asciidoctor (>= 1.5.4), - ruby-pygments.rb, -- debhelper (>= 12), -+ debhelper (>= 11), - cmake, pkg-config, - libncursesw5-dev, - gem2deb, -@@ -14,8 +14,8 @@ Build-Depends: - libaspell-dev, - liblua5.3-dev, - tcl8.6-dev, -- guile-3.0-dev, -- php-dev, libphp-embed, libargon2-dev, libsodium-dev, -+ guile-2.2-dev, -+ php-dev, libphp-embed, libargon2-0-dev, libsodium-dev, - libxml2-dev, - libcurl4-gnutls-dev, - libgcrypt20-dev,