Date: Saturday, November 3, 2012 @ 14:22:25 Author: giovanni Revision: 170153
upgpkg: vice 2.4-1 upstream release Added: vice/trunk/vice-2.4-no-fc-cache-no-lib64.patch vice/trunk/vice-2.4-notexi-notxt.patch vice/trunk/vice-2.4-x11video.patch vice/trunk/vice-2.4-zlib-1.2.7.patch Modified: vice/trunk/PKGBUILD Deleted: vice/trunk/vice-2.3-no-fc-cache.patch vice/trunk/vice-2.3-notexi-notxt.patch vice/trunk/vice-2.3-x11video.patch vice/trunk/vice-2.3-zlib-1.2.7.patch -------------------------------------+ PKGBUILD | 32 ++++++++++++++--------------- vice-2.3-no-fc-cache.patch | 15 ------------- vice-2.3-notexi-notxt.patch | 23 --------------------- vice-2.3-x11video.patch | 11 ---------- vice-2.3-zlib-1.2.7.patch | 37 ---------------------------------- vice-2.4-no-fc-cache-no-lib64.patch | 25 ++++++++++++++++++++++ vice-2.4-notexi-notxt.patch | 28 +++++++++++++++++++++++++ vice-2.4-x11video.patch | 11 ++++++++++ vice-2.4-zlib-1.2.7.patch | 37 ++++++++++++++++++++++++++++++++++ 9 files changed, 117 insertions(+), 102 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-11-03 17:56:09 UTC (rev 170152) +++ PKGBUILD 2012-11-03 18:22:25 UTC (rev 170153) @@ -3,34 +3,34 @@ # Contributor: Tom Newsom <[email protected]> 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 \ Deleted: vice-2.3-no-fc-cache.patch =================================================================== --- vice-2.3-no-fc-cache.patch 2012-11-03 17:56:09 UTC (rev 170152) +++ vice-2.3-no-fc-cache.patch 2012-11-03 18:22:25 UTC (rev 170153) @@ -1,15 +0,0 @@ ---- 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 Deleted: vice-2.3-notexi-notxt.patch =================================================================== --- vice-2.3-notexi-notxt.patch 2012-11-03 17:56:09 UTC (rev 170152) +++ vice-2.3-notexi-notxt.patch 2012-11-03 18:22:25 UTC (rev 170153) @@ -1,23 +0,0 @@ ---- 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) Deleted: vice-2.3-x11video.patch =================================================================== --- vice-2.3-x11video.patch 2012-11-03 17:56:09 UTC (rev 170152) +++ vice-2.3-x11video.patch 2012-11-03 18:22:25 UTC (rev 170153) @@ -1,11 +0,0 @@ ---- a/src/arch/unix/x11/xaw/x11video.c 2011-01-18 23:59:00.000000000 +0100 -+++ b/src/arch/unix/x11/xaw/x11video.c 2011-02-27 18:40:52.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: vice-2.3-zlib-1.2.7.patch =================================================================== --- vice-2.3-zlib-1.2.7.patch 2012-11-03 17:56:09 UTC (rev 170152) +++ vice-2.3-zlib-1.2.7.patch 2012-11-03 18:22:25 UTC (rev 170153) @@ -1,37 +0,0 @@ ---- 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); Added: vice-2.4-no-fc-cache-no-lib64.patch =================================================================== --- vice-2.4-no-fc-cache-no-lib64.patch (rev 0) +++ vice-2.4-no-fc-cache-no-lib64.patch 2012-11-03 18:22:25 UTC (rev 170153) @@ -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" Added: vice-2.4-notexi-notxt.patch =================================================================== --- vice-2.4-notexi-notxt.patch (rev 0) +++ vice-2.4-notexi-notxt.patch 2012-11-03 18:22:25 UTC (rev 170153) @@ -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) Added: vice-2.4-x11video.patch =================================================================== --- vice-2.4-x11video.patch (rev 0) +++ vice-2.4-x11video.patch 2012-11-03 18:22:25 UTC (rev 170153) @@ -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> Added: vice-2.4-zlib-1.2.7.patch =================================================================== --- vice-2.4-zlib-1.2.7.patch (rev 0) +++ vice-2.4-zlib-1.2.7.patch 2012-11-03 18:22:25 UTC (rev 170153) @@ -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);
