Re: [PR PATCH] [Updated] New package: Shortwave-2.0.1

[q66 <q66@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1709 bytes --]

There is an updated pull request by q66 against master on the void-packages repository

https://github.com/oynqr/void-packages shortwave
https://github.com/void-linux/void-packages/pull/29157

New package: Shortwave-2.0.1
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

I did not find what causes the x86_64-musl builds to fail, any help with that would be appreciated.
Closes #28886

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29157.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-shortwave-29157.patch --]
[-- Type: text/x-diff, Size: 12569 bytes --]

From 5c8f387f1a5d7b2e86e354dba907e1c3e36f2d47 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 1 Aug 2021 10:40:12 +0200
Subject: [PATCH 1/3] New package: libgnt-2.14.2.

---
 srcpkgs/libgnt                        |   1 -
 srcpkgs/libgnt-devel                  |   2 +-
 srcpkgs/libgnt/patches/cross-fix.diff | 130 ++++++++++++++++++++++++++
 srcpkgs/libgnt/template               |  31 ++++++
 4 files changed, 162 insertions(+), 2 deletions(-)
 delete mode 120000 srcpkgs/libgnt
 create mode 100644 srcpkgs/libgnt/patches/cross-fix.diff
 create mode 100644 srcpkgs/libgnt/template

