[arch-commits] CVS update of extra/multimedia/gcombust (PKGBUILD gcc4.1-compile.patch)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 14:00:11
  Author: jgc
    Path: /home/cvs-extra/extra/multimedia/gcombust

   Added: gcc4.1-compile.patch (1.1)
Modified: PKGBUILD (1.11 -> 1.12)

upgpkg: gcombust 0.1.55-3
Fix compile with gcc 4.x, move to /usr


----------------------+
 PKGBUILD             |   25 +++++++++++++------------
 gcc4.1-compile.patch |   19 +++++++++++++++++++
 2 files changed, 32 insertions(+), 12 deletions(-)


Index: extra/multimedia/gcombust/PKGBUILD
diff -u extra/multimedia/gcombust/PKGBUILD:1.11 extra/multimedia/gcombust/PKGBUILD:1.12
--- extra/multimedia/gcombust/PKGBUILD:1.11	Mon Apr 19 02:24:57 2004
+++ extra/multimedia/gcombust/PKGBUILD	Sun Apr 22 14:00:06 2007
@@ -1,22 +1,23 @@
-# $Id: PKGBUILD,v 1.11 2004/04/19 06:24:57 dorphell Exp $
+# $Id: PKGBUILD,v 1.12 2007/04/22 18:00:06 jgc Exp $
 # Contributor: Bob Finch w9ya at arrl.net
 # Maintainer: Jason Chu <jason at archlinux.org>
 
 pkgname=gcombust
 pkgver=0.1.55
-pkgrel=2
+pkgrel=3
+arch=(i686)
+license=('GPL')
 pkgdesc="gtk+ frontend for mkisofs, mkhybrid, cdrecord, and cdlabelgen"
 url="http://www.abo.fi/~jmunsin/gcombust/"
-depends=('gtk' 'glib' 'cdrtools' 'cdlabelgen')
-source=(http://www.abo.fi/~jmunsin/gcombust/$pkgname-$pkgver.tar.gz)
-md5sums=('25ddecef7f8556f0fac82d9d4927e8eb')
+depends=('gtk' 'cdrkit' 'cdlabelgen')
+source=(http://www.abo.fi/~jmunsin/gcombust/${pkgname}-${pkgver}.tar.gz
+        gcc4.1-compile.patch)
+md5sums=('25ddecef7f8556f0fac82d9d4927e8eb' 'ef324b9a8c97297ef41127e7053bb726')
 
 build() {
-	cd $startdir/src/$pkgname-$pkgver
-	./configure --prefix=/usr
-	make || return 1
-	make DESTDIR=$startdir/pkg install
-	mkdir $startdir/pkg/opt/gnome/share/applications -p
-	mv $startdir/pkg/usr/share/applications/gcombust.desktop $startdir/pkg/opt/gnome/share/applications
-	rm $startdir/pkg/usr/share/aclocal -rf
+  cd ${startdir}/src/${pkgname}-${pkgver}
+  patch -Np0 -i ${startdir}/src/gcc4.1-compile.patch || return 1
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make || return 1
+  make DESTDIR=${startdir}/pkg install
 }
Index: extra/multimedia/gcombust/gcc4.1-compile.patch
diff -u /dev/null extra/multimedia/gcombust/gcc4.1-compile.patch:1.1
--- /dev/null	Sun Apr 22 14:00:11 2007
+++ extra/multimedia/gcombust/gcc4.1-compile.patch	Sun Apr 22 14:00:10 2007
@@ -0,0 +1,19 @@
+--- src/optimize_usage.h.orig	2007-04-22 15:40:51.000000000 +0000
++++ src/optimize_usage.h	2007-04-22 15:41:25.000000000 +0000
+@@ -16,7 +16,7 @@
+ ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+ 
+-extern GtkWidget *opt_try_harder;
++static GtkWidget *opt_try_harder;
+ extern long int opt_cdsize;
+ 
+ void open_optimize_size_win(GtkWidget *, gpointer);
+--- src/rip_audio.h.orig	2007-04-22 15:41:45.000000000 +0000
++++ src/rip_audio.h	2007-04-22 15:41:59.000000000 +0000
+@@ -20,4 +20,4 @@
+ 
+ extern char *cdda2wav_path, *cdda_device_path, *cdparanoia_path;
+ extern char *def_rip_path;
+-extern GtkWidget *rip_path_entry;
++static GtkWidget *rip_path_entry;