Update weechat to the latest stable version. I would be happy about
testers as I would like to see this in 7.1.
- FYI: CA_FILE build option was removed.
- I drop the c/cpp flags, see the patch below for details.
Tested with:
*.freenode.net: *** You are connected to chat.freenode.net using TLS
(SSL) cipher 'TLSv1.3-TLS_AES_256_GCM_SHA384'
Rafael
diff --git a/net/weechat/Makefile b/net/weechat/Makefile
index 200149a2062..8e49a4afd2e 100644
--- a/net/weechat/Makefile
+++ b/net/weechat/Makefile
@@ -4,8 +4,7 @@ COMMENT-python= Python bindings for weechat
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 3.3
-REVISION-python= 0
+V= 3.4.1
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
@@ -75,8 +74,7 @@ CONFIGURE_ARGS+= -DENABLE_GUILE=OFF \
-DENABLE_TESTS=ON \
-DHAVE_BACKTRACE=OFF
-CONFIGURE_ARGS+= -DCA_FILE=/etc/ssl/cert.pem \
- -DTCL_TCLSH=${MODTCL_BIN} \
+CONFIGURE_ARGS+= -DTCL_TCLSH=${MODTCL_BIN} \
-DTCL_INCLUDE_PATH=${MODTCL_INCDIR} \
-DMODTCL_LIB=${MODTCL_LIB}
diff --git a/net/weechat/distinfo b/net/weechat/distinfo
index 124a8bfd000..fbc4cc88ea7 100644
--- a/net/weechat/distinfo
+++ b/net/weechat/distinfo
@@ -1,2 +1,2 @@
-SHA256 (weechat-3.3.tar.gz) = qYNPhNi2s3vOoQf+Wig2mfExLabfndcNZ15w32XO58k=
-SIZE (weechat-3.3.tar.gz) = 5129511
+SHA256 (weechat-3.4.1.tar.gz) = +jYfmZ6ZgoF7Ea0SSh984HIEOfKc4l+Svh2j2LV6R7U=
+SIZE (weechat-3.4.1.tar.gz) = 5177946
diff --git a/net/weechat/patches/patch-CMakeLists_txt
b/net/weechat/patches/patch-CMakeLists_txt
index 923e0f2fb35..b845541ab15 100644
--- a/net/weechat/patches/patch-CMakeLists_txt
+++ b/net/weechat/patches/patch-CMakeLists_txt
@@ -1,9 +1,24 @@
Disable icons and weechat.desktop to avoid GUI dependencies
+Remove flags:
+In file included from
/usr/ports/pobj/weechat-3.4.1/weechat-3.4.1/src/plugins/plugin.c:27:
+In file included from /usr/include/stdlib.h:40:
+/usr/include/machine/_types.h:133:15: error: cannot combine with previous
'int' declaration specifier
+typedef int __wchar_t;
+
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -221,7 +221,7 @@ if(DL_LIBRARY)
+@@ -27,8 +27,6 @@ project(weechat C)
+ set(CMAKE_VERBOSE_MAKEFILE OFF)
+ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+ set(CMAKE_SKIP_RPATH ON)
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsigned-char -fms-extensions -Wall
-Wextra -Werror-implicit-function-declaration")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char -fms-extensions -Wall
-Wextra")
+
+ # version
+ execute_process(COMMAND ${CMAKE_SOURCE_DIR}/version.sh devel-major
OUTPUT_VARIABLE VERSION_MAJOR)
+@@ -221,7 +219,7 @@ if(DL_LIBRARY)
list(APPEND EXTRA_LIBS dl)
endif()
diff --git a/net/weechat/patches/patch-doc_CMakeLists_txt
b/net/weechat/patches/patch-doc_CMakeLists_txt
index 0766b7563ce..c638536dc7c 100644
--- a/net/weechat/patches/patch-doc_CMakeLists_txt
+++ b/net/weechat/patches/patch-doc_CMakeLists_txt
@@ -1,10 +1,10 @@
Index: doc/CMakeLists.txt
--- doc/CMakeLists.txt.orig
+++ doc/CMakeLists.txt
-@@ -22,16 +22,16 @@ if(ENABLE_MAN OR ENABLE_DOC)
- find_package(Asciidoctor)
- if(ASCIIDOCTOR_FOUND)
- set(ASCIIDOCTOR_ARGS -a experimental -a "prewrap!" -a icons=font -a
revnumber="${VERSION}" -a sectanchors -a source-highlighter=prettify)
+@@ -73,16 +73,16 @@ if(ENABLE_MAN OR ENABLE_DOC)
+ add_custom_target(rn DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/ReleaseNotes.html)
+
+ # man/doc in all languages
- add_subdirectory(cs)
- add_subdirectory(de)
- add_subdirectory(en)
@@ -15,16 +15,16 @@ Index: doc/CMakeLists.txt
- add_subdirectory(pl)
- add_subdirectory(ru)
- add_subdirectory(sr)
-+# add_subdirectory(cs)
-+# add_subdirectory(de)
-+# add_subdirectory(en)
-+# add_subdirectory(es)
-+# add_subdirectory(fr)
-+# add_subdirectory(it)
-+# add_subdirectory(ja)
-+# add_subdirectory(pl)
-+# add_subdirectory(ru)
-+# add_subdirectory(sr)
++ #add_subdirectory(cs)
++ #add_subdirectory(de)
++ #add_subdirectory(en)
++ #add_subdirectory(es)
++ #add_subdirectory(fr)
++ #add_subdirectory(it)
++ #add_subdirectory(ja)
++ #add_subdirectory(pl)
++ #add_subdirectory(ru)
++ #add_subdirectory(sr)
else()
message(SEND_ERROR "Asciidoctor not found")
endif()
diff --git a/net/weechat/patches/patch-src_plugins_ruby_CMakeLists_txt
b/net/weechat/patches/patch-src_plugins_ruby_CMakeLists_txt
deleted file mode 100644
index e917ae60ffd..00000000000
--- a/net/weechat/patches/patch-src_plugins_ruby_CMakeLists_txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: src/plugins/ruby/CMakeLists.txt
---- src/plugins/ruby/CMakeLists.txt.orig
-+++ src/plugins/ruby/CMakeLists.txt
-@@ -25,9 +25,7 @@ set_target_properties(ruby PROPERTIES PREFIX "")
-
- if(RUBY_FOUND)
- include_directories(${RUBY_INCLUDE_DIRS})
-- set(LINK_LIBS)
-- list(APPEND LINK_LIBS ${RUBY_LDFLAGS})
-- target_link_libraries(ruby ${LINK_LIBS} ${RUBY_LIB} weechat_plugins_scripts
coverage_config)
-+ target_link_libraries(ruby ${RUBY_LIBRARY} weechat_plugins_scripts
coverage_config)
- endif(RUBY_FOUND)
-
- install(TARGETS ruby LIBRARY DESTINATION ${WEECHAT_LIBDIR}/plugins)
diff --git a/net/weechat/patches/patch-tests_CMakeLists_txt
b/net/weechat/patches/patch-tests_CMakeLists_txt
index 7c541f7756a..c8cd7eb5653 100644
--- a/net/weechat/patches/patch-tests_CMakeLists_txt
+++ b/net/weechat/patches/patch-tests_CMakeLists_txt
@@ -1,7 +1,7 @@
Index: tests/CMakeLists.txt
--- tests/CMakeLists.txt.orig
+++ tests/CMakeLists.txt
-@@ -91,7 +91,7 @@ if(ICONV_LIBRARY)
+@@ -95,7 +95,7 @@ if(ICONV_LIBRARY)
list(APPEND EXTRA_LIBS ${ICONV_LIBRARY})
endif()
diff --git a/net/weechat/pkg/PLIST-main b/net/weechat/pkg/PLIST-main
index a17f46b74ef..557160663f7 100644
--- a/net/weechat/pkg/PLIST-main
+++ b/net/weechat/pkg/PLIST-main
@@ -29,7 +29,6 @@ share/doc/weechat/weechat_plugin_api.en.adoc
share/doc/weechat/weechat_quickstart.en.adoc
share/doc/weechat/weechat_relay_protocol.en.adoc
share/doc/weechat/weechat_scripting.en.adoc
-share/doc/weechat/weechat_tester.en.adoc
share/doc/weechat/weechat_user.en.adoc
share/locale/cs/LC_MESSAGES/weechat.mo
share/locale/de/LC_MESSAGES/weechat.mo
