Wed Aug 8 00:02:17 UTC 2012

5 files changed, 116 insertions, 10 deletions

diff --git a/extra/vice/PKGBUILD b/extra/vice/PKGBUILD
index 3d3762728..552188f90 100644
--- a/extra/vice/PKGBUILD
+++ b/extra/vice/PKGBUILD
@@ -1,35 +1,48 @@
-# $Id: PKGBUILD 148952 2012-02-05 11:57:30Z ibiru $
+# $Id: PKGBUILD 164816 2012-08-06 17:52:50Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=vice
 pkgver=2.3
-pkgrel=5
-pkgdesc="A Versatile Commodore Emulator"
+pkgrel=6
+pkgdesc="The Versatile Commodore 8-bit Emulator"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.viceteam.org/"
-depends=('alsa-lib' 'gcc-libs' 'giflib' 'lame' 'libxrandr' 
-         'libxv' 'libjpeg' 'libpng' 'libxaw' 'libxxf86vm')
+depends=('alsa-lib' 'giflib' 'libxxf86vm' 'gtk2')
 makedepends=('xorg-font-utils')
 options=('!makeflags')
+install=vice.install
 source=("http://downloads.sourceforge.net/project/vice-emu/releases/${pkgname}-${pkgver}.tar.gz"
-        'vice-2.3-x11video.patch')
+        'vice-2.3-x11video.patch'
+        'vice-2.3-no-fc-cache.patch'
+        'vice-2.3-notexi-notxt.patch'
+        'vice-2.3-zlib-1.2.7.patch')
 md5sums=('b48d137874daad50c087a0686cbdde34'
-         '088292ce9efe785edfb2b0c7c670785e')
+         '088292ce9efe785edfb2b0c7c670785e'
+         '873042d07f3768819b589a4c8fe24607'
+         '05159b6ef78e3b7dd5d362f766da4cd4'
+         '6d8736974a21c3862a4bf0fe0ee6e266')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  patch -Np1 -i ${srcdir}/vice-2.3-x11video.patch
+  patch -Np1 -i "${srcdir}/vice-2.3-x11video.patch"
+  patch -Np1 -i "${srcdir}/vice-2.3-no-fc-cache.patch"
+  patch -Np1 -i "${srcdir}/vice-2.3-notexi-notxt.patch"
+  patch -Np1 -i "${srcdir}/vice-2.3-zlib-1.2.7.patch"
+
+  autoreconf
   ./configure --prefix=/usr \
               --with-alsa \
-              --enable-fullscreen
+              --enable-fullscreen \
+              --enable-gnomeui
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" realdocdir="/usr/share/doc/vice" install
+  ln -s /usr/share/doc/vice "${pkgdir}/usr/lib/vice/doc"
 }
diff --git a/extra/vice/vice-2.3-no-fc-cache.patch b/extra/vice/vice-2.3-no-fc-cache.patch
new file mode 100644
index 000000000..7efdc87c7
--- /dev/null
+++ b/extra/vice/vice-2.3-no-fc-cache.patch
@@ -0,0 +1,15 @@
+--- a/configure.in	2011-02-19 23:07:05.000000000 +0100
++++ b/configure.in	2012-08-06 13:18:46.000000000 +0200
+@@ -1990,12 +1990,7 @@
+ 
+ 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
+ 
+ if test x"$is_amigaos4" = "xyes"; then
+   if test x"$enable_sdlui" != "xyes"; then
diff --git a/extra/vice/vice-2.3-notexi-notxt.patch b/extra/vice/vice-2.3-notexi-notxt.patch
new file mode 100644
index 000000000..f26ac0beb
--- /dev/null
+++ b/extra/vice/vice-2.3-notexi-notxt.patch
@@ -0,0 +1,23 @@
+--- a/doc/Makefile.am	2011-02-05 17:52:48.000000000 +0100
++++ b/doc/Makefile.am	2012-08-06 14:33:37.000000000 +0200
+@@ -48,14 +48,7 @@
+ $(srcdir)/vice.txt:	vice.texi
+ 	$(MAKEINFO) -o $(srcdir)/vice.txt --no-headers $(srcdir)/vice.texi
+ 
+-if BUILD_PDF
+-$(srcdir)/vice.pdf:	vice.texi
+-	$(TEXI2DVI) -q --clean --pdf -o $(srcdir)/vice.pdf $(srcdir)/vice.texi
+-
+-PDF_DEPS=$(srcdir)/vice.pdf
+-else
+ PDF_DEPS=
+-endif
+ 
+ if BUILD_AMIGAGUIDE
+ $(srcdir)/vice.guide:	vice.texi
+@@ -99,4 +92,4 @@
+ IPF_DEPS=
+ endif
+ 
+-INFO_DEPS = $(srcdir)/vice.txt $(srcdir)/vice.info $(PDF_DEPS) $(GUIDE_DEPS) $(HLP_DEPS) $(CHM_DEPS) $(IPF_DEPS)
++INFO_DEPS = $(srcdir)/vice.info $(PDF_DEPS) $(GUIDE_DEPS) $(HLP_DEPS) $(CHM_DEPS) $(IPF_DEPS)
diff --git a/extra/vice/vice-2.3-zlib-1.2.7.patch b/extra/vice/vice-2.3-zlib-1.2.7.patch
new file mode 100644
index 000000000..079a8d6bd
--- /dev/null
+++ b/extra/vice/vice-2.3-zlib-1.2.7.patch
@@ -0,0 +1,37 @@
+--- a/src/zfile.c	2010-07-16 20:20:01.000000000 +0200
++++ b/src/zfile.c	2012-08-06 15:29:10.000000000 +0200
+@@ -197,10 +197,10 @@
+     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);
+@@ -209,7 +209,7 @@
+         }
+     } while (len > 0);
+ 
+-    gzclose(fdsrc);
++    gzclose((gzFile)fdsrc);
+     fclose(fddest);
+ 
+     return tmp_name;
+@@ -792,10 +792,10 @@
+         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);
diff --git a/extra/vice/vice.install b/extra/vice/vice.install
new file mode 100644
index 000000000..b8b72f7da
--- /dev/null
+++ b/extra/vice/vice.install
@@ -0,0 +1,18 @@
+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
+}
+
+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
+}