Initial import into AUR 4

9 files changed, 318 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..c877b9e08062
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,44 @@
+pkgbase = vice-gnomeui-devel
+	pkgdesc = Versatile Commodore Emulator (development release with the Gnome UI)
+	pkgver = 2.4.20
+	pkgrel = 1
+	url = http://vice-emu.sourceforge.net
+	install = vice-gnomeui-devel.install
+	arch = i686
+	arch = x86_64
+	license = GPL
+	makedepends = dos2unix
+	makedepends = xorg-bdftopcf
+	makedepends = xorg-mkfontdir
+	makedepends = autoconf
+	depends = libpulse
+	depends = giflib
+	depends = vte
+	depends = gtkglext
+	depends = libpcap
+	conflicts = vice
+	conflicts = vice-ethernet
+	conflicts = vice-gnome
+	conflicts = vice-gnomeui
+	conflicts = vice-gtkglext
+	conflicts = vice-sdl
+	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 = 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 = 1433ed9e88f5eab34e53f89201df62c0c3a6aa4b61e6855823bb1ff833886a3058bdfeb9ea79c0f8658c2ec744314638524db6e0194783b4bf04d86824f19cdf
+	sha512sums = dc96b8658fac1a6f605b8f0052c11a5abb653da4b9deb3401d8b8177b14a664c0b3a5ed9e7c5c3013b0bc18b831045244f2f9187de9ff8b25b90f0b1cfa0cd8a
+	sha512sums = 77260d30312b44a50287cae55d57b5e8bfcee7b693ca87f206affff5bdc5d1717cc9260d4c9372a098c2b83028061222c36061d67559ba05859213cf640a9563
+	sha512sums = 0589c751a448caa3dd82cd667900d3cb35d718426423a4b2573a5ffba6ca9340849afb98d2a9fadb30f463a6fc7b24ef71bf2ea4ef2d5ad451709e424601216a
+	sha512sums = d37544313037fa75971bab198b37d3824571a3e82d4e87bbe23b01d8a847fcf3f6652a23e4bc58cec6ae43deccc9322db2f77d046641b521f275e368aca940dd
+	sha512sums = 03c90e52d22545a7964b92df2286fa63014a4d5d20ae290196e9afa0a1bb04e1b94d81e3f4c969ed225c935db453499aee48068a56143091b98b77a9e55ec277
+
+pkgname = vice-gnomeui-devel
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..9cd480ef8668
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,86 @@
+# Maintainer: Kevin MacMartin <prurigro at gmail dot com>
+# Contributor: Sebastian Wolf <fatmike303 at gmail dot com>
+# Contributor: grimi <grimi at poczta dot fm>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Contributor: Markus M. May <mmay@javafreedom.org>
+
+_pkgname=vice
+pkgname=$_pkgname-gnomeui-devel
+pkgver=2.4.20
+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')
+makedepends=('dos2unix' 'xorg-bdftopcf' 'xorg-mkfontdir' 'autoconf')
+options=('!makeflags')
+install=$pkgname.install
+conflicts=('vice' 'vice-ethernet' 'vice-gnome' 'vice-gnomeui' 'vice-gtkglext' 'vice-sdl' 'vice-svn' 'vice-2.2-gnomeui')
+
+source=(
+  "http://downloads.sourceforge.net/project/vice-emu/development-releases/$_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=(
+  'a27b1672ca356d0e8f2890c91e449b78ef76512f6d81bdf25350b90c1f472d57ae6d23646d0176c5544c47d81023aa3deb172e3a02eeb0022ea32a13311b5a76'
+  '1433ed9e88f5eab34e53f89201df62c0c3a6aa4b61e6855823bb1ff833886a3058bdfeb9ea79c0f8658c2ec744314638524db6e0194783b4bf04d86824f19cdf'
+  'dc96b8658fac1a6f605b8f0052c11a5abb653da4b9deb3401d8b8177b14a664c0b3a5ed9e7c5c3013b0bc18b831045244f2f9187de9ff8b25b90f0b1cfa0cd8a'
+  '77260d30312b44a50287cae55d57b5e8bfcee7b693ca87f206affff5bdc5d1717cc9260d4c9372a098c2b83028061222c36061d67559ba05859213cf640a9563'
+  '0589c751a448caa3dd82cd667900d3cb35d718426423a4b2573a5ffba6ca9340849afb98d2a9fadb30f463a6fc7b24ef71bf2ea4ef2d5ad451709e424601216a'
+  'd37544313037fa75971bab198b37d3824571a3e82d4e87bbe23b01d8a847fcf3f6652a23e4bc58cec6ae43deccc9322db2f77d046641b521f275e368aca940dd'
+  '03c90e52d22545a7964b92df2286fa63014a4d5d20ae290196e9afa0a1bb04e1b94d81e3f4c969ed225c935db453499aee48068a56143091b98b77a9e55ec277'
+)
+
+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
+
+  # Convert MS-DOS linebreaks to Unix style ones
+  printf '%s ' 'Converting MS-DOS format linebreaks to Unix format...'
+  while read -r; do
+      dos2unix -q "$REPLY"
+  done < <(find . -type f -regextype posix-egrep -regex '.*\.([ch]|in)$')
+  printf '%s\n' 'DONE!'
+
+  # Reconfigure the project build environment
+  autoreconf -vi
+}
+
+build() {
+  # Build the project
+  cd $_pkgname-$pkgver
+  ./configure --prefix=/usr \
+              --enable-fullscreen \
+              --enable-gnomeui \
+              --enable-ethernet
+  make
+}
+
+package() {
+  # Install the XDG desktop file and icon
+  install -Dm644 $_pkgname.desktop "$pkgdir/usr/share/applications/$_pkgname.desktop"
+  install -Dm644 $_pkgname.png "$pkgdir/usr/share/pixmaps/$_pkgname.png"
+
+  # Install Vice
+  cd $_pkgname-$pkgver
+  make DESTDIR="$pkgdir" realdocdir=/usr/share/doc/$_pkgname install
+
+  # Link the docs folder to where Vice is expecting it to be
+  ln -s /usr/share/doc/$_pkgname "$pkgdir/usr/lib/$_pkgname/doc"
+
+  # Link the ttf font included with Vice to the system TTF fonts folder
+  install -d "$pkgdir/usr/share/fonts/TTF"
+  ln -s /usr/lib/$_pkgname/fonts/CBM.ttf "$pkgdir/usr/share/fonts/TTF/CBM.ttf"
+}
+
diff --git a/no-fc-cache-no-lib64.patch b/no-fc-cache-no-lib64.patch
new file mode 100644
index 000000000000..12cff3036edd
--- /dev/null
+++ b/no-fc-cache-no-lib64.patch
@@ -0,0 +1,76 @@
+diff --git a/configure b/configure
+index 1582758..ee9af70 100755
+--- a/configure
++++ b/configure
+@@ -16720,7 +16720,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
+@@ -21493,7 +21493,7 @@ fi
+     ;;
+   linux*)
+     if test x"$host_cpu" = "xx86_64"; then
+-      VICEDIR="$PREFIX/lib64/vice"
++      VICEDIR="$PREFIX/lib/vice"
+        if false; then
+   ALTERNATE_DOCDIR_TRUE=
+   ALTERNATE_DOCDIR_FALSE='#'
+diff --git a/configure.ac b/configure.ac
+index 59f03b6..f0b043d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2257,12 +2257,7 @@ if test x"$enable_lame" != "xno" ; then
+ 
+ fi
+ 
+-AC_PATH_PROGS(FCCACHE, fc-cache, false)
+-if test x"$FCCACHE" = "xfalse"; then
+-  AM_CONDITIONAL(HAVE_FC_CACHE, false)
+-else
+-  AM_CONDITIONAL(HAVE_FC_CACHE, true)
+-fi
++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
+     ;;
+   linux*)
+     if test x"$host_cpu" = "xx86_64"; then
+-      VICEDIR="$PREFIX/lib64/vice"
++      VICEDIR="$PREFIX/lib/vice"
+       AM_CONDITIONAL(ALTERNATE_DOCDIR, false)
+     else
+       VICEDIR="$PREFIX/lib/vice"
+diff --git a/configure.proto b/configure.proto
+index 59f03b6..f0b043d 100644
+--- a/configure.proto
++++ b/configure.proto
+@@ -2257,12 +2257,7 @@ if test x"$enable_lame" != "xno" ; then
+ 
+ fi
+ 
+-AC_PATH_PROGS(FCCACHE, fc-cache, false)
+-if test x"$FCCACHE" = "xfalse"; then
+-  AM_CONDITIONAL(HAVE_FC_CACHE, false)
+-else
+-  AM_CONDITIONAL(HAVE_FC_CACHE, true)
+-fi
++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
+     ;;
+   linux*)
+     if test x"$host_cpu" = "xx86_64"; then
+-      VICEDIR="$PREFIX/lib64/vice"
++      VICEDIR="$PREFIX/lib/vice"
+       AM_CONDITIONAL(ALTERNATE_DOCDIR, false)
+     else
+       VICEDIR="$PREFIX/lib/vice"
diff --git a/notexi-notxt.patch b/notexi-notxt.patch
new file mode 100644
index 000000000000..2d3f8ff4aa17
--- /dev/null
+++ b/notexi-notxt.patch
@@ -0,0 +1,30 @@
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 48ecf71..9f7f0f8 100644
+--- 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)
diff --git a/vice-gnomeui-devel.install b/vice-gnomeui-devel.install
new file mode 100644
index 000000000000..c7e22b7ab0e6
--- /dev/null
+++ b/vice-gnomeui-devel.install
@@ -0,0 +1,20 @@
+info_dir=/usr/share/info
+info_files=('vice.info')
+
+post_install() {
+    for f in ${info_files[@]}; do
+        install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+    done
+    fc-cache
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+    for f in ${info_files[@]}; do
+        install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+    done
+    fc-cache
+}
diff --git a/vice.desktop b/vice.desktop
new file mode 100644
index 000000000000..75ce2c61cf65
--- /dev/null
+++ b/vice.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=VICE: C64 Emulator
+Comment=Commodore 64 Emulator
+Exec=x64
+Icon=vice
+Terminal=false
+StartupNotify=false
+Categories=Application;Game;
diff --git a/vice.png b/vice.png
new file mode 100644
index 000000000000..612dec5d87a2
--- /dev/null
+++ b/vice.png
diff --git a/x11video.patch b/x11video.patch
new file mode 100644
index 000000000000..06fbb0f9beb5
--- /dev/null
+++ b/x11video.patch
@@ -0,0 +1,12 @@
+diff --git a/src/arch/unix/x11/xaw/x11video.c b/src/arch/unix/x11/xaw/x11video.c
+index 73f2c4e..891caf4 100644
+--- a/src/arch/unix/x11/xaw/x11video.c
++++ b/src/arch/unix/x11/xaw/x11video.c
+@@ -60,6 +60,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
new file mode 100644
index 000000000000..75c535668f45
--- /dev/null
+++ b/zlib-1.2.7.patch
@@ -0,0 +1,40 @@
+diff --git a/src/zfile.c b/src/zfile.c
+index 660f19b..abc5f94 100644
+--- a/src/zfile.c
++++ b/src/zfile.c
+@@ -201,10 +201,10 @@ static char *try_uncompress_with_gzip(const char *name)
+     do {
+         char buf[256];
+ 
+-        len = gzread(fdsrc, (void *)buf, 256);
++        len = gzread((gzFile)fdsrc, (void *)buf, 256);
+         if (len > 0) {
+             if (fwrite((void *)buf, 1, (size_t)len, fddest) < len) {
+-                gzclose(fdsrc);
++                gzclose((gzFile)fdsrc);
+                 fclose(fddest);
+                 ioutil_remove(tmp_name);
+                 lib_free(tmp_name);
+@@ -213,7 +213,7 @@ static char *try_uncompress_with_gzip(const char *name)
+         }
+     } while (len > 0);
+ 
+-    gzclose(fdsrc);
++    gzclose((gzFile)fdsrc);
+     fclose(fddest);
+ 
+     return tmp_name;
+@@ -810,11 +810,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) {
+-            gzwrite(fddest, (void *)buf, (unsigned int)len);
++            gzwrite((gzFile)fddest, (void *)buf, (unsigned int)len);
+         }
+     } while (len > 0);
+ 
+-    gzclose(fddest);
++    gzclose((gzFile)fddest);
+     fclose(fdsrc);
+ 
+     archdep_file_set_gzip(dest);