diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-09-05 10:33:48 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-09-05 10:33:48 +0200 |
| commit | 4a133169d99e3d760caad3cbca2781872f4a0805 (patch) | |
| tree | 73d442004d2d4f70e0194bd78d6b293337ec2456 /community/milkytracker | |
| parent | a420f5c4c2a4eeb411175d086b339b620dba309d (diff) | |
| parent | 58f5e0b164b5f4c9af61b2e42bd10c85f28b9bed (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/apcupsd/PKGBUILD
community/freedroidrpg/PKGBUILD
community/lincity-ng/PKGBUILD
community/python2-pymongo/PKGBUILD
core/openssh/PKGBUILD
core/systemd/PKGBUILD
core/sysvinit/PKGBUILD
extra/gnutls/PKGBUILD
extra/gtkmm3/PKGBUILD
extra/mkvtoolnix/PKGBUILD
multilib/chuck/PKGBUILD
multilib/lib32-gdk-pixbuf2/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
multilib/lib32-libdrm/no-pthread-stubs.patch
multilib/lib32-sdl/PKGBUILD
multilib/wine/PKGBUILD
social/monkeysphere/PKGBUILD
testing/cups/PKGBUILD
testing/cups/cups-systemd-socket.patch
testing/cups/cups.install
testing/inetutils/PKGBUILD
testing/inetutils/ftpd.service
testing/libreoffice/PKGBUILD
testing/libreoffice/libreoffice-common.csh
testing/libreoffice/libreoffice-common.sh
testing/modemmanager/PKGBUILD
testing/openssh/PKGBUILD
testing/openssh/sshd.service
testing/openssh/sshd.socket
testing/upower/PKGBUILD
Diffstat (limited to 'community/milkytracker')
| -rw-r--r-- | community/milkytracker/PKGBUILD | 7 | ||||
| -rw-r--r-- | community/milkytracker/arch.patch | 31 |
2 files changed, 13 insertions, 25 deletions
diff --git a/community/milkytracker/PKGBUILD b/community/milkytracker/PKGBUILD index 2befb3d30..8d427a35b 100644 --- a/community/milkytracker/PKGBUILD +++ b/community/milkytracker/PKGBUILD @@ -1,10 +1,11 @@ # $Id: PKGBUILD 61589 2012-01-03 23:37:49Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Christopher O'Neill <milkytracker at chrisoneill co uk> +# Contributor: Christopher O'Neill <milkytracker@chrisoneill.co.uk> +# Contributor: Maks Verver <maksverver@geocities.com> pkgname=milkytracker pkgver=0.90.85 -pkgrel=6 +pkgrel=7 pkgdesc="Fast Tracker II inspired music tracker" arch=('x86_64' 'i686' 'mips64el') url="http://www.milkytracker.org/" @@ -17,7 +18,7 @@ install=$pkgname.install source=("http://milkytracker.org/files/$pkgname-$pkgver.tar.bz2" 'arch.patch') sha256sums=('59a0d294d63752be74b157e07b0c70252c9198c312d9b1ad0ca460129fe5bd80' - 'cb9dfa99491d72eae7c09e7bae6c35871dddbc5b6a71730e772daa2f31f922bc') + 'c0cf7adc0db78519644a64321c319b04a6ee6c26de1f0620b581137791f596c3') _name=('MilkyTracker') build() { diff --git a/community/milkytracker/arch.patch b/community/milkytracker/arch.patch index 3f5cb16cb..f7ade306f 100644 --- a/community/milkytracker/arch.patch +++ b/community/milkytracker/arch.patch @@ -203,35 +203,22 @@ diff -c -x .svn milkytracker-0.90.85/docs/MilkyTracker.html milkytracker-trunk/d Only in milkytracker-0.90.85/docs/: MilkyTracker.rtf ---- milkytracker-0.90.85/src/compression/DecompressorGZIP.cpp 2009-04-17 22:34:16.000000000 +0200 -+++ milkytracker-trunk/src/compression/DecompressorGZIP.cpp 2012-02-20 20:24:49.161937553 +0100 -@@ -61,7 +61,7 @@ +--- x/src/compression/DecompressorGZIP.cpp 2012-08-28 17:54:46.000000000 +0200 ++++ y/src/compression/DecompressorGZIP.cpp 2012-08-28 17:55:21.000000000 +0200 +@@ -57,11 +57,11 @@ + + bool DecompressorGZIP::decompress(const PPSystemString& outFileName, Hints hint) + { +- gzFile *gz_input_file = NULL; ++ gzFile gz_input_file = NULL; int len = 0; pp_uint8 *buf; - if ((gz_input_file = (void **)gzopen (fileName.getStrBuffer(), "r")) == NULL) -+ if ((gz_input_file = (gzFile*)gzopen (fileName.getStrBuffer(), "r")) == NULL) ++ if ((gz_input_file = gzopen (fileName.getStrBuffer(), "r")) == NULL) return false; if ((buf = new pp_uint8[0x10000]) == NULL) -@@ -71,7 +71,7 @@ - - while (true) - { -- len = gzread (gz_input_file, buf, 0x10000); -+ len = gzread (*gz_input_file, buf, 0x10000); - - if (len < 0) - { -@@ -84,7 +84,7 @@ - fOut.write(buf, 1, len); - } - -- if (gzclose (gz_input_file) != Z_OK) -+ if (gzclose (*gz_input_file) != Z_OK) - { - delete[] buf; - return false; diff -cx .svn milkytracker-0.90.85/src/milkyplay/drivers/jack/AudioDriver_JACK.cpp milkytracker-trunk/src/milkyplay/drivers/jack/AudioDriver_JACK.cpp *** milkytracker-0.90.85/src/milkyplay/drivers/jack/AudioDriver_JACK.cpp 2009-03-28 11:19:41.392162000 +0000 --- milkytracker-trunk/src/milkyplay/drivers/jack/AudioDriver_JACK.cpp 2010-01-03 18:48:15.616918068 +0000 |