[arch-commits] Commit in vice/repos (16 files)
Bartłomiej Piotrowski
bpiotrowski at nymeria.archlinux.org
Sun Jun 1 11:56:41 UTC 2014
Date: Sunday, June 1, 2014 @ 13:56:40
Author: bpiotrowski
Revision: 214026
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
vice/repos/staging-i686/
vice/repos/staging-i686/PKGBUILD
(from rev 214025, vice/trunk/PKGBUILD)
vice/repos/staging-i686/vice-2.4-giflib-5.1.0.patch
(from rev 214025, vice/trunk/vice-2.4-giflib-5.1.0.patch)
vice/repos/staging-i686/vice-2.4-no-fc-cache-no-lib64.patch
(from rev 214025, vice/trunk/vice-2.4-no-fc-cache-no-lib64.patch)
vice/repos/staging-i686/vice-2.4-notexi-notxt.patch
(from rev 214025, vice/trunk/vice-2.4-notexi-notxt.patch)
vice/repos/staging-i686/vice-2.4-x11video.patch
(from rev 214025, vice/trunk/vice-2.4-x11video.patch)
vice/repos/staging-i686/vice-2.4-zlib-1.2.7.patch
(from rev 214025, vice/trunk/vice-2.4-zlib-1.2.7.patch)
vice/repos/staging-i686/vice.install
(from rev 214025, vice/trunk/vice.install)
vice/repos/staging-x86_64/
vice/repos/staging-x86_64/PKGBUILD
(from rev 214025, vice/trunk/PKGBUILD)
vice/repos/staging-x86_64/vice-2.4-giflib-5.1.0.patch
(from rev 214025, vice/trunk/vice-2.4-giflib-5.1.0.patch)
vice/repos/staging-x86_64/vice-2.4-no-fc-cache-no-lib64.patch
(from rev 214025, vice/trunk/vice-2.4-no-fc-cache-no-lib64.patch)
vice/repos/staging-x86_64/vice-2.4-notexi-notxt.patch
(from rev 214025, vice/trunk/vice-2.4-notexi-notxt.patch)
vice/repos/staging-x86_64/vice-2.4-x11video.patch
(from rev 214025, vice/trunk/vice-2.4-x11video.patch)
vice/repos/staging-x86_64/vice-2.4-zlib-1.2.7.patch
(from rev 214025, vice/trunk/vice-2.4-zlib-1.2.7.patch)
vice/repos/staging-x86_64/vice.install
(from rev 214025, vice/trunk/vice.install)
----------------------------------------------------+
staging-i686/PKGBUILD | 60 +++++++++++++++++++
staging-i686/vice-2.4-giflib-5.1.0.patch | 39 ++++++++++++
staging-i686/vice-2.4-no-fc-cache-no-lib64.patch | 25 +++++++
staging-i686/vice-2.4-notexi-notxt.patch | 28 ++++++++
staging-i686/vice-2.4-x11video.patch | 11 +++
staging-i686/vice-2.4-zlib-1.2.7.patch | 37 +++++++++++
staging-i686/vice.install | 18 +++++
staging-x86_64/PKGBUILD | 60 +++++++++++++++++++
staging-x86_64/vice-2.4-giflib-5.1.0.patch | 39 ++++++++++++
staging-x86_64/vice-2.4-no-fc-cache-no-lib64.patch | 25 +++++++
staging-x86_64/vice-2.4-notexi-notxt.patch | 28 ++++++++
staging-x86_64/vice-2.4-x11video.patch | 11 +++
staging-x86_64/vice-2.4-zlib-1.2.7.patch | 37 +++++++++++
staging-x86_64/vice.install | 18 +++++
14 files changed, 436 insertions(+)
Copied: vice/repos/staging-i686/PKGBUILD (from rev 214025, vice/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2014-06-01 11:56:40 UTC (rev 214026)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgname=vice
+pkgver=2.4
+pkgrel=6
+pkgdesc="The Versatile Commodore 8-bit Emulator"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://vice-emu.sourceforge.net/"
+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'
+ 'vice-2.4-giflib-5.1.0.patch')
+md5sums=('b017647a0c159bbe43cdb81762d1c577'
+ '99931efcb779734c9df069e94f0b38a5'
+ 'b0d1392664decd3169740baf90661710'
+ '877f93db1550ea81386aae7c3b578442'
+ '9d9f62f05a967a5926df496e86404148'
+ '94563e3023d804341f1d252c0e6d1384')
+
+prepare() {
+ cd ${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"
+ patch -Np1 -i "${srcdir}/vice-2.4-giflib-5.1.0.patch"
+
+ sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in
+
+ autoreconf -vi
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ ./configure --prefix=/usr \
+ --enable-ethernet \
+ --with-alsa \
+ --enable-fullscreen \
+ --enable-gnomeui \
+ --disable-ffmpeg
+ make
+}
+
+package() {
+ cd ${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/staging-i686/vice-2.4-giflib-5.1.0.patch (from rev 214025, vice/trunk/vice-2.4-giflib-5.1.0.patch)
===================================================================
--- staging-i686/vice-2.4-giflib-5.1.0.patch (rev 0)
+++ staging-i686/vice-2.4-giflib-5.1.0.patch 2014-06-01 11:56:40 UTC (rev 214026)
@@ -0,0 +1,39 @@
+diff -rupN a/src/gfxoutputdrv/gifdrv.c b/src/gfxoutputdrv/gifdrv.c
+--- a/src/gfxoutputdrv/gifdrv.c 2012-07-25 23:46:05.000000000 +0000
++++ b/src/gfxoutputdrv/gifdrv.c 2014-06-01 11:48:40.493722851 +0000
+@@ -114,7 +114,7 @@ static int gifdrv_open(screenshot_t *scr
+ if (EGifPutScreenDesc(sdata->fd, screenshot->width, screenshot->height, 8, 0, gif_colors) == GIF_ERROR ||
+ EGifPutImageDesc(sdata->fd, 0, 0, screenshot->width, screenshot->height, 0, NULL) == GIF_ERROR)
+ {
+- EGifCloseFile(sdata->fd);
++ EGifCloseFile(sdata->fd, NULL);
+ VICE_FreeMapObject(gif_colors);
+ lib_free(sdata->data);
+ lib_free(sdata->ext_filename);
+@@ -145,7 +145,7 @@ static int gifdrv_close(screenshot_t *sc
+
+ sdata = screenshot->gfxoutputdrv_data;
+
+- EGifCloseFile(sdata->fd);
++ EGifCloseFile(sdata->fd, NULL);
+ VICE_FreeMapObject(gif_colors);
+
+ /* for some reason giflib will create a file with unexpected
+@@ -184,7 +184,7 @@ static char *gifdrv_memmap_ext_filename;
+
+ static int gifdrv_close_memmap(void)
+ {
+- EGifCloseFile(gifdrv_memmap_fd);
++ EGifCloseFile(gifdrv_memmap_fd, NULL);
+ VICE_FreeMapObject(gif_colors);
+ lib_free(gifdrv_memmap_ext_filename);
+
+@@ -231,7 +231,7 @@ static int gifdrv_open_memmap(const char
+ if (EGifPutScreenDesc(gifdrv_memmap_fd, x_size, y_size, 8, 0, gif_colors) == GIF_ERROR ||
+ EGifPutImageDesc(gifdrv_memmap_fd, 0, 0, x_size, y_size, 0, NULL) == GIF_ERROR)
+ {
+- EGifCloseFile(gifdrv_memmap_fd);
++ EGifCloseFile(gifdrv_memmap_fd, NULL);
+ VICE_FreeMapObject(gif_colors);
+ lib_free(gifdrv_memmap_ext_filename);
+ return -1;
Copied: vice/repos/staging-i686/vice-2.4-no-fc-cache-no-lib64.patch (from rev 214025, vice/trunk/vice-2.4-no-fc-cache-no-lib64.patch)
===================================================================
--- staging-i686/vice-2.4-no-fc-cache-no-lib64.patch (rev 0)
+++ staging-i686/vice-2.4-no-fc-cache-no-lib64.patch 2014-06-01 11:56:40 UTC (rev 214026)
@@ -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"
Copied: vice/repos/staging-i686/vice-2.4-notexi-notxt.patch (from rev 214025, vice/trunk/vice-2.4-notexi-notxt.patch)
===================================================================
--- staging-i686/vice-2.4-notexi-notxt.patch (rev 0)
+++ staging-i686/vice-2.4-notexi-notxt.patch 2014-06-01 11:56:40 UTC (rev 214026)
@@ -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)
Copied: vice/repos/staging-i686/vice-2.4-x11video.patch (from rev 214025, vice/trunk/vice-2.4-x11video.patch)
===================================================================
--- staging-i686/vice-2.4-x11video.patch (rev 0)
+++ staging-i686/vice-2.4-x11video.patch 2014-06-01 11:56:40 UTC (rev 214026)
@@ -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>
Copied: vice/repos/staging-i686/vice-2.4-zlib-1.2.7.patch (from rev 214025, vice/trunk/vice-2.4-zlib-1.2.7.patch)
===================================================================
--- staging-i686/vice-2.4-zlib-1.2.7.patch (rev 0)
+++ staging-i686/vice-2.4-zlib-1.2.7.patch 2014-06-01 11:56:40 UTC (rev 214026)
@@ -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);
Copied: vice/repos/staging-i686/vice.install (from rev 214025, vice/trunk/vice.install)
===================================================================
--- staging-i686/vice.install (rev 0)
+++ staging-i686/vice.install 2014-06-01 11:56:40 UTC (rev 214026)
@@ -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
+}
Copied: vice/repos/staging-x86_64/PKGBUILD (from rev 214025, vice/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2014-06-01 11:56:40 UTC (rev 214026)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgname=vice
+pkgver=2.4
+pkgrel=6
+pkgdesc="The Versatile Commodore 8-bit Emulator"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://vice-emu.sourceforge.net/"
+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'
+ 'vice-2.4-giflib-5.1.0.patch')
+md5sums=('b017647a0c159bbe43cdb81762d1c577'
+ '99931efcb779734c9df069e94f0b38a5'
+ 'b0d1392664decd3169740baf90661710'
+ '877f93db1550ea81386aae7c3b578442'
+ '9d9f62f05a967a5926df496e86404148'
+ '94563e3023d804341f1d252c0e6d1384')
+
+prepare() {
+ cd ${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"
+ patch -Np1 -i "${srcdir}/vice-2.4-giflib-5.1.0.patch"
+
+ sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in
+
+ autoreconf -vi
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ ./configure --prefix=/usr \
+ --enable-ethernet \
+ --with-alsa \
+ --enable-fullscreen \
+ --enable-gnomeui \
+ --disable-ffmpeg
+ make
+}
+
+package() {
+ cd ${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/staging-x86_64/vice-2.4-giflib-5.1.0.patch (from rev 214025, vice/trunk/vice-2.4-giflib-5.1.0.patch)
===================================================================
--- staging-x86_64/vice-2.4-giflib-5.1.0.patch (rev 0)
+++ staging-x86_64/vice-2.4-giflib-5.1.0.patch 2014-06-01 11:56:40 UTC (rev 214026)
@@ -0,0 +1,39 @@
+diff -rupN a/src/gfxoutputdrv/gifdrv.c b/src/gfxoutputdrv/gifdrv.c
+--- a/src/gfxoutputdrv/gifdrv.c 2012-07-25 23:46:05.000000000 +0000
++++ b/src/gfxoutputdrv/gifdrv.c 2014-06-01 11:48:40.493722851 +0000
+@@ -114,7 +114,7 @@ static int gifdrv_open(screenshot_t *scr
+ if (EGifPutScreenDesc(sdata->fd, screenshot->width, screenshot->height, 8, 0, gif_colors) == GIF_ERROR ||
+ EGifPutImageDesc(sdata->fd, 0, 0, screenshot->width, screenshot->height, 0, NULL) == GIF_ERROR)
+ {
+- EGifCloseFile(sdata->fd);
++ EGifCloseFile(sdata->fd, NULL);
+ VICE_FreeMapObject(gif_colors);
+ lib_free(sdata->data);
+ lib_free(sdata->ext_filename);
+@@ -145,7 +145,7 @@ static int gifdrv_close(screenshot_t *sc
+
+ sdata = screenshot->gfxoutputdrv_data;
+
+- EGifCloseFile(sdata->fd);
++ EGifCloseFile(sdata->fd, NULL);
+ VICE_FreeMapObject(gif_colors);
+
+ /* for some reason giflib will create a file with unexpected
+@@ -184,7 +184,7 @@ static char *gifdrv_memmap_ext_filename;
+
+ static int gifdrv_close_memmap(void)
+ {
+- EGifCloseFile(gifdrv_memmap_fd);
++ EGifCloseFile(gifdrv_memmap_fd, NULL);
+ VICE_FreeMapObject(gif_colors);
+ lib_free(gifdrv_memmap_ext_filename);
+
+@@ -231,7 +231,7 @@ static int gifdrv_open_memmap(const char
+ if (EGifPutScreenDesc(gifdrv_memmap_fd, x_size, y_size, 8, 0, gif_colors) == GIF_ERROR ||
+ EGifPutImageDesc(gifdrv_memmap_fd, 0, 0, x_size, y_size, 0, NULL) == GIF_ERROR)
+ {
+- EGifCloseFile(gifdrv_memmap_fd);
++ EGifCloseFile(gifdrv_memmap_fd, NULL);
+ VICE_FreeMapObject(gif_colors);
+ lib_free(gifdrv_memmap_ext_filename);
+ return -1;
Copied: vice/repos/staging-x86_64/vice-2.4-no-fc-cache-no-lib64.patch (from rev 214025, vice/trunk/vice-2.4-no-fc-cache-no-lib64.patch)
===================================================================
--- staging-x86_64/vice-2.4-no-fc-cache-no-lib64.patch (rev 0)
+++ staging-x86_64/vice-2.4-no-fc-cache-no-lib64.patch 2014-06-01 11:56:40 UTC (rev 214026)
@@ -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"
Copied: vice/repos/staging-x86_64/vice-2.4-notexi-notxt.patch (from rev 214025, vice/trunk/vice-2.4-notexi-notxt.patch)
===================================================================
--- staging-x86_64/vice-2.4-notexi-notxt.patch (rev 0)
+++ staging-x86_64/vice-2.4-notexi-notxt.patch 2014-06-01 11:56:40 UTC (rev 214026)
@@ -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)
Copied: vice/repos/staging-x86_64/vice-2.4-x11video.patch (from rev 214025, vice/trunk/vice-2.4-x11video.patch)
===================================================================
--- staging-x86_64/vice-2.4-x11video.patch (rev 0)
+++ staging-x86_64/vice-2.4-x11video.patch 2014-06-01 11:56:40 UTC (rev 214026)
@@ -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>
Copied: vice/repos/staging-x86_64/vice-2.4-zlib-1.2.7.patch (from rev 214025, vice/trunk/vice-2.4-zlib-1.2.7.patch)
===================================================================
--- staging-x86_64/vice-2.4-zlib-1.2.7.patch (rev 0)
+++ staging-x86_64/vice-2.4-zlib-1.2.7.patch 2014-06-01 11:56:40 UTC (rev 214026)
@@ -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);
Copied: vice/repos/staging-x86_64/vice.install (from rev 214025, vice/trunk/vice.install)
===================================================================
--- staging-x86_64/vice.install (rev 0)
+++ staging-x86_64/vice.install 2014-06-01 11:56:40 UTC (rev 214026)
@@ -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
+}
More information about the arch-commits
mailing list