Update to 3.1

5 files changed, 62 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 71e676c5abee..ad3ec351d759 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Jan  2 21:59:49 UTC 2017
+# Wed Apr 26 02:31:17 UTC 2017
 pkgbase = vice-gnomeui-devel
 	pkgdesc = Versatile Commodore Emulator (development release with the Gnome UI)
-	pkgver = 3.0
+	pkgver = 3.1
 	pkgrel = 1
 	url = http://vice-emu.sourceforge.net
 	install = vice-gnomeui-devel.install
@@ -15,8 +15,8 @@ pkgbase = vice-gnomeui-devel
 	makedepends = autoconf
 	depends = libpulse
 	depends = giflib
-	depends = vte
-	depends = gtkglext
+	depends = vte3
+	depends = gtk3
 	depends = libpcap
 	depends = mpg123
 	depends = libieee1284
@@ -25,20 +25,20 @@ pkgbase = vice-gnomeui-devel
 	provides = vice
 	conflicts = vice
 	options = !makeflags
-	source = http://downloads.sourceforge.net/project/vice-emu/releases/vice-3.0.tar.gz
+	source = http://downloads.sourceforge.net/project/vice-emu/releases/vice-3.1.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 = 60d33e644d9977df81ffbdceff8c4feec750de9597cfa9f37c4aa236eabbf507373e6f936e2cc3b06f3e7298e0390d1e098242bfacd6435e628a13991a6a452b
+	sha512sums = bc02a3597a17dadb37c487e6942192c0e9dc1a7d4e440fbf0dc8a165dbb2dee60ddf157697a020d2780ddef56a0a67802768d5c6d117b9cf5cdc124de45bc579
 	sha512sums = 1433ed9e88f5eab34e53f89201df62c0c3a6aa4b61e6855823bb1ff833886a3058bdfeb9ea79c0f8658c2ec744314638524db6e0194783b4bf04d86824f19cdf
 	sha512sums = dc96b8658fac1a6f605b8f0052c11a5abb653da4b9deb3401d8b8177b14a664c0b3a5ed9e7c5c3013b0bc18b831045244f2f9187de9ff8b25b90f0b1cfa0cd8a
-	sha512sums = 076e684ecac402ccb014faebe5eaab5bb46e9e9caca9ba23374ddf94a1c83172b0874343e449c91186763114d0f388dac0060afd831bdc9eceffc6cf3529c58d
-	sha512sums = 2706f179cdc6fb4f86198f532dccbe520dce2676238c69013af5303055f94ed44d6b8ec50cd55c47b0bf8b46f3af260767466db728f00fe409281232c8d0165e
+	sha512sums = 849b4a42b331fcd3133e78d6116ea4416e2de45afd698f3ad0a8e94ef4117085e0b2bb756ed4720bfedbcb6b0ed72a8195b338e1fada0a9a105819a87e61cc5e
+	sha512sums = 1a9f5dbfc0593a01ae64825fc13623fe601620fcb2cd3e98f7fdda73ff7e0dc22b20b8ce56aecd5bebf3da5121f0ee3ef1201d203edd8783ebda31a6f6ac1aac
 	sha512sums = d37544313037fa75971bab198b37d3824571a3e82d4e87bbe23b01d8a847fcf3f6652a23e4bc58cec6ae43deccc9322db2f77d046641b521f275e368aca940dd
-	sha512sums = d7637b0604490f1792dde1083211d418b850ecbeaf688b3013913c5af7e752796fe8d45c8306b7a1593b62c028c9def7bf04e81bc0187d05cd464727f0c5645a
+	sha512sums = 399b732462d5f0a1edef16c31d223ec9b99f428f1cd21ca2dd9548c9ffeab2aab6c3576c600b1da7499f78a69cb2077202c4d64fac6fd903966681e21db6692d
 
 pkgname = vice-gnomeui-devel
 
diff --git a/PKGBUILD b/PKGBUILD
index ae9a566392cd..3849a1a1b145 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,13 +7,13 @@
 
 _pkgname=vice
 pkgname=$_pkgname-gnomeui-devel
