[arch-commits] Commit in gweled/trunk (4 files)

[Andrea Scarpino]

    Date: Tuesday, June 22, 2010 @ 19:07:06
  Author: andrea
Revision: 83807

upgpkg: gweled 0.8-1
upstream release

Modified:
  gweled/trunk/PKGBUILD
  gweled/trunk/gweled.install
Deleted:
  gweled/trunk/invalid_free.patch
  gweled/trunk/mikmod-disable-disk-writers.diff

----------------------------------+
 PKGBUILD                         |   41 ++++++++++++++++++-------------------
 gweled.install                   |    2 +
 invalid_free.patch               |   11 ---------
 mikmod-disable-disk-writers.diff |   16 --------------
 4 files changed, 23 insertions(+), 47 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-06-22 22:54:32 UTC (rev 83806)
+++ PKGBUILD	2010-06-22 23:07:06 UTC (rev 83807)
@@ -1,33 +1,34 @@
 # $Id$
+# Maintainer:
 # Contributor: Ben <contrasutra at myrealbox.com>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gweled
-pkgver=0.7
-pkgrel=6
-pkgdesc="Bejewled Game (aka Diamond Mine)"
+pkgver=0.8
+pkgrel=1
+pkgdesc="A GTK+ version of Bejeweled game (aka Diamond Mine)"
 arch=('i686' 'x86_64')
 license=('GPL')
-url="http://sebdelestaing.free.fr/gweled/"
-depends=('libgnomeui' 'librsvg' 'libmikmod' 'filesystem')
-install=gweled.install
-source=(http://sebdelestaing.free.fr/gweled/Release/${pkgname}-${pkgver}.tar.gz
-        invalid_free.patch mikmod-disable-disk-writers.diff)
-md5sums=('730fe1737e0b0e9940575aa573d63d84' '7b467d82e42183c36b25bcf5f9bf4407'\
-         'ae57a575d7fe51e58ede88aa5f486065')
-sha1sums=('7a58dce08de467172413b2947cd5d4992640a334' '61d4abcc39fd38c4cf4c55a6af5d9defb7122897'\
-         '5743b56d13028de6609b41b9aa8ce087bb01f230')
+url="https://launchpad.net/gweled/"
+depends=('filesystem' 'librsvg' 'libmikmod' 'xdg-utils' 'hicolor-icon-theme')
+makedepends=('intltool')
+install=${pkgname}.install
+source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
+md5sums=('2b52636abdd6b71e537ede7410db4cfa')
 
 build() {
   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 || return 1
-  make LDFLAGS+=-Wl,--export-dynamic || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --with-scores-user=root \
+    --with-scores-group=games
+}
 
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
   #We generate these files on postinstall to prevent score resets on upgrade
   rm -rf "${pkgdir}/var"
 }
-

Modified: gweled.install
===================================================================
--- gweled.install	2010-06-22 22:54:32 UTC (rev 83806)
+++ gweled.install	2010-06-22 23:07:06 UTC (rev 83807)
@@ -12,6 +12,7 @@
     chown root:games "var/games/${score}"
     chmod 664 "var/games/${score}"
   done
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 }
 
 post_upgrade() {
@@ -22,4 +23,5 @@
   for score in "${scores[@]}" ; do
     rm -f "var/games/$score"
   done
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 }

Deleted: invalid_free.patch
===================================================================
--- invalid_free.patch	2010-06-22 22:54:32 UTC (rev 83806)
+++ invalid_free.patch	2010-06-22 23:07:06 UTC (rev 83807)
@@ -1,11 +0,0 @@
---- src/main.c.orig	2005-11-19 19:30:59.000000000 +0000
-+++ src/main.c	2005-11-19 19:31:11.000000000 +0000
-@@ -365,7 +365,7 @@
- 	if(swap_sfx)
- 		Sample_Free(swap_sfx);
- 	if(click_sfx)
--		Sample_Free(swap_sfx);
-+		Sample_Free(click_sfx);
- 
- 	MikMod_Exit();
- 

Deleted: mikmod-disable-disk-writers.diff
===================================================================
--- mikmod-disable-disk-writers.diff	2010-06-22 22:54:32 UTC (rev 83806)
+++ mikmod-disable-disk-writers.diff	2010-06-22 23:07:06 UTC (rev 83807)
@@ -1,16 +0,0 @@
-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();