Version 2.9

doc: replace wildcard command by list of included files in Makefile.am files
This fixes the `make distcheck` command.
2026-06-16 08:04:46 +02:00 · 2020-07-18 13:59:02 +02:00 · 2020-07-11 12:23:14 +02:00 · 2020-07-07 20:29:03 +02:00 · 2020-07-07 20:27:57 +02:00 · 2020-07-07 20:26:17 +02:00
14 changed files with 121 additions and 16 deletions
@@ -78,6 +78,7 @@ Alphabetically:
 * Maarten de Vries
 * Mantas Mikulėnas (grawity)
 * Marco Paolone
+* Marco Sirabella
 * Mateusz Poszwa
 * Matt Robinson
 * Matthew Horan
@@ -16,7 +16,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]


 [[v2.9]]
-== Version 2.9 (under dev)
+== Version 2.9 (2020-07-18)

 New features::

@@ -43,6 +43,7 @@ New features::
  * buflist: evaluate option buflist.look.sort so that sort can be customized for each of the three buflist bar items (issue #1465)
  * irc: add support of UTF8MAPPING (issue #1528)
  * irc: display account messages in buffers (issue #1250)
+  * python: add WeeChat sharedir python directory to PYTHONPATH (issue #1537)
  * relay: increase default limits for IRC backlog options
  * relay: add command "handshake" in weechat relay protocol and nonce to prevent replay attacks, add options relay.network.password_hash_algo, relay.network.password_hash_iterations, relay.network.nonce_size (issue #1474)
  * relay: add command "completion" in weechat relay protocol to perform a completion on a string at a given position (issue #1484)
@@ -18,7 +18,7 @@ https://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog]


 [[v2.9]]
-== Version 2.9 (under dev)
+== Version 2.9 (2020-07-18)

 [[v2.9_bar_color_bg_inactive]]
 === New background color for inactive bars
@@ -24,7 +24,8 @@ EXTRA_DIST = CMakeLists.txt \
             weechat.1.cs.adoc \
             weechat-headless.1.cs.adoc \
             weechat_quickstart.cs.adoc \
-             $(wildcard includes/*.adoc)
+             includes/cmdline_options.cs.adoc \
+             includes/man.cs.adoc

 if MAN
  man_targets = weechat.1 \
@@ -29,7 +29,19 @@ EXTRA_DIST = CMakeLists.txt \
             weechat_faq.de.adoc \
             weechat_quickstart.de.adoc \
             weechat_tester.de.adoc \
-             $(wildcard includes/*.adoc)
+             includes/autogen_api_completions.de.adoc \
+             includes/autogen_api_hdata.de.adoc \
+             includes/autogen_api_infolists.de.adoc \
+             includes/autogen_api_infos.de.adoc \
+             includes/autogen_api_infos_hashtable.de.adoc \
+             includes/autogen_api_plugins_priority.de.adoc \
+             includes/autogen_api_url_options.de.adoc \
+             includes/autogen_user_commands.de.adoc \
+             includes/autogen_user_default_aliases.de.adoc \
+             includes/autogen_user_irc_colors.de.adoc \
+             includes/autogen_user_options.de.adoc \
+             includes/cmdline_options.de.adoc \
+             includes/man.de.adoc

 if MAN
  man_targets = weechat.1 \
@@ -32,7 +32,19 @@ EXTRA_DIST = CMakeLists.txt \
             weechat_tester.en.adoc \
             weechat_relay_protocol.en.adoc \
             weechat_dev.en.adoc \
-             $(wildcard includes/*.adoc)
+             includes/autogen_api_completions.en.adoc \
+             includes/autogen_api_hdata.en.adoc \
+             includes/autogen_api_infolists.en.adoc \
+             includes/autogen_api_infos.en.adoc \
+             includes/autogen_api_infos_hashtable.en.adoc \
+             includes/autogen_api_plugins_priority.en.adoc \
+             includes/autogen_api_url_options.en.adoc \
+             includes/autogen_user_commands.en.adoc \
+             includes/autogen_user_default_aliases.en.adoc \
+             includes/autogen_user_irc_colors.en.adoc \
+             includes/autogen_user_options.en.adoc \
+             includes/cmdline_options.en.adoc \
+             includes/man.en.adoc

 if MAN
  man_targets = weechat.1 \
@@ -32,7 +32,19 @@ EXTRA_DIST = CMakeLists.txt \
             weechat_tester.fr.adoc \
             weechat_relay_protocol.fr.adoc \
             weechat_dev.fr.adoc \
-             $(wildcard includes/*.adoc)
+             includes/autogen_api_completions.fr.adoc \
+             includes/autogen_api_hdata.fr.adoc \
+             includes/autogen_api_infolists.fr.adoc \
+             includes/autogen_api_infos.fr.adoc \
+             includes/autogen_api_infos_hashtable.fr.adoc \
+             includes/autogen_api_plugins_priority.fr.adoc \
+             includes/autogen_api_url_options.fr.adoc \
+             includes/autogen_user_commands.fr.adoc \
+             includes/autogen_user_default_aliases.fr.adoc \
+             includes/autogen_user_irc_colors.fr.adoc \
+             includes/autogen_user_options.fr.adoc \
+             includes/cmdline_options.fr.adoc \
+             includes/man.fr.adoc

 if MAN
  man_targets = weechat.1 \
@@ -29,7 +29,19 @@ EXTRA_DIST = CMakeLists.txt \
             weechat_faq.it.adoc \
             weechat_quickstart.it.adoc \
             weechat_tester.it.adoc \
-             $(wildcard includes/*.adoc)
+             includes/autogen_api_completions.it.adoc \
+             includes/autogen_api_hdata.it.adoc \
+             includes/autogen_api_infolists.it.adoc \
+             includes/autogen_api_infos_hashtable.it.adoc \
+             includes/autogen_api_infos.it.adoc \
+             includes/autogen_api_plugins_priority.it.adoc \
+             includes/autogen_api_url_options.it.adoc \
+             includes/autogen_user_commands.it.adoc \
+             includes/autogen_user_default_aliases.it.adoc \
+             includes/autogen_user_irc_colors.it.adoc \
+             includes/autogen_user_options.it.adoc \
+             includes/cmdline_options.it.adoc \
+             includes/man.it.adoc

 if MAN
  man_targets = weechat.1 \
@@ -31,7 +31,19 @@ EXTRA_DIST = CMakeLists.txt \
             weechat_tester.ja.adoc \
             weechat_relay_protocol.ja.adoc \
             weechat_dev.ja.adoc \
-             $(wildcard includes/*.adoc)
+             includes/autogen_api_completions.ja.adoc \
+             includes/autogen_api_hdata.ja.adoc \
+             includes/autogen_api_infolists.ja.adoc \
+             includes/autogen_api_infos_hashtable.ja.adoc \
+             includes/autogen_api_infos.ja.adoc \
+             includes/autogen_api_plugins_priority.ja.adoc \
+             includes/autogen_api_url_options.ja.adoc \
+             includes/autogen_user_commands.ja.adoc \
+             includes/autogen_user_default_aliases.ja.adoc \
+             includes/autogen_user_irc_colors.ja.adoc \
+             includes/autogen_user_options.ja.adoc \
+             includes/cmdline_options.ja.adoc \
+             includes/man.ja.adoc

 if MAN
  man_targets = weechat.1 \
@@ -29,7 +29,19 @@ EXTRA_DIST = CMakeLists.txt \
             weechat_faq.pl.adoc \
             weechat_quickstart.pl.adoc \
             weechat_tester.pl.adoc \
-             $(wildcard includes/*.adoc)
+             includes/autogen_api_completions.pl.adoc \
+             includes/autogen_api_hdata.pl.adoc \
+             includes/autogen_api_infolists.pl.adoc \
+             includes/autogen_api_infos_hashtable.pl.adoc \
+             includes/autogen_api_infos.pl.adoc \
+             includes/autogen_api_plugins_priority.pl.adoc \
+             includes/autogen_api_url_options.pl.adoc \
+             includes/autogen_user_commands.pl.adoc \
+             includes/autogen_user_default_aliases.pl.adoc \
+             includes/autogen_user_irc_colors.pl.adoc \
+             includes/autogen_user_options.pl.adoc \
+             includes/cmdline_options.pl.adoc \
+             includes/man.pl.adoc

 if MAN
  man_targets = weechat.1 \
@@ -24,7 +24,8 @@ EXTRA_DIST = CMakeLists.txt \
             weechat.1.ru.adoc \
             weechat-headless.1.ru.adoc \
             weechat_quickstart.ru.adoc \
-             $(wildcard includes/*.adoc)
+             includes/cmdline_options.ru.adoc \
+             includes/man.ru.adoc

 if MAN
  man_targets = weechat.1 \
@@ -797,8 +797,8 @@ weechat_python_load (const char *filename, const char *code)
 #endif /* PY_MAJOR_VERSION >= 3 */
    FILE *fp;
    PyObject *python_path, *path, *module_main, *globals, *rc;
-    char *weechat_home;
-    char *str_home;
+    char *weechat_sharedir, *weechat_home;
+    char *str_sharedir, *str_home;
    int len;

    fp = NULL;
@@ -862,8 +862,34 @@ weechat_python_load (const char *filename, const char *code)

    PyThreadState_Swap (python_current_interpreter);

-    /* adding $weechat_dir/python in $PYTHONPATH */
+    /* adding $weechat_sharedir/python in $PYTHONPATH */
    python_path = PySys_GetObject ("path");
+    weechat_sharedir = weechat_info_get ("weechat_sharedir", "");
+    if (weechat_sharedir)
+    {
+        len = strlen (weechat_sharedir) + 1 + strlen (PYTHON_PLUGIN_NAME) + 1;
+        str_sharedir = malloc (len);
+        if (str_sharedir)
+        {
+            snprintf (str_sharedir, len, "%s/python", weechat_sharedir);
+#if PY_MAJOR_VERSION >= 3
+            /* python >= 3.x */
+            path = PyUnicode_FromString (str_sharedir);
+#else
+            /* python <= 2.x */
+            path = PyBytes_FromString (str_sharedir);
+#endif /* PY_MAJOR_VERSION >= 3 */
+            if (path != NULL)
+            {
+                PyList_Insert (python_path, 0, path);
+                Py_DECREF (path);
+            }
+            free (str_sharedir);
+        }
+        free (weechat_sharedir);
+    }
+
+    /* adding $weechat_dir/python in $PYTHONPATH */
    weechat_home = weechat_info_get ("weechat_dir", "");
    if (weechat_home)
    {
@@ -889,6 +915,7 @@ weechat_python_load (const char *filename, const char *code)
        free (weechat_home);
    }

+
    weechat_python_set_output ();

    python_current_script_filename = filename;
@@ -32,9 +32,9 @@
 #     devel-patch  the patch version of devel (e.g. 2 for version 1.4.2)
 #

-WEECHAT_STABLE=2.8
+WEECHAT_STABLE=2.9
 WEECHAT_DEVEL=2.9
-WEECHAT_DEVEL_FULL=2.9-rc1
+WEECHAT_DEVEL_FULL=2.9

 if [ $# -lt 1 ]; then
    echo >&2 "Syntax: $0 stable|devel|devel-full|devel-major|devel-minor|devel-patch"
@@ -23,7 +23,7 @@
 #

 %define name weechat
-%define version 2.8
+%define version 2.9
 %define release 1

 Name:      %{name}
@@ -82,6 +82,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_prefix}/share/icons/hicolor/512x512/apps/weechat.png

 %changelog
+* Sat Jul 18 2020 Sébastien Helleu <flashcode@flashtux.org> 2.9-1
+- Released version 2.9
 * Sun Mar 29 2020 Sébastien Helleu <flashcode@flashtux.org> 2.8-1
 - Released version 2.8
 * Thu Feb 20 2020 Sébastien Helleu <flashcode@flashtux.org> 2.7.1-1
Author	SHA1	Message	Date
Sébastien Helleu	c096750e96	Version 2.9	2020-07-18 13:59:02 +02:00
Sébastien Helleu	0ebed7e7b0	doc: replace wildcard command by list of included files in Makefile.am files This fixes the `make distcheck` command.	2020-07-11 12:23:14 +02:00
Sébastien Helleu	cef0a77ace	core: add contributor in AUTHORS.adoc (issue #1537 )	2020-07-07 20:29:03 +02:00
Sébastien Helleu	19e98e7599	core: update ChangeLog (issue #1537 )	2020-07-07 20:27:57 +02:00
Marco Sirabella	ab7104e34c	Add $weechat_sharedir/python for global python package import Related: #1461 Some scripts (eg weechat-matrix) ship directories that need to be imported from the script. Rather than globally installing the python packages to python's `site-packages` the directories can be installed alongside the script in `WEECHAT_SHAREDIR/python`. This change adds that directory to the `$PYTHONPATH` to import successfully.	2020-07-07 20:26:17 +02:00