mirror of
https://github.com/irssi/irssi.git
synced 2024-09-01 04:14:16 -04:00
Merge tag '1.4.1' into integrate/1.4.1
This commit is contained in:
commit
531c68ed09
10
NEWS
10
NEWS
@ -1,6 +1,7 @@
|
||||
v1.5-head-an 2022-xx-xx Ailin Nemui <Nei>
|
||||
v1.5-head-an 2022-xx-xx The Irssi team <staff@irssi.org>
|
||||
|
||||
v1.4.0-an 2022-05-31 Ailin Nemui <Nei>
|
||||
v1.4.1 2022-06-12 The Irssi team <staff@irssi.org>
|
||||
! 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,
|
||||
@ -8,7 +9,7 @@ v1.4.0-an 2022-05-31 Ailin Nemui <Nei>
|
||||
+ 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
|
||||
@ -20,18 +21,15 @@ v1.4.0-an 2022-05-31 Ailin Nemui <Nei>
|
||||
- Fix memory leak in /IGNORE (#1373, an#84). Found by Jookia
|
||||
- Misc fixes (an#45, an#67, an#70, #1368, an#77)
|
||||
|
||||
v1.3.2-an 2022-01-14 Ailin Nemui <Nei>
|
||||
- CHANTYPES take precedence over (missing) STATUSMSG in /join
|
||||
(#1358, an#54)
|
||||
- Fix crash in Perl's $view->set_bookmark (freebsd#254237,
|
||||
an#56)
|
||||
|
||||
v1.3.1-an 2021-12-17 Ailin Nemui <Nei>
|
||||
- Minor help fixes (an#51, an#52)
|
||||
- Fix regression where own channel status was forgotten after
|
||||
/UPGRADE (#1357, an#53)
|
||||
|
||||
v1.3.0-an 2021-11-11 Ailin Nemui <Nei>
|
||||
* /SET resolve_reverse_lookup setting was removed (#1034,
|
||||
#1135)
|
||||
* Irssi will try to connect on IPv4 if IPv6 connection failed
|
||||
|
@ -11,7 +11,7 @@ there are third party [ICB](https://github.com/jperkin/irssi-icb),
|
||||
[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://ailin-nemui.github.io/irssi/Getting.html)
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
project('irssi', 'c',
|
||||
version : '1.5-head-an',
|
||||
version : '1.5-head',
|
||||
meson_version : '>=0.53',
|
||||
default_options : ['warning_level=1'])
|
||||
|
||||
|
@ -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
|
||||
git_version=$(GIT_DIR=$1/.git git describe --dirty --long --tags --match '[0-9]*.[0-9]*' 2>/dev/null)
|
||||
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"
|
||||
|
Loading…
Reference in New Issue
Block a user