Update to 4.2.2

Update to 4.2.1
Update to 4.1.2
2024-04-08 20:03:38 +02:00 · 2024-01-22 19:37:12 +01:00 · 2023-12-04 15:59:30 +01:00 · 2023-10-27 19:53:58 +02:00 · 2023-10-16 00:11:28 +02:00 · 2023-09-24 19:05:39 +02:00
6 changed files with 116 additions and 87 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1 @@
 /weechat-*.tar.xz
-/weechat-*.tar.xz.asc
--- a/51
+++ b/51
@ -1,51 +0,0 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-bZlCOWLXBLOqK0Z0
-=MySb
-----END PGP PUBLIC KEY BLOCK-----
--- a/3
+++ b/3
@ -1,2 +1 @@
-SHA512 (weechat-4.10.1.tar.xz) = 60b09b47f584dec4a140212bebcdadd230fcbd24fb3ab8160e3c00c46f591a0d70388f6048a5d382bdf5c7e946363853e6958b825f088335d8594faea9f67403
-SHA512 (weechat-4.10.1.tar.xz.asc) = 7008b62299bbf9d78b955fc0a1e084f4bc783ab9b42c31c747dd4fb96551407fb39e7e6fe9508120d6b4347598959793b14f74503f9455ea333af0960e753af6
+SHA512 (weechat-4.2.2.tar.xz) = cee642ea0fd43763933bb401d40999dff0b1a5260d536d7437cb2188e31f90c8196c6836072be51fa9df7abca5f5aee91a5f99e82852c9268091347d56350032
--- a/weechat-3.4-disable-memleak-detection.patch
+++ b/weechat-3.4-disable-memleak-detection.patch
@ -0,0 +1,23 @@
+diff -ruN weechat-3.4/tests/tests.cpp weechat-3.4-disable-memleak-detection/tests/tests.cpp
+--- weechat-3.4/tests/tests.cpp	2021-12-17 23:57:32.000000000 -0800
+++ weechat-3.4-disable-memleak-detection/tests/tests.cpp	2022-01-14 16:36:08.330205164 -0800
+@@ -49,6 +49,7 @@
+ }
+ 
+ #include "CppUTest/CommandLineTestRunner.h"
+#include "CppUTest/MemoryLeakWarningPlugin.h"
+ 
+ #define LOCALE_TESTS "en_US.UTF-8"
+ 
+@@ -330,6 +331,11 @@
+         return 1;
+     }
+ 
+    /* this fails on basically every test right now 
+     * see https://cpputest.github.io/manual.html#turning-memory-leak-detection-off-and-on
+     */
+    MemoryLeakWarningPlugin::turnOffNewDeleteOverloads();
+
+     /* clean WeeChat home */
+     dir_exec_on_files (WEECHAT_TESTS_HOME, 1, 1, &exec_on_files_cb, NULL);
+ 
--- a/weechat-3.4-tests-fPIC.patch
+++ b/weechat-3.4-tests-fPIC.patch
@ -0,0 +1,12 @@
+diff -ruN weechat-3.4/tests/CMakeLists.txt weechat-3.4-tests-fPIC/tests/CMakeLists.txt
+--- weechat-3.4/tests/CMakeLists.txt	2021-12-17 23:57:32.000000000 -0800
+++ weechat-3.4-tests-fPIC/tests/CMakeLists.txt	2022-01-14 15:34:23.072801796 -0800
+@@ -22,6 +22,8 @@
+ remove_definitions(-DHAVE_CONFIG_H)
+ include_directories(${CPPUTEST_INCLUDE_DIRS} ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR})
+ 
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+
+ # unit tests (core)
+ set(LIB_WEECHAT_UNIT_TESTS_CORE_SRC
+   unit/core/test-core-arraylist.cpp
--- a/weechat.spec
+++ b/weechat.spec
@ -1,49 +1,85 @@
+%if 0%{?fedora} || 0%{?rhel} >= 8
+%bcond_without check
+%else
+# no cpputest in EL7
+%bcond_with check
+%endif
+
+%if 0%{?fedora} || 0%{?rhel} < 8
+%bcond_without docs
+%else
+# TODO: package rubygem-asciidoctor
+%bcond_with docs
+%endif
+
+%if 0%{?rhel} && 0%{?rhel} < 9
+%undefine __cmake_in_source_build
+%endif
 %global __provides_exclude_from ^%{_libdir}/weechat/plugins/.*$

+%if %{?_pkgdocdir:1}0
+%if 0%{?rhel}
+%global _doc %{name}-%{version}
+%else
+%global _doc %{name}
+%endif
+%else
+%global _doc %{name}-%{version}
+%global _pkgdocdir %{_docdir}/%{_doc}
+%endif
+
 Name:      weechat
-Version:   4.10.1
+Version:   4.2.2
 Release:   %autorelease
 Summary:   Portable, fast, light and extensible IRC client
 Group:     Applications/Communications
 URL:       http://weechat.org
-License:   GPL-3.0-only
+License:   GPLv3

-Source:    https://weechat.org/files/src/%{name}-%{version}.tar.xz
-Source1:   https://weechat.org/files/src/%{name}-%{version}.tar.xz.asc
-Source2:   https://keys.openpgp.org/vks/v1/by-fingerprint/A9AB5AB778FA5C3522FD0378F82F4B16DEC408F8
+Source:    http://weechat.org/files/src/%{name}-%{version}.tar.xz
+# /usr/bin/ld: CMakeFiles/charset.dir/charset.o:
+# relocation R_X86_64_PC32 against symbol `weechat_charset_plugin'
+# can not be used when making a shared object; recompile with -fPIC
+Patch0:    weechat-3.4-tests-fPIC.patch
+# this fails on too many tests, we want to let them finish anyway
+Patch1:    weechat-3.4-disable-memleak-detection.patch

-BuildRequires: asciidoctor
-BuildRequires: ca-certificates
-BuildRequires: cjson-devel
-BuildRequires: cmake
-BuildRequires: cpputest-devel
-BuildRequires: enchant2-devel
 BuildRequires: gcc
-BuildRequires: gettext
+%if %{with check}
+BuildRequires: cpputest-devel
 BuildRequires: glibc-langpack-en
-BuildRequires: gnupg2
+%endif
+%if %{with docs}
+BuildRequires: asciidoctor
+%endif
+BuildRequires: ca-certificates
+BuildRequires: cmake
+BuildRequires: docbook-style-xsl
+BuildRequires: enchant-devel
+BuildRequires: gettext
 BuildRequires: gnutls-devel
-BuildRequires: guile30-devel
+%if 0%{?fedora} >= 30 || 0%{?rhel} > 8
+BuildRequires: guile22-devel
+%else
+BuildRequires: guile-devel
+%endif
 BuildRequires: libcurl-devel
 BuildRequires: libgcrypt-devel
-BuildRequires: libzstd-devel
 BuildRequires: lua-devel
 BuildRequires: ncurses-devel
-BuildRequires: perl-devel
 BuildRequires: perl-ExtUtils-Embed
-%ifnarch %{ix86}
-BuildRequires: php-embedded
-BuildRequires: php-devel
-%endif
+BuildRequires: perl-devel
 BuildRequires: pkgconfig
 BuildRequires: python3-devel
 BuildRequires: ruby
 BuildRequires: ruby-devel
+BuildRequires: source-highlight
 BuildRequires: tcl-devel
-%ifnarch %{ix86}
-BuildRequires: uriparser-devel
-%endif
+BuildRequires: libzstd-devel
 BuildRequires: zlib-devel
+%if 0%{?rhel}
+BuildRequires: cmake3
+%endif

 Requires:      hicolor-icon-theme

@ -66,40 +102,49 @@ This package contains include files and pc file for weechat.


 %prep
-%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %autosetup -p1 -n %{name}-%{version}
+find doc/ -type f -name 'CMakeLists.txt' \
+    -exec sed -i -e 's#${PROJECT_NAME}#%{_doc}#g' '{}' \;


 %build
-%cmake \
+%cmake3 \
+  -DPREFIX=%{_prefix} \
  -DLIBDIR=%{_libdir} \
  -DENABLE_ENCHANT=ON \
-%ifarch %{ix86}
  -DENABLE_PHP=OFF \
-%endif
+%if %{with check}
  -DENABLE_TESTS=ON \
-  -DENABLE_DOC=ON \
-%ifarch %{ix86}
-  -DENABLE_DOC_INCOMPLETE=ON \
+%else
+  -DENABLE_TESTS=OFF \
 %endif
+%if %{with docs}
+  -DENABLE_DOC=ON \
+  -DENABLE_DOC_INCOMPLETE=ON \
  -DENABLE_MAN=ON \
+%else
+  -DENABLE_DOC=OFF \
+  -DENABLE_MAN=OFF \
+%endif
+  -DCA_FILE=/etc/pki/tls/certs/ca-bundle.crt \
  %{nil}
-%cmake_build
+%cmake3_build


 %install
-%cmake_install
+%cmake3_install

 %find_lang %name


-%check
-%ctest --verbose
+%if %{with check}
+%ctest3 -- -V
+%endif


 %files -f %{name}.lang
-%doc AUTHORS.md CHANGELOG.md CONTRIBUTING.md
-%doc README.md UPGRADING.md
+%doc AUTHORS.adoc ChangeLog.adoc Contributing.adoc
+%doc README.adoc ReleaseNotes.adoc
 %license COPYING
 %{_bindir}/%{name}-curses
 %{_bindir}/%{name}
@ -112,11 +157,13 @@ This package contains include files and pc file for weechat.
 %{_datadir}/icons/hicolor/256x256/apps/%{name}.png
 %{_datadir}/icons/hicolor/512x512/apps/%{name}.png
 %{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+%if 0%{?fedora} || 0%{?rhel} < 8
 %{_pkgdocdir}/weechat_*.html
 %{_mandir}/man1/weechat.1*
 %{_mandir}/*/man1/weechat.1*
 %{_mandir}/man1/%{name}-headless.1*
 %{_mandir}/*/man1/%{name}-headless.1*
+%endif

 %files devel
 %dir %{_includedir}/%{name}
Author	SHA1	Message	Date
LuK1337	16b8c7cd0e	Update to 4.2.2	2024-04-08 20:03:38 +02:00
LuK1337	23189ea181	Update to 4.2.1	2024-01-22 19:37:12 +01:00
LuK1337	04f0ee2d97	Update to 4.1.2	2023-12-04 15:59:30 +01:00
LuK1337	a089ea4872	Update to 4.1.1	2023-10-27 19:53:58 +02:00
LuK1337	64400c75cf	Update to 4.1.0 * Reenable tests on s390x, because those work now since https://github.com/weechat/weechat/pull/2021 * Remove unnecessary cmake/FindPython.cmake edit * Unset ENABLE_JAVASCRIPT (and remove v8-devel dependency) since it's off by default	2023-10-16 00:11:28 +02:00
LuK1337	03ca7d5984	Update to 4.0.5	2023-09-24 19:05:39 +02:00
LuK1337	8eec4f9c25	Revert "Reenable PHP plugins support" Looks like php-embed is not working properly at the moment. This reverts commit `1465126ece`.	2023-08-24 14:57:04 +02:00