Update to 3.3

6 files changed, 30 insertions, 56 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e99188df975c..834e1ab7aadd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue May 22 04:26:27 UTC 2018
+# Thu Jan 10 04:46:05 UTC 2019
 pkgbase = vice-gnomeui-devel
 	pkgdesc = Versatile Commodore Emulator (development release with the Gnome UI)
-	pkgver = 3.2
+	pkgver = 3.3
 	pkgrel = 1
 	url = http://vice-emu.sourceforge.net
 	install = vice-gnomeui-devel.install
@@ -26,20 +26,18 @@ pkgbase = vice-gnomeui-devel
 	provides = vice
 	conflicts = vice
 	options = !makeflags
-	source = http://downloads.sourceforge.net/project/vice-emu/releases/vice-3.2.tar.gz
+	source = http://downloads.sourceforge.net/project/vice-emu/releases/vice-3.3.tar.gz
 	source = vice.png
 	source = vice.desktop
-	source = x11video.patch
 	source = no-fc-cache-no-lib64.patch
 	source = zlib-1.2.7.patch
 	source = notexi-notxt.patch
-	sha512sums = d05081db90e2ee85745ecdee0b692a5c485b76b21a56463b17639de29c29c6deda3c39504122d8440f1667156d11dad504cea76b9b0272fc770ccfe0da3df616
+	sha512sums = 702942e33b6e3d7e29ca6ed483242319ed5f6be26831def88a282cf7dce25d4c34dbf3651fcf8b583492fcb280ce5f4304c6eda3712088a73db24772c7a2bb3a
 	sha512sums = 1433ed9e88f5eab34e53f89201df62c0c3a6aa4b61e6855823bb1ff833886a3058bdfeb9ea79c0f8658c2ec744314638524db6e0194783b4bf04d86824f19cdf
 	sha512sums = dc96b8658fac1a6f605b8f0052c11a5abb653da4b9deb3401d8b8177b14a664c0b3a5ed9e7c5c3013b0bc18b831045244f2f9187de9ff8b25b90f0b1cfa0cd8a
-	sha512sums = 9d5625a7ed63d9908d778cecfe077ae238137894d82029c11144bc4986e92e69472dea3530cf18535ad72d2f5eec04f92d68a9b58ea3a99d1dd65a9c703662cd
-	sha512sums = 568360097d382886a046cb43f046db18180d5fa3ca04a1205334e05891fa6b649a5c767e68dd2087ec70aab7595b2d01182da77589e4c507407ee3bd694c9803
-	sha512sums = cc5a0a8967d5532de0b0948ebd95f3aa69136ffc0aea4efc736b6dcef68f750d6103871acd41d18fac3828f412944d9f2d7f040825d5d6e7aacce24f43329de6
-	sha512sums = 8f7d6ca165dee7f4cad53ddcc64c63236a5fbd1541e9eeaca3fde00a1133ee938b656d9a238934fd0170555d301fd81b9e67c7f6338a061628364e56dee1fff1
+	sha512sums = fc93c4917624bdee2c3b86acc8a36ddf2cfdbd69e89dff4907771c66c4457ee499dfb76a49e603474a12c9f84d0561a0b1b4b7ae82a9034b57dd0bb977770d13
+	sha512sums = b97fc172f4092675f13866ec208b12b494a4a1c35d535fe1e5d2c69bbc62b6d19df922fc7086c1878071d67ac2aa70920d1469b48a898a89c41b58ba053f73bd
+	sha512sums = 25537f0e433d3b7a403adeb4efad48d29c869bf90a38de2868b3324240a63c6927f43cb0246e35b9b669bc1d02f17ebbcb77f51aeae7ff78071c9a412fd9e1cb
 
 pkgname = vice-gnomeui-devel
 
diff --git a/PKGBUILD b/PKGBUILD
index ec12827f1f5c..7ffe3727883b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 _pkgname=vice
 pkgname=$_pkgname-gnomeui-devel
-pkgver=3.2
+pkgver=3.3
 pkgrel=1
 pkgdesc='Versatile Commodore Emulator (development release with the Gnome UI)'
 arch=('i686' 'x86_64')
