Re: [PR PATCH] [Updated] vice: update to 3.6.1.

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

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

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

https://github.com/ypsvlq/void-packages vice
https://github.com/void-linux/void-packages/pull/37480

vice: update to 3.6.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/37480.patch is attached

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

From 3bfefda9b66fc2a43841e8311f298cd18cc38def Mon Sep 17 00:00:00 2001
From: Elaine Gibson <ypsvlq@gmail.com>
Date: Fri, 10 Jun 2022 09:53:21 +0100
Subject: [PATCH] vice: update to 3.6.1.

---
 srcpkgs/vice/template | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/vice/template b/srcpkgs/vice/template
index 0924767cfcfb..3dc6cbb0d2f8 100644
--- a/srcpkgs/vice/template
+++ b/srcpkgs/vice/template
@@ -1,26 +1,24 @@
 # Template file for 'vice'
 pkgname=vice
-version=3.5
+version=3.6.1
 revision=1
 build_style=gnu-configure
 configure_args="
 	$(vopt_enable sdl2 sdlui2)
 	$(vopt_with sdl2 sdlsound)
-	$(vopt_enable gtk3 gnomeui3)
+	$(vopt_enable gtk3 native-gtk3ui)
+	$(vopt_enable gtk3 desktop-files)
 	$(vopt_with gtk3 pulse)
-	$(vopt_enable ffmpeg  external-ffmpeg)
-	--disable-option-checking
+	$(vopt_enable ffmpeg external-ffmpeg)
 	--enable-cpuhistory
 	--enable-x64
 	--disable-pdf-docs
-	AR=${AR}"
-hostmakedepends="bdftopcf flex mkfontdir perl pkg-config xa
- glib-devel autoconf texinfo automake dos2unix"
+	--libdir=/usr/lib$XBPS_TARGET_WORDSIZE"
+hostmakedepends="pkg-config flex dos2unix xa perl glib-devel xdg-utils"
 makedepends="
 	zlib-devel
 	readline-devel
 	libpng-devel
-	giflib-devel
 	glew-devel
 	alsa-lib-devel
 	$(vopt_if sdl2 SDL2_mixer-devel)
@@ -32,10 +30,10 @@ makedepends="
 short_desc="Emulator for C64, C128, CBM-II, PET, VIC20, Plus4 and C16"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://vice-emu.sourceforge.net/"
+homepage="https://vice-emu.sourceforge.net/"
 changelog="https://vice-emu.sourceforge.io/NEWS"
 distfiles="${SOURCEFORGE_SITE}/vice-emu/releases/vice-${version}.tar.gz"
-checksum=56b978faaeb8b2896032bd604d03c3501002187eef1ca58ceced40f11a65dc0e
+checksum=20df84c851aaf2f5000510927f6d31b32f269916d351465c366dc0afc9dc150c
 
 # Package build options
 build_options="sdl2 gtk3 ffmpeg"
@@ -43,15 +41,13 @@ build_options_default="gtk3 ffmpeg"
 
 desc_option_ffmpeg="Support video recording via FFmpeg"
 
-CFLAGS="-fcommon"
+export XDG_DATA_DIRS=$DESTDIR/usr/share
 
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) configure_args+=" --disable-nls";;
-esac
+post_patch() {
+	sed -i -e 's/\$(XDG_DESKTOP_MENU) install/$(XDG_DESKTOP_MENU) install --mode system/' src/arch/gtk3/data/unix/Makefile.in
+}
 
-pre_configure() {
-	# __u_char is not portable...
-	sed -i 's,__u_char,unsigned char,g' src/*.[ch]
-	sed -i 's/lib64/lib/g' configure.ac
-	autoreconf -fi
+pre_install() {
+	# required for xdg-desktop-menu to work
+	mkdir -p $DESTDIR/usr/share/{applications,desktop-directories}
 }