Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d1b95b7d06ca9be737c2305681d261f82397e10c
commit d1b95b7d06ca9be737c2305681d261f82397e10c Author: crazy <[EMAIL PROTECTED]> Date: Mon Dec 10 16:50:17 2007 +0100 tuxpaint-0.9.18-1-i686 * Version bump * fixed depends() * updated patch * added missing backup and scriptlet option diff --git a/source/games-extra/tuxpaint/FrugalBuild b/source/games-extra/tuxpaint/FrugalBuild index 926ded3..b631c90 100644 --- a/source/games-extra/tuxpaint/FrugalBuild +++ b/source/games-extra/tuxpaint/FrugalBuild @@ -2,31 +2,31 @@ # Maintainer: Priyank Gosalia <[EMAIL PROTECTED]> pkgname=tuxpaint -pkgver=0.9.16 +pkgver=0.9.18 pkgrel=1 pkgdesc="A drawing program for young children." _F_sourceforge_broken_up2date=1 Finclude sourceforge url="http://tuxpaint.org/"; -depends=('sdl' 'sdlimage' 'sdl_ttf' 'sdl_mixer' 'libpng' 'freetype2' 'netpbm') +depends=('sdlimage' 'sdl_ttf' 'sdl_mixer' 'sdl_pango' 'librsvg' 'libpaper' 'libxcb') +backup=('etc/tuxpaint/tuxpaint.conf') +options=('scriptlet') groups=('games-extra') archs=('i686' 'x86_64') _F_gnome_iconcache="y" Finclude gnome-scriptlet source=([EMAIL PROTECTED] $pkgname-fix.patch) -sha1sums=('7c09582abe69d0fc6f0e1077c839b8931899fbe7' \ - '41bd3adc853fa53f48f8fe7a3d5b97f99ff52a92') +sha1sums=('34c59dc7789e4bd85ba5b34f3e173227b5879e5b' \ + '14f373b5b5e590b186b4f8e58d2e4db1145ef773') build() { Fcd Fpatchall make ENABLE_GETTEXT=1 || Fdie - make PKG_ROOT="$Fdestdir" ENABLE_GETTEXT=1 install + make PKG_ROOT="$Fdestdir" ENABLE_GETTEXT=1 install || Fdie Fbuild_gnome_scriptlet - # Fix categories in desktop icon - echo "Categories=Application;Graphics;" >> $Fdestdir/usr/share/applications/tuxpaint.desktop } # optimization OK diff --git a/source/games-extra/tuxpaint/tuxpaint-fix.patch b/source/games-extra/tuxpaint/tuxpaint-fix.patch index dd06cdc..44c8de0 100644 --- a/source/games-extra/tuxpaint/tuxpaint-fix.patch +++ b/source/games-extra/tuxpaint/tuxpaint-fix.patch @@ -1,7 +1,7 @@ -diff -NurdB tuxpaint-0.9.16/Makefile tuxpaint-0.9.16-patched/Makefile ---- tuxpaint-0.9.16/Makefile 2006-10-19 02:41:49.000000000 -0500 -+++ tuxpaint-0.9.16-patched/Makefile 2006-12-11 23:22:55.000000000 -0500 -@@ -18,7 +18,7 @@ +diff -NurdpB tuxpaint-0.9.18/Makefile tuxpaint-0.9.18-patched/Makefile +--- tuxpaint-0.9.18/Makefile 2007-11-21 17:16:33.000000000 -0500 ++++ tuxpaint-0.9.18-patched/Makefile 2007-11-27 18:45:15.000000000 -0500 +@@ -20,7 +20,7 @@ SO_TYPE=so # Where to install things: @@ -10,7 +10,7 @@ diff -NurdB tuxpaint-0.9.16/Makefile tuxpaint-0.9.16-patched/Makefile # Root directory to place files when creating packages. -@@ -62,13 +62,15 @@ +@@ -72,11 +72,14 @@ MIMESET_CMD=echo -n ICON_PREFIX=$(PKG_ROOT)$(PREFIX)/share/pixmaps X11_ICON_PREFIX=$(PKG_ROOT)$(PREFIX)/X11R6/include/X11/pixmaps @@ -23,39 +23,38 @@ diff -NurdB tuxpaint-0.9.16/Makefile tuxpaint-0.9.16-patched/Makefile +DESKTOP_ICON_PREFIX=$(PREFIX)/share/icons - # Locale files - +ENABLE_GETTEXT=0 - LOCALE_PREFIX=$(PKG_ROOT)$(PREFIX)/share/locale - # LOCALE_PREFIX=/usr/share/locale ++ + # Built with sound by default (override with "make nosound") -@@ -97,7 +99,7 @@ - # The entire set of CFLAGS: + NOSOUNDFLAG=__SOUND +@@ -134,7 +137,7 @@ ARCH_LIBS=obj/postscript_print.o #-ffast-math --CFLAGS=-O2 -W -Wall -fno-common -ffloat-store \ + OPTFLAGS=-O2 +-CFLAGS=$(OPTFLAGS) -W -Wall -fno-common -ffloat-store \ +CFLAGS += -W -Wall -fno-common -ffloat-store \ -Wcast-align -Wredundant-decls \ -Wbad-function-cast -Wwrite-strings \ -Waggregate-return \ -@@ -118,7 +120,10 @@ +@@ -160,7 +163,10 @@ MOUSE_CFLAGS=-Isrc/$(MOUSEDIR) -D$(CURSO # "make" with no arguments builds the program and man page from sources: --all: tuxpaint translations -+all: tuxpaint +-all: tuxpaint translations magic-plugins tp-magic-config ++all: tuxpaint magic-plugins tp-magic-config + @if [ -n "$(ENABLE_GETTEXT)" ] && [ $(ENABLE_GETTEXT) -eq 1 ]; then \ + make translations; \ + fi @echo @echo "--------------------------------------------------------------" @echo -@@ -220,10 +225,13 @@ - # to do this as superuser ("root")) - +@@ -350,10 +356,13 @@ include Makefile-i18n install: install-bin install-data install-man install-doc \ -- install-icon install-gettext install-importscript \ -+ install-icon install-importscript \ + install-magic-plugins \ + install-magic-plugin-dev \ +- install-icon install-gettext install-im install-importscript \ ++ install-icon install-im install-importscript \ install-default-config install-example-stamps \ install-example-starters \ - install-gnome install-kde install-kde-icons @@ -66,7 +65,7 @@ diff -NurdB tuxpaint-0.9.16/Makefile tuxpaint-0.9.16-patched/Makefile @echo @echo "--------------------------------------------------------------" @echo -@@ -497,16 +505,49 @@ +@@ -622,16 +631,49 @@ install-example-starters: # Install a launcher icon in the Gnome menu, under "Graphics" @@ -125,7 +124,7 @@ diff -NurdB tuxpaint-0.9.16/Makefile tuxpaint-0.9.16-patched/Makefile fi -@@ -590,9 +631,6 @@ +@@ -725,9 +767,6 @@ install-icon: @install -d $(ICON_PREFIX) @cp data/images/icon.png $(ICON_PREFIX)/tuxpaint.png @chmod 644 $(ICON_PREFIX)/tuxpaint.png @@ -135,12 +134,20 @@ diff -NurdB tuxpaint-0.9.16/Makefile tuxpaint-0.9.16-patched/Makefile # Install the program: -@@ -1034,7 +1072,7 @@ - $^ \ - $(HQXX_O) \ +@@ -873,7 +912,7 @@ tuxpaint: obj/tuxpaint.o obj/i18n.o obj/ $(SDL_LIBS) \ + $(SVG_LIB) \ + $(PAPER_LIB) \ - -lm $(ARCH_LINKS) + -lm -lpng12 $(ARCH_LINKS) @$(RSRC_CMD) @$(MIMESET_CMD) +diff -NurdpB tuxpaint-0.9.18/src/tuxpaint.desktop tuxpaint-0.9.18-patched/src/tuxpaint.desktop +--- tuxpaint-0.9.18/src/tuxpaint.desktop 2007-10-29 11:15:48.000000000 -0500 ++++ tuxpaint-0.9.18-patched/src/tuxpaint.desktop 2007-11-27 18:35:49.000000000 -0500 +@@ -191,3 +191,4 @@ Comment[wo]=Lël lu natal yu ñu jagglel + Comment[xh]=Inkqubo yokuzoba yabantwana. + Comment[zh_cn]=å©åçç»å¾ç¨åºã + Comment[zh_tw]=é©åå ç«¥çç«åç¨å¼ ++Categories=Application;Graphics; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