@@ -28,26 +28,23 @@ source=(
   "http://downloads.sourceforge.net/project/vice-emu/$_release/$_pkgname-$pkgver.tar.gz"
   "$_pkgname.png"
   "$_pkgname.desktop"
-  'x11video.patch'
   'no-fc-cache-no-lib64.patch'
   'zlib-1.2.7.patch'
   'notexi-notxt.patch'
 )
 
 sha512sums=(
-  'd05081db90e2ee85745ecdee0b692a5c485b76b21a56463b17639de29c29c6deda3c39504122d8440f1667156d11dad504cea76b9b0272fc770ccfe0da3df616'
+  '702942e33b6e3d7e29ca6ed483242319ed5f6be26831def88a282cf7dce25d4c34dbf3651fcf8b583492fcb280ce5f4304c6eda3712088a73db24772c7a2bb3a'
   '1433ed9e88f5eab34e53f89201df62c0c3a6aa4b61e6855823bb1ff833886a3058bdfeb9ea79c0f8658c2ec744314638524db6e0194783b4bf04d86824f19cdf'
   'dc96b8658fac1a6f605b8f0052c11a5abb653da4b9deb3401d8b8177b14a664c0b3a5ed9e7c5c3013b0bc18b831045244f2f9187de9ff8b25b90f0b1cfa0cd8a'
-  '9d5625a7ed63d9908d778cecfe077ae238137894d82029c11144bc4986e92e69472dea3530cf18535ad72d2f5eec04f92d68a9b58ea3a99d1dd65a9c703662cd'
-  '568360097d382886a046cb43f046db18180d5fa3ca04a1205334e05891fa6b649a5c767e68dd2087ec70aab7595b2d01182da77589e4c507407ee3bd694c9803'
-  'cc5a0a8967d5532de0b0948ebd95f3aa69136ffc0aea4efc736b6dcef68f750d6103871acd41d18fac3828f412944d9f2d7f040825d5d6e7aacce24f43329de6'
-  '8f7d6ca165dee7f4cad53ddcc64c63236a5fbd1541e9eeaca3fde00a1133ee938b656d9a238934fd0170555d301fd81b9e67c7f6338a061628364e56dee1fff1'
+  'fc93c4917624bdee2c3b86acc8a36ddf2cfdbd69e89dff4907771c66c4457ee499dfb76a49e603474a12c9f84d0561a0b1b4b7ae82a9034b57dd0bb977770d13'
+  'b97fc172f4092675f13866ec208b12b494a4a1c35d535fe1e5d2c69bbc62b6d19df922fc7086c1878071d67ac2aa70920d1469b48a898a89c41b58ba053f73bd'
+  '25537f0e433d3b7a403adeb4efad48d29c869bf90a38de2868b3324240a63c6927f43cb0246e35b9b669bc1d02f17ebbcb77f51aeae7ff78071c9a412fd9e1cb'
 )
 
 prepare() {
   # Apply patches
   cd $_pkgname-$pkgver
-  patch -Np1 -i ../x11video.patch
   patch -Np1 -i ../no-fc-cache-no-lib64.patch
   patch -Np1 -i ../zlib-1.2.7.patch
   patch -Np1 -i ../notexi-notxt.patch
@@ -68,7 +65,7 @@ prepare() {
 build() {
   # Build the project
   cd $_pkgname-$pkgver
-  ./configure --prefix=/usr --enable-fullscreen --enable-native-gtk3ui --enable-ethernet
+  ./configure --prefix=/usr --enable-native-gtk3ui --enable-ethernet
   make
 }
 
diff --git a/no-fc-cache-no-lib64.patch b/no-fc-cache-no-lib64.patch
index 74f42d1d8bba..e07669df9075 100644
--- a/no-fc-cache-no-lib64.patch
+++ b/no-fc-cache-no-lib64.patch
@@ -1,17 +1,8 @@
 diff --git a/configure b/configure
-index 47e2c9e..6c33c7b 100755
+index 03e9e18..e5e561d 100755
 --- a/configure
 +++ b/configure
-@@ -21203,7 +21203,7 @@ _ACEOF
- 	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
-     esac
-     case $ac_im_usrlibdir in
--	/usr/lib | /usr/lib64 | /lib | /lib64) ;;
-+	/usr/lib | /usr/lib | /lib | /lib) ;;
- 	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
-     esac
-   fi
-@@ -26125,7 +26125,7 @@ fi
+@@ -21918,7 +21918,7 @@ fi
      ;;
    linux*)
      if test x"$host_cpu" = "xx86_64"; then
@@ -21,10 +12,10 @@ index 47e2c9e..6c33c7b 100755
    ALTERNATE_DOCDIR_TRUE=
    ALTERNATE_DOCDIR_FALSE='#'
 diff --git a/configure.ac b/configure.ac
-index 205b927..e54e072 100644
+index bc0da30..53d867e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3252,12 +3252,7 @@ if test x"$enable_lame" != "xno" ; then
+@@ -3012,12 +3012,7 @@ if test x"$enable_lame" != "xno" ; then
    fi
  fi
  
