[arch-commits] Commit in gweled/repos (3 files)

[Eric Bélanger]

    Date: Saturday, February 6, 2010 @ 09:31:34
  Author: eric
Revision: 67361

Merged revisions 67360 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/gweled/trunk

........
  r67360 | eric | 2010-02-06 09:31:17 -0500 (Sat, 06 Feb 2010) | 2 lines
  
  upgpkg: gweled 0.7-6
      Removed creation of music.raw file (close FS#15685)
........

Added:
  gweled/repos/extra-i686/mikmod-disable-disk-writers.diff
    (from rev 67360, gweled/trunk/mikmod-disable-disk-writers.diff)
Modified:
  gweled/repos/extra-i686/	(properties)
  gweled/repos/extra-i686/PKGBUILD

----------------------------------+
 PKGBUILD                         |   20 ++++++++++++--------
 mikmod-disable-disk-writers.diff |   16 ++++++++++++++++
 2 files changed, 28 insertions(+), 8 deletions(-)


Property changes on: gweled/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /gweled/trunk:1-57045
   + /gweled/trunk:1-67360

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2010-02-06 14:31:17 UTC (rev 67360)
+++ extra-i686/PKGBUILD	2010-02-06 14:31:34 UTC (rev 67361)
@@ -4,7 +4,7 @@
 
 pkgname=gweled
 pkgver=0.7
-pkgrel=5
+pkgrel=6
 pkgdesc="Bejewled Game (aka Diamond Mine)"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -12,18 +12,22 @@
 depends=('libgnomeui' 'librsvg' 'libmikmod' 'filesystem')
 install=gweled.install
 source=(http://sebdelestaing.free.fr/gweled/Release/${pkgname}-${pkgver}.tar.gz
-        invalid_free.patch)
-md5sums=('730fe1737e0b0e9940575aa573d63d84' '7b467d82e42183c36b25bcf5f9bf4407')
+        invalid_free.patch mikmod-disable-disk-writers.diff)
+md5sums=('730fe1737e0b0e9940575aa573d63d84' '7b467d82e42183c36b25bcf5f9bf4407'\
+         'ae57a575d7fe51e58ede88aa5f486065')
+sha1sums=('7a58dce08de467172413b2947cd5d4992640a334' '61d4abcc39fd38c4cf4c55a6af5d9defb7122897'\
+         '5743b56d13028de6609b41b9aa8ce087bb01f230')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np0 -i ${srcdir}/invalid_free.patch || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np0 -i "${srcdir}/invalid_free.patch" || return 1
+  patch -Np1 -i "${srcdir}/mikmod-disable-disk-writers.diff" || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --with-scores-user=root --with-scores-group=games
+              --with-scores-user=root --with-scores-group=games || return 1
   make LDFLAGS+=-Wl,--export-dynamic || return 1
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="${pkgdir}" install || return 1
 
   #We generate these files on postinstall to prevent score resets on upgrade
-  rm -rf ${pkgdir}/var
+  rm -rf "${pkgdir}/var"
 }
 

Copied: gweled/repos/extra-i686/mikmod-disable-disk-writers.diff (from rev 67360, gweled/trunk/mikmod-disable-disk-writers.diff)
===================================================================
--- extra-i686/mikmod-disable-disk-writers.diff	                        (rev 0)
+++ extra-i686/mikmod-disable-disk-writers.diff	2010-02-06 14:31:34 UTC (rev 67361)
@@ -0,0 +1,16 @@
+diff -urN gweled-0.7~/src/main.c gweled-0.7/src/main.c
+--- gweled-0.7~/src/main.c	2005-05-25 23:44:04.000000000 +0200
++++ gweled-0.7/src/main.c	2006-12-05 18:29:49.000000000 +0100
+@@ -254,7 +254,11 @@
+ 				PACKAGE_DATA_DIR, NULL);
+ 
+     /* register all the drivers */
+-    MikMod_RegisterAllDrivers();
++    MikMod_RegisterDriver(&drv_AF);
++    MikMod_RegisterDriver(&drv_esd);
++    MikMod_RegisterDriver(&drv_alsa);
++    MikMod_RegisterDriver(&drv_oss);
++    MikMod_RegisterDriver(&drv_nos);
+ 
+     /* register all the module loaders */
+     MikMod_RegisterAllLoaders();