Compare commits
No commits in common. 'c9' and 'i8c-beta' have entirely different histories.
@ -1 +1 @@
|
|||||||
SOURCES/hexchat-2.16.0.tar.xz
|
SOURCES/hexchat-2.14.3.tar.xz
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
9867719f068ae867b3ca790dcf15ef3df83c7148 SOURCES/hexchat-2.16.0.tar.xz
|
a219796d70023b675e5ea24af9f22beb9e855abb SOURCES/hexchat-2.14.3.tar.xz
|
||||||
|
|||||||
@ -0,0 +1,25 @@
|
|||||||
|
From 090fd29acf4af0d8e13fcf2861b14a356db72641 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Sbgodin <christophe.henry@sbgodin.fr>
|
||||||
|
Date: Sun, 7 Mar 2021 12:51:45 +0000
|
||||||
|
Subject: [PATCH] python: Fix exception with list_pluginpref()
|
||||||
|
|
||||||
|
__decode cannot work (with Python3) because prefs_str has no attribute 'decode'.
|
||||||
|
|
||||||
|
Related to https://github.com/hexchat/hexchat/issues/2531
|
||||||
|
---
|
||||||
|
plugins/python/_hexchat.py | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/plugins/python/_hexchat.py b/plugins/python/_hexchat.py
|
||||||
|
index 567b34934..5e4b0c65f 100644
|
||||||
|
--- a/plugins/python/_hexchat.py
|
||||||
|
+++ b/plugins/python/_hexchat.py
|
||||||
|
@@ -319,7 +319,7 @@ def del_pluginpref(name):
|
||||||
|
def list_pluginpref():
|
||||||
|
prefs_str = ffi.new('char[4096]')
|
||||||
|
if lib.hexchat_pluginpref_list(lib.ph, prefs_str) == 1:
|
||||||
|
- return __decode(prefs_str).split(',')
|
||||||
|
+ return __decode(ffi.string(prefs_str)).split(',')
|
||||||
|
|
||||||
|
return []
|
||||||
|
|
||||||
@ -0,0 +1,48 @@
|
|||||||
|
From 163608d7fd861c2c4911a38f45be484c88626bdc Mon Sep 17 00:00:00 2001
|
||||||
|
From: John Levon <levon@movementarian.org>
|
||||||
|
Date: Mon, 7 Sep 2020 17:53:31 +0100
|
||||||
|
Subject: [PATCH] Use pango_font_metrics_get_height() to calculate font height
|
||||||
|
(#2500)
|
||||||
|
|
||||||
|
---
|
||||||
|
src/fe-gtk/xtext.c | 18 ++++++++++++++++--
|
||||||
|
1 file changed, 16 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/fe-gtk/xtext.c b/src/fe-gtk/xtext.c
|
||||||
|
index fac0c4e6d..418bb4da5 100644
|
||||||
|
--- a/src/fe-gtk/xtext.c
|
||||||
|
+++ b/src/fe-gtk/xtext.c
|
||||||
|
@@ -283,8 +283,24 @@ backend_font_open (GtkXText *xtext, char *name)
|
||||||
|
metrics = pango_context_get_metrics (context, xtext->font->font, lang);
|
||||||
|
xtext->font->ascent = pango_font_metrics_get_ascent (metrics) / PANGO_SCALE;
|
||||||
|
xtext->font->descent = pango_font_metrics_get_descent (metrics) / PANGO_SCALE;
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
+ * In later versions of pango, a font's height should be calculated like
|
||||||
|
+ * this to account for line gap; a typical symptom of not doing so is
|
||||||
|
+ * cutting off the underscore on some fonts.
|
||||||
|
+ */
|
||||||
|
+#if PANGO_VERSION_CHECK(1, 44, 0)
|
||||||
|
+ xtext->fontsize = pango_font_metrics_get_height (metrics) / PANGO_SCALE + 1;
|
||||||
|
+
|
||||||
|
+ if (xtext->fontsize == 0)
|
||||||
|
+ xtext->fontsize = xtext->font->ascent + xtext->font->descent;
|
||||||
|
+#else
|
||||||
|
+ xtext->fontsize = xtext->font->ascent + xtext->font->descent;
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
pango_font_metrics_unref (metrics);
|
||||||
|
}
|
||||||
|
+
|
||||||
|
static int
|
||||||
|
backend_get_text_width_emph (GtkXText *xtext, guchar *str, int len, int emphasis)
|
||||||
|
{
|
||||||
|
@@ -3479,8 +3495,6 @@ gtk_xtext_set_font (GtkXText *xtext, char *name)
|
||||||
|
if (xtext->font == NULL)
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
- xtext->fontsize = xtext->font->ascent + xtext->font->descent;
|
||||||
|
-
|
||||||
|
{
|
||||||
|
char *time_str;
|
||||||
|
int stamp_size = xtext_get_stamp_str (time(0), &time_str);
|
||||||
@ -0,0 +1,23 @@
|
|||||||
|
From fb0e8e2387ad3ce044458b9b7f7aaa0a2293d217 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Panagiotis Vasilopoulos <hello@alwayslivid.com>
|
||||||
|
Date: Wed, 19 May 2021 16:25:16 +0300
|
||||||
|
Subject: [PATCH] Add Libera Chat to network list
|
||||||
|
|
||||||
|
---
|
||||||
|
src/common/servlist.c | 3 +++
|
||||||
|
1 file changed, 3 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/common/servlist.c b/src/common/servlist.c
|
||||||
|
index e44a3f2df..33bd80f2d 100644
|
||||||
|
--- a/src/common/servlist.c
|
||||||
|
+++ b/src/common/servlist.c
|
||||||
|
@@ -239,6 +239,9 @@ static const struct defaultserver def[] =
|
||||||
|
/* Self signed */
|
||||||
|
{0, "irc.librairc.net"},
|
||||||
|
|
||||||
|
+ {"Libera Chat", 0, 0, 0, LOGIN_SASL, 0, TRUE},
|
||||||
|
+ {0, "irc.libera.chat"},
|
||||||
|
+
|
||||||
|
#ifdef USE_OPENSSL
|
||||||
|
{"LinkNet", 0},
|
||||||
|
{0, "irc.link-net.org/+7000"},
|
||||||
@ -0,0 +1,28 @@
|
|||||||
|
From 5deb69591992d4fede9090b60d3dc847612a4d60 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Patrick Griffis <tingping@tingping.se>
|
||||||
|
Date: Wed, 11 Mar 2020 11:07:56 -0700
|
||||||
|
Subject: [PATCH] build: Better support building against python 3.8+
|
||||||
|
|
||||||
|
Closes #2441
|
||||||
|
---
|
||||||
|
plugins/python/meson.build | 8 +++++++-
|
||||||
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/plugins/python/meson.build b/plugins/python/meson.build
|
||||||
|
index 2ad5128e5..eb762134a 100644
|
||||||
|
--- a/plugins/python/meson.build
|
||||||
|
+++ b/plugins/python/meson.build
|
||||||
|
@@ -1,6 +1,12 @@
|
||||||
|
python_opt = get_option('with-python')
|
||||||
|
if python_opt.startswith('python3')
|
||||||
|
- python_dep = dependency(python_opt, version: '>= 3.3')
|
||||||
|
+ # Python 3.8 introduced a new -embed variant
|
||||||
|
+ if not python_opt.endswith('-embed')
|
||||||
|
+ python_dep = dependency(python_opt + '-embed', version: '>= 3.3', required: false)
|
||||||
|
+ endif
|
||||||
|
+ if not python_dep.found()
|
||||||
|
+ python_dep = dependency(python_opt, version: '>= 3.3')
|
||||||
|
+ endif
|
||||||
|
else
|
||||||
|
python_dep = dependency(python_opt, version: '>= 2.7')
|
||||||
|
endif
|
||||||
@ -0,0 +1,30 @@
|
|||||||
|
From 90c91d6c9aa048eff8f8f8f888d37a21fd714522 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mateusz Gozdek <mgozdekof@gmail.com>
|
||||||
|
Date: Sun, 4 Apr 2021 21:07:30 +0200
|
||||||
|
Subject: [PATCH] plugins/lua/lua.c: fix segfault on lua_pop with Lua 5.4.3
|
||||||
|
|
||||||
|
Closes #2558
|
||||||
|
|
||||||
|
Co-authored-by: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
|
||||||
|
Signed-off-by: Mateusz Gozdek <mgozdekof@gmail.com>
|
||||||
|
---
|
||||||
|
plugins/lua/lua.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/plugins/lua/lua.c b/plugins/lua/lua.c
|
||||||
|
index d73fbb230..d1370eafb 100644
|
||||||
|
--- a/plugins/lua/lua.c
|
||||||
|
+++ b/plugins/lua/lua.c
|
||||||
|
@@ -1189,11 +1189,11 @@ static void patch_clibs(lua_State *L)
|
||||||
|
if(lua_type(L, -2) == LUA_TLIGHTUSERDATA && lua_type(L, -1) == LUA_TTABLE)
|
||||||
|
{
|
||||||
|
lua_setfield(L, LUA_REGISTRYINDEX, "_CLIBS");
|
||||||
|
+ lua_pop(L, 1);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
lua_pop(L, 1);
|
||||||
|
}
|
||||||
|
- lua_pop(L, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
static GPtrArray *scripts;
|
||||||
@ -0,0 +1,45 @@
|
|||||||
|
From d3545f37cd5f551ed8bc0ab7b20e5c8140adc0a6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Patrick Griffis <pgriffis@igalia.com>
|
||||||
|
Date: Sun, 23 May 2021 21:15:43 -0500
|
||||||
|
Subject: [PATCH] Change default network to Libera.Chat
|
||||||
|
|
||||||
|
---
|
||||||
|
src/common/servlist.c | 4 ++--
|
||||||
|
src/fe-gtk/joind.c | 2 +-
|
||||||
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/common/servlist.c b/src/common/servlist.c
|
||||||
|
index de75c8b9a..93557f975 100644
|
||||||
|
--- a/src/common/servlist.c
|
||||||
|
+++ b/src/common/servlist.c
|
||||||
|
@@ -240,7 +240,7 @@ static const struct defaultserver def[] =
|
||||||
|
/* Self signed */
|
||||||
|
{0, "irc.librairc.net"},
|
||||||
|
|
||||||
|
- {"Libera Chat", 0, 0, 0, LOGIN_SASL, 0, TRUE},
|
||||||
|
+ {"Libera.Chat", 0, 0, 0, LOGIN_SASL, 0, TRUE},
|
||||||
|
{0, "irc.libera.chat"},
|
||||||
|
|
||||||
|
#ifdef USE_OPENSSL
|
||||||
|
@@ -942,7 +942,7 @@ servlist_load_defaults (void)
|
||||||
|
{
|
||||||
|
int i = 0, j = 0;
|
||||||
|
ircnet *net = NULL;
|
||||||
|
- guint def_hash = g_str_hash ("freenode");
|
||||||
|
+ guint def_hash = g_str_hash ("Libera.Chat");
|
||||||
|
|
||||||
|
while (1)
|
||||||
|
{
|
||||||
|
diff --git a/src/fe-gtk/joind.c b/src/fe-gtk/joind.c
|
||||||
|
index f1d3da504..ce3cbcaec 100644
|
||||||
|
--- a/src/fe-gtk/joind.c
|
||||||
|
+++ b/src/fe-gtk/joind.c
|
||||||
|
@@ -247,7 +247,7 @@ joind_show_dialog (server *serv)
|
||||||
|
G_CALLBACK (joind_ok_cb), serv);
|
||||||
|
|
||||||
|
if (serv->network)
|
||||||
|
- if (g_ascii_strcasecmp(((ircnet*)serv->network)->name, "freenode") == 0)
|
||||||
|
+ if (g_ascii_strcasecmp(((ircnet*)serv->network)->name, "Libera.Chat") == 0)
|
||||||
|
{
|
||||||
|
gtk_entry_set_text (GTK_ENTRY (entry1), "#hexchat");
|
||||||
|
}
|
||||||
@ -1,46 +0,0 @@
|
|||||||
From dac8ace90cffef656b1292c8d91648cc722c28fe Mon Sep 17 00:00:00 2001
|
|
||||||
From: Patrick Griffis <tingping@tingping.se>
|
|
||||||
Date: Mon, 25 Oct 2021 15:02:22 -0500
|
|
||||||
Subject: [PATCH] Install icons as io.github.Hexchat
|
|
||||||
|
|
||||||
This matches our app-id as the desktop-file spec recommends.
|
|
||||||
|
|
||||||
This also fixes a bug where our notifications referred to this new
|
|
||||||
name already.
|
|
||||||
---
|
|
||||||
data/icons/meson.build | 2 ++
|
|
||||||
data/misc/io.github.Hexchat.desktop.in.in | 2 +-
|
|
||||||
2 files changed, 3 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/data/icons/meson.build b/data/icons/meson.build
|
|
||||||
index d7926e831259..710e0045f24b 100644
|
|
||||||
--- a/data/icons/meson.build
|
|
||||||
+++ b/data/icons/meson.build
|
|
||||||
@@ -1,9 +1,11 @@
|
|
||||||
icondir = join_paths(get_option('datadir'), 'icons/hicolor')
|
|
||||||
install_data(
|
|
||||||
'hexchat.png',
|
|
||||||
+ rename: 'io.github.Hexchat.png',
|
|
||||||
install_dir: join_paths(icondir, '48x48/apps')
|
|
||||||
)
|
|
||||||
install_data(
|
|
||||||
'hexchat.svg',
|
|
||||||
+ rename: 'io.github.Hexchat.svg',
|
|
||||||
install_dir: join_paths(icondir, 'scalable/apps')
|
|
||||||
)
|
|
||||||
diff --git a/data/misc/io.github.Hexchat.desktop.in.in b/data/misc/io.github.Hexchat.desktop.in.in
|
|
||||||
index 7bf6a9a8110c..5e00ce8f2539 100644
|
|
||||||
--- a/data/misc/io.github.Hexchat.desktop.in.in
|
|
||||||
+++ b/data/misc/io.github.Hexchat.desktop.in.in
|
|
||||||
@@ -4,7 +4,7 @@ GenericName=IRC Client
|
|
||||||
Comment=Chat with other people online
|
|
||||||
Keywords=IM;Chat;
|
|
||||||
Exec=@exec_command@
|
|
||||||
-Icon=hexchat
|
|
||||||
+Icon=io.github.Hexchat
|
|
||||||
Terminal=false
|
|
||||||
Type=Application
|
|
||||||
Categories=GTK;Network;IRCClient;
|
|
||||||
--
|
|
||||||
2.41.0
|
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue