diff options
author | Kevin MacMartin | 2016-06-20 22:02:45 -0400 |
---|---|---|
committer | Kevin MacMartin | 2016-06-20 22:02:45 -0400 |
commit | 2a8d107c596a0296c7bfdc761aeb7ddf960ad1e9 (patch) | |
tree | a46a159a044b1d6b685d02c52ac9d8e21c9e14a3 | |
parent | 31bf197cebb56e713c55ac319221cbbb222992cb (diff) | |
download | aur-2a8d107c596a0296c7bfdc761aeb7ddf960ad1e9.tar.gz |
Update to 2.4.28, patch the updated version so it builds correctly, update the patches so they apply cleanly, add missing dependencies, clean up the .install, and remove install-info from it as this is now handled by hooks
-rw-r--r-- | .SRCINFO | 19 | ||||
-rw-r--r-- | PKGBUILD | 15 | ||||
-rw-r--r-- | no-fc-cache-no-lib64.patch | 18 | ||||
-rw-r--r-- | notexi-notxt.patch | 6 | ||||
-rw-r--r-- | paraport-close-no-return.patch | 12 | ||||
-rw-r--r-- | vice-gnomeui-devel.install | 13 | ||||
-rw-r--r-- | x11video.patch | 4 |
7 files changed, 50 insertions, 37 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Fri Apr 22 17:18:53 UTC 2016 +# Tue Jun 21 01:00:50 UTC 2016 pkgbase = vice-gnomeui-devel pkgdesc = Versatile Commodore Emulator (development release with the Gnome UI) - pkgver = 2.4.27 + pkgver = 2.4.28 pkgrel = 1 url = http://vice-emu.sourceforge.net install = vice-gnomeui-devel.install @@ -18,23 +18,28 @@ pkgbase = vice-gnomeui-devel depends = vte depends = gtkglext depends = libpcap + depends = mpg123 + depends = libieee1284 + depends = portaudio provides = vice conflicts = vice options = !makeflags - source = http://downloads.sourceforge.net/project/vice-emu/development-releases/vice-2.4.27.tar.gz + source = http://downloads.sourceforge.net/project/vice-emu/development-releases/vice-2.4.28.tar.gz source = vice.png source = vice.desktop source = x11video.patch source = no-fc-cache-no-lib64.patch source = zlib-1.2.7.patch source = notexi-notxt.patch - sha512sums = 589b9892f3180db6f169e74b863171f08567045862f2f47cac73ef946e81d55dcde5373fc910cfd1659238669f12ee6ad934c7143c87fad736cda77479439bec + source = paraport-close-no-return.patch + sha512sums = 78fbff6fd56bd0055fc95329eca697983a0f576701ce140719cd506e02b139c459df9f3b63bcfd530530578ada9dd23ce4524dc21f10b707a602f4a5d20e6a8a sha512sums = 1433ed9e88f5eab34e53f89201df62c0c3a6aa4b61e6855823bb1ff833886a3058bdfeb9ea79c0f8658c2ec744314638524db6e0194783b4bf04d86824f19cdf sha512sums = dc96b8658fac1a6f605b8f0052c11a5abb653da4b9deb3401d8b8177b14a664c0b3a5ed9e7c5c3013b0bc18b831045244f2f9187de9ff8b25b90f0b1cfa0cd8a - sha512sums = 4f68a6af7f474fc87ec56697a36a52642005497a2cb19615ae0fe835cc12a32391b4f0974d8e771901ecbb5411674ba32a90e5db660868ae82b4eccdcad61736 - sha512sums = 2d05d9729d3659f86525db636927a9ba7004c0a2b0702698659b0e2d2dfeecbb6bd4a251f6056702b1eefd5d14f9b63c1f96f96cdc9dfb7ed1f99c86d8431858 + sha512sums = 076e684ecac402ccb014faebe5eaab5bb46e9e9caca9ba23374ddf94a1c83172b0874343e449c91186763114d0f388dac0060afd831bdc9eceffc6cf3529c58d + sha512sums = a0b764c15c0e55ef606ae8ba5c7e760ea197bebbea897e943d4097798e77f0bd08a4fc35bbfc0a006c7762538941d88362d7cb3efea137f5f0646f7056892585 sha512sums = d37544313037fa75971bab198b37d3824571a3e82d4e87bbe23b01d8a847fcf3f6652a23e4bc58cec6ae43deccc9322db2f77d046641b521f275e368aca940dd - sha512sums = 1e59cb6c038e2537e0a01eed6213b6d6a16c0e42dd3967b2653d5ed414ae764dfe227d000dd673d7d0b4590f07197f63d65d81825ae09baf2df36d7f1e409ca0 + sha512sums = 7506936c33eb5bb6843f5e6b340e9a0a30ce57aa5c7f569cbbf9fed541682965f02ada819f987be3b4800f61b32b6c15b789de708f5224f2a89519ce47779ffc + sha512sums = 4b40ede13b86d49d6904b5e255fc707d51dad928d879325f5ee70e54026d7b2edfc691804e3a048133b2abb44e36116ec57d41551a82861b49712f37691073b6 pkgname = vice-gnomeui-devel @@ -7,13 +7,13 @@ _pkgname=vice pkgname=$_pkgname-gnomeui-devel -pkgver=2.4.27 +pkgver=2.4.28 pkgrel=1 pkgdesc='Versatile Commodore Emulator (development release with the Gnome UI)' arch=('i686' 'x86_64') license=('GPL') url='http://vice-emu.sourceforge.net' -depends=('libpulse' 'giflib' 'vte' 'gtkglext' 'libpcap') +depends=('libpulse' 'giflib' 'vte' 'gtkglext' 'libpcap' 'mpg123' 'libieee1284' 'portaudio') makedepends=('dos2unix' 'xorg-bdftopcf' 'xorg-mkfontdir' 'autoconf') options=('!makeflags') install=$pkgname.install @@ -28,15 +28,17 @@ source=( 'no-fc-cache-no-lib64.patch' 'zlib-1.2.7.patch' 'notexi-notxt.patch' + 'paraport-close-no-return.patch' ) sha512sums=( - '589b9892f3180db6f169e74b863171f08567045862f2f47cac73ef946e81d55dcde5373fc910cfd1659238669f12ee6ad934c7143c87fad736cda77479439bec' + '78fbff6fd56bd0055fc95329eca697983a0f576701ce140719cd506e02b139c459df9f3b63bcfd530530578ada9dd23ce4524dc21f10b707a602f4a5d20e6a8a' '1433ed9e88f5eab34e53f89201df62c0c3a6aa4b61e6855823bb1ff833886a3058bdfeb9ea79c0f8658c2ec744314638524db6e0194783b4bf04d86824f19cdf' 'dc96b8658fac1a6f605b8f0052c11a5abb653da4b9deb3401d8b8177b14a664c0b3a5ed9e7c5c3013b0bc18b831045244f2f9187de9ff8b25b90f0b1cfa0cd8a' - '4f68a6af7f474fc87ec56697a36a52642005497a2cb19615ae0fe835cc12a32391b4f0974d8e771901ecbb5411674ba32a90e5db660868ae82b4eccdcad61736' - '2d05d9729d3659f86525db636927a9ba7004c0a2b0702698659b0e2d2dfeecbb6bd4a251f6056702b1eefd5d14f9b63c1f96f96cdc9dfb7ed1f99c86d8431858' + '076e684ecac402ccb014faebe5eaab5bb46e9e9caca9ba23374ddf94a1c83172b0874343e449c91186763114d0f388dac0060afd831bdc9eceffc6cf3529c58d' + 'a0b764c15c0e55ef606ae8ba5c7e760ea197bebbea897e943d4097798e77f0bd08a4fc35bbfc0a006c7762538941d88362d7cb3efea137f5f0646f7056892585' 'd37544313037fa75971bab198b37d3824571a3e82d4e87bbe23b01d8a847fcf3f6652a23e4bc58cec6ae43deccc9322db2f77d046641b521f275e368aca940dd' - '1e59cb6c038e2537e0a01eed6213b6d6a16c0e42dd3967b2653d5ed414ae764dfe227d000dd673d7d0b4590f07197f63d65d81825ae09baf2df36d7f1e409ca0' + '7506936c33eb5bb6843f5e6b340e9a0a30ce57aa5c7f569cbbf9fed541682965f02ada819f987be3b4800f61b32b6c15b789de708f5224f2a89519ce47779ffc' + '4b40ede13b86d49d6904b5e255fc707d51dad928d879325f5ee70e54026d7b2edfc691804e3a048133b2abb44e36116ec57d41551a82861b49712f37691073b6' ) prepare() { @@ -46,6 +48,7 @@ prepare() { patch -Np1 -i ../no-fc-cache-no-lib64.patch patch -Np1 -i ../zlib-1.2.7.patch patch -Np1 -i ../notexi-notxt.patch + patch -Np1 -i ../paraport-close-no-return.patch # Convert MS-DOS linebreaks to Unix style ones printf '%s ' 'Converting MS-DOS format linebreaks to Unix format...' diff --git a/no-fc-cache-no-lib64.patch b/no-fc-cache-no-lib64.patch index 081762a68cae..2a0e35944be9 100644 --- a/no-fc-cache-no-lib64.patch +++ b/no-fc-cache-no-lib64.patch @@ -1,8 +1,8 @@ diff --git a/configure b/configure -index 0ca64ad..022f2cb 100755 +index 64d437d..c8c8b49 100755 --- a/configure +++ b/configure -@@ -19380,7 +19380,7 @@ _ACEOF +@@ -19608,7 +19608,7 @@ _ACEOF *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; esac case $ac_im_usrlibdir in @@ -11,7 +11,7 @@ index 0ca64ad..022f2cb 100755 *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; esac fi -@@ -24348,7 +24348,7 @@ fi +@@ -24579,7 +24579,7 @@ fi ;; linux*) if test x"$host_cpu" = "xx86_64"; then @@ -21,10 +21,10 @@ index 0ca64ad..022f2cb 100755 ALTERNATE_DOCDIR_TRUE= ALTERNATE_DOCDIR_FALSE='#' diff --git a/configure.ac b/configure.ac -index 865e508..0b15afd 100755 +index b5403d2..0f1a37d 100755 --- a/configure.ac +++ b/configure.ac -@@ -2865,12 +2865,7 @@ if test x"$enable_lame" != "xno" ; then +@@ -2917,12 +2917,7 @@ if test x"$enable_lame" != "xno" ; then fi @@ -38,7 +38,7 @@ index 865e508..0b15afd 100755 if test x"$is_amigaos4" = "xyes"; then if test x"$enable_sdlui" != "xyes" -a x"$enable_sdlui2" != "xyes"; then -@@ -4436,7 +4431,7 @@ case "$host_os" in +@@ -4542,7 +4537,7 @@ case "$host_os" in ;; linux*) if test x"$host_cpu" = "xx86_64"; then @@ -48,10 +48,10 @@ index 865e508..0b15afd 100755 else VICEDIR="$PREFIX/lib/vice" diff --git a/configure.proto b/configure.proto -index 865e508..0b15afd 100755 +index b5403d2..0f1a37d 100755 --- a/configure.proto +++ b/configure.proto -@@ -2865,12 +2865,7 @@ if test x"$enable_lame" != "xno" ; then +@@ -2917,12 +2917,7 @@ if test x"$enable_lame" != "xno" ; then fi @@ -65,7 +65,7 @@ index 865e508..0b15afd 100755 if test x"$is_amigaos4" = "xyes"; then if test x"$enable_sdlui" != "xyes" -a x"$enable_sdlui2" != "xyes"; then -@@ -4436,7 +4431,7 @@ case "$host_os" in +@@ -4542,7 +4537,7 @@ case "$host_os" in ;; linux*) if test x"$host_cpu" = "xx86_64"; then diff --git a/notexi-notxt.patch b/notexi-notxt.patch index e90258141a14..725c169a4208 100644 --- a/notexi-notxt.patch +++ b/notexi-notxt.patch @@ -1,5 +1,5 @@ diff --git a/doc/Makefile.am b/doc/Makefile.am -index 6f1d5fc..fc24ead 100755 +index e9f3804..dbf88a3 100755 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -58,19 +58,6 @@ $(builddir)/vice.txt: $(srcdir)/vice.texi @@ -22,9 +22,11 @@ index 6f1d5fc..fc24ead 100755 $(builddir)/vice.guide: $(srcdir)/vice.texi
if BUILD_AMIGAGUIDE
cp $(srcdir)/vice.texi tmp.texi
-@@ -132,4 +119,4 @@ $(builddir)/vice.info: $(srcdir)/vice.texi +@@ -132,6 +119,6 @@ $(builddir)/vice.info: $(srcdir)/vice.texi touch $(builddir)/vice.info
$(MAKEINFO) -D$(PLATFORM_DOX_FLAGS) -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)
+
+ .texi.pdf:
diff --git a/paraport-close-no-return.patch b/paraport-close-no-return.patch new file mode 100644 index 000000000000..c8f959c36f7b --- /dev/null +++ b/paraport-close-no-return.patch @@ -0,0 +1,12 @@ +diff --git a/src/arch/unix/parsid-drv.c b/src/arch/unix/parsid-drv.c +index 7612c37..37ce5db 100755 +--- a/src/arch/unix/parsid-drv.c ++++ b/src/arch/unix/parsid-drv.c +@@ -134,7 +134,6 @@ static int parsid_linux_parport_open(void) +
+ static void parsid_linux_parport_close(void)
+ {
+- return 0;
+ }
+ #endif
+
diff --git a/vice-gnomeui-devel.install b/vice-gnomeui-devel.install index c7e22b7ab0e6..b397193aa38d 100644 --- a/vice-gnomeui-devel.install +++ b/vice-gnomeui-devel.install @@ -1,11 +1,5 @@ -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 - fc-cache + fc-cache } post_upgrade() { @@ -13,8 +7,5 @@ post_upgrade() { } pre_remove() { - for f in ${info_files[@]}; do - install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done - fc-cache + post_install } diff --git a/x11video.patch b/x11video.patch index 8f4671602931..44760b23df36 100644 --- a/x11video.patch +++ b/x11video.patch @@ -1,8 +1,8 @@ diff --git a/src/arch/unix/x11/xaw/x11video.c b/src/arch/unix/x11/xaw/x11video.c -index 7046690..d2714d1 100644 +index 8d1c943..67a673a 100755 --- a/src/arch/unix/x11/xaw/x11video.c +++ b/src/arch/unix/x11/xaw/x11video.c -@@ -62,6 +62,7 @@ +@@ -63,6 +63,7 @@ #include <X11/Xutil.h>
#include <X11/Intrinsic.h>
#include <X11/cursorfont.h>
|