Version 2.6-rc2

ChangeLog.adoc

@@ -58,6 +58,7 @@ Tests::
 
 Build::
 
+  * core: fix compilation with autotools on FreeBSD 12.0
   * debian: disable Javascript plugin on Debian Buster/Bullseye (issue #1374)
   * python: compile with Python 3 by default
   * python: use pkg-config to detect Python (issue #1382)

debian-devel/control

@@ -162,11 +162,11 @@ Depends:
     ${shlibs:Depends},
     weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version})
 Conflicts: weechat-python
-Description: Fast, light and extensible chat client - Python plugin
+Description: Fast, light and extensible chat client - Python 3 plugin
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
  for many operating systems. Everything can be done with a keyboard.
  .
- This package provides the Python scripting API plugin.
+ This package provides the Python 3 scripting API plugin.
 
 Package: weechat-devel-perl
 Architecture: any

debian-stable/control

@@ -156,11 +156,11 @@ Depends:
     ${misc:Depends},
     ${shlibs:Depends},
     weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version})
-Description: Fast, light and extensible chat client - Python plugin
+Description: Fast, light and extensible chat client - Python 3 plugin
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
  for many operating systems. Everything can be done with a keyboard.
  .
- This package provides the Python scripting API plugin.
+ This package provides the Python 3 scripting API plugin.
 
 Package: weechat-perl
 Architecture: any

src/core/hook/wee-hook-timer.h

@@ -21,6 +21,7 @@
 #define WEECHAT_HOOK_TIMER_H
 
 #include <time.h>
+#include <sys/time.h>
 
 struct t_weechat_plugin;
 struct t_infolist_item;

src/plugins/python/CMakeLists.txt

@@ -23,6 +23,11 @@ weechat-python-api.c weechat-python-api.h)
 set_target_properties(python PROPERTIES PREFIX "")
 
 if(PYTHON_FOUND)
+  # There's a weird bug on FreeBSD: the value of PYTHON_LDFLAGS is
+  # "-L/usr/local/lib;-lpython3.6m" instead of "-L/usr/local/lib -lpython3.6m".
+  # This is a temporary hack to fix the value, waiting for a clean fix.
+  string(REPLACE ";" " " PYTHON_LDFLAGS "${PYTHON_LDFLAGS}")
+
   include_directories(${PYTHON_INCLUDE_DIRS})
   set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${PYTHON_LDFLAGS}")
   target_link_libraries(python ${PYTHON_LIBRARIES} weechat_plugins_scripts coverage_config)

version.sh

@@ -34,7 +34,7 @@
 
 WEECHAT_STABLE=2.5
 WEECHAT_DEVEL=2.6
-WEECHAT_DEVEL_FULL=2.6-rc1
+WEECHAT_DEVEL_FULL=2.6-rc2
 
 if [ $# -lt 1 ]; then
     echo >&2 "Syntax: $0 stable|devel|devel-full|devel-major|devel-minor|devel-patch"

weechat.cygport.in

@@ -53,7 +53,7 @@ SRC_URI="https://weechat.org/files/src/weechat-${VERSION}.tar.bz2"
 # Build dependencies only
 DEPEND="cmake gettext gettext-devel libgnutls-devel libaspell-devel \
 libcurl-devel libgcrypt-devel libncurses-devel lua perl pkg-config \
-python2-devel ruby tcl-devel libguile2.0-devel php-devel zlib-devel"
+python3-devel ruby tcl-devel libguile2.0-devel php-devel zlib-devel"
 
 #
 # CMake compilation of WeeChat: