From a9a8a80c9a1b23809d121ba95b9d45fc3b3bce08 Mon Sep 17 00:00:00 2001 From: 0x5c Date: Sat, 2 Oct 2021 16:31:29 -0400 Subject: [PATCH] hexchat: update to 2.16.0 and maintainer change - Remove obsolete [host]makedep 'libxml2-devel' as hexchat does not use libxml2 - Add makedep 'python3-cffi' - Add hostmakedep 'python3-cffi' for crossbuilds - Update configure args for dbus and tls (upstream renamed them) - Remove configure args for building the text interface (now disabled by default by upstream) - Add configure arg for libcanbera - Remove patch for cross compile (introduced in 32a4badf) The file it applies to is now unrecognisable, and the patch *seems* unneeded - Change the maintainer from Orphan - Remove obsolete 'update' file (project has moved to github releases) --- srcpkgs/hexchat/changelog-DNC | 12 ++++++++++++ srcpkgs/hexchat/depchanges-DNC | 3 +++ srcpkgs/hexchat/newflags-DNC | 17 +++++++++++++++++ srcpkgs/hexchat/patches/perl-link.patch | 20 -------------------- srcpkgs/hexchat/template | 20 ++++++++++---------- srcpkgs/hexchat/update | 2 -- 6 files changed, 42 insertions(+), 32 deletions(-) create mode 100644 srcpkgs/hexchat/changelog-DNC create mode 100644 srcpkgs/hexchat/depchanges-DNC create mode 100644 srcpkgs/hexchat/newflags-DNC delete mode 100644 srcpkgs/hexchat/patches/perl-link.patch delete mode 100644 srcpkgs/hexchat/update diff --git a/srcpkgs/hexchat/changelog-DNC b/srcpkgs/hexchat/changelog-DNC new file mode 100644 index 000000000000..76312d3a89b7 --- /dev/null +++ b/srcpkgs/hexchat/changelog-DNC @@ -0,0 +1,12 @@ +- Remove obsolete [host]makedep 'libxml2-devel' as hexchat does not use libxml2 +- Add makedep 'python3-cffi' +- Add hostmakedep 'python3-cffi' for crossbuilds +- Update configure args for dbus and tls (upstream renamed them) +- Remove configure args for building the text interface (now disabled by default by upstream) +- Add configure arg for libcanbera +- Remove patch for cross compile (introduced in 32a4badf) + The file it applies to is now unrecognisable, and the patch *seems* unneeded + +- Change the maintainer from Orphan + +- Remove obsolete 'update' file (project has moved to github releases) diff --git a/srcpkgs/hexchat/depchanges-DNC b/srcpkgs/hexchat/depchanges-DNC new file mode 100644 index 000000000000..3da286a3089e --- /dev/null +++ b/srcpkgs/hexchat/depchanges-DNC @@ -0,0 +1,3 @@ +makedeps: +X libxml2-devel ++ python3-cffi diff --git a/srcpkgs/hexchat/newflags-DNC b/srcpkgs/hexchat/newflags-DNC new file mode 100644 index 000000000000..9e118e0c22a2 --- /dev/null +++ b/srcpkgs/hexchat/newflags-DNC @@ -0,0 +1,17 @@ +-Ddbus=enabled <- -Dwith-dbus=true +? -Dtls=enabled <- -Dwith-ssl=true +X -Dwith-text=false +? -Dwith-perl=perl <- -Dwith-perl=/usr/bin/perl +-Dwith-python=python3 +-Dwith-lua=$(vopt_if LuaJIT luajit lua) + +new? + +-Dlibcanberra=enabled +-Dtheme-manager=true + + +for backup: +configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false + -Dwith-perl=/usr/bin/perl -Dwith-python=python3 + -Dwith-lua=$(vopt_if LuaJIT luajit lua)" diff --git a/srcpkgs/hexchat/patches/perl-link.patch b/srcpkgs/hexchat/patches/perl-link.patch deleted file mode 100644 index 66390dedd5f4..000000000000 --- a/srcpkgs/hexchat/patches/perl-link.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/plugins/perl/meson.build 2018-08-15 13:30:17.108881970 +0200 -+++ b/plugins/perl/meson.build 2018-08-15 13:30:36.682882751 +0200 -@@ -39,7 +39,7 @@ - perl_ldflags = [] - perl_rpath = '' - foreach flag : ret.stdout().strip().split(' ') -- if flag.startswith('-L') or flag.startswith('-l') -+ if flag.startswith('-l') - perl_ldflags += flag - endif - if flag.startswith('-Wl,-rpath,') -@@ -52,6 +52,8 @@ - endif - endforeach - -+perl_ldflags += '-L${XBPS_CROSS_BASE}/usr/lib/perl5/core_perl/CORE' -+ - perl_cflags += [ - # Perl has its own 'config.h' that we must override - # TODO: Just rename ours to something more unique. diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template index 8bd4b443f7d9..f2e356f54736 100644 --- a/srcpkgs/hexchat/template +++ b/srcpkgs/hexchat/template @@ -1,23 +1,23 @@ # Template file for 'hexchat' pkgname=hexchat -version=2.14.3 -revision=6 +version=2.16.0 +revision=1 build_style=meson -configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false +configure_args="-Ddbus=enabled -Dtls=enabled -Dwith-text=false -Dwith-perl=/usr/bin/perl -Dwith-python=python3 - -Dwith-lua=$(vopt_if LuaJIT luajit lua)" + -Dwith-lua=$(vopt_if LuaJIT luajit lua) -Dlibcanberra=enabled" hostmakedepends="gettext pkg-config glib-devel" makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel - libcanberra-devel libxml2-devel pciutils-devel libproxy-devel - iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)" + libcanberra-devel pciutils-devel libproxy-devel iso-codes + python3-devel python3-cffi $(vopt_if LuaJIT LuaJIT-devel lua53-devel)" depends="desktop-file-utils enchant2" short_desc="GTK+ based IRC client successor of Xchat" -maintainer="Orphaned " +maintainer="0x5c " license="GPL-2.0-or-later" homepage="https://hexchat.github.io/" changelog="https://hexchat.readthedocs.org/en/latest/changelog.html" -distfiles="https://dl.hexchat.net/hexchat/${pkgname}-${version}.tar.xz" -checksum=901a9d13db5a4da69b827f6093306bbd16863dc49016f7668bd3e4506512e882 +distfiles="https://github.com/hexchat/hexchat/archive/v${version}.tar.gz" +checksum=5c7f35317bb3bc437fc5fb57392ddc13ba11c173718cdfe4de89d69c30a40b06 build_options="LuaJIT" lib32disabled=yes @@ -27,7 +27,7 @@ case "$XBPS_TARGET_MACHINE" in esac if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" dbus-glib-devel libxml2-devel gdk-pixbuf perl + hostmakedepends+=" dbus-glib-devel python3-cffi gdk-pixbuf perl shared-mime-info" fi diff --git a/srcpkgs/hexchat/update b/srcpkgs/hexchat/update deleted file mode 100644 index c2af9761bb72..000000000000 --- a/srcpkgs/hexchat/update +++ /dev/null @@ -1,2 +0,0 @@ -pkgname=HexChat -site=https://dl.hexchat.net/hexchat/