From d88f53b21188e1378d61ecf2a40f5c9eed970883 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/files/desktop-install.sh |  3 ++
 srcpkgs/vice/template                 | 54 +++++++--------------------
 2 files changed, 16 insertions(+), 41 deletions(-)
 create mode 100755 srcpkgs/vice/files/desktop-install.sh

diff --git a/srcpkgs/vice/files/desktop-install.sh b/srcpkgs/vice/files/desktop-install.sh
new file mode 100755
index 000000000000..823c4f50569a
--- /dev/null
+++ b/srcpkgs/vice/files/desktop-install.sh
@@ -0,0 +1,3 @@
+#!/bin/sh -e
+dir=$DESTDIR/usr/share/applications/
+[ "$1" = install ] && mkdir -p $dir && shift && for f; do cp $f $dir; done
diff --git a/srcpkgs/vice/template b/srcpkgs/vice/template
index 0924767cfcfb..eab0f976095d 100644
--- a/srcpkgs/vice/template
+++ b/srcpkgs/vice/template
@@ -1,57 +1,29 @@
 # 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_with gtk3 pulse)
-	$(vopt_enable ffmpeg  external-ffmpeg)
-	--disable-option-checking
-	--enable-cpuhistory
-	--enable-x64
-	--disable-pdf-docs
-	AR=${AR}"
-hostmakedepends="bdftopcf flex mkfontdir perl pkg-config xa
- glib-devel autoconf texinfo automake dos2unix"
-makedepends="
-	zlib-devel
-	readline-devel
-	libpng-devel
-	giflib-devel
-	glew-devel
-	alsa-lib-devel
-	$(vopt_if sdl2 SDL2_mixer-devel)
-	$(vopt_if sdl2 SDL2-devel)
-	$(vopt_if gtk3 gtk+3-devel)
-	$(vopt_if gtk3 pulseaudio-devel)
-	$(vopt_if gtk3 pango-devel)
-	$(vopt_if ffmpeg ffmpeg-devel)"
+configure_args="XDG_DESKTOP_MENU=${FILESDIR}/desktop-install.sh
+ --libdir=/usr/lib$XBPS_TARGET_WORDSIZE
+ --enable-cpuhistory --enable-x64 --disable-pdf-docs
+ $(vopt_enable sdl2 sdlui2) $(vopt_with sdl2 sdlsound)
+ $(vopt_enable gtk3 native-gtk3ui) $(vopt_enable gtk3 desktop-files)
+ $(vopt_with gtk3 pulse) $(vopt_enable ffmpeg external-ffmpeg)"
+hostmakedepends="pkgconf flex dos2unix xa perl glib-devel"
+makedepends="zlib-devel readline-devel libpng-devel glew-devel alsa-lib-devel
+ $(vopt_if sdl2 SDL2-devel) $(vopt_if sdl2 SDL2_mixer-devel)
+ $(vopt_if gtk3 gtk+3-devel) $(vopt_if gtk3 pulseaudio-devel)
+ $(vopt_if gtk3 pango-devel) $(vopt_if ffmpeg ffmpeg-devel)"
 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/"
 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"
 build_options_default="gtk3 ffmpeg"
 
 desc_option_ffmpeg="Support video recording via FFmpeg"
-
-CFLAGS="-fcommon"
-
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) configure_args+=" --disable-nls";;
-esac
-
-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
-}