From 7207a26d1eafc708926598b7046687e6d88e5f77 Mon Sep 17 00:00:00 2001 From: Ailin Nemui Date: Tue, 31 May 2022 10:25:01 +0200 Subject: [PATCH 1/3] revert branding --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4e1bb88d..ea4b817b 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ built in, and there are third party [Quassel](https://github.com/phhusson/quassel-irssi) protocol modules available. -![irssi](https://user-images.githubusercontent.com/5665186/154820868-50c35841-04f4-4f4c-8df9-dd5aa4bbcde8.png) +![irssi](https://user-images.githubusercontent.com/5665186/32180643-cf127f60-bd92-11e7-8aa2-882313ce1d8e.png) ## [Download information](https://irssi.org/download/) From 580b05a7f312231315db72ed6f8b4695e4c2ef65 Mon Sep 17 00:00:00 2001 From: ailin-nemui Date: Wed, 1 Jun 2022 18:38:15 +0200 Subject: [PATCH 2/3] Merge pull request #88 from ailin-nemui/arraycopy fix missing len in g_array_copy (cherry picked from commit 47b0661e9689d870f6ad499259368a7860880f2f) --- src/fe-text/gui-readline.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c index 88ea254b..a53e4151 100644 --- a/src/fe-text/gui-readline.c +++ b/src/fe-text/gui-readline.c @@ -96,6 +96,7 @@ GArray *g_array_copy(GArray *array) elt_size = g_array_get_element_size(array); out = g_array_sized_new(FALSE, FALSE, elt_size, array->len); memcpy(out->data, array->data, array->len * elt_size); + out->len = array->len; return out; } From 0e0bc17992251f32ba43990e41c52b36ad344515 Mon Sep 17 00:00:00 2001 From: Ailin Nemui Date: Mon, 6 Jun 2022 12:08:49 +0200 Subject: [PATCH 3/3] tag as 1.4.1 --- NEWS | 5 +++-- configure.ac | 2 +- meson.build | 2 +- utils/irssi-version.sh | 39 ++++++++++++++++++++------------------- 4 files changed, 25 insertions(+), 23 deletions(-) diff --git a/NEWS b/NEWS index 95f2c385..501ef0ba 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,5 @@ -v1.4.0 2022-xx-xx The Irssi team +v1.4.1 2022-06-12 The Irssi team + ! Note: botti no longer compiles; get in touch if you use it * Format the output of /QUOTE HELP (#1371, an#82). By Val Lorentz. Add /SHELP as default alias (an#83) + GLib log message filter: /SET glib_log_domains (an#50, @@ -6,7 +7,7 @@ v1.4.0 2022-xx-xx The Irssi team + An option to clear the cutbuffer: /SET empty_kill_clears_cutbuffer (an#58). By Mikael Magnusson - + Scriptable pastebin (an#60) + + Scriptable pastebin (an#60, an#88) + Configurable actlist separator: /SET actlist_separator (#1364, an#61) - Fix window left/right not skipping visible windows diff --git a/configure.ac b/configure.ac index d0de185b..f03569eb 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(irssi, 1.4.0) +AC_INIT(irssi, 1.4.1) AC_CONFIG_SRCDIR([src]) AC_CONFIG_AUX_DIR(build-aux) AC_PREREQ(2.50) diff --git a/meson.build b/meson.build index 59a26f3c..71dacead 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('irssi', 'c', - version : '1.4.0', + version : '1.4.1', meson_version : '>=0.49', default_options : ['warning_level=1']) diff --git a/utils/irssi-version.sh b/utils/irssi-version.sh index 75c62835..0d82147f 100755 --- a/utils/irssi-version.sh +++ b/utils/irssi-version.sh @@ -1,30 +1,31 @@ #!/bin/sh -DATE=`GIT_DIR=$1/.git git log -1 --pretty=format:%ci HEAD 2>/dev/null` - -VERSION_DATE=`echo $DATE | cut -f 1 -d ' ' | tr -d -` -VERSION_TIME=`echo $DATE | cut -f 2 -d ' ' | awk -F: '{printf "%d", $1$2}'` - -if test -z "$VERSION_DATE"; then - DATE=`grep '^v' $1/NEWS | head -1` - VERSION_DATE=`echo "$DATE" | cut -f 2 -d ' ' | tr -d -` - case $VERSION_DATE in - *xx) - VERSION_DATE=`date +%Y%m%d` - ;; - esac - VERSION_TIME=`echo "$DATE" | cut -f 1 -d ' ' | tr -d v | tr .- ' '` - VERSION_TIME=`printf %d%d%02d $VERSION_TIME 2>/dev/null | cut -c 1-4` -fi - -echo "#define IRSSI_VERSION_DATE $VERSION_DATE" -echo "#define IRSSI_VERSION_TIME $VERSION_TIME" +DATE=`grep '^v' $1/NEWS | head -1` +VERSION_DATE=`echo "$DATE" | cut -f 2 -d ' ' | tr -d -` +case $VERSION_DATE in + *xx) + VERSION_DATE=`date +%Y%m%d` + ;; +esac +VERSION_TIME=`echo "$DATE" | cut -f 1 -d ' ' | tr -d v | tr .- ' '` +VERSION_TIME=`printf %d%d%02d $VERSION_TIME 2>/dev/null | cut -c 1-4` if echo "${VERSION}" | grep -q -- -head; then # -head version, get extra details from git if we can + DATE=`GIT_DIR=$1/.git git log -1 --pretty=format:%ci HEAD 2>/dev/null` + + VERSION_DATE=`echo $DATE | cut -f 1 -d ' ' | tr -d -` + + if test -z "$VERSION_DATE"; then + VERSION_DATE=`date +%Y%m%d` + fi + git_version=$(GIT_DIR=$1/.git git describe --dirty --long --tags --match '[0-9]*.[0-9]*' 2>/dev/null) if [ $? = 0 ]; then echo "#undef PACKAGE_VERSION" echo "#define PACKAGE_VERSION \"${git_version}\"" fi fi + +echo "#define IRSSI_VERSION_DATE $VERSION_DATE" +echo "#define IRSSI_VERSION_TIME $VERSION_TIME"