[Frugalware-git] frugalware-current: tuxpaint-0.9.21-1-i686 * version bump * removed useless patch * added fribidi in depends()

Devil505 devil505linux at gmail.com
Sat Jan 2 18:57:59 CET 2010


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=673bfd04aec0fbd438cea2578c07f30db7587ba3

commit 673bfd04aec0fbd438cea2578c07f30db7587ba3
Author: Devil505 <devil505linux at gmail.com>
Date:   Sat Jan 2 18:56:03 2010 +0100

tuxpaint-0.9.21-1-i686
* version bump
* removed useless patch
* added fribidi in depends()

diff --git a/source/games-extra/tuxpaint/FrugalBuild b/source/games-extra/tuxpaint/FrugalBuild
index 960163c..6493897 100644
--- a/source/games-extra/tuxpaint/FrugalBuild
+++ b/source/games-extra/tuxpaint/FrugalBuild
@@ -2,13 +2,12 @@
# Maintainer: Priyank Gosalia <priyankmg at gmail.com>

pkgname=tuxpaint
-pkgver=0.9.19
-pkgrel=2
+pkgver=0.9.21
+pkgrel=1
pkgdesc="A drawing program for young children."
-_F_sourceforge_broken_up2date=1
Finclude sourceforge
url="http://tuxpaint.org/"
-depends=('sdlimage' 'sdl_ttf' 'sdl_mixer' 'sdl_pango' 'librsvg' 'libpaper' 'libxcb')
+depends=('sdlimage' 'sdl_ttf' 'sdl_mixer' 'sdl_pango' 'librsvg' 'libpaper' 'libxcb' 'fribidi')
backup=('etc/tuxpaint/tuxpaint.conf')
options=('scriptlet')
groups=('games-extra')
@@ -19,9 +18,7 @@ _F_desktop_icon="tuxpaint.png"
_F_desktop_exec="tuxpaint --fullscreen"
_F_desktop_filename="tuxpaintfs"
Finclude gnome-scriptlet
-source=(${source[@]} $pkgname-fix.patch)
-sha1sums=('6e2f806e8216808f602cccef45fb538c6f620578' \
-          '107de925f43fc50d8782d5fe620e39efd2a76388')
+sha1sums=('082a179a3cb44ee17af47421bc92125a890846e4')

