Compare commits
No commits in common. "c8" and "c10s" have entirely different histories.
21
.gitignore
vendored
21
.gitignore
vendored
@ -1 +1,20 @@
|
||||
SOURCES/hexchat-2.14.3.tar.xz
|
||||
/hexchat-2.9.4.tar.xz
|
||||
/hexchat-2.9.5.tar.xz
|
||||
/hexchat-2.9.6.tar.xz
|
||||
/hexchat-2.9.6.1.tar.xz
|
||||
/hexchat-2.10.0.tar.xz
|
||||
/hexchat-2.10.1.tar.xz
|
||||
/hexchat-2.10.2.tar.xz
|
||||
/hexchat-2.12.0.tar.xz
|
||||
/hexchat-2.12.1.tar.xz
|
||||
/91df075d62606ee295932f1dfefc98187b5ce839.patch
|
||||
/hexchat-2.12.2.tar.xz
|
||||
/hexchat-2.12.3.tar.xz
|
||||
/hexchat-2.12.4.tar.xz
|
||||
/hexchat-2.12.4-repack.tar.xz
|
||||
/hexchat-2.14.0.tar.xz
|
||||
/hexchat-2.14.1.tar.xz
|
||||
/hexchat-2.14.2.tar.xz
|
||||
/hexchat-2.14.3.tar.xz
|
||||
/hexchat-2.16.0.tar.xz
|
||||
/hexchat-2.16.1.tar.xz
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
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 []
|
||||
|
||||
@ -1,48 +0,0 @@
|
||||
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);
|
||||
@ -1,23 +0,0 @@
|
||||
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"},
|
||||
@ -1,28 +0,0 @@
|
||||
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
|
||||
@ -1,30 +0,0 @@
|
||||
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;
|
||||
@ -1,45 +0,0 @@
|
||||
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");
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
6
gating.yaml
Normal file
6
gating.yaml
Normal file
@ -0,0 +1,6 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
||||
@ -2,23 +2,12 @@
|
||||
|
||||
Summary: A popular and easy to use graphical IRC (chat) client
|
||||
Name: hexchat
|
||||
Version: 2.14.3
|
||||
Version: 2.16.1
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+
|
||||
URL: https://hexchat.github.io
|
||||
Source: https://dl.hexchat.net/hexchat/%{name}-%{version}.tar.xz
|
||||
|
||||
# Patch to link better to python 3.8
|
||||
Patch1: https://github.com/hexchat/hexchat/commit/5deb69591992d4fede9090b60d3dc847612a4d60.patch
|
||||
Patch2: python-plugin-from-master.patch
|
||||
Patch3: https://github.com/hexchat/hexchat/commit/163608d7fd861c2c4911a38f45be484c88626bdc.patch
|
||||
Patch4: https://github.com/hexchat/hexchat/commit/090fd29acf4af0d8e13fcf2861b14a356db72641.patch
|
||||
# Fix lua plugin to not segfault with lua 5.4.3
|
||||
Patch5: https://github.com/hexchat/hexchat/commit/90c91d6c9aa048eff8f8f8f888d37a21fd714522.patch
|
||||
# Move from freenode to Libera.chat
|
||||
Patch6: https://patch-diff.githubusercontent.com/raw/hexchat/hexchat/pull/2566.patch
|
||||
Patch7: https://github.com/hexchat/hexchat/commit/d3545f37cd5f551ed8bc0ab7b20e5c8140adc0a6.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: meson
|
||||
BuildRequires: hicolor-icon-theme
|
||||
@ -26,8 +15,6 @@ BuildRequires: pkgconfig(glib-2.0)
|
||||
BuildRequires: pkgconfig(gtk+-2.0)
|
||||
BuildRequires: pkgconfig(dbus-glib-1)
|
||||
BuildRequires: pkgconfig(libcanberra)
|
||||
BuildRequires: pkgconfig(libnotify)
|
||||
BuildRequires: pkgconfig(libproxy-1.0)
|
||||
BuildRequires: pkgconfig(iso-codes)
|
||||
BuildRequires: pkgconfig(openssl)
|
||||
BuildRequires: pkgconfig(python3)
|
||||
@ -52,10 +39,10 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
This package contains the development files for %{name}.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
%autosetup
|
||||
|
||||
%build
|
||||
%meson -Dwith-lua=lua
|
||||
%meson -Dwith-lua=lua %{?flatpak:-Ddbus-service-use-appid=true}
|
||||
%meson_build
|
||||
|
||||
%install
|
||||
@ -76,22 +63,117 @@ This package contains the development files for %{name}.
|
||||
%{_libdir}/hexchat/plugins/python.so
|
||||
%{_libdir}/hexchat/python
|
||||
%{_datadir}/applications/%{app_id}.desktop
|
||||
%{_datadir}/icons/hicolor/*/apps/%{name}.*
|
||||
%{_datadir}/icons/hicolor/*/apps/%{app_id}.*
|
||||
%{_datadir}/metainfo/%{app_id}.appdata.xml
|
||||
%if 0%{?flatpak}
|
||||
%{_datadir}/dbus-1/services/%{app_id}.service
|
||||
%else
|
||||
%{_datadir}/dbus-1/services/org.hexchat.service.service
|
||||
%{_mandir}/man1/*.gz
|
||||
%endif
|
||||
%{_mandir}/man1/hexchat.1*
|
||||
|
||||
%files devel
|
||||
%{_includedir}/hexchat-plugin.h
|
||||
%{_libdir}/pkgconfig/hexchat-plugin.pc
|
||||
|
||||
%changelog
|
||||
* Thu Sep 28 2023 Debarshi Ray <rishi@fedoraproject.org> 2.14.3-1
|
||||
- Update to 2.14.3
|
||||
- Pull in all the downstream fixes from Fedora
|
||||
Resolves: RHEL-767
|
||||
* Thu Sep 28 2023 Debarshi Ray <rishi@fedoraproject.org> - 2.16.1-1
|
||||
- Update to 2.16.1
|
||||
Resolves: RHEL-766
|
||||
|
||||
* Tue Jun 26 2018 Debarshi Ray <rishi@fedoraproject.org> 2.14.1-2
|
||||
* Mon Jul 10 2023 Debarshi Ray <rishi@fedoraproject.org> - 2.16.0-2
|
||||
- Unbreak notification icon
|
||||
Resolves: #2051561
|
||||
|
||||
* Mon Dec 13 2021 Debarshi Ray <rishi@fedoraproject.org> - 2.16.0-1
|
||||
- Update to 2.16.0
|
||||
Resolves: #1965883
|
||||
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.14.3-17
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Wed Jul 28 2021 Florian Weimer <fweimer@redhat.com> - 2.14.3-16
|
||||
- Rebuild to pick up OpenSSL 3.0 Beta ABI (#1984097)
|
||||
|
||||
* Mon Jul 12 2021 Debarshi Ray <rishi@fedoraproject.org> - 2.14.3-15
|
||||
- Avoid direct use of libproxy
|
||||
Resolves: #1981509
|
||||
|
||||
* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.14.3-14
|
||||
- Rebuilt for RHEL 9 BETA for openssl 3.0
|
||||
Related: rhbz#1971065
|
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.14.3-13
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Fri Mar 12 2021 Kevin Fenzi <kevin@scrye.com> - 2.14.3-12
|
||||
- Add patch to fix exception in python3 plugin.
|
||||
|
||||
* Sat Feb 06 2021 Mikel Olasagasti Uranga <mikel@olasagasti.info> - 2.14.3-11
|
||||
- Include patch to fix underscore not being printed correctly
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.3-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Fri Jan 15 2021 Kevin Fenzi <kevin@scrye.com> - 2.14.3-9
|
||||
- Fix typo in last commit
|
||||
|
||||
* Fri Jan 15 2021 Kevin Fenzi <kevin@scrye.com> - 2.14.3-8
|
||||
- Add missing dependency on cffi. Fixes rhbz#1914874
|
||||
|
||||
* Wed Dec 30 2020 Kevin Fenzi <kevin@scrye.com> - 2.14.3-7
|
||||
- Backport new python plugin from devel upstream. RHBZ#1883982
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.3-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 2.14.3-5
|
||||
- Perl 5.32 rebuild
|
||||
|
||||
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 2.14.3-4
|
||||
- Rebuilt for Python 3.9
|
||||
|
||||
* Fri Mar 27 2020 Kevin Fenzi <kevin@scrye.com> - 2.14.3-3
|
||||
- Add patch to link better against python3.8. Fixes #1817862
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Tue Jan 07 2020 Kevin Fenzi <kevin@scrye.com> - 2.14.3-1
|
||||
- Update to 2.14.3.
|
||||
|
||||
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 2.14.2-6
|
||||
- Rebuilt for Python 3.8
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.2-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 2.14.2-4
|
||||
- Perl 5.30 rebuild
|
||||
|
||||
* Tue Apr 30 2019 Adam Williamson <awilliam@redhat.com> - 2.14.2-3
|
||||
- Apply a fix suggested by ncoghlan for the crash-on-exit bug (#1632039)
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Thu Sep 06 2018 Gwyn Ciesla <limburgher@gmail.com> - 2.14.2-1
|
||||
- 2.14.2
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.1-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed Jul 04 2018 Petr Pisar <ppisar@redhat.com> - 2.14.1-5
|
||||
- Perl 5.28 rebuild
|
||||
|
||||
* Mon Jul 02 2018 Kevin Fenzi <kevin@scrye.com> - 2.14.1-4
|
||||
- Rebuild for python 3.7
|
||||
|
||||
* Wed Jun 27 2018 Jitka Plesnikova <jplesnik@redhat.com> - 2.14.1-3
|
||||
- Perl 5.28 rebuild
|
||||
|
||||
* Wed Mar 21 2018 Patrick Griffis <tingping@fedoraproject.org> 2.14.1-2
|
||||
- Always use lua over luajit, just more common
|
||||
- Remove no longer needed snippets
|
||||
- Add enchant/enchant2 to requires
|
||||
7
rpminspect.yaml
Normal file
7
rpminspect.yaml
Normal file
@ -0,0 +1,7 @@
|
||||
# https://one.redhat.com/rhel-developer-guide/#_modifying_a_per_package_rpminspect_yaml_file
|
||||
# https://github.com/rpminspect/rpminspect/blob/master/data/generic.yaml
|
||||
badfuncs:
|
||||
# RFE to ignore a specific function for a specific file:
|
||||
# https://issues.redhat.com/browse/OSCI-2690
|
||||
ignore:
|
||||
- /usr/bin/hexchat
|
||||
Loading…
Reference in New Issue
Block a user