Update to 3.2

6 files changed, 42 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ad3ec351d759..e99188df975c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Apr 26 02:31:17 UTC 2017
+# Tue May 22 04:26:27 UTC 2018
 pkgbase = vice-gnomeui-devel
 	pkgdesc = Versatile Commodore Emulator (development release with the Gnome UI)
-	pkgver = 3.1
+	pkgver = 3.2
 	pkgrel = 1
 	url = http://vice-emu.sourceforge.net
 	install = vice-gnomeui-devel.install
@@ -13,9 +13,10 @@ pkgbase = vice-gnomeui-devel
 	makedepends = xorg-bdftopcf
 	makedepends = xorg-mkfontdir
 	makedepends = autoconf
+	makedepends = xa
 	depends = libpulse
 	depends = giflib
-	depends = vte3
+	depends = vte
 	depends = gtk3
 	depends = libpcap
 	depends = mpg123
@@ -25,20 +26,20 @@ pkgbase = vice-gnomeui-devel
 	provides = vice
 	conflicts = vice
 	options = !makeflags
-	source = http://downloads.sourceforge.net/project/vice-emu/releases/vice-3.1.tar.gz
+	source = http://downloads.sourceforge.net/project/vice-emu/releases/vice-3.2.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 = bc02a3597a17dadb37c487e6942192c0e9dc1a7d4e440fbf0dc8a165dbb2dee60ddf157697a020d2780ddef56a0a67802768d5c6d117b9cf5cdc124de45bc579
+	sha512sums = d05081db90e2ee85745ecdee0b692a5c485b76b21a56463b17639de29c29c6deda3c39504122d8440f1667156d11dad504cea76b9b0272fc770ccfe0da3df616
 	sha512sums = 1433ed9e88f5eab34e53f89201df62c0c3a6aa4b61e6855823bb1ff833886a3058bdfeb9ea79c0f8658c2ec744314638524db6e0194783b4bf04d86824f19cdf
 	sha512sums = dc96b8658fac1a6f605b8f0052c11a5abb653da4b9deb3401d8b8177b14a664c0b3a5ed9e7c5c3013b0bc18b831045244f2f9187de9ff8b25b90f0b1cfa0cd8a
-	sha512sums = 849b4a42b331fcd3133e78d6116ea4416e2de45afd698f3ad0a8e94ef4117085e0b2bb756ed4720bfedbcb6b0ed72a8195b338e1fada0a9a105819a87e61cc5e
-	sha512sums = 1a9f5dbfc0593a01ae64825fc13623fe601620fcb2cd3e98f7fdda73ff7e0dc22b20b8ce56aecd5bebf3da5121f0ee3ef1201d203edd8783ebda31a6f6ac1aac
-	sha512sums = d37544313037fa75971bab198b37d3824571a3e82d4e87bbe23b01d8a847fcf3f6652a23e4bc58cec6ae43deccc9322db2f77d046641b521f275e368aca940dd
-	sha512sums = 399b732462d5f0a1edef16c31d223ec9b99f428f1cd21ca2dd9548c9ffeab2aab6c3576c600b1da7499f78a69cb2077202c4d64fac6fd903966681e21db6692d
+	sha512sums = 9d5625a7ed63d9908d778cecfe077ae238137894d82029c11144bc4986e92e69472dea3530cf18535ad72d2f5eec04f92d68a9b58ea3a99d1dd65a9c703662cd
+	sha512sums = 568360097d382886a046cb43f046db18180d5fa3ca04a1205334e05891fa6b649a5c767e68dd2087ec70aab7595b2d01182da77589e4c507407ee3bd694c9803
+	sha512sums = cc5a0a8967d5532de0b0948ebd95f3aa69136ffc0aea4efc736b6dcef68f750d6103871acd41d18fac3828f412944d9f2d7f040825d5d6e7aacce24f43329de6
+	sha512sums = 8f7d6ca165dee7f4cad53ddcc64c63236a5fbd1541e9eeaca3fde00a1133ee938b656d9a238934fd0170555d301fd81b9e67c7f6338a061628364e56dee1fff1
 
 pkgname = vice-gnomeui-devel
 
diff --git a/PKGBUILD b/PKGBUILD
index 3849a1a1b145..ec12827f1f5c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,14 +7,14 @@
 
 _pkgname=vice
 pkgname=$_pkgname-gnomeui-devel
-pkgver=3.1
+pkgver=3.2
 pkgrel=1
 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' 'vte' 'gtk3' 'libpcap' 'mpg123' 'libieee1284' 'portaudio' 'pciutils')
-makedepends=('dos2unix' 'xorg-bdftopcf' 'xorg-mkfontdir' 'autoconf')
+makedepends=('dos2unix' 'xorg-bdftopcf' 'xorg-mkfontdir' 'autoconf' 'xa')
 options=('!makeflags')
 install=$pkgname.install
 provides=("$_pkgname")