build()
{
diff --git a/source/games-extra/tuxpaint/tuxpaint-fix.patch b/source/games-extra/tuxpaint/tuxpaint-fix.patch
deleted file mode 100644
index 09aeaee..0000000
--- a/source/games-extra/tuxpaint/tuxpaint-fix.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-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:
-
--PREFIX=/usr/local
-+PREFIX=/usr
-
-
- # Root directory to place files when creating packages.
-@@ -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
--GNOME_PREFIX=`gnome-config --prefix 2> /dev/null`
--KDE_PREFIX=`kde-config --install apps --expandvars 2> /dev/null`
--KDE_ICON_PREFIX=`kde-config --install icon --expandvars 2> /dev/null`
-+GNOME_PREFIX=
-+KDE_PREFIX=
-+KDE_ICON_PREFIX=
-+DESKTOP_ICON_PREFIX=$(PREFIX)/share/icons
-
-
-+ENABLE_GETTEXT=0
-+
- # Built with sound by default  (override with "make nosound")
-
- NOSOUNDFLAG=__SOUND
-@@ -134,7 +137,7 @@ ARCH_LIBS=obj/postscript_print.o
-
- #-ffast-math
- OPTFLAGS=-O2
--CFLAGS=$(OPTFLAGS) -W -Wall -fno-common -ffloat-store \
-+CFLAGS += -fPIC -W -Wall -fno-common -ffloat-store \
- 	-Wcast-align -Wredundant-decls \
- 	-Wbad-function-cast -Wwrite-strings \
- 	-Waggregate-return \
-@@ -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 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
-@@ -350,10 +356,13 @@ include Makefile-i18n
- install:	install-bin install-data install-man install-doc \
- 		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
-+		install-desktop-data
-+	@if [ -n "$(ENABLE_GETTEXT)" ] && [ $(ENABLE_GETTEXT) -eq 1 ]; then \
-+		make install-gettext; \
-+	fi
- 	@echo
- 	@echo "--------------------------------------------------------------"
- 	@echo
-@@ -622,16 +631,49 @@ install-example-starters:
-
- # Install a launcher icon in the Gnome menu, under "Graphics"
-
--install-gnome:
-+install-desktop-data:
- 	@echo
--	@echo "...Installing launcher icon into GNOME..."
--	@if [ "x$(GNOME_PREFIX)" != "x" ]; then \
--	 install -d $(PKG_ROOT)$(GNOME_PREFIX)/share/pixmaps; \
--	 cp data/images/icon.png $(PKG_ROOT)/$(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
--	 chmod 644 $(PKG_ROOT)$(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
--	 install -d $(PKG_ROOT)$(GNOME_PREFIX)/share/gnome/apps/Graphics; \
--	 cp src/tuxpaint.desktop $(PKG_ROOT)$(GNOME_PREFIX)/share/gnome/apps/Graphics/; \
--	 chmod 644 $(PKG_ROOT)$(GNOME_PREFIX)/share/gnome/apps/Graphics/tuxpaint.desktop; \
-+	@echo "...Installing launcher entry..."
-+	@if [ "x$(PREFIX)" != "x" ]; then \
-+	 install -d $(PKG_ROOT)$(PREFIX)/share/applications; \
-+	 cp src/tuxpaint.desktop $(PKG_ROOT)$(PREFIX)/share/applications/; \
-+	 chmod 644 $(PKG_ROOT)$(PREFIX)/share/applications/tuxpaint.desktop; \
-+	 install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/scalable/apps/; \
-+	 install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/192x192/apps/; \
-+	 install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/128x128/apps/; \
-+	 install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/96x96/apps/; \
-+	 install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/64x64/apps/; \
-+	 install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/48x48/apps/; \
-+	 install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/32x32/apps/; \
-+	 install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/22x22/apps/; \
-+	 install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/16x16/apps/; \
-+	 cp data/images/tuxpaint-icon.svg \
-+		$(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/scalable/apps/tuxpaint.svg; \
-+	 chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/scalable/apps/tuxpaint.svg; \
-+	 cp data/images/icon192x192.png \
-+		$(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/192x192/apps/tuxpaint.png; \
-+	 chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/192x192/apps/tuxpaint.png; \
-+	 cp data/images/icon128x128.png \
-+		$(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/128x128/apps/tuxpaint.png; \
-+	 chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/128x128/apps/tuxpaint.png; \
-+	 cp data/images/icon96x96.png \
-+		$(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/96x96/apps/tuxpaint.png; \
-+	 chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/96x96/apps/tuxpaint.png; \
-+	 cp data/images/icon64x64.png \
-+		$(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/64x64/apps/tuxpaint.png; \
-+	 chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/64x64/apps/tuxpaint.png; \
-+	 cp data/images/icon48x48.png \
-+		$(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/48x48/apps/tuxpaint.png; \
-+	 chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/48x48/apps/tuxpaint.png; \
-+	 cp data/images/icon32x32.png \
-+		$(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/32x32/apps/tuxpaint.png; \
-+	 chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/32x32/apps/tuxpaint.png; \
-+	 cp data/images/icon22x22.png \
-+		$(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/22x22/apps/tuxpaint.png; \
-+	 chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/22x22/apps/tuxpaint.png; \
-+	 cp data/images/icon16x16.png \
-+		$(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/16x16/apps/tuxpaint.png; \
-+	 chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/16x16/apps/tuxpaint.png; \
- 	fi
-
-
-@@ -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
--	@install -d $(X11_ICON_PREFIX)
--	@cp data/images/icon32x32.xpm $(X11_ICON_PREFIX)/tuxpaint.xpm
--	@chmod 644 $(X11_ICON_PREFIX)/tuxpaint.xpm
-
-
- # Install the program:
-
-


More information about the Frugalware-git mailing list