* [PR PATCH] vice: update to 3.6.1.
@ 2022-06-10 8:54 ypsvlq
2022-06-10 16:02 ` [PR REVIEW] " paper42
` (25 more replies)
0 siblings, 26 replies; 27+ messages in thread
From: ypsvlq @ 2022-06-10 8:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1223 bytes --]
There is a new 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: 3297 bytes --]
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
-}
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] vice: update to 3.6.1.
2022-06-10 8:54 [PR PATCH] vice: update to 3.6.1 ypsvlq
2022-06-10 16:02 ` [PR REVIEW] " paper42
2022-06-10 16:02 ` paper42
@ 2022-06-10 16:02 ` paper42
2022-06-10 17:10 ` ypsvlq
` (22 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: paper42 @ 2022-06-10 16:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 211 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/37480#discussion_r894675757
Comment:
```suggestion
homepage="https://vice-emu.sourceforge.net/"
```
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] vice: update to 3.6.1.
2022-06-10 8:54 [PR PATCH] vice: update to 3.6.1 ypsvlq
2022-06-10 16:02 ` [PR REVIEW] " paper42
@ 2022-06-10 16:02 ` paper42
2022-06-10 16:02 ` paper42
` (23 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: paper42 @ 2022-06-10 16:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 218 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/37480#discussion_r894683155
Comment:
Is there a reason why you didn't just add xdg-utils to hostmakedepends?
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] vice: update to 3.6.1.
2022-06-10 8:54 [PR PATCH] vice: update to 3.6.1 ypsvlq
@ 2022-06-10 16:02 ` paper42
2022-06-10 16:02 ` paper42
` (24 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: paper42 @ 2022-06-10 16:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 252 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/37480#discussion_r894675652
Comment:
I would prefer if we could keep this in the old format, it would make the whole PR much easier to review.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] vice: update to 3.6.1.
2022-06-10 8:54 [PR PATCH] vice: update to 3.6.1 ypsvlq
` (2 preceding siblings ...)
2022-06-10 16:02 ` paper42
@ 2022-06-10 17:10 ` ypsvlq
2022-06-10 17:20 ` [PR PATCH] [Updated] " ypsvlq
` (21 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: ypsvlq @ 2022-06-10 17:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 273 bytes --]
New review comment by ypsvlq on void-packages repository
https://github.com/void-linux/void-packages/pull/37480#discussion_r894743716
Comment:
@paper42 it didn't install properly into DESTDIR, I'm not sure if there's some XDG_ env var that needs to be set for it to work
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] vice: update to 3.6.1.
2022-06-10 8:54 [PR PATCH] vice: update to 3.6.1 ypsvlq
` (3 preceding siblings ...)
2022-06-10 17:10 ` ypsvlq
@ 2022-06-10 17:20 ` ypsvlq
2022-09-09 2:15 ` github-actions
` (20 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: ypsvlq @ 2022-06-10 17:20 UTC (permalink / raw)
To: ml
[-- 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: 2807 bytes --]
From 61469b9f30caad6916a8e160e4641d4b89382577 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 | 32 ++++++++-------------------
2 files changed, 12 insertions(+), 23 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..d28ef75a9573 100644
--- a/srcpkgs/vice/template
+++ b/srcpkgs/vice/template
@@ -1,26 +1,25 @@
# 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
+ XDG_DESKTOP_MENU=${FILESDIR}/desktop-install.sh"
+hostmakedepends="pkgconf flex dos2unix xa perl glib-devel"
makedepends="
zlib-devel
readline-devel
libpng-devel
- giflib-devel
glew-devel
alsa-lib-devel
$(vopt_if sdl2 SDL2_mixer-devel)
@@ -32,26 +31,13 @@ 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"
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
-}
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: vice: update to 3.6.1.
2022-06-10 8:54 [PR PATCH] vice: update to 3.6.1 ypsvlq
` (4 preceding siblings ...)
2022-06-10 17:20 ` [PR PATCH] [Updated] " ypsvlq
@ 2022-09-09 2:15 ` github-actions
2022-09-10 7:27 ` ypsvlq
` (19 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: github-actions @ 2022-09-09 2:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/37480#issuecomment-1241420678
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: vice: update to 3.6.1.
2022-06-10 8:54 [PR PATCH] vice: update to 3.6.1 ypsvlq
` (5 preceding siblings ...)
2022-09-09 2:15 ` github-actions
@ 2022-09-10 7:27 ` ypsvlq
2022-09-10 10:22 ` [PR REVIEW] " paper42
` (18 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: ypsvlq @ 2022-09-10 7:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 145 bytes --]
New comment by ypsvlq on void-packages repository
https://github.com/void-linux/void-packages/pull/37480#issuecomment-1242656460
Comment:
bump
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] vice: update to 3.6.1.
2022-06-10 8:54 [PR PATCH] vice: update to 3.6.1 ypsvlq
` (7 preceding siblings ...)
2022-09-10 10:22 ` [PR REVIEW] " paper42
@ 2022-09-10 10:22 ` paper42
2022-09-10 10:22 ` paper42
` (16 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: paper42 @ 2022-09-10 10:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 173 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/37480#discussion_r967631585
Comment:
Did you try XDG_DATA_DIRS?
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] vice: update to 3.6.1.
2022-06-10 8:54 [PR PATCH] vice: update to 3.6.1 ypsvlq
` (6 preceding siblings ...)
2022-09-10 7:27 ` ypsvlq
@ 2022-09-10 10:22 ` paper42
2022-09-10 10:22 ` paper42
` (17 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: paper42 @ 2022-09-10 10:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 157 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/37480#discussion_r967623841
Comment:
pkg-config
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] vice: update to 3.6.1.
2022-06-10 8:54 [PR PATCH] vice: update to 3.6.1 ypsvlq
` (8 preceding siblings ...)
2022-09-10 10:22 ` paper42
@ 2022-09-10 10:22 ` paper42
2022-09-11 17:16 ` ypsvlq
` (15 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: paper42 @ 2022-09-10 10:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 210 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/37480#discussion_r967624170
Comment:
--libdir should already be set by the gnu-configure build style
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] vice: update to 3.6.1.
2022-06-10 8:54 [PR PATCH] vice: update to 3.6.1 ypsvlq
` (9 preceding siblings ...)
2022-09-10 10:22 ` paper42
@ 2022-09-11 17:16 ` ypsvlq
2022-09-11 17:20 ` ypsvlq
` (14 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: ypsvlq @ 2022-09-11 17:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1480 bytes --]
New review comment by ypsvlq on void-packages repository
https://github.com/void-linux/void-packages/pull/37480#discussion_r967860267
Comment:
Not specifying it there causes
```
=== configuring in src/resid (/builddir/vice-3.6.1/src/resid)
configure: running /bin/sh ./configure '--prefix=/usr' --disable-option-checking '--sysconfdir=/etc' '--sbindir=/usr/bin' '--bindir=/usr/bin' '--mandir=/usr/share/man' '--infodir=/usr/share/info' '--localstatedir=/var' '--host=x86_64-unknown-linux-gnu' '--build=x86_64-unknown-linux-gnu' '--libdir=NONE/lib64' '--disable-sdlui2' '--without-sdlsound' '--enable-native-gtk3ui' '--enable-desktop-files' '--with-pulse' '--enable-external-ffmpeg' '--enable-cpuhistory' '--enable-x64' '--disable-pdf-docs' 'build_alias=x86_64-unknown-linux-gnu' 'host_alias=x86_64-unknown-linux-gnu' 'CC=cc' 'CFLAGS=-fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe -fdebug-prefix-map=/builddir/vice-3.6.1=.' 'LDFLAGS=-Wl,-z,relro -Wl,-z,now -Wl,--as-needed ' 'CPPFLAGS=
' 'CPP=cpp' 'CXX=g++' 'CXXFLAGS=-fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe -fdebug-prefix-map=/builddir/vice-3.6.1=.' 'PKG_CONFIG=pkg-config' '--disable-option-checking' '--srcdir=.' --cache-file=
configure: error: expected an absolute directory name for --libdir: NONE/lib64
configure: error: ./configure failed for src/resid
=> ERROR: vice-3.6.1_1: do_configure: '${configure_script} ${configure_args}' exited with 1
```
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] vice: update to 3.6.1.
2022-06-10 8:54 [PR PATCH] vice: update to 3.6.1 ypsvlq
` (10 preceding siblings ...)
2022-09-11 17:16 ` ypsvlq
@ 2022-09-11 17:20 ` ypsvlq
2022-09-11 17:46 ` [PR PATCH] [Updated] " ypsvlq
` (13 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: ypsvlq @ 2022-09-11 17:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1529 bytes --]
New review comment by ypsvlq on void-packages repository
https://github.com/void-linux/void-packages/pull/37480#discussion_r967860267
Comment:
Not specifying it there causes
```
=== configuring in src/resid (/builddir/vice-3.6.1/src/resid)
configure: running /bin/sh ./configure '--prefix=/usr' --disable-option-checking '--sysconfdir=/etc' '--sbindir=/usr/bin' '--bindir=/usr/bin' '--mandir=/usr/share/man' '--infodir=/usr/share/info' '--localstatedir=/var' '--host=x86_64-unknown-linux-gnu' '--build=x86_64-unknown-linux-gnu' '--libdir=NONE/lib64' '--disable-sdlui2' '--without-sdlsound' '--enable-native-gtk3ui' '--enable-desktop-files' '--with-pulse' '--enable-external-ffmpeg' '--enable-cpuhistory' '--enable-x64' '--disable-pdf-docs' 'build_alias=x86_64-unknown-linux-gnu' 'host_alias=x86_64-unknown-linux-gnu' 'CC=cc' 'CFLAGS=-fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe -fdebug-prefix-map=/builddir/vice-3.6.1=.' 'LDFLAGS=-Wl,-z,relro -Wl,-z,now -Wl,--as-needed ' 'CPPFLAGS=
' 'CPP=cpp' 'CXX=g++' 'CXXFLAGS=-fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe -fdebug-prefix-map=/builddir/vice-3.6.1=.' 'PKG_CONFIG=pkg-config' '--disable-option-checking' '--srcdir=.' --cache-file=
configure: error: expected an absolute directory name for --libdir: NONE/lib64
configure: error: ./configure failed for src/resid
=> ERROR: vice-3.6.1_1: do_configure: '${configure_script} ${configure_args}' exited with 1
```
(presumably it's lack of exec_prefix somewhere)
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] vice: update to 3.6.1.
2022-06-10 8:54 [PR PATCH] vice: update to 3.6.1 ypsvlq
` (11 preceding siblings ...)
2022-09-11 17:20 ` ypsvlq
@ 2022-09-11 17:46 ` ypsvlq
2022-09-11 17:46 ` [PR REVIEW] " ypsvlq
` (12 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: ypsvlq @ 2022-09-11 17:46 UTC (permalink / raw)
To: ml
[-- 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}
}
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] vice: update to 3.6.1.
2022-06-10 8:54 [PR PATCH] vice: update to 3.6.1 ypsvlq
` (12 preceding siblings ...)
2022-09-11 17:46 ` [PR PATCH] [Updated] " ypsvlq
@ 2022-09-11 17:46 ` ypsvlq
2022-12-11 2:03 ` github-actions
` (11 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: ypsvlq @ 2022-09-11 17:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 197 bytes --]
New review comment by ypsvlq on void-packages repository
https://github.com/void-linux/void-packages/pull/37480#discussion_r967863929
Comment:
Ah, I did but it needs directories to exist already
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: vice: update to 3.6.1.
2022-06-10 8:54 [PR PATCH] vice: update to 3.6.1 ypsvlq
` (13 preceding siblings ...)
2022-09-11 17:46 ` [PR REVIEW] " ypsvlq
@ 2022-12-11 2:03 ` github-actions
2022-12-11 2:47 ` ypsvlq
` (10 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: github-actions @ 2022-12-11 2:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/37480#issuecomment-1345434000
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: vice: update to 3.6.1.
2022-06-10 8:54 [PR PATCH] vice: update to 3.6.1 ypsvlq
` (14 preceding siblings ...)
2022-12-11 2:03 ` github-actions
@ 2022-12-11 2:47 ` ypsvlq
2023-03-12 2:02 ` github-actions
` (9 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: ypsvlq @ 2022-12-11 2:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 145 bytes --]
New comment by ypsvlq on void-packages repository
https://github.com/void-linux/void-packages/pull/37480#issuecomment-1345440849
Comment:
bump
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: vice: update to 3.6.1.
2022-06-10 8:54 [PR PATCH] vice: update to 3.6.1 ypsvlq
` (15 preceding siblings ...)
2022-12-11 2:47 ` ypsvlq
@ 2023-03-12 2:02 ` github-actions
2023-03-12 8:18 ` ypsvlq
` (8 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: github-actions @ 2023-03-12 2:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/37480#issuecomment-1465070413
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: vice: update to 3.6.1.
2022-06-10 8:54 [PR PATCH] vice: update to 3.6.1 ypsvlq
` (16 preceding siblings ...)
2023-03-12 2:02 ` github-actions
@ 2023-03-12 8:18 ` ypsvlq
2023-04-07 21:37 ` [PR REVIEW] " zlice
` (7 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: ypsvlq @ 2023-03-12 8:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 153 bytes --]
New comment by ypsvlq on void-packages repository
https://github.com/void-linux/void-packages/pull/37480#issuecomment-1465122052
Comment:
bump i guess
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] vice: update to 3.6.1.
2022-06-10 8:54 [PR PATCH] vice: update to 3.6.1 ypsvlq
` (17 preceding siblings ...)
2023-03-12 8:18 ` ypsvlq
@ 2023-04-07 21:37 ` zlice
2023-06-24 18:59 ` classabbyamp
` (6 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: zlice @ 2023-04-07 21:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 211 bytes --]
New review comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/37480#discussion_r1160979183
Comment:
do a `configure_args+=` and see if that works w/o the `--libdir`?
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] vice: update to 3.6.1.
2022-06-10 8:54 [PR PATCH] vice: update to 3.6.1 ypsvlq
` (19 preceding siblings ...)
2023-06-24 18:59 ` classabbyamp
@ 2023-06-24 18:59 ` classabbyamp
2023-06-24 19:36 ` [PR PATCH] [Updated] " ypsvlq
` (4 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: classabbyamp @ 2023-06-24 18:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 161 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/37480#discussion_r1240918908
Comment:
use vsed
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] vice: update to 3.6.1.
2022-06-10 8:54 [PR PATCH] vice: update to 3.6.1 ypsvlq
` (18 preceding siblings ...)
2023-04-07 21:37 ` [PR REVIEW] " zlice
@ 2023-06-24 18:59 ` classabbyamp
2023-06-24 18:59 ` classabbyamp
` (5 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: classabbyamp @ 2023-06-24 18:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 163 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/37480#discussion_r1240918892
Comment:
use vmkdir
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] vice: update to 3.6.1.
2022-06-10 8:54 [PR PATCH] vice: update to 3.6.1 ypsvlq
` (20 preceding siblings ...)
2023-06-24 18:59 ` classabbyamp
@ 2023-06-24 19:36 ` ypsvlq
2023-06-24 19:46 ` ypsvlq
` (3 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: ypsvlq @ 2023-06-24 19:36 UTC (permalink / raw)
To: ml
[-- 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: 2642 bytes --]
From 33b3a659607050daa95c12165897da53e69c65a1 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 | 35 ++++++++++++++++-------------------
1 file changed, 16 insertions(+), 19 deletions(-)
diff --git a/srcpkgs/vice/template b/srcpkgs/vice/template
index 0924767cfcfb..fc69890183cd 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,14 @@ 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() {
+ vsed -i src/arch/gtk3/data/unix/Makefile.in -e 's/\$(XDG_DESKTOP_MENU) install/$(XDG_DESKTOP_MENU) install --mode system/'
+}
-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
+ vmkdir usr/share/applications
+ vmkdir usr/share/desktop-directories
}
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] vice: update to 3.6.1.
2022-06-10 8:54 [PR PATCH] vice: update to 3.6.1 ypsvlq
` (21 preceding siblings ...)
2023-06-24 19:36 ` [PR PATCH] [Updated] " ypsvlq
@ 2023-06-24 19:46 ` ypsvlq
2023-06-24 19:57 ` [PR PATCH] [Updated] vice: update to 3.7.1 ypsvlq
` (2 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: ypsvlq @ 2023-06-24 19:46 UTC (permalink / raw)
To: ml
[-- 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: 2642 bytes --]
From 8efe9cce4ccb49ba93e97442aa0dfd7f1d70af80 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.7.1.
---
srcpkgs/vice/template | 35 ++++++++++++++++-------------------
1 file changed, 16 insertions(+), 19 deletions(-)
diff --git a/srcpkgs/vice/template b/srcpkgs/vice/template
index 0924767cfcfb..fc69890183cd 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,14 @@ 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() {
+ vsed -i src/arch/gtk3/data/unix/Makefile.in -e 's/\$(XDG_DESKTOP_MENU) install/$(XDG_DESKTOP_MENU) install --mode system/'
+}
-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
+ vmkdir usr/share/applications
+ vmkdir usr/share/desktop-directories
}
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] vice: update to 3.7.1.
2022-06-10 8:54 [PR PATCH] vice: update to 3.6.1 ypsvlq
` (22 preceding siblings ...)
2023-06-24 19:46 ` ypsvlq
@ 2023-06-24 19:57 ` ypsvlq
2023-06-24 20:01 ` ypsvlq
2023-06-24 20:16 ` [PR PATCH] [Merged]: " classabbyamp
25 siblings, 0 replies; 27+ messages in thread
From: ypsvlq @ 2023-06-24 19:57 UTC (permalink / raw)
To: ml
[-- 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.7.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: 2642 bytes --]
From 82f72ed4d88bdd0d937ee1841cbf919564e666f3 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.7.1.
---
srcpkgs/vice/template | 35 ++++++++++++++++-------------------
1 file changed, 16 insertions(+), 19 deletions(-)
diff --git a/srcpkgs/vice/template b/srcpkgs/vice/template
index 0924767cfcfb..10ad40afc369 100644
--- a/srcpkgs/vice/template
+++ b/srcpkgs/vice/template
@@ -1,26 +1,24 @@
# Template file for 'vice'
pkgname=vice
-version=3.5
+version=3.7.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,14 @@ 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() {
+ vsed -i src/arch/gtk3/data/unix/Makefile.in -e 's/\$(XDG_DESKTOP_MENU) install/$(XDG_DESKTOP_MENU) install --mode system/'
+}
-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
+ vmkdir usr/share/applications
+ vmkdir usr/share/desktop-directories
}
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] vice: update to 3.7.1.
2022-06-10 8:54 [PR PATCH] vice: update to 3.6.1 ypsvlq
` (23 preceding siblings ...)
2023-06-24 19:57 ` [PR PATCH] [Updated] vice: update to 3.7.1 ypsvlq
@ 2023-06-24 20:01 ` ypsvlq
2023-06-24 20:16 ` [PR PATCH] [Merged]: " classabbyamp
25 siblings, 0 replies; 27+ messages in thread
From: ypsvlq @ 2023-06-24 20:01 UTC (permalink / raw)
To: ml
[-- 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.7.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: 2642 bytes --]
From 27a6e4c1c0f23144774e9b47bddcfc4fa1533cdf 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.7.1.
---
srcpkgs/vice/template | 35 ++++++++++++++++-------------------
1 file changed, 16 insertions(+), 19 deletions(-)
diff --git a/srcpkgs/vice/template b/srcpkgs/vice/template
index 0924767cfcfb..fe9d33a81194 100644
--- a/srcpkgs/vice/template
+++ b/srcpkgs/vice/template
@@ -1,26 +1,24 @@
# Template file for 'vice'
pkgname=vice
-version=3.5
+version=3.7.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=7e3811e6024db0698bfbc321bb324572446b8853d01b4073f09865957b0cab98
# Package build options
build_options="sdl2 gtk3 ffmpeg"
@@ -43,15 +41,14 @@ 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() {
+ vsed -i src/arch/gtk3/data/unix/Makefile.in -e 's/\$(XDG_DESKTOP_MENU) install/$(XDG_DESKTOP_MENU) install --mode system/'
+}
-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
+ vmkdir usr/share/applications
+ vmkdir usr/share/desktop-directories
}
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Merged]: vice: update to 3.7.1.
2022-06-10 8:54 [PR PATCH] vice: update to 3.6.1 ypsvlq
` (24 preceding siblings ...)
2023-06-24 20:01 ` ypsvlq
@ 2023-06-24 20:16 ` classabbyamp
25 siblings, 0 replies; 27+ messages in thread
From: classabbyamp @ 2023-06-24 20:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1077 bytes --]
There's a merged pull request on the void-packages repository
vice: update to 3.7.1.
https://github.com/void-linux/void-packages/pull/37480
Description:
<!-- 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
-->
^ permalink raw reply [flat|nested] 27+ messages in thread
end of thread, other threads:[~2023-06-24 20:16 UTC | newest]
Thread overview: 27+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-10 8:54 [PR PATCH] vice: update to 3.6.1 ypsvlq
2022-06-10 16:02 ` [PR REVIEW] " paper42
2022-06-10 16:02 ` paper42
2022-06-10 16:02 ` paper42
2022-06-10 17:10 ` ypsvlq
2022-06-10 17:20 ` [PR PATCH] [Updated] " ypsvlq
2022-09-09 2:15 ` github-actions
2022-09-10 7:27 ` ypsvlq
2022-09-10 10:22 ` [PR REVIEW] " paper42
2022-09-10 10:22 ` paper42
2022-09-10 10:22 ` paper42
2022-09-11 17:16 ` ypsvlq
2022-09-11 17:20 ` ypsvlq
2022-09-11 17:46 ` [PR PATCH] [Updated] " ypsvlq
2022-09-11 17:46 ` [PR REVIEW] " ypsvlq
2022-12-11 2:03 ` github-actions
2022-12-11 2:47 ` ypsvlq
2023-03-12 2:02 ` github-actions
2023-03-12 8:18 ` ypsvlq
2023-04-07 21:37 ` [PR REVIEW] " zlice
2023-06-24 18:59 ` classabbyamp
2023-06-24 18:59 ` classabbyamp
2023-06-24 19:36 ` [PR PATCH] [Updated] " ypsvlq
2023-06-24 19:46 ` ypsvlq
2023-06-24 19:57 ` [PR PATCH] [Updated] vice: update to 3.7.1 ypsvlq
2023-06-24 20:01 ` ypsvlq
2023-06-24 20:16 ` [PR PATCH] [Merged]: " classabbyamp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).