From a3382f5a09a7795f4bb2a31b5633835675e5364e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Tue, 22 Aug 2023 09:52:25 +0200 Subject: [PATCH] build: update build dependency from libncursesw5-dev to libncurses-dev --- .github/workflows/ci.yml | 2 +- debian-devel/control | 2 +- debian-stable/control | 2 +- doc/de/weechat_user.de.adoc | 10 +++------- doc/en/weechat_user.en.adoc | 9 +++------ doc/fr/weechat_user.fr.adoc | 12 ++++------- doc/it/weechat_user.it.adoc | 10 +++------- doc/ja/weechat_user.ja.adoc | 9 +++------ doc/pl/weechat_user.pl.adoc | 9 +++------ doc/sr/weechat_user.sr.adoc | 7 +++---- .../patches/weechat_ubuntu_bionic.patch | 20 +++++++++++-------- 11 files changed, 37 insertions(+), 55 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 78dfbf956..82c96b160 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,7 @@ on: - pull_request env: - WEECHAT_DEPENDENCIES: devscripts equivs python3-pip cmake ninja-build lcov pkg-config libncursesw5-dev gem2deb libperl-dev python3-dev libaspell-dev liblua5.3-dev tcl8.6-dev guile-3.0-dev libv8-dev libcurl4-gnutls-dev libgcrypt20-dev libgnutls28-dev libzstd-dev zlib1g-dev curl libcpputest-dev php-dev libphp-embed libargon2-dev libsodium-dev flake8 pylint python3-bandit asciidoctor ruby-pygments.rb shellcheck + WEECHAT_DEPENDENCIES: devscripts equivs python3-pip cmake ninja-build lcov pkg-config libncurses-dev gem2deb libperl-dev python3-dev libaspell-dev liblua5.3-dev tcl8.6-dev guile-3.0-dev libv8-dev libcurl4-gnutls-dev libgcrypt20-dev libgnutls28-dev libzstd-dev zlib1g-dev curl libcpputest-dev php-dev libphp-embed libargon2-dev libsodium-dev flake8 pylint python3-bandit asciidoctor ruby-pygments.rb shellcheck jobs: diff --git a/debian-devel/control b/debian-devel/control index 1abbda247..4229b00f6 100644 --- a/debian-devel/control +++ b/debian-devel/control @@ -7,7 +7,7 @@ Build-Depends: ruby-pygments.rb, debhelper (>= 12), cmake, pkg-config, - libncursesw5-dev, + libncurses-dev, gem2deb, libperl-dev, python3-dev, diff --git a/debian-stable/control b/debian-stable/control index 428f11ce9..ad3f771b7 100644 --- a/debian-stable/control +++ b/debian-stable/control @@ -7,7 +7,7 @@ Build-Depends: ruby-pygments.rb, debhelper (>= 12), cmake, pkg-config, - libncursesw5-dev, + libncurses-dev, gem2deb, libperl-dev, python3-dev, diff --git a/doc/de/weechat_user.de.adoc b/doc/de/weechat_user.de.adoc index aa3fc5f8a..909edcb80 100644 --- a/doc/de/weechat_user.de.adoc +++ b/doc/de/weechat_user.de.adoc @@ -118,7 +118,7 @@ Die folgende Tabelle zeigt eine Auflistung der Pakete, die zum Erstellen von Wee | pkg-config | | entdeckt installierte Bibliotheken. -| libncursesw5-dev ^(2)^ | +| libncurses-dev | | Ncurses Oberfläche. | libcurl4-gnutls-dev | @@ -127,7 +127,7 @@ Die folgende Tabelle zeigt eine Auflistung der Pakete, die zum Erstellen von Wee | libgcrypt20-dev | | Geschützte Daten, IRC SASL Authentifikation. -| libgnutls28-dev | ≥ 2.2.0 ^(3)^ +| libgnutls28-dev | ≥ 2.2.0 ^(2)^ | IRC-Erweiterung: Unterstützung von TLS Verbindungen, IRC SASL Authentifikation (ECDSA-NIST256P-CHALLENGE). + Relay-Erweiterung: Untersützung von TLS Verbindungen. @@ -144,11 +144,7 @@ Die folgende Tabelle zeigt eine Auflistung der Pakete, die zum Erstellen von Wee [NOTE] ^(1)^ Der Name stammt von der Debian GNU/Linux Bookworm-Distribution, Version und Name können in anderen Distributionen anders lauten. + -^(2)^ Es wird empfohlen WeeChat mit libncurses**w**5-dev (das *w* ist -entscheidend) zu kompilieren. Eine Kompilierung kann auch mit libncurses5-dev erfolgen, -aber dies wird *NICHT* empfohlen: -Es können Darstellungsfehler mit breiten Zeichen auftreten. + -^(3)^ GnuTLS ≥ 3.0.21 wird benötigt um eine IRC SASL Authentifizierung mittels +^(2)^ GnuTLS ≥ 3.0.21 wird benötigt um eine IRC SASL Authentifizierung mittels ECDSA-NIST256P-CHALLENGE durchzuführen. Die folgende Tabelle zeigt die Liste der Pakete, die zum Kompilieren von diff --git a/doc/en/weechat_user.en.adoc b/doc/en/weechat_user.en.adoc index 3fffc5ba8..d0ea70be9 100644 --- a/doc/en/weechat_user.en.adoc +++ b/doc/en/weechat_user.en.adoc @@ -113,7 +113,7 @@ WeeChat: | pkg-config | | Detect installed libraries. -| libncursesw5-dev ^(2)^ | +| libncurses-dev | | Ncurses interface. | libcurl4-gnutls-dev | @@ -122,7 +122,7 @@ WeeChat: | libgcrypt20-dev | | Secured data, IRC SASL authentication. -| libgnutls28-dev | ≥ 2.2.0 ^(3)^ +| libgnutls28-dev | ≥ 2.2.0 ^(2)^ | IRC plugin: support of TLS connections, IRC SASL authentication (ECDSA-NIST256P-CHALLENGE). + Relay plugin: support of TLS connections. @@ -139,10 +139,7 @@ WeeChat: [NOTE] ^(1)^ Name comes from the Debian GNU/Linux Bookworm distribution, version and name can be different in other distributions. + -^(2)^ It is recommended to compile with libncurses**w**5-dev (the *w* is -important). WeeChat can compile with libncurses5-dev, but it is *NOT* recommended: -you may experience display bugs with wide chars. + -^(3)^ GnuTLS ≥ 3.0.21 is required for IRC SASL authentication with mechanism +^(2)^ GnuTLS ≥ 3.0.21 is required for IRC SASL authentication with mechanism ECDSA-NIST256P-CHALLENGE. The following table shows the list of packages that are optional to compile diff --git a/doc/fr/weechat_user.fr.adoc b/doc/fr/weechat_user.fr.adoc index 02ffb7f15..13ec9bb41 100644 --- a/doc/fr/weechat_user.fr.adoc +++ b/doc/fr/weechat_user.fr.adoc @@ -113,7 +113,7 @@ Le tableau suivant liste les paquets *requis* pour construire WeeChat : | pkg-config | | Détection des bibliothèques installées. -| libncursesw5-dev ^(2)^ | +| libncurses-dev | | Interface ncurses. | libcurl4-gnutls-dev | @@ -122,7 +122,7 @@ Le tableau suivant liste les paquets *requis* pour construire WeeChat : | libgcrypt20-dev | | Données sécurisées, authentification IRC SASL. -| libgnutls28-dev | ≥ 2.2.0 ^(3)^ +| libgnutls28-dev | ≥ 2.2.0 ^(2)^ | Extension IRC : support des connexions TLS, authentification IRC SASL (ECDSA-NIST256P-CHALLENGE). + Extension Relay : support des connexions TLS. @@ -138,12 +138,8 @@ Le tableau suivant liste les paquets *requis* pour construire WeeChat : [NOTE] ^(1)^ Le nom provient de la distribution GNU/Linux Debian Bookworm, la version -et le nom peuvent être différents dans les autres distributions. -^(2)^ Il est recommandé de compiler avec libncurses**w**5-dev (le *w* est -important). WeeChat peut compiler avec libncurses5-dev, mais ce n'est *PAS* -recommandé : vous pourriez avoir des problèmes d'affichage avec les caractères -larges. + -^(3)^ GnuTLS ≥ 3.0.21 est requis pour l'authentification SASL avec le mécanisme +et le nom peuvent être différents dans les autres distributions. + +^(2)^ GnuTLS ≥ 3.0.21 est requis pour l'authentification SASL avec le mécanisme ECDSA-NIST256P-CHALLENGE. Le tableau suivant liste les paquets optionnels pour compiler WeeChat : diff --git a/doc/it/weechat_user.it.adoc b/doc/it/weechat_user.it.adoc index 084ab666e..108c1fb6d 100644 --- a/doc/it/weechat_user.it.adoc +++ b/doc/it/weechat_user.it.adoc @@ -139,7 +139,7 @@ WeeChat: | pkg-config | | Detect installed libraries. -| libncursesw5-dev ^(2)^ | +| libncurses-dev | | Interfaccia ncurses. | libcurl4-gnutls-dev | @@ -150,7 +150,7 @@ WeeChat: | Secured data, IRC SASL authentication. // TRANSLATION MISSING -| libgnutls28-dev | ≥ 2.2.0 ^(3)^ +| libgnutls28-dev | ≥ 2.2.0 ^(2)^ | IRC plugin: support of TLS connections, IRC SASL authentication (ECDSA-NIST256P-CHALLENGE). + Relay plugin: support of TLS connections. @@ -171,11 +171,7 @@ WeeChat: ^(1)^ Name comes from the Debian GNU/Linux Bookworm distribution, version and name can be different in other distributions. + // TRANSLATION MISSING -^(2)^ It is recommended to compile with libncurses**w**5-dev (the *w* is -important). WeeChat can compile with libncurses5-dev, but it is *NOT* recommended: -you may experience display bugs with wide chars. + -// TRANSLATION MISSING -^(3)^ GnuTLS ≥ 3.0.21 is required for IRC SASL authentication with mechanism +^(2)^ GnuTLS ≥ 3.0.21 is required for IRC SASL authentication with mechanism ECDSA-NIST256P-CHALLENGE. // TRANSLATION MISSING diff --git a/doc/ja/weechat_user.ja.adoc b/doc/ja/weechat_user.ja.adoc index 43ea9ab76..fed231d9b 100644 --- a/doc/ja/weechat_user.ja.adoc +++ b/doc/ja/weechat_user.ja.adoc @@ -127,7 +127,7 @@ WeeChat: | pkg-config | | インストール済みライブラリを検出 -| libncursesw5-dev ^(2)^ | +| libncurses-dev | | ncurses インターフェース | libcurl4-gnutls-dev | @@ -137,7 +137,7 @@ WeeChat: | 保護データ、IRC SASL 認証 // TRANSLATION MISSING -| libgnutls28-dev | ≥ 2.2.0 ^(3)^ +| libgnutls28-dev | ≥ 2.2.0 ^(2)^ | IRC plugin: support of TLS connections, IRC SASL authentication (ECDSA-NIST256P-CHALLENGE). + Relay plugin: support of TLS connections. @@ -157,10 +157,7 @@ WeeChat: // TRANSLATION MISSING ^(1)^ Name comes from the Debian GNU/Linux Bookworm distribution, version and name can be different in other distributions. + -^(2)^ WeeChat は libncurses**w**5-dev でコンパイルすることを推奨します -(*w* が重要です)。libncurses5-dev でもコンパイル可能ですが、これは推奨 -*されません* (ワイドキャラクタの表示にバグを生じるでしょう)。 + -^(3)^ IRC SASL 認証で ECDSA-NIST256P-CHALLENGE を使うには、GnuTLS +^(2)^ IRC SASL 認証で ECDSA-NIST256P-CHALLENGE を使うには、GnuTLS バージョン 3.0.21 以上が必要です。 // TRANSLATION MISSING diff --git a/doc/pl/weechat_user.pl.adoc b/doc/pl/weechat_user.pl.adoc index 162cb4f58..af92dca73 100644 --- a/doc/pl/weechat_user.pl.adoc +++ b/doc/pl/weechat_user.pl.adoc @@ -117,7 +117,7 @@ WeeChat: | pkg-config | | Wykrywa zainstalowane biblioteki. -| libncursesw5-dev ^(2)^ | +| libncurses-dev | | Interfejs ncurses. | libcurl4-gnutls-dev | @@ -126,7 +126,7 @@ WeeChat: | libgcrypt20-dev | | Zabezpieczone dane, uwierzytelnianie IRC SASL. -| libgnutls28-dev | ≥ 2.2.0 ^(3)^ +| libgnutls28-dev | ≥ 2.2.0 ^(2)^ | Wtyczka IRC: wsparcie dla połączeń TLS, autentykacja IRC SASL (ECDSA-NIST256P-CHALLENGE). + Wtyczka relay: wsparcie dla połączeń TLS. @@ -143,10 +143,7 @@ WeeChat: [NOTE] ^(1)^ Nazwa pochodzi z repozytorium dystrybucji Debian GNU/Linux Bookworm distribution, wersja i nazwa mogą się różnić dla innych dystrybucji. + -^(2)^ Zaleca się kompilację z użyciem libncurses**w**5-dev (*w* jest istotne). -WeeChat można skompilowac używając libncurses5-dev, ale *NIE* jest to zalecane: -możesz doświadczyć błędów wyświetlania. + -^(3)^ GnuTLS ≥ 3.0.21 jest wymagany dla uwierzytelnienia IRC SASL za pomocą +^(2)^ GnuTLS ≥ 3.0.21 jest wymagany dla uwierzytelnienia IRC SASL za pomocą mechanizmu ECDSA-NIST256P-CHALLENGE. The following table shows the list of packages that are optional to compile diff --git a/doc/sr/weechat_user.sr.adoc b/doc/sr/weechat_user.sr.adoc index 480d9129c..228f30a29 100644 --- a/doc/sr/weechat_user.sr.adoc +++ b/doc/sr/weechat_user.sr.adoc @@ -112,7 +112,7 @@ WeeChat мора да се изгради са CMake. | pkg-config | | Детекција инсталираних библиотека. -| libncursesw5-dev ^(2)^ | +| libncurses-dev | | Ncurses интерфејс. | libcurl4-gnutls-dev | @@ -121,7 +121,7 @@ WeeChat мора да се изгради са CMake. | libgcrypt20-dev | | Обезбеђени подаци, IRC SASL аутентификација. -| libgnutls28-dev | ≥ 2.2.0 ^(3)^ +| libgnutls28-dev | ≥ 2.2.0 ^(2)^ | IRC додатак: подршка за TLS везе, IRC SASL аутентификацију (ECDSA-NIST256P-CHALLENGE). + Relay додатак: подршка за TLS везе. @@ -138,8 +138,7 @@ WeeChat мора да се изгради са CMake. [NOTE] ^(1)^ Име долази из Debian GNU/Linux Bookworm дистрибуције, верзија и име могу да буду другачији у осталим дитрибуцијама. + -^(2)^ Препоручује се компајлирање са libncurses**w**5-dev (битно је *w*). Програм WeeChat може да се компајлира са libncurses5-dev, али се то *НЕ* препоручује: можете имати багове код приказа широких карактера. + -^(3)^ GnuTLS ≥ 3.0.21 је неопходан за IRC SASL аутентификацију механизмом ECDSA-NIST256P-CHALLENGE. +^(2)^ GnuTLS ≥ 3.0.21 је неопходан за IRC SASL аутентификацију механизмом ECDSA-NIST256P-CHALLENGE. Следећа табела приказује листу пакета који нису обавезни за компајлирање програма WeeChat: diff --git a/tools/debian/patches/weechat_ubuntu_bionic.patch b/tools/debian/patches/weechat_ubuntu_bionic.patch index f7df304f2..53405db88 100644 --- a/tools/debian/patches/weechat_ubuntu_bionic.patch +++ b/tools/debian/patches/weechat_ubuntu_bionic.patch @@ -6,19 +6,21 @@ index 48082f72f..b4de39476 100644 -12 +11 diff --git a/debian-devel/control b/debian-devel/control -index 1abbda247..41addd80b 100644 +index 4229b00f6..41addd80b 100644 --- a/debian-devel/control +++ b/debian-devel/control -@@ -5,7 +5,7 @@ Maintainer: Sébastien Helleu +@@ -5,17 +5,17 @@ Maintainer: Sébastien Helleu Build-Depends: asciidoctor (>= 1.5.4), ruby-pygments.rb, - debhelper (>= 12), + debhelper (>= 11), cmake, pkg-config, - libncursesw5-dev, +- libncurses-dev, ++ libncursesw5-dev, gem2deb, -@@ -14,8 +14,8 @@ Build-Depends: + libperl-dev, + python3-dev, libaspell-dev, liblua5.3-dev, tcl8.6-dev, @@ -37,19 +39,21 @@ index 48082f72f..b4de39476 100644 -12 +11 diff --git a/debian-stable/control b/debian-stable/control -index 428f11ce9..e88f167b8 100644 +index ad3f771b7..e88f167b8 100644 --- a/debian-stable/control +++ b/debian-stable/control -@@ -5,7 +5,7 @@ Maintainer: Emmanuel Bouthenot +@@ -5,17 +5,17 @@ Maintainer: Emmanuel Bouthenot Build-Depends: asciidoctor (>= 1.5.4), ruby-pygments.rb, - debhelper (>= 12), + debhelper (>= 11), cmake, pkg-config, - libncursesw5-dev, +- libncurses-dev, ++ libncursesw5-dev, gem2deb, -@@ -14,8 +14,8 @@ Build-Depends: + libperl-dev, + python3-dev, libaspell-dev, liblua5.3-dev, tcl8.6-dev,