Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (ddc708fdd2e5ba325a8d33ca41561d20f825368b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (ddc708fdd2e5ba325a8d33ca41561d20f825368b)
  • Date: Sun, 24 Jul 2022 15:57:28 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

chat-irc/hexchat/CONFIGURE | 95
++++++++++++++++++++++++----------------
chat-irc/hexchat/DEPENDS | 90 +++++++++++--------------------------
chat-irc/hexchat/DETAILS | 8 +--
chat-irc/hexchat/HISTORY | 7 ++
chat-irc/hexchat/INSTALL | 4 -
chat-irc/hexchat/PRE_BUILD | 12 -----
chat-irc/hexchat/libressl.patch | 49 --------------------
chat-irc/hexchat/no-mono.patch | 28 -----------
8 files changed, 94 insertions(+), 199 deletions(-)

New commits:
commit ddc708fdd2e5ba325a8d33ca41561d20f825368b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

hexchat 2.16.1

diff --git a/chat-irc/hexchat/CONFIGURE b/chat-irc/hexchat/CONFIGURE
index 31c0e9d..e0fa901 100755
--- a/chat-irc/hexchat/CONFIGURE
+++ b/chat-irc/hexchat/CONFIGURE
@@ -1,44 +1,63 @@
-# remove obsolete options from HEXCHAT_OPTS
-list_remove HEXCHAT_OPTS '--enable-threads=pth' &&
-list_remove HEXCHAT_OPTS '--disable-theads' &&
-list_remove HEXCHAT_OPTS '--enable-xft' &&
-list_remove HEXCHAT_OPTS '--disable-xft' &&
-list_remove HEXCHAT_OPTS '--enable-shm' &&
-list_remove HEXCHAT_OPTS '--disable-shm' &&
-list_remove HEXCHAT_OPTS '--enable-mmx' &&
-list_remove HEXCHAT_OPTS '--disable-mmx' &&
-list_remove HEXCHAT_OPTS '--enable-sasl' &&
-list_remove HEXCHAT_OPTS '--disable-sasl' &&
-list_remove HEXCHAT_OPTS '--enable-ipv6' &&
-list_remove HEXCHAT_OPTS '--disable-ipv6' &&
-list_remove HEXCHAT_OPTS '--enable-doat' &&
-list_remove HEXCHAT_OPTS '--disable-doat' &&
+persistent_remove HEXCHAT_NO_MONO &&
+. "$GRIMOIRE"/MESON_CONFIGURE &&

-config_query_option HEXCHAT_OPTS "Build the text frontend?" n \
- "--enable-textfe" \
- "--disable-textfe" &&
+# Update autotools options to meson options
+for i in $HEXCHAT_OPTS; do
+ case "$i" in
+ (--disable-checksum) newopt=with-checksum=false;;
+ (--disable-dbus) newopt=dbus=disabled;;
+ (--disable-fishlim) newopt=with-fishlim=false;;
+ (--disable-gtkfe) newopt=gtk-frontend=false;;
+ (--disable-libcanberra) newopt=libcanberra=disabled;;
+ (--disable-lua) newopt=with-lua=false;;
+ (--disable-openssl) newopt=tls=disabled;;
+ (--disable-perl) newopt=with-perl=false;;
+ (--disable-plugin) newopt=plugin=false;;
+ (--disable-python) newopt=with-python=false;;
+ (--disable-sysinfo) newopt=with-sysinfo=false;;
+ (--disable-textfe) newopt=text-frontend=false;;
+ (--enable-checksum) newopt=with-checksum=true;;
+ (--enable-dbus) newopt=dbus=enabled;;
+ (--enable-fishlim) newopt=with-fishlim=true;;
+ (--enable-gtkfe) newopt=gtk-frontend=true;;
+ (--enable-libcanberra) newopt=libcanberra=enabled;;
+ (--enable-lua) newopt=with-lua=luajit;;
+ (--enable-openssl*) newopt=tls=enabled;;
+ (--enable-perl) newopt=with-perl=perl;;
+ (--enable-plugin) newopt=plugin=true;;
+ (--enable-python) newopt=with-python=python3;;
+ (--enable-sysinfo) newopt=with-sysinfo=true;;
+ (--enable-textfe) newopt=text-frontend=true;;
+ (--with-theme-manager) newopt=theme-manager=true;;
+ (--without-theme-manager) newopt=theme-manager=false;;
+ (--*)
+ # Remove obsolete/unknown options
+ message "${PROBLEM_COLOR}WARNING: Unknown option '$i';" \
+ "removing$DEFAULT_COLOR"
+ list_remove HEXCHAT_OPTS "$i"
+ ;&
+ (*) continue;;
+ esac &&
+ list_remove HEXCHAT_OPTS "$i" &&
+ list_add HEXCHAT_OPTS "$newopt" || return 1
+done &&

+config_query_option HEXCHAT_OPTS "Build the text frontend?" n \
+ text-frontend={true,false} &&
config_query_option HEXCHAT_OPTS "Enable plugin support?" y \
- "--enable-plugin" \
- "--disable-plugin" &&
-
-if list_find "$HEXCHAT_OPTS" "--enable-plugin"; then
- config_query_option HEXCHAT_OPTS "Enable checksum plugin?" y \
- "--enable-checksum" \
- "--disable-checksum" &&
-
- config_query_option HEXCHAT_OPTS "Enable FiSHLiM plugin?" y \
- "--enable-fishlim" \
- "--disable-fishlim" &&
+ plugin={true,false} &&

+if list_find "$HEXCHAT_OPTS" "plugin=true"; then
+ config_query_option HEXCHAT_OPTS "Enable the legacy IRC perl module for
compatilibity with old scripts?" n \
+ with-perl-legacy-api={true,false} &&
+ config_query_option HEXCHAT_OPTS "Enable DCC checksum plugin?" y \
+ with-checksum={true,false} &&
+ config_query_option HEXCHAT_OPTS "Enable FiSH encryption plugin?" y \
+ with-fishlim={true,false} &&
config_query_option HEXCHAT_OPTS "Enable sysinfo plugin?" y \
- "--enable-sysinfo" \
- "--disable-sysinfo"
+ with-systinfo={true,false}
else
- list_add HEXCHAT_OPTS '--disable-checksum' &&
- list_add HEXCHAT_OPTS '--disable-doat' &&
- list_add HEXCHAT_OPTS '--disable-fishlim' &&
- list_add HEXCHAT_OPTS '--disable-sysinfo'
-fi &&
-
-config_query HEXCHAT_NO_MONO "Apply patch to prevent from forcing monospace
fonts (useful for pixel font users)?" n
+ list_add HEXCHAT_OPTS 'with-checksum=false' &&
+ list_add HEXCHAT_OPTS 'with-fishlim=false' &&
+ list_add HEXCHAT_OPTS 'with-sysinfo=false'
+fi
diff --git a/chat-irc/hexchat/DEPENDS b/chat-irc/hexchat/DEPENDS
index 0a5da2e..81d3a05 100755
--- a/chat-irc/hexchat/DEPENDS
+++ b/chat-irc/hexchat/DEPENDS
@@ -1,84 +1,48 @@
+persistent_remove HEXCHAT_PYTHON &&
+. "$GRIMOIRE"/MESON_DEPENDS &&
depends glib2 &&
-depends autoconf-archive &&
-
-optional_depends GETTEXT \
- "--enable-nls" \
- "--disable-nls" \
- "for Native Language Support" &&
+depends GETTEXT &&

optional_depends SSL \
- "--enable-openssl=/usr/bin/openssl" \
- "--disable-openssl" \
- "to enable use of openSSL" &&
+ tls={enabled,disabled} \
+ "for TLS connections support" &&

optional_depends gtk+2 \
- "--enable-gtkfe" \
- "--disable-gtkfe" \
- "for building gtk frontend" &&
+ gtk-frontend={true,false} \
+ "for building the graphical interface" &&

-if list_find "$HEXCHAT_OPTS" "--disable-textfe" && ! is_depends_enabled
$SPELL gtk+2; then
+if list_find "$HEXCHAT_OPTS" "text-frontend=false" &&
+ ! is_depends_enabled "$SPELL" gtk+2
+then
message "${PROBLEM_COLOR}No frontend selected,
aborting...${DEFAULT_COLOR}" &&
return 1
fi &&

-if list_find "$HEXCHAT_OPTS" "--enable-plugin"; then
- config_query_list HEXCHAT_PYTHON "Which version do you want for Python
scripting support?" \
- none \
- python2 \
- python3 &&
-
- case $HEXCHAT_PYTHON in
- none)
- list_add HEXCHAT_OPTS '--disable-python'
- ;;
- python2)
- depends python '--enable-python=python2'
- ;;
- python3)
- depends python3 '--enable-python=python3'
- ;;
- esac &&
-
+if list_find "$HEXCHAT_OPTS" plugin=true; then
+ optional_depends python3 \
+ with-python={python3,false} \
+ "for Python scripting support" &&
optional_depends perl \
- "--enable-perl" \
- "--disable-perl" \
+ with-perl={perl,false} \
"for Perl scripting support" &&
-
- optional_depends LUA \
- "--enable-lua" \
- "--disable-lua" \
+ # FIXME enable using lua too
+ optional_depends luajit \
+ with-lua={luajit,false}
"for Lua scripting support"
else
- list_add HEXCHAT_OPTS '--disable-python' &&
- list_add HEXCHAT_OPTS '--disable-perl'
+ list_add HEXCHAT_OPTS 'with-lua=false' &&
+ list_add HEXCHAT_OPTS 'with-python=false' &&
+ list_add HEXCHAT_OPTS 'with-perl=false'
fi &&

optional_depends dbus \
- "--enable-dbus" \
- "--disable-dbus" \
- "to enable DBUS support" &&
-
-optional_depends libnotify \
- "--enable-libnotify" \
- "--disable-libnotify" \
- "to enable libnotify support" &&
-
-optional_depends iso-codes \
- "--enable-isocodes" \
- "--disable-isocodes" \
- "for iso-codes with spell-check" &&
+ dbus={enabled,disabled} \
+ "for singe-instance and scripting" &&

optional_depends libcanberra \
- "--enable-libcanberra" \
- "--disable-libcanberra" \
- "for libcanberra support" &&
-
-optional_depends libproxy \
- "--enable-libproxy" \
- "--disable-libproxy" \
- "for libproxy support" &&
+ libcanberra={enabled,disabled} \
+ "for sound alerts" &&

optional_depends monodevelop \
- "--with-theme-manager" \
- "--without-theme-manager" \
- "to compile theme manager"
+ theme-manager={true,false} \
+ "to compile the theme manager"
diff --git a/chat-irc/hexchat/DETAILS b/chat-irc/hexchat/DETAILS
index 16634c2..dacdc8a 100755
--- a/chat-irc/hexchat/DETAILS
+++ b/chat-irc/hexchat/DETAILS
@@ -1,12 +1,10 @@
+. "$GRIMOIRE"/MESON_FUNCTIONS
SPELL=hexchat
- VERSION=2.12.4
+ VERSION=2.16.1
SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE2=$SOURCE.asc
+
SOURCE_HASH=sha256:a7e497da71df419daf9855582d51c723a2611de25d5e97b5efc33fe78da5c4c7
SOURCE_URL[0]=https://dl.hexchat.net/$SPELL/$SOURCE
- SOURCE2_URL[0]=$SOURCE_URL.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_GPG=hexchat.gpg:$SOURCE2:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
WEB_SITE=http://www.hexchat.org/
ENTERED=20120909
LICENSE[0]=GPL
diff --git a/chat-irc/hexchat/HISTORY b/chat-irc/hexchat/HISTORY
index 90e9ee7..f2a3ae0 100644
--- a/chat-irc/hexchat/HISTORY
+++ b/chat-irc/hexchat/HISTORY
@@ -1,3 +1,10 @@
+2022-07-24 Ismael Luceno <ismael AT iodev.co.uk>
+ * INSTALL, PRE_BUILD, libressl.patch, no-mono.patch:
+ removed, lo longer needed
+ * CONFIGURE, DEPENDS, DETAILS:
+ updated spell to 2.16.1
+ switched to meson
+
2019-05-18 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: Update dependency; s/gettext/GETTEXT/

diff --git a/chat-irc/hexchat/INSTALL b/chat-irc/hexchat/INSTALL
deleted file mode 100755
index 8c58061..0000000
--- a/chat-irc/hexchat/INSTALL
+++ /dev/null
@@ -1,4 +0,0 @@
-# actually it's false
-make UPDATE_MIME_DATABASE=true install &&
-
-install -vm 644 "src/common/hexchat-plugin.h" "$INSTALL_ROOT/usr/include"
diff --git a/chat-irc/hexchat/PRE_BUILD b/chat-irc/hexchat/PRE_BUILD
deleted file mode 100755
index 69b6cee..0000000
--- a/chat-irc/hexchat/PRE_BUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-if is_depends_enabled $SPELL $(get_spell_provider $SPELL SSL) && [[
$(get_spell_provider $SPELL SSL) == "libressl" ]]; then
- patch -p0 < "$SPELL_DIRECTORY/libressl.patch"
-fi &&
-
-if [[ $HEXCHAT_NO_MONO == y ]]; then
- patch -p0 < "$SPELL_DIRECTORY/no-mono.patch"
-fi &&
-
-autoreconf -fi
diff --git a/chat-irc/hexchat/libressl.patch b/chat-irc/hexchat/libressl.patch
deleted file mode 100644
index 284a484..0000000
--- a/chat-irc/hexchat/libressl.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- src/common/ssl.c.orig 2016-10-23 03:40:01.000000000 -0400
-+++ src/common/ssl.c 2016-12-30 11:36:06.582192488 -0500
-@@ -176,7 +176,7 @@
- return 1;
-
- alg = OBJ_obj2nid (algor->algorithm);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- sign_alg = OBJ_obj2nid (peer_cert->sig_alg->algorithm);
- #else
- sign_alg = X509_get_signature_nid (peer_cert);
-@@ -306,7 +306,7 @@
-
- SSL_set_fd (ssl, sd);
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- method = ctx->method;
- #else
- method = SSL_CTX_get_ssl_method (ctx);
---- plugins/fishlim/dh1080.c.orig 2016-10-23 03:40:01.000000000 -0400
-+++ plugins/fishlim/dh1080.c 2016-12-30 11:41:45.356343478 -0500
-@@ -74,7 +74,7 @@
-
- BN_set_word (g, 2);
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- g_dh->p = p;
- g_dh->g = g;
- #else
-@@ -162,7 +162,7 @@
- return 0;
- }
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- dh_pub_key = dh->pub_key;
- dh_priv_key = dh->priv_key;
- #else
-@@ -213,7 +213,7 @@
-
- priv_key_data = dh1080_decode_b64 (priv_key, &priv_key_len);
- priv_key_num = BN_bin2bn(priv_key_data, priv_key_len, NULL);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- dh->priv_key = priv_key_num;
- #else
- DH_set0_key (dh, NULL, priv_key_num);
diff --git a/chat-irc/hexchat/no-mono.patch b/chat-irc/hexchat/no-mono.patch
deleted file mode 100644
index 9f13417..0000000
--- a/chat-irc/hexchat/no-mono.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Addresses: https://github.com/hexchat/hexchat/issues/1990
---- src/fe-gtk/maingui.c.orig 2016-11-11 19:20:35.000000000 -0500
-+++ src/fe-gtk/maingui.c 2017-04-08 22:52:19.421637506 -0400
-@@ -1965,17 +1965,16 @@
- static GtkWidget *
- mg_create_flagbutton (char *tip, GtkWidget *box, char *face)
- {
-- GtkWidget *btn, *lbl;
-- char label_markup[16];
-+ GtkWidget *btn, *lbl_tst;
-+ GtkRequisition req;
-
-- g_snprintf (label_markup, sizeof(label_markup), "<tt>%s</tt>", face);
-- lbl = gtk_label_new (NULL);
-- gtk_label_set_markup (GTK_LABEL(lbl), label_markup);
-+ lbl_tst = gtk_label_new("W");
-+ gtk_widget_size_request(lbl_tst, &req);
-+ gtk_widget_destroy (lbl_tst);
-
-- btn = gtk_toggle_button_new ();
-- gtk_widget_set_size_request (btn, -1, 0);
-+ btn = gtk_toggle_button_new_with_label (face);
-+ gtk_widget_set_size_request (btn, req.width + 10, 0);
- gtk_widget_set_tooltip_text (btn, tip);
-- gtk_container_add (GTK_CONTAINER(btn), lbl);
-
- gtk_box_pack_start (GTK_BOX (box), btn, 0, 0, 0);
- g_signal_connect (G_OBJECT (btn), "toggled",



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (ddc708fdd2e5ba325a8d33ca41561d20f825368b), Ismael Luceno, 07/24/2022

Archive powered by MHonArc 2.6.24.

Top of Page