[notify] hexchat: 2.12.4 -> 2.14.2
update python3 to 3.6.7-2 for important configuration symlinks, or else hexchat will fail to find python3 closes FS#1649
This commit is contained in:
Danny Rawlins
parent
88cff7f47b
commit
37564e1a30
@ -7,23 +7,16 @@ drwxr-xr-x root/root usr/include/
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
drwxr-xr-x root/root usr/lib/hexchat/
|
||||
drwxr-xr-x root/root usr/lib/hexchat/plugins/
|
||||
-rwxr-xr-x root/root usr/lib/hexchat/plugins/checksum.la
|
||||
-rwxr-xr-x root/root usr/lib/hexchat/plugins/checksum.so
|
||||
-rwxr-xr-x root/root usr/lib/hexchat/plugins/fishlim.la
|
||||
-rwxr-xr-x root/root usr/lib/hexchat/plugins/fishlim.so
|
||||
-rwxr-xr-x root/root usr/lib/hexchat/plugins/perl.la
|
||||
-rwxr-xr-x root/root usr/lib/hexchat/plugins/perl.so
|
||||
-rwxr-xr-x root/root usr/lib/hexchat/plugins/python.la
|
||||
-rwxr-xr-x root/root usr/lib/hexchat/plugins/python.so
|
||||
-rwxr-xr-x root/root usr/lib/hexchat/plugins/sysinfo.la
|
||||
-rwxr-xr-x root/root usr/lib/hexchat/plugins/sysinfo.so
|
||||
drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/hexchat-plugin.pc
|
||||
drwxr-xr-x root/root usr/share/
|
||||
drwxr-xr-x root/root usr/share/appdata/
|
||||
-rw-r--r-- root/root usr/share/appdata/hexchat.appdata.xml
|
||||
drwxr-xr-x root/root usr/share/applications/
|
||||
-rw-r--r-- root/root usr/share/applications/hexchat.desktop
|
||||
-rw-r--r-- root/root usr/share/applications/io.github.Hexchat.desktop
|
||||
drwxr-xr-x root/root usr/share/icons/
|
||||
drwxr-xr-x root/root usr/share/icons/hicolor/
|
||||
drwxr-xr-x root/root usr/share/icons/hicolor/48x48/
|
||||
@ -35,3 +28,5 @@ drwxr-xr-x root/root usr/share/icons/hicolor/scalable/apps/
|
||||
drwxr-xr-x root/root usr/share/man/
|
||||
drwxr-xr-x root/root usr/share/man/man1/
|
||||
-rw-r--r-- root/root usr/share/man/man1/hexchat.1.gz
|
||||
drwxr-xr-x root/root usr/share/metainfo/
|
||||
-rw-r--r-- root/root usr/share/metainfo/io.github.Hexchat.appdata.xml
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
untrusted comment: verify with /etc/ports/opt.pub
|
||||
RWSE3ohX2g5d/TzGa7BIeiTbgtRqB5Y2pLzC+UEfiDuoFRYwvW1RUeh4WlkJOcKD4NM1fwIieQXHmQBl1FjIXWbk7Eoc1/QRCgc=
|
||||
SHA256 (Pkgfile) = e584c24caebc1e61f924e1ce8068f5734a3111920adc24794b097a958f5893ee
|
||||
SHA256 (.footprint) = 23bf408e9ed745eb12003a6b2270de16b3a651b03374c34b29edec11ceac6cdd
|
||||
SHA256 (hexchat-2.12.4.tar.xz) = fa35913158bbc7d0d99de79371b6df3e8d21802f1d2c7c92f0e5db694acf2c3a
|
||||
SHA256 (hexchat-enchant2.0.patch) = d5f1e70b696337b15d40386292748483d2b27631a9bba6cfa5c97eae4f6987f1
|
||||
SHA256 (hexchat-enchant2.0_name.patch) = b9687999f8e013716ec997458de1db0d3618382a6963d5f6eb578fea253daa24
|
||||
RWSE3ohX2g5d/dt62tUhOiWIWsMnrTUIh8VJKR3H764CpI2l4q6BT4gK5caCq04erbb62fSgq5eM7+o1l1RGNriTxvckaaARXQc=
|
||||
SHA256 (Pkgfile) = a85db66ee677f3cdb857a022d64167e791d70cbfc047209bdcfde027c59826bb
|
||||
SHA256 (.footprint) = 890fbae8258fa479df98a709305dec29ce2e972446df597faf3fc2013476308b
|
||||
SHA256 (hexchat-2.14.2.tar.xz) = 7792b9e52560fbd3e10d75bfb5d138a20913a87771d676d296547f1b4ac09618
|
||||
|
||||
@ -1,38 +1,40 @@
|
||||
# Description: GTK+ based IRC client.
|
||||
# URL: http://hexchat.github.io/
|
||||
# Maintainer: Danny Rawlins, crux at romster dot me
|
||||
# Depends on: autoconf-archive gtk iso-codes libnotify pciutils xorg-libxdamage
|
||||
# Optional: enchant libcanberra lua
|
||||
# Depends on: gtk iso-codes xorg-libxdamage
|
||||
# Optional: dbus-glib desktop-file-utils enchant libcanberra libnotify libproxy lua pciutils
|
||||
|
||||
name=hexchat
|
||||
version=2.12.4
|
||||
release=3
|
||||
source=(http://dl.hexchat.net/hexchat/$name-$version.tar.xz
|
||||
hexchat-enchant2.0.patch
|
||||
hexchat-enchant2.0_name.patch)
|
||||
version=2.14.2
|
||||
release=1
|
||||
source=(http://dl.hexchat.net/hexchat/$name-$version.tar.xz)
|
||||
|
||||
build() {
|
||||
cd $name-$version
|
||||
|
||||
patch -p1 -i $SRC/hexchat-enchant2.0.patch
|
||||
patch -p1 -i $SRC/hexchat-enchant2.0_name.patch
|
||||
# Lua scripting plugin, value is pkg-config name
|
||||
prt-get isinst lua && PKGMK_HEXCHAT+=' -Dwith-lua=lua' || PKGMK_HEXCHAT+=' -Dwith-lua=false'
|
||||
|
||||
local LUA
|
||||
if [ "$(pkginfo -i | grep '^lua ')" ]; then
|
||||
LUA='--enable-lua'
|
||||
else
|
||||
LUA='--disable-lua'
|
||||
fi
|
||||
# Support for getting proxy information
|
||||
prt-get isinst libproxy || PKGMK_HEXCHAT+=' -Dwith-libproxy=false'
|
||||
|
||||
autoreconf -vi
|
||||
# Support for freedesktop notifications
|
||||
prt-get isinst libnotify || PKGMK_HEXCHAT+=' -Dwith-libnotify=false'
|
||||
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--enable-python=python2 \
|
||||
--enable-textfe $LUA
|
||||
# Support for sound alerts
|
||||
prt-get isinst libcanberra || PKGMK_HEXCHAT+=' -Dwith-libcanberra=false'
|
||||
|
||||
make
|
||||
make DESTDIR=$PKG install
|
||||
# Support used for single-instance and scripting interface
|
||||
prt-get isinst dbus-glib || PKGMK_HEXCHAT+=' -Dwith-dbus=false'
|
||||
|
||||
prt-get isinst pciutils && PKGMK_HEXCHAT+=' -Dwith-sysinfo=true'
|
||||
|
||||
meson build ${PKGMK_HEXCHAT} \
|
||||
--prefix /usr \
|
||||
-Dwith-text=true
|
||||
|
||||
ninja -C build -j ${JOBS:-1}
|
||||
DESTDIR="$PKG" ninja -C build install
|
||||
|
||||
rm -r $PKG/usr/share/locale
|
||||
}
|
||||
|
||||
@ -1,124 +0,0 @@
|
||||
From 005858795878b92fc17b4c2127bce90a1d053483 Mon Sep 17 00:00:00 2001
|
||||
From: Patrick Griffis <tingping@tingping.se>
|
||||
Date: Fri, 24 Nov 2017 03:51:10 -0500
|
||||
Subject: [PATCH] spell-entry: Improve robustness of enchant loading and fix
|
||||
2.0 support
|
||||
|
||||
- Add logging and error handling to loading symbols
|
||||
- Don't load unversioned symbol
|
||||
- Handle new function names in Enchant 2.0
|
||||
|
||||
Closes #2095
|
||||
---
|
||||
src/fe-gtk/sexy-spell-entry.c | 94 +++++++++++++++++++++++++------------------
|
||||
1 file changed, 55 insertions(+), 39 deletions(-)
|
||||
|
||||
diff --git a/src/fe-gtk/sexy-spell-entry.c b/src/fe-gtk/sexy-spell-entry.c
|
||||
index 566abcf3e..bd31d2239 100644
|
||||
--- a/src/fe-gtk/sexy-spell-entry.c
|
||||
+++ b/src/fe-gtk/sexy-spell-entry.c
|
||||
@@ -159,49 +159,65 @@ initialize_enchant (void)
|
||||
{
|
||||
GModule *enchant;
|
||||
gpointer funcptr;
|
||||
-
|
||||
-
|
||||
- enchant = g_module_open("libenchant."G_MODULE_SUFFIX, 0);
|
||||
- if (enchant == NULL)
|
||||
- {
|
||||
-#ifndef WIN32
|
||||
- enchant = g_module_open("libenchant.so.1", 0);
|
||||
- if (enchant == NULL)
|
||||
- {
|
||||
-#ifdef __APPLE__
|
||||
- enchant = g_module_open("libenchant.dylib", 0);
|
||||
- if (enchant == NULL)
|
||||
+ gsize i;
|
||||
+ const char * const libnames[] = {
|
||||
+#ifdef G_OS_WIN32
|
||||
+ "libenchant.dll",
|
||||
#endif
|
||||
- return;
|
||||
- }
|
||||
-#else
|
||||
- return;
|
||||
+#ifdef G_OS_UNIX
|
||||
+ "libenchant.so.1",
|
||||
+ "libenchant.so.2",
|
||||
#endif
|
||||
- }
|
||||
-
|
||||
- have_enchant = TRUE;
|
||||
-
|
||||
-#define MODULE_SYMBOL(name, func) \
|
||||
- g_module_symbol(enchant, (name), &funcptr); \
|
||||
- (func) = funcptr;
|
||||
-
|
||||
- MODULE_SYMBOL("enchant_broker_init", enchant_broker_init)
|
||||
- MODULE_SYMBOL("enchant_broker_free", enchant_broker_free)
|
||||
- MODULE_SYMBOL("enchant_broker_free_dict", enchant_broker_free_dict)
|
||||
- MODULE_SYMBOL("enchant_broker_list_dicts", enchant_broker_list_dicts)
|
||||
- MODULE_SYMBOL("enchant_broker_request_dict", enchant_broker_request_dict)
|
||||
-
|
||||
- MODULE_SYMBOL("enchant_dict_add_to_personal", enchant_dict_add_to_personal)
|
||||
- MODULE_SYMBOL("enchant_dict_add_to_session", enchant_dict_add_to_session)
|
||||
- MODULE_SYMBOL("enchant_dict_check", enchant_dict_check)
|
||||
- MODULE_SYMBOL("enchant_dict_describe", enchant_dict_describe)
|
||||
+#ifdef __APPLE__
|
||||
+ "libenchant.dylib",
|
||||
+#endif
|
||||
+ };
|
||||
+
|
||||
+ for (i = 0; i < G_N_ELEMENTS(libnames); ++i)
|
||||
+ {
|
||||
+ enchant = g_module_open(libnames[i], 0);
|
||||
+ if (enchant)
|
||||
+ {
|
||||
+ g_info ("Loaded %s", libnames[i]);
|
||||
+ have_enchant = TRUE;
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ if (!have_enchant)
|
||||
+ return;
|
||||
+
|
||||
+#define MODULE_SYMBOL(name, func, alt_name) G_STMT_START { \
|
||||
+ const char *funcname = name; \
|
||||
+ gboolean ret = g_module_symbol(enchant, funcname, &funcptr); \
|
||||
+ if (alt_name) { \
|
||||
+ funcname = alt_name; \
|
||||
+ ret = g_module_symbol(enchant, funcname, &funcptr); \
|
||||
+ } \
|
||||
+ if (ret == FALSE) { \
|
||||
+ g_warning ("Failed to find enchant symbol %s", funcname); \
|
||||
+ have_enchant = FALSE; \
|
||||
+ return; \
|
||||
+ } \
|
||||
+ (func) = funcptr; \
|
||||
+} G_STMT_END;
|
||||
+
|
||||
+ MODULE_SYMBOL("enchant_broker_init", enchant_broker_init, NULL)
|
||||
+ MODULE_SYMBOL("enchant_broker_free", enchant_broker_free, NULL)
|
||||
+ MODULE_SYMBOL("enchant_broker_free_dict", enchant_broker_free_dict, NULL)
|
||||
+ MODULE_SYMBOL("enchant_broker_list_dicts", enchant_broker_list_dicts, NULL)
|
||||
+ MODULE_SYMBOL("enchant_broker_request_dict", enchant_broker_request_dict, NULL)
|
||||
+
|
||||
+ MODULE_SYMBOL("enchant_dict_add_to_personal", enchant_dict_add_to_personal,
|
||||
+ "enchant_dict_add")
|
||||
+ MODULE_SYMBOL("enchant_dict_add_to_session", enchant_dict_add_to_session, NULL)
|
||||
+ MODULE_SYMBOL("enchant_dict_check", enchant_dict_check, NULL)
|
||||
+ MODULE_SYMBOL("enchant_dict_describe", enchant_dict_describe, NULL)
|
||||
MODULE_SYMBOL("enchant_dict_free_suggestions",
|
||||
- enchant_dict_free_suggestions)
|
||||
+ enchant_dict_free_suggestions, "enchant_dict_free_string_list")
|
||||
MODULE_SYMBOL("enchant_dict_store_replacement",
|
||||
- enchant_dict_store_replacement)
|
||||
- MODULE_SYMBOL("enchant_dict_suggest", enchant_dict_suggest)
|
||||
-
|
||||
-#undef MODULE_SYMBOL
|
||||
+ enchant_dict_store_replacement, NULL)
|
||||
+ MODULE_SYMBOL("enchant_dict_suggest", enchant_dict_suggest, NULL)
|
||||
}
|
||||
|
||||
static void
|
||||
@ -1,24 +0,0 @@
|
||||
From 234fe8698781f149df0e6928e48859f66b5e947b Mon Sep 17 00:00:00 2001
|
||||
From: Patrick Griffis <tingping@tingping.se>
|
||||
Date: Tue, 6 Feb 2018 16:57:30 -0500
|
||||
Subject: [PATCH] Fix Enchant 2.1.3+ support
|
||||
|
||||
They changed the lib name yet again...
|
||||
|
||||
Closes #2117
|
||||
---
|
||||
src/fe-gtk/sexy-spell-entry.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/fe-gtk/sexy-spell-entry.c b/src/fe-gtk/sexy-spell-entry.c
|
||||
index bd31d2239..dce19b829 100644
|
||||
--- a/src/fe-gtk/sexy-spell-entry.c
|
||||
+++ b/src/fe-gtk/sexy-spell-entry.c
|
||||
@@ -167,6 +167,7 @@ initialize_enchant (void)
|
||||
#ifdef G_OS_UNIX
|
||||
"libenchant.so.1",
|
||||
"libenchant.so.2",
|
||||
+ "libenchant-2.so.2",
|
||||
#endif
|
||||
#ifdef __APPLE__
|
||||
"libenchant.dylib",
|
||||
Loading…
Reference in New Issue
Block a user