Date: Tuesday, November 6, 2012 @ 14:33:54 Author: giovanni Revision: 170377
archrelease: copy trunk to extra-i686, extra-x86_64 Added: vice/repos/extra-i686/PKGBUILD (from rev 170376, vice/trunk/PKGBUILD) vice/repos/extra-i686/vice-2.4-no-fc-cache-no-lib64.patch (from rev 170376, vice/trunk/vice-2.4-no-fc-cache-no-lib64.patch) vice/repos/extra-i686/vice-2.4-notexi-notxt.patch (from rev 170376, vice/trunk/vice-2.4-notexi-notxt.patch) vice/repos/extra-i686/vice-2.4-x11video.patch (from rev 170376, vice/trunk/vice-2.4-x11video.patch) vice/repos/extra-i686/vice-2.4-zlib-1.2.7.patch (from rev 170376, vice/trunk/vice-2.4-zlib-1.2.7.patch) vice/repos/extra-i686/vice.install (from rev 170376, vice/trunk/vice.install) vice/repos/extra-x86_64/PKGBUILD (from rev 170376, vice/trunk/PKGBUILD) vice/repos/extra-x86_64/vice-2.4-no-fc-cache-no-lib64.patch (from rev 170376, vice/trunk/vice-2.4-no-fc-cache-no-lib64.patch) vice/repos/extra-x86_64/vice-2.4-notexi-notxt.patch (from rev 170376, vice/trunk/vice-2.4-notexi-notxt.patch) vice/repos/extra-x86_64/vice-2.4-x11video.patch (from rev 170376, vice/trunk/vice-2.4-x11video.patch) vice/repos/extra-x86_64/vice-2.4-zlib-1.2.7.patch (from rev 170376, vice/trunk/vice-2.4-zlib-1.2.7.patch) vice/repos/extra-x86_64/vice.install (from rev 170376, vice/trunk/vice.install) Deleted: vice/repos/extra-i686/PKGBUILD vice/repos/extra-i686/vice-2.4-no-fc-cache-no-lib64.patch vice/repos/extra-i686/vice-2.4-notexi-notxt.patch vice/repos/extra-i686/vice-2.4-x11video.patch vice/repos/extra-i686/vice-2.4-zlib-1.2.7.patch vice/repos/extra-i686/vice.install vice/repos/extra-x86_64/PKGBUILD vice/repos/extra-x86_64/vice-2.4-no-fc-cache-no-lib64.patch vice/repos/extra-x86_64/vice-2.4-notexi-notxt.patch vice/repos/extra-x86_64/vice-2.4-x11video.patch vice/repos/extra-x86_64/vice-2.4-zlib-1.2.7.patch vice/repos/extra-x86_64/vice.install --------------------------------------------------+ extra-i686/PKGBUILD | 98 ++++++++++----------- extra-i686/vice-2.4-no-fc-cache-no-lib64.patch | 50 +++++----- extra-i686/vice-2.4-notexi-notxt.patch | 56 ++++++------ extra-i686/vice-2.4-x11video.patch | 22 ++-- extra-i686/vice-2.4-zlib-1.2.7.patch | 74 +++++++-------- extra-i686/vice.install | 36 +++---- extra-x86_64/PKGBUILD | 98 ++++++++++----------- extra-x86_64/vice-2.4-no-fc-cache-no-lib64.patch | 50 +++++----- extra-x86_64/vice-2.4-notexi-notxt.patch | 56 ++++++------ extra-x86_64/vice-2.4-x11video.patch | 22 ++-- extra-x86_64/vice-2.4-zlib-1.2.7.patch | 74 +++++++-------- extra-x86_64/vice.install | 36 +++---- 12 files changed, 338 insertions(+), 334 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2012-11-06 19:33:03 UTC (rev 170376) +++ extra-i686/PKGBUILD 2012-11-06 19:33:54 UTC (rev 170377) @@ -1,48 +0,0 @@ -# $Id$ -# Maintainer: Giovanni Scafora <giova...@archlinux.org> -# Contributor: Tom Newsom <jeeps...@gmx.co.uk> - -pkgname=vice -pkgver=2.4 -pkgrel=1 -pkgdesc="The Versatile Commodore 8-bit Emulator" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.viceteam.org/" -depends=('alsa-lib' 'giflib' 'libxxf86vm' 'vte') -makedepends=('xorg-font-utils') -options=('!makeflags') -install=vice.install -source=("http://downloads.sourceforge.net/project/vice-emu/releases/${pkgname}-${pkgver}.tar.gz" - 'vice-2.4-x11video.patch' - 'vice-2.4-no-fc-cache-no-lib64.patch' - 'vice-2.4-notexi-notxt.patch' - 'vice-2.4-zlib-1.2.7.patch') -md5sums=('b017647a0c159bbe43cdb81762d1c577' - '99931efcb779734c9df069e94f0b38a5' - 'b0d1392664decd3169740baf90661710' - '877f93db1550ea81386aae7c3b578442' - '9d9f62f05a967a5926df496e86404148') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np1 -i "${srcdir}/vice-2.4-x11video.patch" - patch -Np1 -i "${srcdir}/vice-2.4-no-fc-cache-no-lib64.patch" - patch -Np1 -i "${srcdir}/vice-2.4-notexi-notxt.patch" - patch -Np1 -i "${srcdir}/vice-2.4-zlib-1.2.7.patch" - - autoreconf - ./configure --prefix=/usr \ - --with-alsa \ - --enable-fullscreen \ - --enable-gnomeui - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" realdocdir="/usr/share/doc/vice" install - ln -s /usr/share/doc/vice "${pkgdir}/usr/lib/vice/doc" -} Copied: vice/repos/extra-i686/PKGBUILD (from rev 170376, vice/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2012-11-06 19:33:54 UTC (rev 170377) @@ -0,0 +1,50 @@ +# $Id$ +# Maintainer: Giovanni Scafora <giova...@archlinux.org> +# Contributor: Tom Newsom <jeeps...@gmx.co.uk> + +pkgname=vice +pkgver=2.4 +pkgrel=2 +pkgdesc="The Versatile Commodore 8-bit Emulator" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.viceteam.org/" +depends=('alsa-lib' 'giflib' 'libxxf86vm' 'vte' 'libnet' 'libpcap') +makedepends=('xorg-font-utils') +options=('!makeflags') +install=vice.install +source=("http://downloads.sourceforge.net/project/vice-emu/releases/${pkgname}-${pkgver}.tar.gz" + 'vice-2.4-x11video.patch' + 'vice-2.4-no-fc-cache-no-lib64.patch' + 'vice-2.4-notexi-notxt.patch' + 'vice-2.4-zlib-1.2.7.patch') +md5sums=('b017647a0c159bbe43cdb81762d1c577' + '99931efcb779734c9df069e94f0b38a5' + 'b0d1392664decd3169740baf90661710' + '877f93db1550ea81386aae7c3b578442' + '9d9f62f05a967a5926df496e86404148') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 -i "${srcdir}/vice-2.4-x11video.patch" + patch -Np1 -i "${srcdir}/vice-2.4-no-fc-cache-no-lib64.patch" + patch -Np1 -i "${srcdir}/vice-2.4-notexi-notxt.patch" + patch -Np1 -i "${srcdir}/vice-2.4-zlib-1.2.7.patch" + + autoreconf + ./configure --prefix=/usr \ + --enable-ethernet \ + --with-alsa \ + --enable-fullscreen \ + --enable-gnomeui \ + --disable-ffmpeg + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" realdocdir="/usr/share/doc/vice" install + ln -s /usr/share/doc/vice "${pkgdir}/usr/lib/vice/doc" +} Deleted: extra-i686/vice-2.4-no-fc-cache-no-lib64.patch =================================================================== --- extra-i686/vice-2.4-no-fc-cache-no-lib64.patch 2012-11-06 19:33:03 UTC (rev 170376) +++ extra-i686/vice-2.4-no-fc-cache-no-lib64.patch 2012-11-06 19:33:54 UTC (rev 170377) @@ -1,25 +0,0 @@ ---- a/configure.in 2012-11-01 16:37:51.000000000 +0100 -+++ b/configure.in 2012-11-03 18:07:35.000000000 +0100 -@@ -2090,12 +2090,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 -+AM_CONDITIONAL(HAVE_FC_CACHE, false) - - if test x"$is_amigaos4" = "xyes"; then - if test x"$enable_sdlui" != "xyes"; then -@@ -3424,7 +3419,7 @@ - ;; - 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" Copied: vice/repos/extra-i686/vice-2.4-no-fc-cache-no-lib64.patch (from rev 170376, vice/trunk/vice-2.4-no-fc-cache-no-lib64.patch) =================================================================== --- extra-i686/vice-2.4-no-fc-cache-no-lib64.patch (rev 0) +++ extra-i686/vice-2.4-no-fc-cache-no-lib64.patch 2012-11-06 19:33:54 UTC (rev 170377) @@ -0,0 +1,25 @@ +--- a/configure.in 2012-11-01 16:37:51.000000000 +0100 ++++ b/configure.in 2012-11-03 18:07:35.000000000 +0100 +@@ -2090,12 +2090,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 ++AM_CONDITIONAL(HAVE_FC_CACHE, false) + + if test x"$is_amigaos4" = "xyes"; then + if test x"$enable_sdlui" != "xyes"; then +@@ -3424,7 +3419,7 @@ + ;; + 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" Deleted: extra-i686/vice-2.4-notexi-notxt.patch =================================================================== --- extra-i686/vice-2.4-notexi-notxt.patch 2012-11-06 19:33:03 UTC (rev 170376) +++ extra-i686/vice-2.4-notexi-notxt.patch 2012-11-06 19:33:54 UTC (rev 170377) @@ -1,28 +0,0 @@ ---- a/doc/Makefile.am 2012-10-20 01:32:30.000000000 +0200 -+++ b/doc/Makefile.am 2012-11-03 18:29:03.000000000 +0100 -@@ -79,19 +79,6 @@ - $(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 -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 - $(srcdir)/texi2guide.sh $(MAKEGUIDE) $(builddir)/vice.guide $(srcdir)/vice.texi -@@ -148,4 +135,4 @@ - touch $(builddir)/vice.info - $(MAKEINFO) -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) Copied: vice/repos/extra-i686/vice-2.4-notexi-notxt.patch (from rev 170376, vice/trunk/vice-2.4-notexi-notxt.patch) =================================================================== --- extra-i686/vice-2.4-notexi-notxt.patch (rev 0) +++ extra-i686/vice-2.4-notexi-notxt.patch 2012-11-06 19:33:54 UTC (rev 170377) @@ -0,0 +1,28 @@ +--- a/doc/Makefile.am 2012-10-20 01:32:30.000000000 +0200 ++++ b/doc/Makefile.am 2012-11-03 18:29:03.000000000 +0100 +@@ -79,19 +79,6 @@ + $(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 -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 + $(srcdir)/texi2guide.sh $(MAKEGUIDE) $(builddir)/vice.guide $(srcdir)/vice.texi +@@ -148,4 +135,4 @@ + touch $(builddir)/vice.info + $(MAKEINFO) -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) Deleted: extra-i686/vice-2.4-x11video.patch =================================================================== --- extra-i686/vice-2.4-x11video.patch 2012-11-06 19:33:03 UTC (rev 170376) +++ extra-i686/vice-2.4-x11video.patch 2012-11-06 19:33:54 UTC (rev 170377) @@ -1,11 +0,0 @@ ---- a/src/arch/unix/x11/xaw/x11video.c 2012-10-28 22:26:24.000000000 +0100 -+++ b/src/arch/unix/x11/xaw/x11video.c 2012-11-03 18:54:08.000000000 +0100 -@@ -60,6 +60,8 @@ - #include <X11/Xutil.h> - #include <X11/Intrinsic.h> - #include <X11/cursorfont.h> -+#include <X11/Xmd.h> -+#include <X11/extensions/shmproto.h> - - #include <stdio.h> - #include <stdlib.h> Copied: vice/repos/extra-i686/vice-2.4-x11video.patch (from rev 170376, vice/trunk/vice-2.4-x11video.patch) =================================================================== --- extra-i686/vice-2.4-x11video.patch (rev 0) +++ extra-i686/vice-2.4-x11video.patch 2012-11-06 19:33:54 UTC (rev 170377) @@ -0,0 +1,11 @@ +--- a/src/arch/unix/x11/xaw/x11video.c 2012-10-28 22:26:24.000000000 +0100 ++++ b/src/arch/unix/x11/xaw/x11video.c 2012-11-03 18:54:08.000000000 +0100 +@@ -60,6 +60,8 @@ + #include <X11/Xutil.h> + #include <X11/Intrinsic.h> + #include <X11/cursorfont.h> ++#include <X11/Xmd.h> ++#include <X11/extensions/shmproto.h> + + #include <stdio.h> + #include <stdlib.h> Deleted: extra-i686/vice-2.4-zlib-1.2.7.patch =================================================================== --- extra-i686/vice-2.4-zlib-1.2.7.patch 2012-11-06 19:33:03 UTC (rev 170376) +++ extra-i686/vice-2.4-zlib-1.2.7.patch 2012-11-06 19:33:54 UTC (rev 170377) @@ -1,37 +0,0 @@ ---- a/src/zfile.c 2012-10-13 14:53:16.000000000 +0200 -+++ b/src/zfile.c 2012-11-03 18:47:40.000000000 +0100 -@@ -198,10 +198,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); -@@ -210,7 +210,7 @@ - } - } while (len > 0); - -- gzclose(fdsrc); -+ gzclose((gzFile)fdsrc); - fclose(fddest); - - return tmp_name; -@@ -779,10 +779,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); Copied: vice/repos/extra-i686/vice-2.4-zlib-1.2.7.patch (from rev 170376, vice/trunk/vice-2.4-zlib-1.2.7.patch) =================================================================== --- extra-i686/vice-2.4-zlib-1.2.7.patch (rev 0) +++ extra-i686/vice-2.4-zlib-1.2.7.patch 2012-11-06 19:33:54 UTC (rev 170377) @@ -0,0 +1,37 @@ +--- a/src/zfile.c 2012-10-13 14:53:16.000000000 +0200 ++++ b/src/zfile.c 2012-11-03 18:47:40.000000000 +0100 +@@ -198,10 +198,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); +@@ -210,7 +210,7 @@ + } + } while (len > 0); + +- gzclose(fdsrc); ++ gzclose((gzFile)fdsrc); + fclose(fddest); + + return tmp_name; +@@ -779,10 +779,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); Deleted: extra-i686/vice.install =================================================================== --- extra-i686/vice.install 2012-11-06 19:33:03 UTC (rev 170376) +++ extra-i686/vice.install 2012-11-06 19:33:54 UTC (rev 170377) @@ -1,18 +0,0 @@ -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 -} Copied: vice/repos/extra-i686/vice.install (from rev 170376, vice/trunk/vice.install) =================================================================== --- extra-i686/vice.install (rev 0) +++ extra-i686/vice.install 2012-11-06 19:33:54 UTC (rev 170377) @@ -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 +} Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2012-11-06 19:33:03 UTC (rev 170376) +++ extra-x86_64/PKGBUILD 2012-11-06 19:33:54 UTC (rev 170377) @@ -1,48 +0,0 @@ -# $Id$ -# Maintainer: Giovanni Scafora <giova...@archlinux.org> -# Contributor: Tom Newsom <jeeps...@gmx.co.uk> - -pkgname=vice -pkgver=2.4 -pkgrel=1 -pkgdesc="The Versatile Commodore 8-bit Emulator" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.viceteam.org/" -depends=('alsa-lib' 'giflib' 'libxxf86vm' 'vte') -makedepends=('xorg-font-utils') -options=('!makeflags') -install=vice.install -source=("http://downloads.sourceforge.net/project/vice-emu/releases/${pkgname}-${pkgver}.tar.gz" - 'vice-2.4-x11video.patch' - 'vice-2.4-no-fc-cache-no-lib64.patch' - 'vice-2.4-notexi-notxt.patch' - 'vice-2.4-zlib-1.2.7.patch') -md5sums=('b017647a0c159bbe43cdb81762d1c577' - '99931efcb779734c9df069e94f0b38a5' - 'b0d1392664decd3169740baf90661710' - '877f93db1550ea81386aae7c3b578442' - '9d9f62f05a967a5926df496e86404148') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np1 -i "${srcdir}/vice-2.4-x11video.patch" - patch -Np1 -i "${srcdir}/vice-2.4-no-fc-cache-no-lib64.patch" - patch -Np1 -i "${srcdir}/vice-2.4-notexi-notxt.patch" - patch -Np1 -i "${srcdir}/vice-2.4-zlib-1.2.7.patch" - - autoreconf - ./configure --prefix=/usr \ - --with-alsa \ - --enable-fullscreen \ - --enable-gnomeui - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" realdocdir="/usr/share/doc/vice" install - ln -s /usr/share/doc/vice "${pkgdir}/usr/lib/vice/doc" -} Copied: vice/repos/extra-x86_64/PKGBUILD (from rev 170376, vice/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2012-11-06 19:33:54 UTC (rev 170377) @@ -0,0 +1,50 @@ +# $Id$ +# Maintainer: Giovanni Scafora <giova...@archlinux.org> +# Contributor: Tom Newsom <jeeps...@gmx.co.uk> + +pkgname=vice +pkgver=2.4 +pkgrel=2 +pkgdesc="The Versatile Commodore 8-bit Emulator" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.viceteam.org/" +depends=('alsa-lib' 'giflib' 'libxxf86vm' 'vte' 'libnet' 'libpcap') +makedepends=('xorg-font-utils') +options=('!makeflags') +install=vice.install +source=("http://downloads.sourceforge.net/project/vice-emu/releases/${pkgname}-${pkgver}.tar.gz" + 'vice-2.4-x11video.patch' + 'vice-2.4-no-fc-cache-no-lib64.patch' + 'vice-2.4-notexi-notxt.patch' + 'vice-2.4-zlib-1.2.7.patch') +md5sums=('b017647a0c159bbe43cdb81762d1c577' + '99931efcb779734c9df069e94f0b38a5' + 'b0d1392664decd3169740baf90661710' + '877f93db1550ea81386aae7c3b578442' + '9d9f62f05a967a5926df496e86404148') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 -i "${srcdir}/vice-2.4-x11video.patch" + patch -Np1 -i "${srcdir}/vice-2.4-no-fc-cache-no-lib64.patch" + patch -Np1 -i "${srcdir}/vice-2.4-notexi-notxt.patch" + patch -Np1 -i "${srcdir}/vice-2.4-zlib-1.2.7.patch" + + autoreconf + ./configure --prefix=/usr \ + --enable-ethernet \ + --with-alsa \ + --enable-fullscreen \ + --enable-gnomeui \ + --disable-ffmpeg + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" realdocdir="/usr/share/doc/vice" install + ln -s /usr/share/doc/vice "${pkgdir}/usr/lib/vice/doc" +} Deleted: extra-x86_64/vice-2.4-no-fc-cache-no-lib64.patch =================================================================== --- extra-x86_64/vice-2.4-no-fc-cache-no-lib64.patch 2012-11-06 19:33:03 UTC (rev 170376) +++ extra-x86_64/vice-2.4-no-fc-cache-no-lib64.patch 2012-11-06 19:33:54 UTC (rev 170377) @@ -1,25 +0,0 @@ ---- a/configure.in 2012-11-01 16:37:51.000000000 +0100 -+++ b/configure.in 2012-11-03 18:07:35.000000000 +0100 -@@ -2090,12 +2090,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 -+AM_CONDITIONAL(HAVE_FC_CACHE, false) - - if test x"$is_amigaos4" = "xyes"; then - if test x"$enable_sdlui" != "xyes"; then -@@ -3424,7 +3419,7 @@ - ;; - 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" Copied: vice/repos/extra-x86_64/vice-2.4-no-fc-cache-no-lib64.patch (from rev 170376, vice/trunk/vice-2.4-no-fc-cache-no-lib64.patch) =================================================================== --- extra-x86_64/vice-2.4-no-fc-cache-no-lib64.patch (rev 0) +++ extra-x86_64/vice-2.4-no-fc-cache-no-lib64.patch 2012-11-06 19:33:54 UTC (rev 170377) @@ -0,0 +1,25 @@ +--- a/configure.in 2012-11-01 16:37:51.000000000 +0100 ++++ b/configure.in 2012-11-03 18:07:35.000000000 +0100 +@@ -2090,12 +2090,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 ++AM_CONDITIONAL(HAVE_FC_CACHE, false) + + if test x"$is_amigaos4" = "xyes"; then + if test x"$enable_sdlui" != "xyes"; then +@@ -3424,7 +3419,7 @@ + ;; + 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" Deleted: extra-x86_64/vice-2.4-notexi-notxt.patch =================================================================== --- extra-x86_64/vice-2.4-notexi-notxt.patch 2012-11-06 19:33:03 UTC (rev 170376) +++ extra-x86_64/vice-2.4-notexi-notxt.patch 2012-11-06 19:33:54 UTC (rev 170377) @@ -1,28 +0,0 @@ ---- a/doc/Makefile.am 2012-10-20 01:32:30.000000000 +0200 -+++ b/doc/Makefile.am 2012-11-03 18:29:03.000000000 +0100 -@@ -79,19 +79,6 @@ - $(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 -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 - $(srcdir)/texi2guide.sh $(MAKEGUIDE) $(builddir)/vice.guide $(srcdir)/vice.texi -@@ -148,4 +135,4 @@ - touch $(builddir)/vice.info - $(MAKEINFO) -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) Copied: vice/repos/extra-x86_64/vice-2.4-notexi-notxt.patch (from rev 170376, vice/trunk/vice-2.4-notexi-notxt.patch) =================================================================== --- extra-x86_64/vice-2.4-notexi-notxt.patch (rev 0) +++ extra-x86_64/vice-2.4-notexi-notxt.patch 2012-11-06 19:33:54 UTC (rev 170377) @@ -0,0 +1,28 @@ +--- a/doc/Makefile.am 2012-10-20 01:32:30.000000000 +0200 ++++ b/doc/Makefile.am 2012-11-03 18:29:03.000000000 +0100 +@@ -79,19 +79,6 @@ + $(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 -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 + $(srcdir)/texi2guide.sh $(MAKEGUIDE) $(builddir)/vice.guide $(srcdir)/vice.texi +@@ -148,4 +135,4 @@ + touch $(builddir)/vice.info + $(MAKEINFO) -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) Deleted: extra-x86_64/vice-2.4-x11video.patch =================================================================== --- extra-x86_64/vice-2.4-x11video.patch 2012-11-06 19:33:03 UTC (rev 170376) +++ extra-x86_64/vice-2.4-x11video.patch 2012-11-06 19:33:54 UTC (rev 170377) @@ -1,11 +0,0 @@ ---- a/src/arch/unix/x11/xaw/x11video.c 2012-10-28 22:26:24.000000000 +0100 -+++ b/src/arch/unix/x11/xaw/x11video.c 2012-11-03 18:54:08.000000000 +0100 -@@ -60,6 +60,8 @@ - #include <X11/Xutil.h> - #include <X11/Intrinsic.h> - #include <X11/cursorfont.h> -+#include <X11/Xmd.h> -+#include <X11/extensions/shmproto.h> - - #include <stdio.h> - #include <stdlib.h> Copied: vice/repos/extra-x86_64/vice-2.4-x11video.patch (from rev 170376, vice/trunk/vice-2.4-x11video.patch) =================================================================== --- extra-x86_64/vice-2.4-x11video.patch (rev 0) +++ extra-x86_64/vice-2.4-x11video.patch 2012-11-06 19:33:54 UTC (rev 170377) @@ -0,0 +1,11 @@ +--- a/src/arch/unix/x11/xaw/x11video.c 2012-10-28 22:26:24.000000000 +0100 ++++ b/src/arch/unix/x11/xaw/x11video.c 2012-11-03 18:54:08.000000000 +0100 +@@ -60,6 +60,8 @@ + #include <X11/Xutil.h> + #include <X11/Intrinsic.h> + #include <X11/cursorfont.h> ++#include <X11/Xmd.h> ++#include <X11/extensions/shmproto.h> + + #include <stdio.h> + #include <stdlib.h> Deleted: extra-x86_64/vice-2.4-zlib-1.2.7.patch =================================================================== --- extra-x86_64/vice-2.4-zlib-1.2.7.patch 2012-11-06 19:33:03 UTC (rev 170376) +++ extra-x86_64/vice-2.4-zlib-1.2.7.patch 2012-11-06 19:33:54 UTC (rev 170377) @@ -1,37 +0,0 @@ ---- a/src/zfile.c 2012-10-13 14:53:16.000000000 +0200 -+++ b/src/zfile.c 2012-11-03 18:47:40.000000000 +0100 -@@ -198,10 +198,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); -@@ -210,7 +210,7 @@ - } - } while (len > 0); - -- gzclose(fdsrc); -+ gzclose((gzFile)fdsrc); - fclose(fddest); - - return tmp_name; -@@ -779,10 +779,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); Copied: vice/repos/extra-x86_64/vice-2.4-zlib-1.2.7.patch (from rev 170376, vice/trunk/vice-2.4-zlib-1.2.7.patch) =================================================================== --- extra-x86_64/vice-2.4-zlib-1.2.7.patch (rev 0) +++ extra-x86_64/vice-2.4-zlib-1.2.7.patch 2012-11-06 19:33:54 UTC (rev 170377) @@ -0,0 +1,37 @@ +--- a/src/zfile.c 2012-10-13 14:53:16.000000000 +0200 ++++ b/src/zfile.c 2012-11-03 18:47:40.000000000 +0100 +@@ -198,10 +198,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); +@@ -210,7 +210,7 @@ + } + } while (len > 0); + +- gzclose(fdsrc); ++ gzclose((gzFile)fdsrc); + fclose(fddest); + + return tmp_name; +@@ -779,10 +779,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); Deleted: extra-x86_64/vice.install =================================================================== --- extra-x86_64/vice.install 2012-11-06 19:33:03 UTC (rev 170376) +++ extra-x86_64/vice.install 2012-11-06 19:33:54 UTC (rev 170377) @@ -1,18 +0,0 @@ -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 -} Copied: vice/repos/extra-x86_64/vice.install (from rev 170376, vice/trunk/vice.install) =================================================================== --- extra-x86_64/vice.install (rev 0) +++ extra-x86_64/vice.install 2012-11-06 19:33:54 UTC (rev 170377) @@ -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 +}