@@ -35,13 +35,13 @@ source=(
 )
 
 sha512sums=(
-  'bc02a3597a17dadb37c487e6942192c0e9dc1a7d4e440fbf0dc8a165dbb2dee60ddf157697a020d2780ddef56a0a67802768d5c6d117b9cf5cdc124de45bc579'
+  'd05081db90e2ee85745ecdee0b692a5c485b76b21a56463b17639de29c29c6deda3c39504122d8440f1667156d11dad504cea76b9b0272fc770ccfe0da3df616'
   '1433ed9e88f5eab34e53f89201df62c0c3a6aa4b61e6855823bb1ff833886a3058bdfeb9ea79c0f8658c2ec744314638524db6e0194783b4bf04d86824f19cdf'
   'dc96b8658fac1a6f605b8f0052c11a5abb653da4b9deb3401d8b8177b14a664c0b3a5ed9e7c5c3013b0bc18b831045244f2f9187de9ff8b25b90f0b1cfa0cd8a'
-  '849b4a42b331fcd3133e78d6116ea4416e2de45afd698f3ad0a8e94ef4117085e0b2bb756ed4720bfedbcb6b0ed72a8195b338e1fada0a9a105819a87e61cc5e'
-  '1a9f5dbfc0593a01ae64825fc13623fe601620fcb2cd3e98f7fdda73ff7e0dc22b20b8ce56aecd5bebf3da5121f0ee3ef1201d203edd8783ebda31a6f6ac1aac'
-  'd37544313037fa75971bab198b37d3824571a3e82d4e87bbe23b01d8a847fcf3f6652a23e4bc58cec6ae43deccc9322db2f77d046641b521f275e368aca940dd'
-  '399b732462d5f0a1edef16c31d223ec9b99f428f1cd21ca2dd9548c9ffeab2aab6c3576c600b1da7499f78a69cb2077202c4d64fac6fd903966681e21db6692d'
+  '9d5625a7ed63d9908d778cecfe077ae238137894d82029c11144bc4986e92e69472dea3530cf18535ad72d2f5eec04f92d68a9b58ea3a99d1dd65a9c703662cd'
+  '568360097d382886a046cb43f046db18180d5fa3ca04a1205334e05891fa6b649a5c767e68dd2087ec70aab7595b2d01182da77589e4c507407ee3bd694c9803'
+  'cc5a0a8967d5532de0b0948ebd95f3aa69136ffc0aea4efc736b6dcef68f750d6103871acd41d18fac3828f412944d9f2d7f040825d5d6e7aacce24f43329de6'
+  '8f7d6ca165dee7f4cad53ddcc64c63236a5fbd1541e9eeaca3fde00a1133ee938b656d9a238934fd0170555d301fd81b9e67c7f6338a061628364e56dee1fff1'
 )
 
 prepare() {
@@ -68,7 +68,7 @@ prepare() {
 build() {
   # Build the project
   cd $_pkgname-$pkgver
-  ./configure --prefix=/usr --enable-fullscreen --enable-gnomeui3 --enable-ethernet
+  ./configure --prefix=/usr --enable-fullscreen --enable-native-gtk3ui --enable-ethernet
   make
 }
 
diff --git a/no-fc-cache-no-lib64.patch b/no-fc-cache-no-lib64.patch
index dc3654818dcd..74f42d1d8bba 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 25b1906..0ab74e8 100755
+index 47e2c9e..6c33c7b 100755
 --- a/configure
 +++ b/configure
-@@ -20573,7 +20573,7 @@ _ACEOF
+@@ -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
@@ -11,7 +11,7 @@ index 25b1906..0ab74e8 100755
  	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
      esac
    fi
-@@ -25490,7 +25490,7 @@ fi
+@@ -26125,7 +26125,7 @@ fi
      ;;
    linux*)
      if test x"$host_cpu" = "xx86_64"; then
@@ -21,11 +21,11 @@ index 25b1906..0ab74e8 100755
    ALTERNATE_DOCDIR_TRUE=
    ALTERNATE_DOCDIR_FALSE='#'
 diff --git a/configure.ac b/configure.ac
-index fa14acc..2fe3620 100755
+index 205b927..e54e072 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3115,12 +3115,7 @@ if test x"$enable_lame" != "xno" ; then
- 
+@@ -3252,12 +3252,7 @@ if test x"$enable_lame" != "xno" ; then
+   fi
  fi
  
 -AC_PATH_PROGS(FCCACHE, fc-cache, false)
@@ -38,7 +38,7 @@ index fa14acc..2fe3620 100755
  
  if test x"$is_amigaos4" = "xyes"; then
    if test x"$enable_sdlui" != "xyes" -a x"$enable_sdlui2" != "xyes"; then
-@@ -4861,7 +4856,7 @@ case "$host_os" in
+@@ -4999,7 +4994,7 @@ case "$host_os" in
      ;;
    linux*)
      if test x"$host_cpu" = "xx86_64"; then