@@ -37,8 +28,8 @@ index 205b927..e54e072 100644
 +AM_CONDITIONAL(HAVE_FC_CACHE, false)
  
  if test x"$is_amigaos4" = "xyes"; then
-   if test x"$enable_sdlui" != "xyes" -a x"$enable_sdlui2" != "xyes"; then
-@@ -4999,7 +4994,7 @@ case "$host_os" in
+   dnl for AmigaOS4 native resid needs to be configured without dependency tracking
+@@ -4060,7 +4055,7 @@ case "$host_os" in
      ;;
    linux*)
      if test x"$host_cpu" = "xx86_64"; then
@@ -48,10 +39,10 @@ index 205b927..e54e072 100644
      else
        VICEDIR="$PREFIX/lib/vice"
 diff --git a/configure.proto b/configure.proto
-index 4521fa3..3b4595b 100755
+index 4204eda..775450a 100755
 --- a/configure.proto
 +++ b/configure.proto
-@@ -3252,12 +3252,7 @@ if test x"$enable_lame" != "xno" ; then
+@@ -3012,12 +3012,7 @@ if test x"$enable_lame" != "xno" ; then
    fi
  fi
  
@@ -64,8 +55,8 @@ index 4521fa3..3b4595b 100755
 +AM_CONDITIONAL(HAVE_FC_CACHE, false)
  
  if test x"$is_amigaos4" = "xyes"; then
-   if test x"$enable_sdlui" != "xyes" -a x"$enable_sdlui2" != "xyes"; then
-@@ -4999,7 +4994,7 @@ case "$host_os" in
+   dnl for AmigaOS4 native resid needs to be configured without dependency tracking
+@@ -4060,7 +4055,7 @@ case "$host_os" in
      ;;
    linux*)
      if test x"$host_cpu" = "xx86_64"; then
diff --git a/notexi-notxt.patch b/notexi-notxt.patch
index ba46469018cd..d8c8e627c70f 100644
--- a/notexi-notxt.patch
+++ b/notexi-notxt.patch
@@ -1,8 +1,8 @@
 diff --git a/doc/Makefile.am b/doc/Makefile.am
-index 28e775e..d44b5f3 100644
+index 5d9e77b..ac756a6 100644
 --- a/doc/Makefile.am
 +++ b/doc/Makefile.am
-@@ -63,19 +63,6 @@ $(builddir)/vice.txt:		$(srcdir)/vice.texi
+@@ -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
  
@@ -10,7 +10,7 @@ index 28e775e..d44b5f3 100644
 -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
+-		rm -f vicepdf.texi
 -
 -PDF_DEPS=$(builddir)/vice.pdf
 -else
@@ -22,9 +22,9 @@ index 28e775e..d44b5f3 100644
  $(builddir)/vice.guide:	$(srcdir)/vice.texi
  if BUILD_AMIGAGUIDE
  	cp $(srcdir)/vice.texi tmp.texi
-@@ -137,6 +124,6 @@ $(builddir)/vice.info:	$(srcdir)/vice.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-split $(srcdir)/vice.texi
+ 	$(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)
diff --git a/x11video.patch b/x11video.patch
deleted file mode 100644
index 7669fb6b53e8..000000000000
--- a/x11video.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/arch/unix/x11/xaw/x11video.c b/src/arch/unix/x11/xaw/x11video.c
-index 0dc264e..9326916 100644
---- a/src/arch/unix/x11/xaw/x11video.c
-+++ b/src/arch/unix/x11/xaw/x11video.c
-@@ -67,6 +67,7 @@
- #include <X11/Xutil.h>
- #include <X11/Intrinsic.h>
- #include <X11/cursorfont.h>
-+#include <X11/Xmd.h>
- 
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/zlib-1.2.7.patch b/zlib-1.2.7.patch
index 5d7f5d61127e..fcaaecaf1c2b 100644
--- a/zlib-1.2.7.patch
+++ b/zlib-1.2.7.patch
@@ -1,5 +1,5 @@
 diff --git a/src/zfile.c b/src/zfile.c
-index 719f06c..fb54b30 100644
+index 52259a3..1f54aa5 100644
 --- a/src/zfile.c
 +++ b/src/zfile.c
 @@ -224,10 +224,10 @@ static char *try_uncompress_with_gzip(const char *name)
@@ -24,7 +24,7 @@ index 719f06c..fb54b30 100644
      fclose(fddest);
  
      return tmp_name;
-@@ -839,11 +839,11 @@ static int compress_with_gzip(const char *src, const char *dest)
+@@ -830,11 +830,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) {