* [gentoo-commits] repo/gentoo:master commit in: net-irc/weechat/, net-irc/weechat/files/
@ 2018-12-13 6:48 Tim Harder
0 siblings, 0 replies; 5+ messages in thread
From: Tim Harder @ 2018-12-13 6:48 UTC (permalink / raw
To: gentoo-commits
commit: fa5f777475b902cc5721e3c7db0f663f9040930c
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 13 03:40:31 2018 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Thu Dec 13 06:47:14 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa5f7774
net-irc/weechat: remove old
Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>
net-irc/weechat/Manifest | 1 -
net-irc/weechat/files/weechat-1.2-tinfo.patch | 32 ------
net-irc/weechat/weechat-2.0.1.ebuild | 151 --------------------------
3 files changed, 184 deletions(-)
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index bbde3e37504..03f1ca58d69 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,2 +1 @@
-DIST weechat-2.0.1.tar.xz 1967336 BLAKE2B 256f4bab45834ed2798490234c9417b8b8e4d06d0ed09f5779ad9d32321ab9aec58c38f4b048de319e4f46809313186462208258ca2d78d1e0470fa2014e7472 SHA512 3947e79a0ac8dce7605905c39039bedf9ba2af4778ee6905f12ca75786b62f3081568ce9426be251e65bad2837ddcf0664cbb08059f898d4ac60171325a94e74
DIST weechat-2.3.tar.xz 2025652 BLAKE2B 74c5d81a77f164c51bee01ff1be5731455ad85178005a360269ffa4ac59554c58dc97175fcb3fa62841b79e7711c1dc41876a839a9d1e4a1f4ce359bac1d6689 SHA512 0de827850de5c70c528e1a8cfa44220c3d48d6767df61a8a6283123173ba63b4c8554d5334a8b14976d19602c36bbc27d89ebbd201ccd8c048d50edc3a4ea19b
diff --git a/net-irc/weechat/files/weechat-1.2-tinfo.patch b/net-irc/weechat/files/weechat-1.2-tinfo.patch
deleted file mode 100644
index e6ae9e0f205..00000000000
--- a/net-irc/weechat/files/weechat-1.2-tinfo.patch
+++ /dev/null
@@ -1,32 +0,0 @@
- src/gui/curses/CMakeLists.txt | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/src/gui/curses/CMakeLists.txt b/src/gui/curses/CMakeLists.txt
-index 284956f..492fc77 100644
---- a/src/gui/curses/CMakeLists.txt
-+++ b/src/gui/curses/CMakeLists.txt
-@@ -35,7 +35,14 @@ main.c)
-
- set(EXECUTABLE weechat)
-
--find_package(Ncurses)
-+
-+find_package(PkgConfig)
-+pkg_search_module(NCURSES ncursesw ncurses)
-+
-+if(NOT NCURSES_FOUND)
-+ find_package(Ncurses)
-+endif(NCURSES_FOUND)
-+
- if(NCURSES_FOUND)
- check_include_files(ncursesw/ncurses.h NCURSESW_HEADERS)
- if(NCURSESW_HEADERS)
-@@ -46,7 +53,7 @@ if(NCURSES_FOUND)
- add_definitions(-DHAVE_NCURSES_H)
- endif()
- endif()
-- list(APPEND EXTRA_LIBS ${NCURSES_LIBRARY})
-+ list(APPEND EXTRA_LIBS ${NCURSES_LIBRARY} ${NCURSES_LIBRARIES} )
- endif()
-
- if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
diff --git a/net-irc/weechat/weechat-2.0.1.ebuild b/net-irc/weechat/weechat-2.0.1.ebuild
deleted file mode 100644
index 1d1eec8e568..00000000000
--- a/net-irc/weechat/weechat-2.0.1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit python-single-r1 cmake-utils
-
-if [[ ${PV} == "9999" ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/weechat/weechat.git"
-else
- SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
- KEYWORDS="amd64 x86 ~x64-macos"
-fi
-
-DESCRIPTION="Portable and multi-interface IRC client"
-HOMEPAGE="https://weechat.org/"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-NETWORKS="+irc"
-PLUGINS="+alias +buflist +charset +exec +fset +fifo +logger +relay +scripts +spell +trigger +xfer"
-# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
-SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
-LANGS=" cs de es fr hu it ja pl pt pt_BR ru tr"
-IUSE="doc nls +ssl test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- dev-libs/libgcrypt:0=
- net-misc/curl[ssl]
- sys-libs/ncurses:0=
- sys-libs/zlib
- charset? ( virtual/libiconv )
- guile? ( >=dev-scheme/guile-2.0 )
- lua? ( dev-lang/lua:0[deprecated] )
- nls? ( virtual/libintl )
- perl? ( dev-lang/perl:= )
- php? ( >=dev-lang/php-7.0:* )
- python? ( ${PYTHON_DEPS} )
- ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 ) )
- ssl? ( net-libs/gnutls )
- spell? ( app-text/aspell )
- tcl? ( >=dev-lang/tcl-8.4.15:0= )
-"
-DEPEND="${RDEPEND}
- doc? (
- >=dev-ruby/asciidoctor-1.5.4
- dev-util/source-highlight
- )
- nls? ( >=sys-devel/gettext-0.15 )
- test? ( dev-util/cpputest )
-"
-
-DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
-
-# tests need to be fixed to not use system plugins if weechat is already installed
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.2-tinfo.patch )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # fix libdir placement
- sed -i \
- -e "s:lib/:$(get_libdir)/:g" \
- -e "s:lib\":$(get_libdir)\":g" \
- CMakeLists.txt || die "sed failed"
-
- # install only required translations
- local i
- for i in ${LANGS} ; do
- if ! has ${i} ${LINGUAS-${i}} ; then
- sed -i \
- -e "/${i}.po/d" \
- po/CMakeLists.txt || die
- fi
- done
-
- # install only required documentation ; en always
- for i in $(grep add_subdirectory doc/CMakeLists.txt \
- | sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
- if ! has ${i} ${LINGUAS-${i}} ; then
- sed -i \
- -e '/add_subdirectory('${i}')/d' \
- doc/CMakeLists.txt || die
- fi
- done
-
- # install docs in correct directory
- sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
-
- if [[ ${CHOST} == *-darwin* ]]; then
- # fix linking error on Darwin
- sed -i "s/+ get_config_var('LINKFORSHARED')//" \
- cmake/FindPython.cmake || die
- # allow to find the plugins by default
- sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
- src/core/wee-config.c || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_NCURSES=ON
- -DENABLE_NLS=$(usex nls)
- -DENABLE_GNUTLS=$(usex ssl)
- -DENABLE_LARGEFILE=ON
- -DENABLE_ALIAS=$(usex alias)
- -DENABLE_ASPELL=$(usex spell)
- -DENABLE_BUFLIST=$(usex buflist)
- -DENABLE_CHARSET=$(usex charset)
- -DENABLE_EXEC=$(usex exec)
- -DENABLE_FSET=$(usex fset)
- -DENABLE_FIFO=$(usex fifo)
- -DENABLE_IRC=$(usex irc)
- -DENABLE_LOGGER=$(usex logger)
- -DENABLE_RELAY=$(usex relay)
- -DENABLE_SCRIPT=$(usex scripts)
- -DENABLE_SCRIPTS=$(usex scripts)
- -DENABLE_PERL=$(usex perl)
- -DENABLE_PHP=$(usex php)
- -DENABLE_PYTHON=$(usex python)
- -DENABLE_RUBY=$(usex ruby)
- -DENABLE_LUA=$(usex lua)
- -DENABLE_TCL=$(usex tcl)
- -DENABLE_GUILE=$(usex guile)
- -DENABLE_JAVASCRIPT=OFF
- -DENABLE_TRIGGER=$(usex trigger)
- -DENABLE_XFER=$(usex xfer)
- -DENABLE_DOC=$(usex doc)
- -DENABLE_TESTS=$(usex test)
- )
-
- if use python; then
- python_export PYTHON_LIBPATH
- mycmakeargs+=(
- -DPYTHON_EXECUTABLE="${PYTHON}"
- -DPYTHON_LIBRARY="${PYTHON_LIBPATH}"
- )
- fi
-
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/weechat/, net-irc/weechat/files/
@ 2020-02-13 10:18 Georgy Yakovlev
0 siblings, 0 replies; 5+ messages in thread
From: Georgy Yakovlev @ 2020-02-13 10:18 UTC (permalink / raw
To: gentoo-commits
commit: 90ebaefdcf0e3762b12a0b4cf107b284ebccae55
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 13 10:13:54 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Thu Feb 13 10:17:11 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90ebaefd
net-irc/weechat: revbump for CVE-2020-8955
Bug: https://bugs.gentoo.org/709452
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
net-irc/weechat/files/2.7-CVE-2020-8955.patch | 46 ++++++++++++++++++++++
...weechat-2.7-r1.ebuild => weechat-2.7-r2.ebuild} | 2 +
2 files changed, 48 insertions(+)
diff --git a/net-irc/weechat/files/2.7-CVE-2020-8955.patch b/net-irc/weechat/files/2.7-CVE-2020-8955.patch
new file mode 100644
index 00000000000..0bad821f913
--- /dev/null
+++ b/net-irc/weechat/files/2.7-CVE-2020-8955.patch
@@ -0,0 +1,46 @@
+From 6f4f147d8e86adf9ad34a8ffd7e7f1f23a7e74da Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= <flashcode@flashtux.org>
+Date: Sat, 8 Feb 2020 20:24:50 +0100
+Subject: [PATCH] irc: fix crash when receiving a malformed message 324
+ (channel mode)
+
+Thanks to Stuart Nevans Locke for reporting the issue.
+---
+ ChangeLog.adoc | 1 +
+ src/plugins/irc/irc-mode.c | 21 ++++++++++++---------
+ 2 files changed, 13 insertions(+), 9 deletions(-)
+
+diff --git a/src/plugins/irc/irc-mode.c b/src/plugins/irc/irc-mode.c
+index 2237a344b..e79f0deb7 100644
+--- a/src/plugins/irc/irc-mode.c
++++ b/src/plugins/irc/irc-mode.c
+@@ -224,17 +224,20 @@ irc_mode_channel_update (struct t_irc_server *server,
+ current_arg++;
+ if (pos[0] == chanmode)
+ {
+- chanmode_found = 1;
+- if (set_flag == '+')
++ if (!chanmode_found)
+ {
+- str_mode[0] = pos[0];
+- str_mode[1] = '\0';
+- strcat (new_modes, str_mode);
+- if (argument)
++ chanmode_found = 1;
++ if (set_flag == '+')
+ {
+- if (new_args[0])
+- strcat (new_args, " ");
+- strcat (new_args, argument);
++ str_mode[0] = pos[0];
++ str_mode[1] = '\0';
++ strcat (new_modes, str_mode);
++ if (argument)
++ {
++ if (new_args[0])
++ strcat (new_args, " ");
++ strcat (new_args, argument);
++ }
+ }
+ }
+ }
diff --git a/net-irc/weechat/weechat-2.7-r1.ebuild b/net-irc/weechat/weechat-2.7-r2.ebuild
similarity index 98%
rename from net-irc/weechat/weechat-2.7-r1.ebuild
rename to net-irc/weechat/weechat-2.7-r2.ebuild
index 37b7a1e4518..82a7c3922fb 100644
--- a/net-irc/weechat/weechat-2.7-r1.ebuild
+++ b/net-irc/weechat/weechat-2.7-r2.ebuild
@@ -62,6 +62,8 @@ DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.ado
# tests need to be fixed to not use system plugins if weechat is already installed
RESTRICT="test"
+PATCHES=( "${FILESDIR}/${PV}-CVE-2020-8955.patch" )
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/weechat/, net-irc/weechat/files/
@ 2021-10-12 16:28 Georgy Yakovlev
0 siblings, 0 replies; 5+ messages in thread
From: Georgy Yakovlev @ 2021-10-12 16:28 UTC (permalink / raw
To: gentoo-commits
commit: d0c82a3959e998729cd5005d0566ecc709162f21
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 12 16:26:26 2021 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Oct 12 16:26:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0c82a39
net-irc/weechat: drop 3.1, 3.2
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
net-irc/weechat/Manifest | 2 -
.../files/weechat-3.0-cmake_lua_version.patch | 9 --
net-irc/weechat/weechat-3.1.ebuild | 171 ---------------------
net-irc/weechat/weechat-3.2.ebuild | 171 ---------------------
4 files changed, 353 deletions(-)
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index cbc6096af90..d27b4e82200 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,3 +1 @@
-DIST weechat-3.1.tar.xz 2230316 BLAKE2B 95ce8c6107351676b64c368484baf2245bd17093c90552339d35d058a3caff7a0c4bb8e7692757bcf8c2d7617621961b5bc118806c5084cc212283d6982bd896 SHA512 1eb3f5a0e4d3f6777970fc60c816e7bc9be5e5cf91b9e072f6c77003f284c7bdbabfae7058cb5083915a2adf7f4c651a9afb8cc8ae17cac950e7f2ef9608ed78
-DIST weechat-3.2.tar.xz 2261376 BLAKE2B 6f9fcc72b4b36275e056f824a46d8640a45b1d78b9b6f0eaa5327fc2a965f891698982fade86c6d4e96d1f5c472ac4a82d036d478f37989f738f2ccd6e2f7002 SHA512 b4ad5cd6e678795d9093ddfa5aac0d396a7dbf994d04a6b9b083460b1639c851f1b9539cf7b97bd300154871d5df2c29f82fae387c42da840a1c3eb35c4a3660
DIST weechat-3.3.tar.xz 2564280 BLAKE2B 9cb119c2506ff5f9b4844b8016790af34347e300a1217762afc1307191cd0831c2c23e019a024c8161ff2e46607eddf94f94b3db9bd351bc51b7f057ddb375eb SHA512 18bbaa93620185ead64f64833e4c5df6a1cbc49dc6f60362614e955947221b78baaa93a2748f153bbb6f7867c7760f7a8fa8d6d9ed30040ad5e12af127526e13
diff --git a/net-irc/weechat/files/weechat-3.0-cmake_lua_version.patch b/net-irc/weechat/files/weechat-3.0-cmake_lua_version.patch
deleted file mode 100644
index 6ed16efbd06..00000000000
--- a/net-irc/weechat/files/weechat-3.0-cmake_lua_version.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/cmake/FindLua.cmake
-+++ b/cmake/FindLua.cmake
-@@ -35,5 +35,5 @@
-
- find_package(PkgConfig)
- if(PKG_CONFIG_FOUND)
-- pkg_search_module(LUA lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua-5.0 lua5.0 lua50 lua)
-+ pkg_search_module(LUA lua)
- endif()
diff --git a/net-irc/weechat/weechat-3.1.ebuild b/net-irc/weechat/weechat-3.1.ebuild
deleted file mode 100644
index a5a2514719d..00000000000
--- a/net-irc/weechat/weechat-3.1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake lua-single python-single-r1 xdg-utils
-
-if [[ ${PV} == "9999" ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/weechat/weechat.git"
-else
- SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
- KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~x86 ~x64-macos"
-fi
-
-DESCRIPTION="Portable and multi-interface IRC client"
-HOMEPAGE="https://weechat.org/"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-NETWORKS="+irc"
-PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer"
-# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
-SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
-LANGS=" cs de es fr it ja pl ru"
-IUSE="doc man nls selinux test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
-
-REQUIRED_USE="
- lua? ( ${LUA_REQUIRED_USE} )
- python? ( ${PYTHON_REQUIRED_USE} )
- test? ( nls )
-"
-
-RDEPEND="
- dev-libs/libgcrypt:0=
- net-libs/gnutls:=
- sys-libs/ncurses:0=
- sys-libs/zlib:=
- net-misc/curl[ssl]
- charset? ( virtual/libiconv )
- guile? ( >=dev-scheme/guile-2.0 )
- lua? ( ${LUA_DEPS} )
- nls? ( virtual/libintl )
- perl? ( dev-lang/perl:= )
- php? ( >=dev-lang/php-7.0:*[embed] )
- python? ( ${PYTHON_DEPS} )
- ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) )
- selinux? ( sec-policy/selinux-irc )
- spell? ( app-text/aspell )
- tcl? ( >=dev-lang/tcl-8.4.15:0= )
-"
-
-DEPEND="${RDEPEND}
- test? ( dev-util/cpputest )
-"
-
-BDEPEND="
- virtual/pkgconfig
- doc? ( >=dev-ruby/asciidoctor-1.5.4 )
- man? ( >=dev-ruby/asciidoctor-1.5.4 )
- nls? ( >=sys-devel/gettext-0.15 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0-cmake_lua_version.patch
-)
-
-DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
- use lua && lua-single_pkg_setup
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-
- # install only required translations
- local i
- for i in ${LANGS} ; do
- if ! has ${i} ${LINGUAS-${i}} ; then
- sed -i \
- -e "/${i}.po/d" \
- po/CMakeLists.txt || die
- fi
- done
-
- # install only required documentation ; en always
- for i in $(grep add_subdirectory doc/CMakeLists.txt \
- | sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
- if ! has ${i} ${LINGUAS-${i}} ; then
- sed -i \
- -e '/add_subdirectory('${i}')/d' \
- doc/CMakeLists.txt || die
- fi
- done
-
- # install docs in correct directory
- sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
-
- if [[ ${CHOST} == *-darwin* ]]; then
- # fix linking error on Darwin
- sed -i "s/+ get_config_var('LINKFORSHARED')//" \
- cmake/FindPython.cmake || die
- # allow to find the plugins by default
- sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
- src/core/wee-config.c || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLIBDIR="${EPREFIX}/usr/$(get_libdir)"
- -DENABLE_JAVASCRIPT=OFF
- -DENABLE_LARGEFILE=ON
- -DENABLE_NCURSES=ON
- -DENABLE_ALIAS=$(usex alias)
- -DENABLE_BUFLIST=$(usex buflist)
- -DENABLE_CHARSET=$(usex charset)
- -DENABLE_DOC=$(usex doc)
- -DENABLE_EXEC=$(usex exec)
- -DENABLE_FIFO=$(usex fifo)
- -DENABLE_FSET=$(usex fset)
- -DENABLE_GUILE=$(usex guile)
- -DENABLE_IRC=$(usex irc)
- -DENABLE_LOGGER=$(usex logger)
- -DENABLE_LUA=$(usex lua)
- -DENABLE_MAN=$(usex man)
- -DENABLE_NLS=$(usex nls)
- -DENABLE_PERL=$(usex perl)
- -DENABLE_PHP=$(usex php)
- -DENABLE_PYTHON=$(usex python)
- -DENABLE_RELAY=$(usex relay)
- -DENABLE_RUBY=$(usex ruby)
- -DENABLE_SCRIPT=$(usex scripts)
- -DENABLE_SCRIPTS=$(usex scripts)
- -DENABLE_SPELL=$(usex spell)
- -DENABLE_TCL=$(usex tcl)
- -DENABLE_TESTS=$(usex test)
- -DENABLE_TRIGGER=$(usex trigger)
- -DENABLE_XFER=$(usex xfer)
- )
- cmake_src_configure
-}
-
-src_test() {
- if $(locale -a | grep -iq "en_US\.utf.*8"); then
- cmake_src_test -V
- else
- eerror "en_US.UTF-8 locale is required to run ${PN}'s ${FUNCNAME}"
- die "required locale missing"
- fi
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
diff --git a/net-irc/weechat/weechat-3.2.ebuild b/net-irc/weechat/weechat-3.2.ebuild
deleted file mode 100644
index f9ced9e04dd..00000000000
--- a/net-irc/weechat/weechat-3.2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake lua-single python-single-r1 xdg-utils
-
-if [[ ${PV} == "9999" ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/weechat/weechat.git"
-else
- SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
-fi
-
-DESCRIPTION="Portable and multi-interface IRC client"
-HOMEPAGE="https://weechat.org/"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-NETWORKS="+irc"
-PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer"
-# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
-SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
-LANGS=" cs de es fr it ja pl ru"
-IUSE="doc man nls selinux test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
-
-REQUIRED_USE="
- lua? ( ${LUA_REQUIRED_USE} )
- python? ( ${PYTHON_REQUIRED_USE} )
- test? ( nls )
-"
-
-RDEPEND="
- dev-libs/libgcrypt:0=
- net-libs/gnutls:=
- sys-libs/ncurses:0=
- sys-libs/zlib:=
- net-misc/curl[ssl]
- charset? ( virtual/libiconv )
- guile? ( >=dev-scheme/guile-2.0 )
- lua? ( ${LUA_DEPS} )
- nls? ( virtual/libintl )
- perl? ( dev-lang/perl:= )
- php? ( >=dev-lang/php-7.0:*[embed] )
- python? ( ${PYTHON_DEPS} )
- ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) )
- selinux? ( sec-policy/selinux-irc )
- spell? ( app-text/aspell )
- tcl? ( >=dev-lang/tcl-8.4.15:0= )
-"
-
-DEPEND="${RDEPEND}
- test? ( dev-util/cpputest )
-"
-
-BDEPEND="
- virtual/pkgconfig
- doc? ( >=dev-ruby/asciidoctor-1.5.4 )
- man? ( >=dev-ruby/asciidoctor-1.5.4 )
- nls? ( >=sys-devel/gettext-0.15 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0-cmake_lua_version.patch
-)
-
-DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
- use lua && lua-single_pkg_setup
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-
- # install only required translations
- local i
- for i in ${LANGS} ; do
- if ! has ${i} ${LINGUAS-${i}} ; then
- sed -i \
- -e "/${i}.po/d" \
- po/CMakeLists.txt || die
- fi
- done
-
- # install only required documentation ; en always
- for i in $(grep add_subdirectory doc/CMakeLists.txt \
- | sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
- if ! has ${i} ${LINGUAS-${i}} ; then
- sed -i \
- -e '/add_subdirectory('${i}')/d' \
- doc/CMakeLists.txt || die
- fi
- done
-
- # install docs in correct directory
- sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
-
- if [[ ${CHOST} == *-darwin* ]]; then
- # fix linking error on Darwin
- sed -i "s/+ get_config_var('LINKFORSHARED')//" \
- cmake/FindPython.cmake || die
- # allow to find the plugins by default
- sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
- src/core/wee-config.c || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLIBDIR="${EPREFIX}/usr/$(get_libdir)"
- -DENABLE_JAVASCRIPT=OFF
- -DENABLE_LARGEFILE=ON
- -DENABLE_NCURSES=ON
- -DENABLE_ALIAS=$(usex alias)
- -DENABLE_BUFLIST=$(usex buflist)
- -DENABLE_CHARSET=$(usex charset)
- -DENABLE_DOC=$(usex doc)
- -DENABLE_EXEC=$(usex exec)
- -DENABLE_FIFO=$(usex fifo)
- -DENABLE_FSET=$(usex fset)
- -DENABLE_GUILE=$(usex guile)
- -DENABLE_IRC=$(usex irc)
- -DENABLE_LOGGER=$(usex logger)
- -DENABLE_LUA=$(usex lua)
- -DENABLE_MAN=$(usex man)
- -DENABLE_NLS=$(usex nls)
- -DENABLE_PERL=$(usex perl)
- -DENABLE_PHP=$(usex php)
- -DENABLE_PYTHON=$(usex python)
- -DENABLE_RELAY=$(usex relay)
- -DENABLE_RUBY=$(usex ruby)
- -DENABLE_SCRIPT=$(usex scripts)
- -DENABLE_SCRIPTS=$(usex scripts)
- -DENABLE_SPELL=$(usex spell)
- -DENABLE_TCL=$(usex tcl)
- -DENABLE_TESTS=$(usex test)
- -DENABLE_TRIGGER=$(usex trigger)
- -DENABLE_XFER=$(usex xfer)
- )
- cmake_src_configure
-}
-
-src_test() {
- if $(locale -a | grep -iq "en_US\.utf.*8"); then
- cmake_src_test -V
- else
- eerror "en_US.UTF-8 locale is required to run ${PN}'s ${FUNCNAME}"
- die "required locale missing"
- fi
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/weechat/, net-irc/weechat/files/
@ 2023-06-23 22:42 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2023-06-23 22:42 UTC (permalink / raw
To: gentoo-commits
commit: 5f5e32b47cfc2b2bdb5d32e451c2a7b5050b1e0e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 23 22:40:58 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 23 22:42:04 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f5e32b4
net-irc/weechat: workaround build failure w/ gettext-0.22
Closes: https://bugs.gentoo.org/908976
Thanks-to: James McGeehan IV <jfmfour22 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../weechat-3.8-workaround-broken-translations.patch | 20 ++++++++++++++++++++
net-irc/weechat/weechat-3.8.ebuild | 1 +
2 files changed, 21 insertions(+)
diff --git a/net-irc/weechat/files/weechat-3.8-workaround-broken-translations.patch b/net-irc/weechat/files/weechat-3.8-workaround-broken-translations.patch
new file mode 100644
index 000000000000..339b3ebe2d26
--- /dev/null
+++ b/net-irc/weechat/files/weechat-3.8-workaround-broken-translations.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/908976
+
+From 7c811ad118d073c23038e61ee68ecdc07d5b563a Mon Sep 17 00:00:00 2001
+From: blockiv <blockiv@tuta.io>
+Date: Thu, 22 Jun 2023 05:26:02 +0000
+Subject: [PATCH] Mark breaking translation as fuzzy
+
+--- a/po/cs.po
++++ b/po/cs.po
+@@ -142,7 +142,7 @@ msgstr "%sChyba: příkaz \"%s\" již existuje pro plugin \"%s\""
+ msgid "%sBad file descriptor (%d) used in hook_fd"
+ msgstr ""
+
+-#, c-format
++#, c-format, fuzzy
+ msgid "End of command '%s', timeout reached (%.1fs)"
+ msgstr "Konec příkazu '%s', vypršel časový limit (%.lfs)"
+
+--
+2.41.0
diff --git a/net-irc/weechat/weechat-3.8.ebuild b/net-irc/weechat/weechat-3.8.ebuild
index 11bbd607533d..ef801944230e 100644
--- a/net-irc/weechat/weechat-3.8.ebuild
+++ b/net-irc/weechat/weechat-3.8.ebuild
@@ -82,6 +82,7 @@ BDEPEND+="
PATCHES=(
"${FILESDIR}"/${PN}-3.3-cmake_lua_version.patch
+ "${FILESDIR}"/${PN}-3.8-workaround-broken-translations.patch
)
DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/weechat/, net-irc/weechat/files/
@ 2023-06-26 14:27 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2023-06-26 14:27 UTC (permalink / raw
To: gentoo-commits
commit: 5932fa56c1d3133cd1ac45e1c6bbddd370e20c3f
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 26 14:27:33 2023 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Jun 26 14:27:33 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5932fa56
net-irc/weechat: fix gettext 0.22 breakage correctly
Closes: https://bugs.gentoo.org/908976
Signed-off-by: David Seifert <soap <AT> gentoo.org>
...n-translations.patch => weechat-3.8-gettext-0.22.patch} | 14 ++++++--------
net-irc/weechat/weechat-3.8.ebuild | 2 +-
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/net-irc/weechat/files/weechat-3.8-workaround-broken-translations.patch b/net-irc/weechat/files/weechat-3.8-gettext-0.22.patch
similarity index 54%
rename from net-irc/weechat/files/weechat-3.8-workaround-broken-translations.patch
rename to net-irc/weechat/files/weechat-3.8-gettext-0.22.patch
index 339b3ebe2d26..a39e265b9b99 100644
--- a/net-irc/weechat/files/weechat-3.8-workaround-broken-translations.patch
+++ b/net-irc/weechat/files/weechat-3.8-gettext-0.22.patch
@@ -7,14 +7,12 @@ Subject: [PATCH] Mark breaking translation as fuzzy
--- a/po/cs.po
+++ b/po/cs.po
-@@ -142,7 +142,7 @@ msgstr "%sChyba: příkaz \"%s\" již existuje pro plugin \"%s\""
- msgid "%sBad file descriptor (%d) used in hook_fd"
- msgstr ""
+@@ -144,7 +144,7 @@
--#, c-format
-+#, c-format, fuzzy
+ #, c-format
msgid "End of command '%s', timeout reached (%.1fs)"
- msgstr "Konec příkazu '%s', vypršel časový limit (%.lfs)"
+-msgstr "Konec příkazu '%s', vypršel časový limit (%.lfs)"
++msgstr "Konec příkazu '%s', vypršel časový limit (%.1fs)"
---
-2.41.0
+ #, c-format
+ msgid "System clock skew detected (%+ld seconds), reinitializing all timers"
diff --git a/net-irc/weechat/weechat-3.8.ebuild b/net-irc/weechat/weechat-3.8.ebuild
index ef801944230e..6053570ece4a 100644
--- a/net-irc/weechat/weechat-3.8.ebuild
+++ b/net-irc/weechat/weechat-3.8.ebuild
@@ -82,7 +82,7 @@ BDEPEND+="
PATCHES=(
"${FILESDIR}"/${PN}-3.3-cmake_lua_version.patch
- "${FILESDIR}"/${PN}-3.8-workaround-broken-translations.patch
+ "${FILESDIR}"/${PN}-3.8-gettext-0.22.patch
)
DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-06-26 14:27 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-23 22:42 [gentoo-commits] repo/gentoo:master commit in: net-irc/weechat/, net-irc/weechat/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-06-26 14:27 David Seifert
2021-10-12 16:28 Georgy Yakovlev
2020-02-13 10:18 Georgy Yakovlev
2018-12-13 6:48 Tim Harder
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox