Update to 2.4.22 and add a gitignore

5 files changed, 53 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cd9adfd6bdec..0ea35d1ba54d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vice-gnomeui-devel
 	pkgdesc = Versatile Commodore Emulator (development release with the Gnome UI)
-	pkgver = 2.4.20
-	pkgrel = 2
+	pkgver = 2.4.22
+	pkgrel = 1
 	url = http://vice-emu.sourceforge.net
 	install = vice-gnomeui-devel.install
 	arch = i686
@@ -25,20 +25,20 @@ pkgbase = vice-gnomeui-devel
 	conflicts = vice-svn
 	conflicts = vice-2.2-gnomeui
 	options = !makeflags
-	source = http://downloads.sourceforge.net/project/vice-emu/development-releases/vice-2.4.20.tar.gz
+	source = http://downloads.sourceforge.net/project/vice-emu/development-releases/vice-2.4.22.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 = a27b1672ca356d0e8f2890c91e449b78ef76512f6d81bdf25350b90c1f472d57ae6d23646d0176c5544c47d81023aa3deb172e3a02eeb0022ea32a13311b5a76
+	sha512sums = b43e609ae2f43717d10e079d3b8ac284e5c4920ed222c7502e9a7b75dfe32784628031ae6cf8672c8d9d50576fb714cecdd1a9292bf53477f4bbd52c10403975
 	sha512sums = 1433ed9e88f5eab34e53f89201df62c0c3a6aa4b61e6855823bb1ff833886a3058bdfeb9ea79c0f8658c2ec744314638524db6e0194783b4bf04d86824f19cdf
 	sha512sums = dc96b8658fac1a6f605b8f0052c11a5abb653da4b9deb3401d8b8177b14a664c0b3a5ed9e7c5c3013b0bc18b831045244f2f9187de9ff8b25b90f0b1cfa0cd8a
 	sha512sums = 77260d30312b44a50287cae55d57b5e8bfcee7b693ca87f206affff5bdc5d1717cc9260d4c9372a098c2b83028061222c36061d67559ba05859213cf640a9563
-	sha512sums = 0589c751a448caa3dd82cd667900d3cb35d718426423a4b2573a5ffba6ca9340849afb98d2a9fadb30f463a6fc7b24ef71bf2ea4ef2d5ad451709e424601216a
+	sha512sums = c22cc0816230b83be646e5ef826c83a2e2c15c9f46e4d0f2b4d703b2dfa6e32e611584a6f195517808cc6fc64dd641b3ab2cf353b3b4ed3dd13a38b74f537d85
 	sha512sums = d37544313037fa75971bab198b37d3824571a3e82d4e87bbe23b01d8a847fcf3f6652a23e4bc58cec6ae43deccc9322db2f77d046641b521f275e368aca940dd
-	sha512sums = 03c90e52d22545a7964b92df2286fa63014a4d5d20ae290196e9afa0a1bb04e1b94d81e3f4c969ed225c935db453499aee48068a56143091b98b77a9e55ec277
+	sha512sums = 1e59cb6c038e2537e0a01eed6213b6d6a16c0e42dd3967b2653d5ed414ae764dfe227d000dd673d7d0b4590f07197f63d65d81825ae09baf2df36d7f1e409ca0
 
 pkgname = vice-gnomeui-devel
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..1e91f0560b44
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*.tar.gz
+*.pkg.tar.xz
+pkg
+src
diff --git a/PKGBUILD b/PKGBUILD
index 0f2d43881df3..8df1cfbb4f5f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@
 
 _pkgname=vice
 pkgname=$_pkgname-gnomeui-devel
-pkgver=2.4.20
-pkgrel=2
+pkgver=2.4.22
+pkgrel=1
 pkgdesc='Versatile Commodore Emulator (development release with the Gnome UI)'
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -29,13 +29,13 @@ source=(
   'notexi-notxt.patch'
 )
 sha512sums=(
-  'a27b1672ca356d0e8f2890c91e449b78ef76512f6d81bdf25350b90c1f472d57ae6d23646d0176c5544c47d81023aa3deb172e3a02eeb0022ea32a13311b5a76'
+  'b43e609ae2f43717d10e079d3b8ac284e5c4920ed222c7502e9a7b75dfe32784628031ae6cf8672c8d9d50576fb714cecdd1a9292bf53477f4bbd52c10403975'
   '1433ed9e88f5eab34e53f89201df62c0c3a6aa4b61e6855823bb1ff833886a3058bdfeb9ea79c0f8658c2ec744314638524db6e0194783b4bf04d86824f19cdf'
   'dc96b8658fac1a6f605b8f0052c11a5abb653da4b9deb3401d8b8177b14a664c0b3a5ed9e7c5c3013b0bc18b831045244f2f9187de9ff8b25b90f0b1cfa0cd8a'
   '77260d30312b44a50287cae55d57b5e8bfcee7b693ca87f206affff5bdc5d1717cc9260d4c9372a098c2b83028061222c36061d67559ba05859213cf640a9563'
-  '0589c751a448caa3dd82cd667900d3cb35d718426423a4b2573a5ffba6ca9340849afb98d2a9fadb30f463a6fc7b24ef71bf2ea4ef2d5ad451709e424601216a'
+  'c22cc0816230b83be646e5ef826c83a2e2c15c9f46e4d0f2b4d703b2dfa6e32e611584a6f195517808cc6fc64dd641b3ab2cf353b3b4ed3dd13a38b74f537d85'
   'd37544313037fa75971bab198b37d3824571a3e82d4e87bbe23b01d8a847fcf3f6652a23e4bc58cec6ae43deccc9322db2f77d046641b521f275e368aca940dd'
-  '03c90e52d22545a7964b92df2286fa63014a4d5d20ae290196e9afa0a1bb04e1b94d81e3f4c969ed225c935db453499aee48068a56143091b98b77a9e55ec277'
+  '1e59cb6c038e2537e0a01eed6213b6d6a16c0e42dd3967b2653d5ed414ae764dfe227d000dd673d7d0b4590f07197f63d65d81825ae09baf2df36d7f1e409ca0'
 )
 
 prepare() {
diff --git a/no-fc-cache-no-lib64.patch b/no-fc-cache-no-lib64.patch
index 12cff3036edd..3fcc18b55bab 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 1582758..ee9af70 100755
+index 573677a..a19c050 100755
 --- a/configure
 +++ b/configure
-@@ -16720,7 +16720,7 @@ _ACEOF
+@@ -18435,7 +18435,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 1582758..ee9af70 100755
  	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
      esac
    fi
-@@ -21493,7 +21493,7 @@ fi
+@@ -23366,7 +23366,7 @@ fi
      ;;
    linux*)
      if test x"$host_cpu" = "xx86_64"; then
@@ -21,10 +21,10 @@ index 1582758..ee9af70 100755
    ALTERNATE_DOCDIR_TRUE=
    ALTERNATE_DOCDIR_FALSE='#'
 diff --git a/configure.ac b/configure.ac
-index 59f03b6..f0b043d 100644
+index b2bc09e..38bdcab 100755
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2257,12 +2257,7 @@ if test x"$enable_lame" != "xno" ; then
+@@ -2548,12 +2548,7 @@ if test x"$enable_lame" != "xno" ; then
  
  fi
  
@@ -37,8 +37,8 @@ index 59f03b6..f0b043d 100644
 +AM_CONDITIONAL(HAVE_FC_CACHE, false)
  
  if test x"$is_amigaos4" = "xyes"; then
-   if test x"$enable_sdlui" != "xyes"; then
-@@ -3729,7 +3724,7 @@ case "$host_os" in
+   if test x"$enable_sdlui" != "xyes" -a x"$enable_sdlui2" != "xyes"; then
+@@ -4061,7 +4056,7 @@ case "$host_os" in
      ;;
    linux*)
      if test x"$host_cpu" = "xx86_64"; then
@@ -48,10 +48,10 @@ index 59f03b6..f0b043d 100644
      else
        VICEDIR="$PREFIX/lib/vice"
 diff --git a/configure.proto b/configure.proto
-index 59f03b6..f0b043d 100644
+index b2bc09e..38bdcab 100755
 --- a/configure.proto
 +++ b/configure.proto
-@@ -2257,12 +2257,7 @@ if test x"$enable_lame" != "xno" ; then
+@@ -2548,12 +2548,7 @@ if test x"$enable_lame" != "xno" ; then
  
  fi
  
@@ -64,8 +64,8 @@ index 59f03b6..f0b043d 100644
 +AM_CONDITIONAL(HAVE_FC_CACHE, false)
  
  if test x"$is_amigaos4" = "xyes"; then
-   if test x"$enable_sdlui" != "xyes"; then
-@@ -3729,7 +3724,7 @@ case "$host_os" in
+   if test x"$enable_sdlui" != "xyes" -a x"$enable_sdlui2" != "xyes"; then
+@@ -4061,7 +4056,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 2d3f8ff4aa17..e90258141a14 100644
--- a/notexi-notxt.patch
+++ b/notexi-notxt.patch
@@ -1,30 +1,30 @@
 diff --git a/doc/Makefile.am b/doc/Makefile.am
-index 48ecf71..9f7f0f8 100644
+index 6f1d5fc..fc24ead 100755
 --- a/doc/Makefile.am
 +++ b/doc/Makefile.am
-@@ -59,19 +59,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
-@@ -131,4 +118,4 @@ $(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)
+@@ -58,19 +58,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

+@@ -132,4 +119,4 @@ $(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)