Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=64cc545e48f60746f8fb485ffc6048606e419116
commit 64cc545e48f60746f8fb485ffc6048606e419116 Author: Devil505 <devil505li...@gmail.com> Date: Thu Nov 4 16:50:06 2010 +0100 gcompris-9.3-1-i686 * version bump * removed useless patch diff --git a/source/games-extra/gcompris/FrugalBuild b/source/games-extra/gcompris/FrugalBuild index a3e650b..bbccd13 100644 --- a/source/games-extra/gcompris/FrugalBuild +++ b/source/games-extra/gcompris/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: crazy <cr...@frugalware.org> pkgname=gcompris -pkgver=8.4.7 -pkgrel=3 +pkgver=9.3 +pkgrel=1 pkgdesc="Educational application for children" depends=('pygtk>=2.14.1-2' 'gnet' 'python' 'gnucap' 'gstreamer' 'sdl_mixer' 'gnuchess' \ 'pysqlite2' 'libxml2' 'sdl' 'gtk+2>=2.20.1' 'libxxf86vm>=1.0.2' 'libxdamage' 'sqlite3' \ @@ -13,28 +13,28 @@ makedepends=('perl-xml-parser' 'intltool' 'texi2html' 'gettext' 'libgnomecanvas' groups=('games-extra') archs=('i686' 'x86_64') Finclude sourceforge -source=($source po-compile.patch) url="http://gcompris.net/" -options=('scriptlet') -sha1sums=('44a97946e651187bdd51c0fdd180754e821daf31' \ - '93b37eaba360fd74be532d6d18f79d9835004353') +options=('scriptlet' 'nobuild') +sha1sums=('a7bbd6a8a8f111e41012709f29a07fb7b0f1079a') -build() -{ - Fcd - ## wtf - for i in 0 1 2 3 4 - do - echo boards/babyshapes/board8_${i}.xml.in >>po/POTFILES.skip - done - cat /usr/share/gettext/config.rpath >config.rpath || Fdie - Fautoreconf - Fpatchall - Fconf --enable-gnet - make || Fdie - make check || Fdie - make update-voices || Fdie - Fmakeinstall +build() { + Fcd + + # GTK_OBJECT_FLAGS is deprecated in GTK+ 2.22 + # gdk_draw_rectangle is deprecated in GDK 2.22 + sed -i -e '/#include <config.h>/ i\ +#undef GTK_DISABLE_DEPRECATED' \ + -e '/#include <config.h>/ i\ +#undef GDK_DISABLE_DEPRECATED' \ + src/goocanvas/src/goocanvas.c || Fdie + + Fmake + make DESTDIR="$Fdestdir" install-exec || Fdie + make DESTDIR="$Fdestdir" install-data || Fdie + + # Place GCompris menu entry under Education + sed -i 's|^Categories=.*|Categories=Education;|' \ + "$Fdestdir/usr/share/applications/gcompris.desktop" || Fdie } # optimization OK diff --git a/source/games-extra/gcompris/po-compile.patch b/source/games-extra/gcompris/po-compile.patch deleted file mode 100644 index 1d06299..0000000 --- a/source/games-extra/gcompris/po-compile.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur gcompris-8.4.7/src/boards/python/clickanddraw.py gcompris-8.4.7-p/src/boards/python/clickanddraw.py ---- gcompris-8.4.7/src/boards/python/clickanddraw.py 2008-02-14 01:45:14.000000000 +0100 -+++ gcompris-8.4.7-p/src/boards/python/clickanddraw.py 2008-11-16 18:41:48.000000000 +0100 -@@ -107,6 +107,6 @@ - self.gamewon = 1 - self.timeout = gobject.timeout_add(1500, self.lauch_bonus) # The level is complete -> Bonus display - -- else : #Action to execute if the selected point isn't the last one of this level -+ else : #Action to execute if the selected point is not the last one of this level - self.POINT[(idpt+1)].set(fill_color='blue') #Set color in blue to next point. Too easy ??? - self.actu = self.actu+1 #self.actu update to set it at actual value of selected point -diff -Naur gcompris-8.4.7/src/boards/python/drawnumber.py gcompris-8.4.7-p/src/boards/python/drawnumber.py ---- gcompris-8.4.7/src/boards/python/drawnumber.py 2008-02-14 01:45:14.000000000 +0100 -+++ gcompris-8.4.7-p/src/boards/python/drawnumber.py 2008-11-16 18:41:26.000000000 +0100 -@@ -185,7 +185,7 @@ - self.gamewon = 1 - self.timeout = gobject.timeout_add(1500, self.lauch_bonus) # The level is complete -> Bonus display - -- else : #Action to execute if the selected point isn't the last one of this level -+ else : #Action to execute if the selected point is not the last one of this level - #self.POINT[(idpt+1)].set(fill_color='blue') #Set color in blue to next point. Too easy ??? - self.actu=self.actu+1 #self.actu update to set it at actual value of selected point - _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git