diff --git a/srcpkgs/libgnt b/srcpkgs/libgnt
deleted file mode 120000
index d5dc3b19c846..000000000000
--- a/srcpkgs/libgnt
+++ /dev/null
@@ -1 +0,0 @@
-pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt-devel b/srcpkgs/libgnt-devel
index d5dc3b19c846..28acf62a72ac 120000
--- a/srcpkgs/libgnt-devel
+++ b/srcpkgs/libgnt-devel
@@ -1 +1 @@
-pidgin
\ No newline at end of file
+libgnt
\ No newline at end of file
diff --git a/srcpkgs/libgnt/patches/cross-fix.diff b/srcpkgs/libgnt/patches/cross-fix.diff
new file mode 100644
index 000000000000..060ced3d0c1f
--- /dev/null
+++ b/srcpkgs/libgnt/patches/cross-fix.diff
@@ -0,0 +1,130 @@
+diff --git a/meson.build b/meson.build
+index 1084c82..7f824b9 100644
+--- a/meson.build
++++ b/meson.build
+@@ -70,67 +70,77 @@ gnt_config.set('NO_LIBXML', not libxml.found())
+ # Check for ncurses and other things used by it
+ #######################################################################
+ ncurses_available = true
+-ncurses_inc = []
+-# The order of this list is important to the condition that follows.
+-ncurses_libs = [
+-	compiler.find_library('ncursesw', required : false),
+-	compiler.find_library('panelw', required : false),
+-	compiler.find_library('tinfow', required : false),
++ncurses_widechar = true
++ncurses_header = 'ncurses.h'
++# Some distros put the headers in ncursesw/, some don't. These are ordered to
++# pick the last available as most-specific version.
++ncursesw_header_paths = ['', 'ncursesw/']
++ncurses = [
++	dependency('ncursesw', required : false),
++	dependency('panelw', required : false),
+ ]
+-if not ncurses_libs[0].found() or not ncurses_libs[1].found()
+-	ncurses_available = false
+-endif
+-
+-if host_machine.system() == 'windows'
+-	# FIXME: $host ?
+-	ncurses_sys_prefix = '/usr/$host/sys-root/mingw'
++if ncurses[0].found() and ncurses[1].found()
++	foreach location : ncursesw_header_paths
++		f = location + 'ncurses.h'
++		if compiler.has_header_symbol(f, 'get_wch',
++		    prefix : '#define _XOPEN_SOURCE_EXTENDED')
++			ncurses_header = f
++		endif
++	endforeach
+ else
+-	ncurses_sys_prefix = '/usr'
+-endif
+-
+-ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw',
+-                    ncurses_sys_prefix + '/include']
+-
+-if ncurses_available
+-	# Some distros put the headers in ncursesw/, some don't
+-	found_ncurses_h = false
+-	foreach location : ncurses_sys_dirs
+-		f = location + '/ncurses.h'
+-		if not found_ncurses_h
++	ncurses_available = false
++	ncurses_inc = []
++	ncurses_libs = [
++		compiler.find_library('ncursesw', required : false),
++		compiler.find_library('panelw', required : false)
++	]
++	if ncurses_libs[0].found() and ncurses_libs[1].found()
++		foreach location : ncursesw_header_paths
++			f = location + 'ncurses.h'
+ 			if compiler.has_header_symbol(f, 'get_wch',
+ 			    prefix : '#define _XOPEN_SOURCE_EXTENDED')
+-				if location != '.'
+-					ncurses_inc += [include_directories(location)]
+-				endif
+-				found_ncurses_h = true
++				ncurses_available = true
++				ncurses_header = f
+ 			endif
++		endforeach
++		if ncurses_available
++			ncurses = declare_dependency(
++			    include_directories : ncurses_inc,
++			    dependencies : ncurses_libs
++			)
+ 		endif
+-	endforeach
+-
+-	if not found_ncurses_h
+-		ncurses_inc = []
+-		ncurses_libs = []
+-		ncurses_available = false
+ 	endif
+-else
++endif
++if not ncurses_available
+ 	# ncursesw was not found. Look for plain old ncurses
+-	# The order of this list is important to the condition that follows.
+-	ncurses_libs = [
+-		compiler.find_library('ncurses', required : false),
+-		compiler.find_library('panel', required : false),
+-		compiler.find_library('tinfo', required : false),
++	ncurses = [
++		dependency('ncurses', required : false),
++		dependency('panel', required : false),
+ 	]
+-	ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
+-	gnt_config.set('NO_WIDECHAR', true)
++	if ncurses[0].found() and ncurses_libs[1].found()
++		ncurses_available = true
++	else
++		ncurses_libs = [
++			compiler.find_library('ncurses', required : false),
++			compiler.find_library('panel', required : false),
++		]
++		ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
++		ncurses = declare_dependency(dependencies : ncurses_libs)
++	endif
++	ncurses_widechar = false
++endif
++if not ncurses_available and host_machine.system() == 'windows'
++	# Try pdcurses too.
++	ncurses_header = 'curses.h'
++	ncurses_libs = compiler.find_library('pdcurses', required : false)
++	ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found()
++	ncurses = declare_dependency(dependencies : ncurses_libs)
+ endif
+ if not ncurses_available
+ 	error('ncurses could not be found!')
+ endif
+-
+-ncurses = declare_dependency(
+-    include_directories : ncurses_inc,
+-    dependencies : ncurses_libs
+-)
++gnt_config.set('NCURSES_HEADER', ncurses_header)
++gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar)
+ 
+ libgnt_SOURCES = [
+ 	'gntwidget.c',
diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template
new file mode 100644
index 000000000000..f362d1561357
--- /dev/null
+++ b/srcpkgs/libgnt/template
@@ -0,0 +1,31 @@
+# Template file for 'libgnt'
+pkgname=libgnt
+version=2.14.2
+revision=1
+build_style=meson
+build_helper=gir
+hostmakedepends="pkg-config glib-devel gtk-doc"
+makedepends="libxml2-devel ncurses-devel python3-devel glib-devel gtk-doc"
+short_desc="GLib Ncurses Toolkit"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://keep.imfreedom.org/libgnt/"
+distfiles="${SOURCEFORGE_SITE}/pidgin/libgnt/${version}/libgnt-${version}.tar.xz"
+checksum=61cf74b14eef10868b2d892e975aa78614f094c8f4d30dfd1aaedf52e6120e75
+
+pre_configure() {
+	# disable doc for cross builds
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i "/subdir('doc')/d" meson.build
+	fi
+}
+
+libgnt-devel_package() {
+	depends="libglib-devel libgnt>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/libgnt.so
+	}
+}

From 72052ed8326c102c65545af575aba1fa98cd1cad Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 1 Aug 2021 10:42:14 +0200
Subject: [PATCH 2/3] pidgin: update to 2.14.6.

---
 .../patches/01-configure_ac-libnm_pc.patch    | 11 -------
 .../patches/02-libpurple-nm_state.patch       | 19 ------------
 srcpkgs/pidgin/template                       | 30 +++++--------------
 3 files changed, 7 insertions(+), 53 deletions(-)
 delete mode 100644 srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
 delete mode 100644 srcpkgs/pidgin/patches/02-libpurple-nm_state.patch

