Compare commits
27 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1eb6e6a7a7 |
||
|
|
243fbd37ec |
||
|
|
54f568197d |
||
|
|
3dc8cbea62 |
||
|
|
0abe07df71 |
||
|
|
80b82e8b1e |
||
|
|
4411562d30 |
||
|
|
fb0d4652a2 |
||
|
|
b081ff397b |
||
|
|
fb0594db1b |
||
|
|
5f90452c51 |
||
|
|
0e274fa550 |
||
|
|
e9c7e24dc7 |
||
|
|
f19dbdee15 |
||
|
|
74e9fd5199 |
||
|
|
7952962bc0 |
||
|
|
c42c7f761a |
||
|
|
1ad5dcb0e5 |
||
|
|
42b1d5567e |
||
|
|
4ef1e94a38 |
||
|
|
b6dda21653 |
||
|
|
d497d56573 | ||
|
|
4a35a60c98 | ||
|
|
cb8827e43e | ||
|
|
0551a8fb90 | ||
|
|
825059c4bf | ||
|
|
0316133846 |
6 changed files with 68 additions and 67 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1 +1,2 @@
|
|||
/weechat-*.tar.xz
|
||||
/weechat-*.tar.xz.asc
|
||||
|
|
|
|||
51
A9AB5AB778FA5C3522FD0378F82F4B16DEC408F8
Normal file
51
A9AB5AB778FA5C3522FD0378F82F4B16DEC408F8
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
|
||||
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
|
||||
bZlCOWLXBLOqK0Z0
|
||||
=MySb
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
3
sources
3
sources
|
|
@ -1 +1,2 @@
|
|||
SHA512 (weechat-4.0.4.tar.xz) = ddd150dad253cf4d9bc96122d2d3951c696b19f796a7cbf159edc258d4b18f1b2544b7b62362e7b59d6b3ff3e756de3ce4aaff83b02d3fe2d1cb614162965efd
|
||||
SHA512 (weechat-4.4.3.tar.xz) = 32df8d6021ed63d11646127920197a1f80dfbbec0cdf4e9a282fc789fcd1c270082806c237ab16ebd0c07a94c6d40bc22432211feac638623d6f2a0a59606dcc
|
||||
SHA512 (weechat-4.4.3.tar.xz.asc) = 5097b0b7d97aac926c72057d51a4ea125ad0edcf7159d275b20ec484127c49d0b58b61fa71a91ce954f87dca47651084243f5440aaee5be315af3376e2b7ef1a
|
||||
|
|
|
|||
|
|
@ -1,23 +0,0 @@
|
|||
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);
|
||||
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
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
|
||||
45
weechat.spec
45
weechat.spec
|
|
@ -1,11 +1,6 @@
|
|||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||
%ifnarch s390x
|
||||
%bcond_without check
|
||||
%else
|
||||
# some tests fail on s390x
|
||||
%bcond_with check
|
||||
%endif
|
||||
%else
|
||||
# no cpputest in EL7
|
||||
%bcond_with check
|
||||
%endif
|
||||
|
|
@ -34,20 +29,16 @@
|
|||
%endif
|
||||
|
||||
Name: weechat
|
||||
Version: 4.0.4
|
||||
Version: 4.4.3
|
||||
Release: %autorelease
|
||||
Summary: Portable, fast, light and extensible IRC client
|
||||
Group: Applications/Communications
|
||||
URL: http://weechat.org
|
||||
License: GPLv3
|
||||
License: GPL-3.0-only
|
||||
|
||||
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
|
||||
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
|
||||
|
||||
BuildRequires: gcc
|
||||
%if %{with check}
|
||||
|
|
@ -58,13 +49,15 @@ BuildRequires: glibc-langpack-en
|
|||
BuildRequires: asciidoctor
|
||||
%endif
|
||||
BuildRequires: ca-certificates
|
||||
BuildRequires: cjson-devel
|
||||
BuildRequires: cmake
|
||||
BuildRequires: docbook-style-xsl
|
||||
BuildRequires: enchant-devel
|
||||
BuildRequires: gettext
|
||||
BuildRequires: gnupg2
|
||||
BuildRequires: gnutls-devel
|
||||
%if 0%{?fedora} >= 30 || 0%{?rhel} > 8
|
||||
BuildRequires: guile22-devel
|
||||
%if 0%{?fedora} >= 35 || 0%{?rhel} > 8
|
||||
BuildRequires: guile30-devel
|
||||
%else
|
||||
BuildRequires: guile-devel
|
||||
%endif
|
||||
|
|
@ -74,8 +67,6 @@ BuildRequires: lua-devel
|
|||
BuildRequires: ncurses-devel
|
||||
BuildRequires: perl-ExtUtils-Embed
|
||||
BuildRequires: perl-devel
|
||||
BuildRequires: php-embedded
|
||||
BuildRequires: php-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: ruby
|
||||
|
|
@ -83,13 +74,6 @@ BuildRequires: ruby-devel
|
|||
BuildRequires: source-highlight
|
||||
BuildRequires: tcl-devel
|
||||
BuildRequires: libzstd-devel
|
||||
%ifarch %{ix86} x86_64 %{arm}
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1338728
|
||||
# https://github.com/weechat/weechat/issues/360
|
||||
%if 0%{?rhel} && 0%{?rhel} < 8
|
||||
BuildRequires: v8-devel
|
||||
%endif
|
||||
%endif
|
||||
BuildRequires: zlib-devel
|
||||
%if 0%{?rhel}
|
||||
BuildRequires: cmake3
|
||||
|
|
@ -116,18 +100,18 @@ 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' '{}' \;
|
||||
|
||||
sed -i 's/NAMES python3.7/NAMES python%{python3_version}m python%{python3_version}/' cmake/FindPython.cmake
|
||||
|
||||
|
||||
%build
|
||||
%cmake3 \
|
||||
-DPREFIX=%{_prefix} \
|
||||
-DLIBDIR=%{_libdir} \
|
||||
-DENABLE_ENCHANT=ON \
|
||||
-DENABLE_PHP=OFF \
|
||||
%if %{with check}
|
||||
-DENABLE_TESTS=ON \
|
||||
%else
|
||||
|
|
@ -135,13 +119,12 @@ sed -i 's/NAMES python3.7/NAMES python%{python3_version}m python%{python3_versio
|
|||
%endif
|
||||
%if %{with docs}
|
||||
-DENABLE_DOC=ON \
|
||||
-DENABLE_DOC_INCOMPLETE=ON \
|
||||
-DENABLE_MAN=ON \
|
||||
%else
|
||||
-DENABLE_DOC=OFF \
|
||||
-DENABLE_MAN=OFF \
|
||||
%endif
|
||||
-DENABLE_JAVASCRIPT=OFF \
|
||||
-DCA_FILE=/etc/pki/tls/certs/ca-bundle.crt \
|
||||
%{nil}
|
||||
%cmake3_build
|
||||
|
||||
|
|
@ -158,8 +141,8 @@ sed -i 's/NAMES python3.7/NAMES python%{python3_version}m python%{python3_versio
|
|||
|
||||
|
||||
%files -f %{name}.lang
|
||||
%doc AUTHORS.adoc ChangeLog.adoc Contributing.adoc
|
||||
%doc README.adoc ReleaseNotes.adoc
|
||||
%doc AUTHORS.md CHANGELOG.md CONTRIBUTING.md
|
||||
%doc README.md UPGRADING.md
|
||||
%license COPYING
|
||||
%{_bindir}/%{name}-curses
|
||||
%{_bindir}/%{name}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue