summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO24
-rw-r--r--PKGBUILD25
-rw-r--r--no-fc-cache-no-lib64.patch16
-rw-r--r--notexi-notxt.patch32
-rw-r--r--notexi.patch20
-rw-r--r--paraport-close-no-return.patch12
-rw-r--r--vice.desktop3
-rw-r--r--zlib-1.2.7.patch8
8 files changed, 60 insertions, 80 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 834e1ab7aadd..d132849577f7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Thu Jan 10 04:46:05 UTC 2019
pkgbase = vice-gnomeui-devel
pkgdesc = Versatile Commodore Emulator (development release with the Gnome UI)
- pkgver = 3.3
- pkgrel = 1
+ pkgver = 3.4
+ pkgrel = 3
url = http://vice-emu.sourceforge.net
install = vice-gnomeui-devel.install
arch = i686
@@ -14,30 +12,32 @@ pkgbase = vice-gnomeui-devel
makedepends = xorg-mkfontdir
makedepends = autoconf
makedepends = xa
+ makedepends = python
depends = libpulse
depends = giflib
- depends = vte
+ depends = vte3
depends = gtk3
depends = libpcap
depends = mpg123
depends = libieee1284
depends = portaudio
depends = pciutils
+ depends = glew
provides = vice
conflicts = vice
options = !makeflags
- source = http://downloads.sourceforge.net/project/vice-emu/releases/vice-3.3.tar.gz
+ source = http://downloads.sourceforge.net/project/vice-emu/releases/vice-3.4.tar.gz
source = vice.png
source = vice.desktop
source = no-fc-cache-no-lib64.patch
source = zlib-1.2.7.patch
- source = notexi-notxt.patch
- sha512sums = 702942e33b6e3d7e29ca6ed483242319ed5f6be26831def88a282cf7dce25d4c34dbf3651fcf8b583492fcb280ce5f4304c6eda3712088a73db24772c7a2bb3a
+ source = notexi.patch
+ sha512sums = 3d42e7bbe15ec6efac918d11e354052048dac8efdeedc64bb724cb8aaf2dd8ec7a2fc176ddbc93722ce7c680f06d3966efc10587c24e9643238315ded025c4b8
sha512sums = 1433ed9e88f5eab34e53f89201df62c0c3a6aa4b61e6855823bb1ff833886a3058bdfeb9ea79c0f8658c2ec744314638524db6e0194783b4bf04d86824f19cdf
- sha512sums = dc96b8658fac1a6f605b8f0052c11a5abb653da4b9deb3401d8b8177b14a664c0b3a5ed9e7c5c3013b0bc18b831045244f2f9187de9ff8b25b90f0b1cfa0cd8a
- sha512sums = fc93c4917624bdee2c3b86acc8a36ddf2cfdbd69e89dff4907771c66c4457ee499dfb76a49e603474a12c9f84d0561a0b1b4b7ae82a9034b57dd0bb977770d13
- sha512sums = b97fc172f4092675f13866ec208b12b494a4a1c35d535fe1e5d2c69bbc62b6d19df922fc7086c1878071d67ac2aa70920d1469b48a898a89c41b58ba053f73bd
- sha512sums = 25537f0e433d3b7a403adeb4efad48d29c869bf90a38de2868b3324240a63c6927f43cb0246e35b9b669bc1d02f17ebbcb77f51aeae7ff78071c9a412fd9e1cb
+ sha512sums = 702fa149f74158dbffe73b000ed7150a429176a66698293899662df220c68bcc233801aa281afc7353ebdbb7eaef395a9dacbf6d97f414f0dec5df5c1a997131
+ sha512sums = 6cc0e6f029750ead84f292dce9879f11b243266cf3787f96347cdd2d1193a74992c3dd63171af79d7f376d983e11a5dfc9327f27e2190de70f008ab81d4d93bb
+ sha512sums = b996c044ff6a7b43a1b6ba2fd3f57ce68d4474902764e8b3f5d9c64e3730e6120e16d6d86b6c5e27513fac7b5d9449afcaf67e4c3014f2f535627648550f56aa
+ sha512sums = 33e544bbce2e559e71e9e8624af2a7ac00bd3578cc8f7aa5ef167f3fe5f6b000dd97306e85d49a8601f88bc1afa427f2143fcb0f339ced223b35f7468ac09e16
pkgname = vice-gnomeui-devel
diff --git a/PKGBUILD b/PKGBUILD
index 64c10be8220a..7252694fe39b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,14 +7,14 @@
_pkgname=vice
pkgname=$_pkgname-gnomeui-devel
-pkgver=3.3
-pkgrel=2
+pkgver=3.4
+pkgrel=3
pkgdesc='Versatile Commodore Emulator (development release with the Gnome UI)'
arch=('i686' 'x86_64')
license=('GPL')
url='http://vice-emu.sourceforge.net'
-depends=('libpulse' 'giflib' 'vte3' 'gtk3' 'libpcap' 'mpg123' 'libieee1284' 'portaudio' 'pciutils')
-makedepends=('dos2unix' 'xorg-bdftopcf' 'xorg-mkfontdir' 'autoconf' 'xa')
+depends=('libpulse' 'giflib' 'vte3' 'gtk3' 'libpcap' 'mpg123' 'libieee1284' 'portaudio' 'pciutils' 'glew')
+makedepends=('dos2unix' 'xorg-bdftopcf' 'xorg-mkfontdir' 'autoconf' 'xa' 'python')
options=('!makeflags')
install=$pkgname.install
provides=("$_pkgname")
@@ -30,16 +30,16 @@ source=(
"$_pkgname.desktop"
'no-fc-cache-no-lib64.patch'
'zlib-1.2.7.patch'
- 'notexi-notxt.patch'
+ 'notexi.patch'
)
sha512sums=(
- '702942e33b6e3d7e29ca6ed483242319ed5f6be26831def88a282cf7dce25d4c34dbf3651fcf8b583492fcb280ce5f4304c6eda3712088a73db24772c7a2bb3a'
+ '3d42e7bbe15ec6efac918d11e354052048dac8efdeedc64bb724cb8aaf2dd8ec7a2fc176ddbc93722ce7c680f06d3966efc10587c24e9643238315ded025c4b8'
'1433ed9e88f5eab34e53f89201df62c0c3a6aa4b61e6855823bb1ff833886a3058bdfeb9ea79c0f8658c2ec744314638524db6e0194783b4bf04d86824f19cdf'
- 'dc96b8658fac1a6f605b8f0052c11a5abb653da4b9deb3401d8b8177b14a664c0b3a5ed9e7c5c3013b0bc18b831045244f2f9187de9ff8b25b90f0b1cfa0cd8a'
- 'fc93c4917624bdee2c3b86acc8a36ddf2cfdbd69e89dff4907771c66c4457ee499dfb76a49e603474a12c9f84d0561a0b1b4b7ae82a9034b57dd0bb977770d13'
- 'b97fc172f4092675f13866ec208b12b494a4a1c35d535fe1e5d2c69bbc62b6d19df922fc7086c1878071d67ac2aa70920d1469b48a898a89c41b58ba053f73bd'
- '25537f0e433d3b7a403adeb4efad48d29c869bf90a38de2868b3324240a63c6927f43cb0246e35b9b669bc1d02f17ebbcb77f51aeae7ff78071c9a412fd9e1cb'
+ '702fa149f74158dbffe73b000ed7150a429176a66698293899662df220c68bcc233801aa281afc7353ebdbb7eaef395a9dacbf6d97f414f0dec5df5c1a997131'
+ '6cc0e6f029750ead84f292dce9879f11b243266cf3787f96347cdd2d1193a74992c3dd63171af79d7f376d983e11a5dfc9327f27e2190de70f008ab81d4d93bb'
+ 'b996c044ff6a7b43a1b6ba2fd3f57ce68d4474902764e8b3f5d9c64e3730e6120e16d6d86b6c5e27513fac7b5d9449afcaf67e4c3014f2f535627648550f56aa'
+ '33e544bbce2e559e71e9e8624af2a7ac00bd3578cc8f7aa5ef167f3fe5f6b000dd97306e85d49a8601f88bc1afa427f2143fcb0f339ced223b35f7468ac09e16'
)
prepare() {
@@ -47,7 +47,7 @@ prepare() {
cd $_pkgname-$pkgver
patch -Np1 -i ../no-fc-cache-no-lib64.patch
patch -Np1 -i ../zlib-1.2.7.patch
- patch -Np1 -i ../notexi-notxt.patch
+ patch -Np1 -i ../notexi.patch
# Convert MS-DOS linebreaks to Unix style ones
printf '%s ' 'Converting MS-DOS format linebreaks to Unix format...'
@@ -78,6 +78,9 @@ package() {
cd $_pkgname-$pkgver
make DESTDIR="$pkgdir" realdocdir=/usr/share/doc/$_pkgname install
+ # Install the help PDF
+ install -Dm644 doc/$_pkgname.pdf "$pkgdir/usr/share/doc/vice/$_pkgname.pdf"
+
# Link the docs folder to where Vice is expecting it to be
ln -s /usr/share/doc/$_pkgname "$pkgdir/usr/lib/$_pkgname/doc"
diff --git a/no-fc-cache-no-lib64.patch b/no-fc-cache-no-lib64.patch
index e07669df9075..a346896026c1 100644
--- a/no-fc-cache-no-lib64.patch
+++ b/no-fc-cache-no-lib64.patch
@@ -1,8 +1,8 @@
diff --git a/configure b/configure
-index 03e9e18..e5e561d 100755
+index 2a884c5..b42319b 100755
--- a/configure
+++ b/configure
-@@ -21918,7 +21918,7 @@ fi
+@@ -21228,7 +21228,7 @@ fi
;;
linux*)
if test x"$host_cpu" = "xx86_64"; then
@@ -12,10 +12,10 @@ index 03e9e18..e5e561d 100755
ALTERNATE_DOCDIR_TRUE=
ALTERNATE_DOCDIR_FALSE='#'
diff --git a/configure.ac b/configure.ac
-index bc0da30..53d867e 100644
+index 6b74e07..c90dbba 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3012,12 +3012,7 @@ if test x"$enable_lame" != "xno" ; then
+@@ -2766,12 +2766,7 @@ if test x"$enable_lame" != "xno" ; then
fi
fi
@@ -29,7 +29,7 @@ index bc0da30..53d867e 100644
if test x"$is_amigaos4" = "xyes"; then
dnl for AmigaOS4 native resid needs to be configured without dependency tracking
-@@ -4060,7 +4055,7 @@ case "$host_os" in
+@@ -3635,7 +3630,7 @@ case "$host_os" in
;;
linux*)
if test x"$host_cpu" = "xx86_64"; then
@@ -39,10 +39,10 @@ index bc0da30..53d867e 100644
else
VICEDIR="$PREFIX/lib/vice"
diff --git a/configure.proto b/configure.proto
-index 4204eda..775450a 100755
+index 4adca9b..677067f 100755
--- a/configure.proto
+++ b/configure.proto
-@@ -3012,12 +3012,7 @@ if test x"$enable_lame" != "xno" ; then
+@@ -2766,12 +2766,7 @@ if test x"$enable_lame" != "xno" ; then
fi
fi
@@ -56,7 +56,7 @@ index 4204eda..775450a 100755
if test x"$is_amigaos4" = "xyes"; then
dnl for AmigaOS4 native resid needs to be configured without dependency tracking
-@@ -4060,7 +4055,7 @@ case "$host_os" in
+@@ -3635,7 +3630,7 @@ case "$host_os" in
;;
linux*)
if test x"$host_cpu" = "xx86_64"; then
diff --git a/notexi-notxt.patch b/notexi-notxt.patch
deleted file mode 100644
index d8c8e627c70f..000000000000
--- a/notexi-notxt.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index 5d9e77b..ac756a6 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -60,19 +60,6 @@ $(builddir)/vice.txt: $(srcdir)/vice.texi
- $(srcdir)/fixdox.sh txt <vicetmp.txt | LANG=C sed 's/ \+$$//' >$(builddir)/vice.txt
- rm -f vicetmp.txt
-
--$(builddir)/vice.pdf: $(srcdir)/vice.texi
--if BUILD_PDF
-- LANG=C sed 's/@heading NO WARRANTY/@center NO WARRANTY/g' <$(srcdir)/vice.texi >vicepdf.texi
-- LANG=C $(TEXI2DVI) -q --clean --pdf "--texinfo=@set $(PLATFORM_DOX_FLAGS) " -o $(builddir)/vice.pdf vicepdf.texi
-- rm -f vicepdf.texi
--
--PDF_DEPS=$(builddir)/vice.pdf
--else
-- touch $(builddir)/vice.pdf
--
--PDF_DEPS=
--endif
--
- $(builddir)/vice.guide: $(srcdir)/vice.texi
- if BUILD_AMIGAGUIDE
- cp $(srcdir)/vice.texi tmp.texi
-@@ -134,6 +121,6 @@ $(builddir)/vice.info: $(srcdir)/vice.texi
- touch $(builddir)/vice.info
- $(MAKEINFO) -D$(PLATFORM_DOX_FLAGS) -o $(builddir)/vice.info --no-validate --no-split $(srcdir)/vice.texi
-
--INFO_DEPS = $(builddir)/vice.txt $(builddir)/vice.info $(PDF_DEPS) $(GUIDE_DEPS) $(HLP_DEPS) $(CHM_DEPS) $(IPF_DEPS)
-+INFO_DEPS = $(builddir)/vice.info $(PDF_DEPS) $(GUIDE_DEPS) $(HLP_DEPS) $(CHM_DEPS) $(IPF_DEPS)
-
- .texi.pdf:
diff --git a/notexi.patch b/notexi.patch
new file mode 100644
index 000000000000..913d4cdf7840
--- /dev/null
+++ b/notexi.patch
@@ -0,0 +1,20 @@
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 11e696e..61a7531 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -63,15 +63,6 @@ $(builddir)/vice.txt: .vice-texi-charset-ok
+ $(srcdir)/fixdox.sh txt <vicetmp.txt | LC_ALL=C sed 's/ \+$$//' >$(builddir)/vice.txt
+ rm -f vicetmp.txt
+
+-if BUILD_PDF
+-VICE_DOX += vice.pdf
+-$(builddir)/vice.pdf: .vice-texi-charset-ok
+- LC_ALL=C sed 's/@heading NO WARRANTY/@center NO WARRANTY/g' <$(srcdir)/vice.texi >vicepdf.texi
+- LC_ALL=C $(TEXI2DVI) -I $(srcdir) -q --clean --pdf "--texinfo=@set $(PLATFORM_DOX_FLAGS) " -o $(builddir)/vice.pdf vicepdf.texi
+- rm -f vicepdf.texi
+-endif
+-
+-
+ # This doesn't appear to delete vice.pdf, vice.chm, vice.guide etc added
+ # in this Makefile with VICE_DOX += FOO, perhaps just some ordinary `rm -f`
+ # would do better? -- Compyx
diff --git a/paraport-close-no-return.patch b/paraport-close-no-return.patch
deleted file mode 100644
index c8f959c36f7b..000000000000
--- a/paraport-close-no-return.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/arch/unix/parsid-drv.c b/src/arch/unix/parsid-drv.c
-index 7612c37..37ce5db 100755
---- a/src/arch/unix/parsid-drv.c
-+++ b/src/arch/unix/parsid-drv.c
-@@ -134,7 +134,6 @@ static int parsid_linux_parport_open(void)
-
- static void parsid_linux_parport_close(void)
- {
-- return 0;
- }
- #endif
-
diff --git a/vice.desktop b/vice.desktop
index 75ce2c61cf65..27a98c01dc52 100644
--- a/vice.desktop
+++ b/vice.desktop
@@ -3,8 +3,9 @@ Encoding=UTF-8
Type=Application
Name=VICE: C64 Emulator
Comment=Commodore 64 Emulator
-Exec=x64
+Exec=x64sc
Icon=vice
Terminal=false
StartupNotify=false
+StartupWMClass=x64sc
Categories=Application;Game;
diff --git a/zlib-1.2.7.patch b/zlib-1.2.7.patch
index fcaaecaf1c2b..b0a2f006d9e4 100644
--- a/zlib-1.2.7.patch
+++ b/zlib-1.2.7.patch
@@ -1,8 +1,8 @@
diff --git a/src/zfile.c b/src/zfile.c
-index 52259a3..1f54aa5 100644
+index c984fa8..88467de 100644
--- a/src/zfile.c
+++ b/src/zfile.c
-@@ -224,10 +224,10 @@ static char *try_uncompress_with_gzip(const char *name)
+@@ -226,10 +226,10 @@ static char *try_uncompress_with_gzip(const char *name)
do {
char buf[256];
@@ -15,7 +15,7 @@ index 52259a3..1f54aa5 100644
fclose(fddest);
ioutil_remove(tmp_name);
lib_free(tmp_name);
-@@ -236,7 +236,7 @@ static char *try_uncompress_with_gzip(const char *name)
+@@ -238,7 +238,7 @@ static char *try_uncompress_with_gzip(const char *name)
}
} while (len > 0);
@@ -24,7 +24,7 @@ index 52259a3..1f54aa5 100644
fclose(fddest);
return tmp_name;
-@@ -830,11 +830,11 @@ static int compress_with_gzip(const char *src, const char *dest)
+@@ -832,11 +832,11 @@ static int compress_with_gzip(const char *src, const char *dest)
char buf[256];
len = fread((void *)buf, 256, 1, fdsrc);
if (len > 0) {