diff --git a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
deleted file mode 100644
index 2e82aaae330c..000000000000
--- a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac	2018-03-08 07:22:25.000000000 +0100
-+++ b/configure.ac	2020-02-11 04:14:37.777681920 +0100
-@@ -1428,7 +1428,7 @@
- dnl Check for NetworkManager.h; if we don't have it, oh well
- if test "x$enable_dbus" = "xyes" ; then
- 	if test "x$enable_nm" = "xyes" ; then
--		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
-+		PKG_CHECK_MODULES(NETWORKMANAGER, [libnm >= 0.5.0], [
- 			AC_SUBST(NETWORKMANAGER_CFLAGS)
- 			AC_SUBST(NETWORKMANAGER_LIBS)
- 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
diff --git a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
deleted file mode 100644
index fd11e320c209..000000000000
--- a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/libpurple/network.c	2018-03-06 07:00:49.000000000 +0100
-+++ b/libpurple/network.c	2020-02-11 04:30:20.163644344 +0100
-@@ -939,8 +939,16 @@
- #if NM_CHECK_VERSION(0,8,992)
- 		case NM_STATE_DISCONNECTING:
- #endif
-+#if NM_CHECK_VERSION(0,8,992)
-+			if (prev != NM_STATE_CONNECTED_LOCAL &&
-+				prev != NM_STATE_CONNECTED_SITE &&
-+				prev != NM_STATE_CONNECTED_GLOBAL &&
-+				prev != NM_STATE_UNKNOWN)
-+				break;
-+#else
- 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
- 				break;
-+#endif
- 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
- 				ui_ops->network_disconnected();
- 			break;
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index a2668cf685eb..b9dc82b75dee 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
-version=2.13.0
-revision=3
+version=2.14.6
+revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv
@@ -15,16 +15,16 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pidgin.im/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
-python_version=2 #unverified
+checksum=bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336
+python_version=2
 lib32disabled=yes
 
 hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
-makedepends="libglib-devel gtk+-devel libXext-devel
+makedepends="evolution-data-server-devel libglib-devel gtk+-devel libXext-devel
  libXScrnSaver-devel gtkspell-devel startup-notification-devel ncurses-devel
  libxml2-devel gst-plugins-base1-devel libidn-devel python-devel
  avahi-glib-libs-devel dbus-glib-devel NetworkManager-devel nss-devel
- libsasl-devel libSM-devel farstream-devel"
+ libsasl-devel libSM-devel farstream-devel libgnt-devel"
 depends="cyrus-sasl-modules gst-plugins-good1"
 
 CFLAGS="-Wno-deprecated-declarations"
@@ -55,23 +55,7 @@ libpurple-devel_package() {
 		vmove usr/share/aclocal/purple.m4
 	}
 }
-libgnt_package() {
-	short_desc="IM library extracted from Pidgin (GNT)"
-	pkg_install() {
-		vmove "usr/lib/libgnt*.so*"
-		vmove usr/lib/finch
-		vmove usr/lib/gnt
-	}
-}
-libgnt-devel_package() {
-	depends="libglib-devel libgnt>=${version}_${revision}"
-	short_desc="IM library extracted from Pidgin (GNT) - development files"
-	pkg_install() {
-		vmove usr/include/gnt
-		vmove usr/lib/pkgconfig/gnt.pc
-		vmove usr/lib/libgnt.so
-	}
-}
+
 finch_package() {
 	short_desc="Ncurses-based messaging client"
 	pkg_install() {

From fa7c3c509269aaefd2c99fc9761c901e71e7b901 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Sun, 8 Aug 2021 14:23:57 +0200
Subject: [PATCH 3/3] New package: Shortwave-2.0.1

---
 srcpkgs/Shortwave/template | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/Shortwave/template

diff --git a/srcpkgs/Shortwave/template b/srcpkgs/Shortwave/template
new file mode 100644
index 000000000000..3a8ec10996df
--- /dev/null
+++ b/srcpkgs/Shortwave/template
@@ -0,0 +1,25 @@
+# Template file for 'Shortwave'
+pkgname=Shortwave
+version=2.0.1
+revision=1
+build_style=meson
+build_helper=rust
+hostmakedepends="cargo gettext git glib-devel pkg-config rust sqlite-devel"
+makedepends="gstreamer1-devel gst-plugins-bad1-devel gtk4-devel libadwaita-devel
+ openssl-devel rust-std sqlite-devel"
+depends="gst-plugins-good1"
+checkdepends="desktop-file-utils"
+short_desc="GTK internet radio player, written in Rust"
+maintainer="Philipp David <pd@3b.pm>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/World/Shortwave"
+distfiles="https://gitlab.gnome.org/World/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=65dd02f7ad0b286613eae5d2f86adf9e8725ddc7885dd8658b2863cf13c6e594
+
+post_patch() {
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i build-aux/cargo.sh \
+			-e 's%"$CARGO_TARGET_DIR"/%&${RUST_TARGET}/%' \
+			-e '/CARGO_HOME/d'
+	fi
+}