From 2030e810a5cfd4d3ff6e0f8930560c96f2990eb2 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 4 Nov 2012 01:49:10 -0700 Subject: Sun Nov 4 01:48:41 PDT 2012 --- extra/vice/PKGBUILD | 34 +++++++++++------------ extra/vice/vice-2.4-no-fc-cache-no-lib64.patch | 25 +++++++++++++++++ extra/vice/vice-2.4-notexi-notxt.patch | 28 +++++++++++++++++++ extra/vice/vice-2.4-x11video.patch | 11 ++++++++ extra/vice/vice-2.4-zlib-1.2.7.patch | 37 ++++++++++++++++++++++++++ 5 files changed, 118 insertions(+), 17 deletions(-) create mode 100644 extra/vice/vice-2.4-no-fc-cache-no-lib64.patch create mode 100644 extra/vice/vice-2.4-notexi-notxt.patch create mode 100644 extra/vice/vice-2.4-x11video.patch create mode 100644 extra/vice/vice-2.4-zlib-1.2.7.patch (limited to 'extra/vice') diff --git a/extra/vice/PKGBUILD b/extra/vice/PKGBUILD index 552188f90..d4e85f681 100644 --- a/extra/vice/PKGBUILD +++ b/extra/vice/PKGBUILD @@ -1,36 +1,36 @@ -# $Id: PKGBUILD 164816 2012-08-06 17:52:50Z giovanni $ +# $Id: PKGBUILD 170154 2012-11-03 18:23:13Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Tom Newsom pkgname=vice -pkgver=2.3 -pkgrel=6 +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' 'gtk2') +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.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' - '873042d07f3768819b589a4c8fe24607' - '05159b6ef78e3b7dd5d362f766da4cd4' - '6d8736974a21c3862a4bf0fe0ee6e266') + '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.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" + 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 \ diff --git a/extra/vice/vice-2.4-no-fc-cache-no-lib64.patch b/extra/vice/vice-2.4-no-fc-cache-no-lib64.patch new file mode 100644 index 000000000..bb27aa3e7 --- /dev/null +++ b/extra/vice/vice-2.4-no-fc-cache-no-lib64.patch @@ -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" diff --git a/extra/vice/vice-2.4-notexi-notxt.patch b/extra/vice/vice-2.4-notexi-notxt.patch new file mode 100644 index 000000000..58121b702 --- /dev/null +++ b/extra/vice/vice-2.4-notexi-notxt.patch @@ -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 $(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) diff --git a/extra/vice/vice-2.4-x11video.patch b/extra/vice/vice-2.4-x11video.patch new file mode 100644 index 000000000..423688ba9 --- /dev/null +++ b/extra/vice/vice-2.4-x11video.patch @@ -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 + #include + #include ++#include ++#include + + #include + #include diff --git a/extra/vice/vice-2.4-zlib-1.2.7.patch b/extra/vice/vice-2.4-zlib-1.2.7.patch new file mode 100644 index 000000000..f41c8afc5 --- /dev/null +++ b/extra/vice/vice-2.4-zlib-1.2.7.patch @@ -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); -- cgit v1.2.3-54-g00ecf