[trunk] -> [community-testing] 'hexchat-2.16.0-1' add
This commit is contained in:
Nathan
File diff suppressed because it is too large
Load Diff
@@ -1,13 +0,0 @@
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index 100a5ee7..c2a2f53c 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -48,7 +48,7 @@ option('with-lua', type: 'string', value: 'luajit',
|
||||
option('with-perl', type: 'string', value: 'perl',
|
||||
description: 'Perl scripting plugin, value is path to perl executable or "false"'
|
||||
)
|
||||
-option('with-python', type: 'string', value: 'python3',
|
||||
+option('with-python', type: 'string', value: 'python3-embed',
|
||||
description: 'Python scripting plugin. value is pkg-config name to use or "false"'
|
||||
)
|
||||
option('with-sysinfo', type: 'boolean',
|
||||
@@ -1,44 +0,0 @@
|
||||
commit 163608d7fd861c2c4911a38f45be484c88626bdc
|
||||
Author: John Levon <levon@movementarian.org>
|
||||
Date: Mon Sep 7 17:53:31 2020 +0100
|
||||
|
||||
Use pango_font_metrics_get_height() to calculate font height (#2500)
|
||||
|
||||
diff --git a/src/fe-gtk/xtext.c b/src/fe-gtk/xtext.c
|
||||
index fac0c4e6..418bb4da 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);
|
||||
@@ -1,30 +0,0 @@
|
||||
From d6319bd8f21042db62f6c7094066052d894416ef 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;
|
||||
@@ -2,41 +2,25 @@
|
||||
# Contributor: TingPing <tingping@tingping.se>
|
||||
|
||||
pkgname=hexchat
|
||||
pkgver=2.14.3
|
||||
pkgrel=9
|
||||
pkgver=2.16.0
|
||||
pkgrel=1
|
||||
pkgdesc='A popular and easy to use graphical IRC (chat) client'
|
||||
arch=('x86_64')
|
||||
url='https://hexchat.github.io/'
|
||||
license=('GPL')
|
||||
depends=('dbus-glib' 'desktop-file-utils' 'gdk-pixbuf2' 'glib2' 'gtk2'
|
||||
'libcanberra' 'libnotify' 'libproxy' 'openssl' 'pango' 'pciutils')
|
||||
'libcanberra' 'openssl' 'pango' 'pciutils')
|
||||
makedepends=('git' 'intltool' 'iso-codes' 'lua' 'meson' 'perl' 'python-cffi')
|
||||
optdepends=('enchant: Spell check'
|
||||
'iso-codes: Display language names instead of codes'
|
||||
'lua: Lua plugin'
|
||||
'perl: Perl plugin'
|
||||
'python-cffi: Python plugin')
|
||||
source=("git+https://github.com/hexchat/hexchat.git#tag=v${pkgver}"
|
||||
'0001-python-cffi.patch'
|
||||
'0002-python-3-8.patch'
|
||||
'0003-Use-pango_font_metrics_get_height-to-calculate-font-height.patch'
|
||||
'0004-fix_segfault_on_lua_pop_with_Lua_5.4.3.patch')
|
||||
sha256sums=('SKIP'
|
||||
'35067ddd80f982a7ffe029533a2a27faeb2c2272822451ddc91052a2c96276a0'
|
||||
'8d17ce657e744272815b5fb33d8ad959f79ece3294349637eaadcf86d90496fa'
|
||||
'691f344479a8b1186008516f0ebe7e3d482059cd297f58573634fa5a58f3d0ca'
|
||||
'a8d6917deec758b3a822471316f0bd7819d3661ef6f657c52953711227a2cbe6')
|
||||
|
||||
prepare() {
|
||||
cd hexchat
|
||||
patch -Np1 < ../0001-python-cffi.patch
|
||||
patch -Np1 < ../0002-python-3-8.patch
|
||||
patch -Np1 < ../0003-Use-pango_font_metrics_get_height-to-calculate-font-height.patch
|
||||
patch -Np1 < ../0004-fix_segfault_on_lua_pop_with_Lua_5.4.3.patch
|
||||
}
|
||||
source=("git+https://github.com/hexchat/hexchat.git#tag=v${pkgver}")
|
||||
sha256sums=('SKIP')
|
||||
|
||||
build() {
|
||||
arch-meson hexchat build \
|
||||
artix-meson hexchat build \
|
||||
-Dwith-lua='lua' \
|
||||
-Dwith-text='true'
|
||||
ninja -C build
|
||||
|
||||
33
x86_64/community-testing/PKGBUILD
Normal file
33
x86_64/community-testing/PKGBUILD
Normal file
@@ -0,0 +1,33 @@
|
||||
# Maintainer: Maxime Gauduin <alucryd@archlinux.org>
|
||||
# Contributor: TingPing <tingping@tingping.se>
|
||||
|
||||
pkgname=hexchat
|
||||
pkgver=2.16.0
|
||||
pkgrel=1
|
||||
pkgdesc='A popular and easy to use graphical IRC (chat) client'
|
||||
arch=('x86_64')
|
||||
url='https://hexchat.github.io/'
|
||||
license=('GPL')
|
||||
depends=('dbus-glib' 'desktop-file-utils' 'gdk-pixbuf2' 'glib2' 'gtk2'
|
||||
'libcanberra' 'openssl' 'pango' 'pciutils')
|
||||
makedepends=('git' 'intltool' 'iso-codes' 'lua' 'meson' 'perl' 'python-cffi')
|
||||
optdepends=('enchant: Spell check'
|
||||
'iso-codes: Display language names instead of codes'
|
||||
'lua: Lua plugin'
|
||||
'perl: Perl plugin'
|
||||
'python-cffi: Python plugin')
|
||||
source=("git+https://github.com/hexchat/hexchat.git#tag=v${pkgver}")
|
||||
sha256sums=('SKIP')
|
||||
|
||||
build() {
|
||||
artix-meson hexchat build \
|
||||
-Dwith-lua='lua' \
|
||||
-Dwith-text='true'
|
||||
ninja -C build
|
||||
}
|
||||
|
||||
package() {
|
||||
DESTDIR="${pkgdir}" ninja -C build install
|
||||
}
|
||||
|
||||
# vim: ts=2 sw=2 et:
|
||||
Reference in New Issue
Block a user