From 235d54be575e3cd50e9e4b2d99799b3e66d5ba5b281ea93f9d6dec2a848cc803 Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Mon, 26 May 2014 15:03:31 +0000 Subject: [PATCH 1/2] - update to version 0.4.3 - new command /print - logical and/or for tags in /filter and hook_print - gaps in buffer numbers - support of italic text - new options to customize default text search in buffers - use of IRC monitor command for /notify (if available on server) - new IRC server option "ssl_fingerprint" - new option to smart-filter IRC mode messages - new option for default IRC ban mask - support of IPv6 for DCC chat/file - auto check CRC32 of files received with DCC - many bugs fixed - add weechat-link-pthread.patch in order to link Weechat against libpthread fixing freezes/crashes with gnutls (backported from upstream git) OBS-URL: https://build.opensuse.org/package/show/server:irc/weechat?expand=0&rev=54 --- weechat-0.4.2.tar.bz2 | 3 --- weechat-0.4.3.tar.bz2 | 3 +++ weechat-capath.patch | 14 +++++++------- weechat-link-pthread.patch | 28 ++++++++++++++++++++++++++++ weechat.changes | 20 ++++++++++++++++++++ weechat.spec | 5 ++++- 6 files changed, 62 insertions(+), 11 deletions(-) delete mode 100644 weechat-0.4.2.tar.bz2 create mode 100644 weechat-0.4.3.tar.bz2 create mode 100644 weechat-link-pthread.patch diff --git a/weechat-0.4.2.tar.bz2 b/weechat-0.4.2.tar.bz2 deleted file mode 100644 index dabf375..0000000 --- a/weechat-0.4.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:95c4337b10f0e54192dcdaf7ce60f9bd22dfc82abd0832219b20dedd06d509dc -size 1892996 diff --git a/weechat-0.4.3.tar.bz2 b/weechat-0.4.3.tar.bz2 new file mode 100644 index 0000000..2c66d9e --- /dev/null +++ b/weechat-0.4.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a8ec847d331a1201de975530a22f1813c260db420c68675b2ecaa7bf3c7c3ff8 +size 2089701 diff --git a/weechat-capath.patch b/weechat-capath.patch index 170f888..239612c 100644 --- a/weechat-capath.patch +++ b/weechat-capath.patch @@ -9,10 +9,10 @@ Subject: [PATCH] use system's default certificate store src/core/wee-network.c | 6 ++++++ 3 files changed, 12 insertions(+), 4 deletions(-) -Index: weechat-0.4.2/src/core/wee-config.c +Index: weechat-0.4.3/src/core/wee-config.c =================================================================== ---- weechat-0.4.2.orig/src/core/wee-config.c -+++ weechat-0.4.2/src/core/wee-config.c +--- weechat-0.4.3.orig/src/core/wee-config.c ++++ weechat-0.4.3/src/core/wee-config.c @@ -61,7 +61,6 @@ #include "../gui/gui-window.h" #include "../plugins/plugin.h" @@ -21,7 +21,7 @@ Index: weechat-0.4.2/src/core/wee-config.c struct t_config_file *weechat_config_file = NULL; struct t_config_section *weechat_config_section_debug = NULL; struct t_config_section *weechat_config_section_color = NULL; -@@ -3084,7 +3083,7 @@ config_weechat_init_options () +@@ -3238,7 +3237,7 @@ config_weechat_init_options () "gnutls_ca_file", "string", N_("file containing the certificate authorities (\"%h\" will be " "replaced by WeeChat home, \"~/.weechat\" by default)"), @@ -30,10 +30,10 @@ Index: weechat-0.4.2/src/core/wee-config.c &config_change_network_gnutls_ca_file, NULL, NULL, NULL); config_network_gnutls_handshake_timeout = config_file_new_option ( weechat_config_file, ptr_section, -Index: weechat-0.4.2/src/core/wee-network.c +Index: weechat-0.4.3/src/core/wee-network.c =================================================================== ---- weechat-0.4.2.orig/src/core/wee-network.c -+++ weechat-0.4.2/src/core/wee-network.c +--- weechat-0.4.3.orig/src/core/wee-network.c ++++ weechat-0.4.3/src/core/wee-network.c @@ -103,6 +103,12 @@ network_set_gnutls_ca_file () } free (ca_path); diff --git a/weechat-link-pthread.patch b/weechat-link-pthread.patch new file mode 100644 index 0000000..7682ea7 --- /dev/null +++ b/weechat-link-pthread.patch @@ -0,0 +1,28 @@ +From 30073b511397646b9ef06ed657fda157dd8c6209 Mon Sep 17 00:00:00 2001 +From: "Jason A. Donenfeld" +Date: Thu, 13 Feb 2014 14:36:23 +0100 +Subject: [PATCH] Link against pthread on all platforms. + +Signed-off-by: Jason A. Donenfeld +--- + src/gui/curses/CMakeLists.txt | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/src/gui/curses/CMakeLists.txt b/src/gui/curses/CMakeLists.txt +index 325c611..a8927bc 100644 +--- a/src/gui/curses/CMakeLists.txt ++++ b/src/gui/curses/CMakeLists.txt +@@ -53,9 +53,7 @@ IF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") + ENDIF(HAVE_BACKTRACE) + ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") + +-IF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD") +- LIST(APPEND EXTRA_LIBS "pthread") +-ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD") ++LIST(APPEND EXTRA_LIBS "pthread") + + IF(ICONV_LIBRARY) + LIST(APPEND EXTRA_LIBS ${ICONV_LIBRARY}) +-- +1.8.5.4 + diff --git a/weechat.changes b/weechat.changes index e8e4255..1c99f67 100644 --- a/weechat.changes +++ b/weechat.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Mon May 26 14:30:57 UTC 2014 - gber@opensuse.org + +- update to version 0.4.3 + - new command /print + - logical and/or for tags in /filter and hook_print + - gaps in buffer numbers + - support of italic text + - new options to customize default text search in buffers + - use of IRC monitor command for /notify (if available on server) + - new IRC server option "ssl_fingerprint" + - new option to smart-filter IRC mode messages + - new option for default IRC ban mask + - support of IPv6 for DCC chat/file + - auto check CRC32 of files received with DCC + - many bugs fixed +- add weechat-link-pthread.patch in order to link Weechat against + libpthread fixing freezes/crashes with gnutls (backported from + upstream git) + ------------------------------------------------------------------- Mon Oct 7 10:09:38 UTC 2013 - gber@opensuse.org diff --git a/weechat.spec b/weechat.spec index 4e21cf3..c3a857c 100644 --- a/weechat.spec +++ b/weechat.spec @@ -17,7 +17,7 @@ Name: weechat -Version: 0.4.2 +Version: 0.4.3 Release: 0 Summary: Portable, Fast, Light and Extensible Chat Client License: GPL-3.0+ @@ -26,6 +26,8 @@ Source: http://www.weechat.org/files/src/weechat-%{version}.tar.bz2 Source1: weechat.desktop # PATCH-FIX-UPSTREAM weechat-capath.patch https://savannah.nongnu.org/patch/index.php?8153 lnussel@suse.de -- use system's default certificate store Patch0: weechat-capath.patch +# PATCH-FIX-UPSTREAM weechat-link-pthread.patch https://bugs.gentoo.org/show_bug.cgi?id=501078 gber@opensuse.org -- Link Weechat against libpthread +Patch1: weechat-link-pthread.patch Url: http://www.weechat.org BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake @@ -131,6 +133,7 @@ Spell-checking support for %{name}, using the aspell library. %prep %setup -q %patch0 -p1 +%patch1 -p1 modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\"" TIME="\"$(date -d "${modified}" "+%%R")\"" From c1bc37a0ef15d0e5b9db3ec196ae5c0329c5610f6879fefe4922d1e966c282be Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Mon, 26 May 2014 21:44:20 +0000 Subject: [PATCH 2/2] make sure weechat-curses is created OBS-URL: https://build.opensuse.org/package/show/server:irc/weechat?expand=0&rev=55 --- weechat.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/weechat.spec b/weechat.spec index c3a857c..ff2e3d5 100644 --- a/weechat.spec +++ b/weechat.spec @@ -160,6 +160,10 @@ pushd build %makeinstall popd #build +# due to an unknown race condition cmake does not always create a compatibility +# symlink +ln -sf %{_bindir}/weechat %{buildroot}%{_bindir}/weechat-curses + install -D -m 0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/%{name}.desktop" %if 0%{?suse_version} %suse_update_desktop_file -r "%{name}" Network IRCClient