diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bbc926376..bbc9b48f8 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 libenchant-dev autopoint cmake ninja-build lcov pkg-config libncursesw5-dev gem2deb libperl-dev python2-dev python3-dev libaspell-dev liblua5.3-dev tcl8.6-dev guile-2.2-dev libv8-dev libcurl4-gnutls-dev libgcrypt20-dev libgnutls28-dev libzstd-dev zlib1g-dev curl libcpputest-dev php8.0-dev libphp8.0-embed libargon2-0-dev libsodium-dev pylint python3-bandit asciidoctor + WEECHAT_DEPENDENCIES: devscripts equivs python3-pip libenchant-dev autopoint cmake ninja-build lcov pkg-config libncursesw5-dev gem2deb libperl-dev python2-dev python3-dev libaspell-dev liblua5.3-dev tcl8.6-dev guile-2.2-dev libv8-dev libcurl4-gnutls-dev libgcrypt20-dev libgnutls28-dev libzstd-dev zlib1g-dev curl libcpputest-dev php8.0-dev libphp8.0-embed libargon2-dev libsodium-dev pylint python3-bandit asciidoctor jobs: diff --git a/ChangeLog.adoc b/ChangeLog.adoc index 84c3eb0d2..e24e4f307 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -50,6 +50,7 @@ Tests:: Build:: + * debian: change dependency libargon2-0-dev to libargon2-dev (debian #1005703) * ruby: add detection of Ruby 3.1 [[v3.4]] diff --git a/debian-devel/control b/debian-devel/control index 6cc1b8c92..9dbbe1fb0 100644 --- a/debian-devel/control +++ b/debian-devel/control @@ -14,7 +14,7 @@ Build-Depends: liblua5.3-dev, tcl8.6-dev, guile-2.2-dev, - php-dev, libphp-embed, libargon2-0-dev, libsodium-dev, + php-dev, libphp-embed, libargon2-dev, libsodium-dev, libxml2-dev, libcurl4-gnutls-dev, libgcrypt20-dev, diff --git a/debian-stable/control b/debian-stable/control index 77c78e4ad..ea31b52d4 100644 --- a/debian-stable/control +++ b/debian-stable/control @@ -14,7 +14,7 @@ Build-Depends: liblua5.3-dev, tcl8.6-dev, guile-2.2-dev, - php-dev, libphp-embed, libargon2-0-dev, libsodium-dev, + php-dev, libphp-embed, libargon2-dev, libsodium-dev, libxml2-dev, libcurl4-gnutls-dev, libgcrypt20-dev, diff --git a/doc/de/weechat_user.de.adoc b/doc/de/weechat_user.de.adoc index 4ff2c1fe4..f46c359de 100644 --- a/doc/de/weechat_user.de.adoc +++ b/doc/de/weechat_user.de.adoc @@ -142,7 +142,7 @@ WeeChat optional sind: | php-dev | ≥ 7.0 | PHP Erweiterung. | libphp-embed | ≥ 7.0 | PHP Erweiterung. | libxml2-dev | | PHP Erweiterung. -| libargon2-0-dev | | PHP Erweiterung (wenn PHP ≥ 7.2). +| libargon2-dev | | PHP Erweiterung (wenn PHP ≥ 7.2). | libsodium-dev | | PHP Erweiterung (wenn PHP ≥ 7.2). | asciidoctor | ≥ 1.5.4 | zum Erstellen der man page und der Dokumentation. | libcpputest-dev | ≥ 3.4 | zum Erstellen und um Test auszuführen. diff --git a/doc/en/weechat_user.en.adoc b/doc/en/weechat_user.en.adoc index ffd4de115..a87a4f225 100644 --- a/doc/en/weechat_user.en.adoc +++ b/doc/en/weechat_user.en.adoc @@ -135,7 +135,7 @@ WeeChat: | php-dev | ≥ 7.0 | PHP plugin. | libphp-embed | ≥ 7.0 | PHP plugin. | libxml2-dev | | PHP plugin. -| libargon2-0-dev | | PHP plugin (if PHP ≥ 7.2). +| libargon2-dev | | PHP plugin (if PHP ≥ 7.2). | libsodium-dev | | PHP plugin (if PHP ≥ 7.2). | asciidoctor | ≥ 1.5.4 | Build man page and documentation. | libcpputest-dev | ≥ 3.4 | Build and run tests. diff --git a/doc/fr/weechat_user.fr.adoc b/doc/fr/weechat_user.fr.adoc index c151ff0ee..a82e1b421 100644 --- a/doc/fr/weechat_user.fr.adoc +++ b/doc/fr/weechat_user.fr.adoc @@ -138,7 +138,7 @@ Le tableau suivant liste les paquets optionnels pour compiler WeeChat : | php-dev | ≥ 7.0 | Extension PHP. | libphp-embed | ≥ 7.0 | Extension PHP. | libxml2-dev | | Extension PHP. -| libargon2-0-dev | | Extension PHP (si PHP ≥ 7.2). +| libargon2-dev | | Extension PHP (si PHP ≥ 7.2). | libsodium-dev | | Extension PHP (si PHP ≥ 7.2). | asciidoctor | ≥ 1.5.4 | Construction de la page man et de la documentation. | libcpputest-dev | ≥ 3.4 | Construction et lancement des tests. diff --git a/doc/it/weechat_user.it.adoc b/doc/it/weechat_user.it.adoc index 3325aa53f..ac40a9a48 100644 --- a/doc/it/weechat_user.it.adoc +++ b/doc/it/weechat_user.it.adoc @@ -164,7 +164,7 @@ WeeChat: | libphp-embed | ≥ 7.0 | Plugin php. | libxml2-dev | | Plugin php. // TRANSLATION MISSING -| libargon2-0-dev | | Plugin php (if PHP ≥ 7.2). +| libargon2-dev | | Plugin php (if PHP ≥ 7.2). // TRANSLATION MISSING | libsodium-dev | | Plugin php (if PHP ≥ 7.2). // TRANSLATION MISSING diff --git a/doc/ja/weechat_user.ja.adoc b/doc/ja/weechat_user.ja.adoc index 709b397d7..25d85c931 100644 --- a/doc/ja/weechat_user.ja.adoc +++ b/doc/ja/weechat_user.ja.adoc @@ -145,7 +145,7 @@ WeeChat: | php-dev | 7.0 以上 | PHP プラグイン | libphp-embed | 7.0 以上 | PHP プラグイン | libxml2-dev | | PHP プラグイン -| libargon2-0-dev | | PHP プラグイン (PHP 7.2 以上の場合) +| libargon2-dev | | PHP プラグイン (PHP 7.2 以上の場合) | libsodium-dev | | PHP プラグイン (PHP 7.2 以上の場合) | asciidoctor | 1.5.4 以上 | man ページと文書のビルド | libcpputest-dev | 3.4 以上 | ビルドとテストの実行 diff --git a/doc/pl/weechat_user.pl.adoc b/doc/pl/weechat_user.pl.adoc index b2860b4a4..05964fdfa 100644 --- a/doc/pl/weechat_user.pl.adoc +++ b/doc/pl/weechat_user.pl.adoc @@ -143,7 +143,7 @@ WeeChat: | php-dev | ≥ 7.0 | Wtyczka PHP. | libphp-embed | ≥ 7.0 | Wtyczka PHP. | libxml2-dev | | Wtyczka PHP. -| libargon2-0-dev | | Wtyczka PHP (jeśli PHP ≥ 7.2). +| libargon2-dev | | Wtyczka PHP (jeśli PHP ≥ 7.2). | libsodium-dev | | Wtyczka PHP (jeśli PHP ≥ 7.2). | asciidoctor | ≥ 1.5.4 | Tworzenie strony man i dokumentacji. | libcpputest-dev | ≥ 3.4 | Kompilacja i uruchamianie testów. diff --git a/doc/sr/weechat_user.sr.adoc b/doc/sr/weechat_user.sr.adoc index 089b104dc..ec339f408 100644 --- a/doc/sr/weechat_user.sr.adoc +++ b/doc/sr/weechat_user.sr.adoc @@ -122,7 +122,7 @@ WeeChat почетна страница се налази на адреси: htt | php-dev | ≥ 7.0 | PHP додатак. | libphp-embed | ≥ 7.0 | PHP додатак. | libxml2-dev | | PHP додатак. -| libargon2-0-dev | | PHP додатак (ако је PHP ≥ 7.2). +| libargon2-dev | | PHP додатак (ако је PHP ≥ 7.2). | libsodium-dev | | PHP додатак (ако је PHP ≥ 7.2). | asciidoctor | ≥ 1.5.4 | Изградњу man странице и документације. | libcpputest-dev | ≥ 3.4 | Изградњу и покретање тестова. diff --git a/tools/debian/patches/weechat_debian_stretch.patch b/tools/debian/patches/weechat_debian_stretch.patch index d706321a0..3f94b77ad 100644 --- a/tools/debian/patches/weechat_debian_stretch.patch +++ b/tools/debian/patches/weechat_debian_stretch.patch @@ -23,7 +23,7 @@ index bf94a36f1..ae29ae9ec 100644 liblua5.3-dev, tcl8.6-dev, - guile-2.2-dev, -- php-dev, libphp-embed, libargon2-0-dev, libsodium-dev, +- php-dev, libphp-embed, libargon2-dev, libsodium-dev, + guile-2.0-dev, + php-dev, libphp-embed, libxml2-dev, @@ -54,7 +54,7 @@ index ccf81cac8..3e6563e42 100644 liblua5.3-dev, tcl8.6-dev, - guile-2.2-dev, -- php-dev, libphp-embed, libargon2-0-dev, libsodium-dev, +- php-dev, libphp-embed, libargon2-dev, libsodium-dev, + guile-2.0-dev, + php-dev, libphp-embed, libxml2-dev, diff --git a/tools/debian/patches/weechat_ubuntu_bionic.patch b/tools/debian/patches/weechat_ubuntu_bionic.patch index c1a9f6d57..6d76bb8e6 100644 --- a/tools/debian/patches/weechat_ubuntu_bionic.patch +++ b/tools/debian/patches/weechat_ubuntu_bionic.patch @@ -6,7 +6,7 @@ index 48082f72f..b4de39476 100644 -12 +11 diff --git a/debian-devel/control b/debian-devel/control -index a6cc3c91c..d078d35b7 100644 +index 9dbbe1fb0..b044f7b44 100644 --- a/debian-devel/control +++ b/debian-devel/control @@ -4,7 +4,7 @@ Priority: optional @@ -18,6 +18,15 @@ index a6cc3c91c..d078d35b7 100644 cmake, pkg-config, libncursesw5-dev, gem2deb, +@@ -14,7 +14,7 @@ Build-Depends: + liblua5.3-dev, + tcl8.6-dev, + guile-2.2-dev, +- php-dev, libphp-embed, libargon2-dev, libsodium-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 @@ -26,7 +35,7 @@ index 48082f72f..b4de39476 100644 -12 +11 diff --git a/debian-stable/control b/debian-stable/control -index 1b0a27009..7880ce7bd 100644 +index ea31b52d4..fd4aad73a 100644 --- a/debian-stable/control +++ b/debian-stable/control @@ -4,7 +4,7 @@ Priority: optional @@ -38,3 +47,12 @@ index 1b0a27009..7880ce7bd 100644 cmake, pkg-config, libncursesw5-dev, gem2deb, +@@ -14,7 +14,7 @@ Build-Depends: + liblua5.3-dev, + tcl8.6-dev, + guile-2.2-dev, +- php-dev, libphp-embed, libargon2-dev, libsodium-dev, ++ php-dev, libphp-embed, libargon2-0-dev, libsodium-dev, + libxml2-dev, + libcurl4-gnutls-dev, + libgcrypt20-dev, diff --git a/tools/debian/patches/weechat_ubuntu_xenial.patch b/tools/debian/patches/weechat_ubuntu_xenial.patch index c604e9dda..fd395d5d0 100644 --- a/tools/debian/patches/weechat_ubuntu_xenial.patch +++ b/tools/debian/patches/weechat_ubuntu_xenial.patch @@ -23,7 +23,7 @@ index bf94a36f1..1eb804643 100644 liblua5.3-dev, tcl8.6-dev, - guile-2.2-dev, -- php-dev, libphp-embed, libargon2-0-dev, libsodium-dev, +- php-dev, libphp-embed, libargon2-dev, libsodium-dev, + guile-2.0-dev, + php-dev, libphp-embed, libxml2-dev, @@ -54,7 +54,7 @@ index ccf81cac8..7098b52c6 100644 liblua5.3-dev, tcl8.6-dev, - guile-2.2-dev, -- php-dev, libphp-embed, libargon2-0-dev, libsodium-dev, +- php-dev, libphp-embed, libargon2-dev, libsodium-dev, + guile-2.0-dev, + php-dev, libphp-embed, libxml2-dev,