-pkgver=3.0
+pkgver=3.1
 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' 'gtkglext' 'libpcap' 'mpg123' 'libieee1284' 'portaudio' 'pciutils')
+depends=('libpulse' 'giflib' 'vte' 'gtk3' 'libpcap' 'mpg123' 'libieee1284' 'portaudio' 'pciutils')
 makedepends=('dos2unix' 'xorg-bdftopcf' 'xorg-mkfontdir' 'autoconf')
 options=('!makeflags')
 install=$pkgname.install
@@ -35,13 +35,13 @@ source=(
 )
 
 sha512sums=(
-  '60d33e644d9977df81ffbdceff8c4feec750de9597cfa9f37c4aa236eabbf507373e6f936e2cc3b06f3e7298e0390d1e098242bfacd6435e628a13991a6a452b'
+  'bc02a3597a17dadb37c487e6942192c0e9dc1a7d4e440fbf0dc8a165dbb2dee60ddf157697a020d2780ddef56a0a67802768d5c6d117b9cf5cdc124de45bc579'
   '1433ed9e88f5eab34e53f89201df62c0c3a6aa4b61e6855823bb1ff833886a3058bdfeb9ea79c0f8658c2ec744314638524db6e0194783b4bf04d86824f19cdf'
   'dc96b8658fac1a6f605b8f0052c11a5abb653da4b9deb3401d8b8177b14a664c0b3a5ed9e7c5c3013b0bc18b831045244f2f9187de9ff8b25b90f0b1cfa0cd8a'
-  '076e684ecac402ccb014faebe5eaab5bb46e9e9caca9ba23374ddf94a1c83172b0874343e449c91186763114d0f388dac0060afd831bdc9eceffc6cf3529c58d'
-  '2706f179cdc6fb4f86198f532dccbe520dce2676238c69013af5303055f94ed44d6b8ec50cd55c47b0bf8b46f3af260767466db728f00fe409281232c8d0165e'
+  '849b4a42b331fcd3133e78d6116ea4416e2de45afd698f3ad0a8e94ef4117085e0b2bb756ed4720bfedbcb6b0ed72a8195b338e1fada0a9a105819a87e61cc5e'
+  '1a9f5dbfc0593a01ae64825fc13623fe601620fcb2cd3e98f7fdda73ff7e0dc22b20b8ce56aecd5bebf3da5121f0ee3ef1201d203edd8783ebda31a6f6ac1aac'
   'd37544313037fa75971bab198b37d3824571a3e82d4e87bbe23b01d8a847fcf3f6652a23e4bc58cec6ae43deccc9322db2f77d046641b521f275e368aca940dd'
-  'd7637b0604490f1792dde1083211d418b850ecbeaf688b3013913c5af7e752796fe8d45c8306b7a1593b62c028c9def7bf04e81bc0187d05cd464727f0c5645a'
+  '399b732462d5f0a1edef16c31d223ec9b99f428f1cd21ca2dd9548c9ffeab2aab6c3576c600b1da7499f78a69cb2077202c4d64fac6fd903966681e21db6692d'
 )
 
 prepare() {
@@ -68,7 +68,7 @@ prepare() {
 build() {
   # Build the project
   cd $_pkgname-$pkgver
-  ./configure --prefix=/usr --enable-fullscreen --enable-gnomeui --enable-ethernet --enable-memmap
+  ./configure --prefix=/usr --enable-fullscreen --enable-gnomeui3 --enable-ethernet
   make
 }
 
diff --git a/no-fc-cache-no-lib64.patch b/no-fc-cache-no-lib64.patch
index 466251658c27..dc3654818dcd 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 c5f25a4..6c15e46 100755
+index 25b1906..0ab74e8 100755
 --- a/configure
 +++ b/configure
-@@ -19813,7 +19813,7 @@ _ACEOF
+@@ -20573,7 +20573,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 c5f25a4..6c15e46 100755
  	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
      esac
    fi
-@@ -24802,7 +24802,7 @@ fi
+@@ -25490,7 +25490,7 @@ fi
      ;;
    linux*)
      if test x"$host_cpu" = "xx86_64"; then
@@ -21,10 +21,10 @@ index c5f25a4..6c15e46 100755
    ALTERNATE_DOCDIR_TRUE=
    ALTERNATE_DOCDIR_FALSE='#'
 diff --git a/configure.ac b/configure.ac
-index 73f5b22..842e246 100755
+index fa14acc..2fe3620 100755
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2954,12 +2954,7 @@ if test x"$enable_lame" != "xno" ; then
+@@ -3115,12 +3115,7 @@ if test x"$enable_lame" != "xno" ; then
  
  fi
  
@@ -38,7 +38,7 @@ index 73f5b22..842e246 100755
  
  if test x"$is_amigaos4" = "xyes"; then
    if test x"$enable_sdlui" != "xyes" -a x"$enable_sdlui2" != "xyes"; then
-@@ -4636,7 +4631,7 @@ case "$host_os" in
+@@ -4861,7 +4856,7 @@ case "$host_os" in
      ;;
    linux*)
      if test x"$host_cpu" = "xx86_64"; then
@@ -48,10 +48,10 @@ index 73f5b22..842e246 100755
      else
        VICEDIR="$PREFIX/lib/vice"
 diff --git a/configure.proto b/configure.proto
-index 73f5b22..842e246 100755
+index fa14acc..2fe3620 100755
 --- a/configure.proto
 +++ b/configure.proto
-@@ -2954,12 +2954,7 @@ if test x"$enable_lame" != "xno" ; then
+@@ -3115,12 +3115,7 @@ if test x"$enable_lame" != "xno" ; then
  
  fi
  
@@ -65,7 +65,7 @@ index 73f5b22..842e246 100755
  
  if test x"$is_amigaos4" = "xyes"; then
    if test x"$enable_sdlui" != "xyes" -a x"$enable_sdlui2" != "xyes"; then
-@@ -4636,7 +4631,7 @@ case "$host_os" in
+@@ -4861,7 +4856,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 f610041ab3c0..f704fc54c08f 100644
--- a/notexi-notxt.patch
+++ b/notexi-notxt.patch
@@ -1,32 +1,32 @@
 diff --git a/doc/Makefile.am b/doc/Makefile.am
-index b60651f..d6974e0 100755
+index 0d0692f..fd26d3e 100755
 --- a/doc/Makefile.am
 +++ b/doc/Makefile.am
-@@ -60,19 +60,6 @@ $(builddir)/vice.txt:		$(srcdir)/vice.texi
- 	$(srcdir)/fixdox.sh txt <vicetmp.txt | 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

--	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-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:

+@@ -61,19 +61,6 @@ $(builddir)/vice.txt:		$(srcdir)/vice.texi
+ 	$(srcdir)/fixdox.sh txt <vicetmp.txt | 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
+-	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
+@@ -135,6 +122,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
+ 
+-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/x11video.patch b/x11video.patch
index 44760b23df36..156d9a4a05e1 100644
--- a/x11video.patch
+++ b/x11video.patch
@@ -1,12 +1,12 @@
 diff --git a/src/arch/unix/x11/xaw/x11video.c b/src/arch/unix/x11/xaw/x11video.c
-index 8d1c943..67a673a 100755
+index 7e25b5d..2f86222 100755
 --- a/src/arch/unix/x11/xaw/x11video.c
 +++ b/src/arch/unix/x11/xaw/x11video.c
 @@ -63,6 +63,7 @@
- #include <X11/Xutil.h>

- #include <X11/Intrinsic.h>

- #include <X11/cursorfont.h>

-+#include <X11/Xmd.h>

- 

- #include <stdio.h>

- #include <stdlib.h>

+ #include <X11/Xutil.h>
+ #include <X11/Intrinsic.h>
+ #include <X11/cursorfont.h>
++#include <X11/Xmd.h>
+ 
+ #include <stdio.h>
+ #include <stdlib.h>