@@ -48,11 +48,11 @@ index fa14acc..2fe3620 100755
      else
        VICEDIR="$PREFIX/lib/vice"
 diff --git a/configure.proto b/configure.proto
-index fa14acc..2fe3620 100755
+index 4521fa3..3b4595b 100755
 --- a/configure.proto
 +++ b/configure.proto
-@@ -3115,12 +3115,7 @@ if test x"$enable_lame" != "xno" ; then
- 
+@@ -3252,12 +3252,7 @@ if test x"$enable_lame" != "xno" ; then
+   fi
  fi
  
 -AC_PATH_PROGS(FCCACHE, fc-cache, false)
@@ -65,7 +65,7 @@ index fa14acc..2fe3620 100755
  
  if test x"$is_amigaos4" = "xyes"; then
    if test x"$enable_sdlui" != "xyes" -a x"$enable_sdlui2" != "xyes"; then
-@@ -4861,7 +4856,7 @@ case "$host_os" in
+@@ -4999,7 +4994,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 f704fc54c08f..ba46469018cd 100644
--- a/notexi-notxt.patch
+++ b/notexi-notxt.patch
@@ -1,15 +1,15 @@
 diff --git a/doc/Makefile.am b/doc/Makefile.am
-index 0d0692f..fd26d3e 100755
+index 28e775e..d44b5f3 100644
 --- a/doc/Makefile.am
 +++ b/doc/Makefile.am
-@@ -61,19 +61,6 @@ $(builddir)/vice.txt:		$(srcdir)/vice.texi
- 	$(srcdir)/fixdox.sh txt <vicetmp.txt | sed 's/ \+$$//' >$(builddir)/vice.txt
+@@ -63,19 +63,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
--	sed 's/@heading NO WARRANTY/@center NO WARRANTY/g' <$(srcdir)/vice.texi >vicepdf.texi
--	$(TEXI2DVI) -q --clean --pdf "--texinfo=@set $(PLATFORM_DOX_FLAGS) " -o $(builddir)/vice.pdf vicepdf.texi
+-	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
@@ -22,7 +22,7 @@ index 0d0692f..fd26d3e 100755
  $(builddir)/vice.guide:	$(srcdir)/vice.texi
  if BUILD_AMIGAGUIDE
  	cp $(srcdir)/vice.texi tmp.texi
-@@ -135,6 +122,6 @@ $(builddir)/vice.info:	$(srcdir)/vice.texi
+@@ -137,6 +124,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
  
diff --git a/x11video.patch b/x11video.patch
index 156d9a4a05e1..7669fb6b53e8 100644
--- a/x11video.patch
+++ b/x11video.patch
@@ -1,8 +1,8 @@
 diff --git a/src/arch/unix/x11/xaw/x11video.c b/src/arch/unix/x11/xaw/x11video.c
-index 7e25b5d..2f86222 100755
+index 0dc264e..9326916 100644
 --- a/src/arch/unix/x11/xaw/x11video.c
 +++ b/src/arch/unix/x11/xaw/x11video.c
-@@ -63,6 +63,7 @@
+@@ -67,6 +67,7 @@
  #include <X11/Xutil.h>
  #include <X11/Intrinsic.h>
  #include <X11/cursorfont.h>
diff --git a/zlib-1.2.7.patch b/zlib-1.2.7.patch
index 75c535668f45..5d7f5d61127e 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 660f19b..abc5f94 100644
+index 719f06c..fb54b30 100644
 --- a/src/zfile.c
 +++ b/src/zfile.c
-@@ -201,10 +201,10 @@ static char *try_uncompress_with_gzip(const char *name)
+@@ -224,10 +224,10 @@ static char *try_uncompress_with_gzip(const char *name)
      do {
          char buf[256];
  
@@ -15,7 +15,7 @@ index 660f19b..abc5f94 100644
                  fclose(fddest);
                  ioutil_remove(tmp_name);
                  lib_free(tmp_name);
-@@ -213,7 +213,7 @@ static char *try_uncompress_with_gzip(const char *name)
+@@ -236,7 +236,7 @@ static char *try_uncompress_with_gzip(const char *name)
          }
      } while (len > 0);
  
@@ -24,7 +24,7 @@ index 660f19b..abc5f94 100644
      fclose(fddest);
  
      return tmp_name;
-@@ -810,11 +810,11 @@ static int compress_with_gzip(const char *src, const char *dest)
+@@ -839,11 +839,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) {
@@ -37,4 +37,4 @@ index 660f19b..abc5f94 100644
 +    gzclose((gzFile)fddest);
      fclose(fdsrc);
  
-     archdep_file_set_gzip(dest);
+     ZDEBUG(("compress with zlib: OK."));