diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-gfx/tuxpaint | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-gfx/tuxpaint')
-rw-r--r-- | media-gfx/tuxpaint/Manifest | 1 | ||||
-rw-r--r-- | media-gfx/tuxpaint/files/tuxpaint-0.9.20-gentoo.patch | 136 | ||||
-rw-r--r-- | media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch | 22 | ||||
-rw-r--r-- | media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch | 19 | ||||
-rw-r--r-- | media-gfx/tuxpaint/files/tuxpaint-0.9.21-underlinking.patch | 17 | ||||
-rw-r--r-- | media-gfx/tuxpaint/metadata.xml | 15 | ||||
-rw-r--r-- | media-gfx/tuxpaint/tuxpaint-0.9.21-r1.ebuild | 71 |
7 files changed, 281 insertions, 0 deletions
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest new file mode 100644 index 000000000000..63c33f1e43b8 --- /dev/null +++ b/media-gfx/tuxpaint/Manifest @@ -0,0 +1 @@ +DIST tuxpaint-0.9.21.tar.gz 9543034 SHA256 6d4f2b981643b5c937708e5e6cdaf318ae7b5562375327b4b1cb84611e65ede9 SHA512 fafd80fe7a5a4d65236c8b5a4f15c644c76180e0e4ed7e774795572b70cc38ddb3273be2a93f041d74a1e536a5a9386c18e51987425ea1a3ff910661e4b0afb3 WHIRLPOOL e9b8dc45ed8f5ffd099d0d8308a13cd0b8658cf08e4c35ba21fe1a2edf18178936809c2e95a2a560c3f3e5b3e875fd078412067830bef69becd8f25fb74ad2fd diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.20-gentoo.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.20-gentoo.patch new file mode 100644 index 000000000000..00af3cb2a867 --- /dev/null +++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.20-gentoo.patch @@ -0,0 +1,136 @@ +diff -ru tuxpaint-0.9.20.orig/Makefile tuxpaint-0.9.20/Makefile +--- tuxpaint-0.9.20.orig/Makefile 2008-12-21 15:04:36.000000000 +0100 ++++ tuxpaint-0.9.20/Makefile 2008-12-21 15:42:24.000000000 +0100 +@@ -137,9 +137,12 @@ + # Icons and launchers: + ICON_PREFIX:=$(DESTDIR)$(PREFIX)/share/pixmaps + X11_ICON_PREFIX:=$(DESTDIR)$(PREFIX)/X11R6/include/X11/pixmaps +-GNOME_PREFIX:=$(shell gnome-config --prefix 2> /dev/null) +-KDE_PREFIX:=$(shell kde-config --install apps --expandvars 2> /dev/null) +-KDE_ICON_PREFIX:=$(shell kde-config --install icon --expandvars 2> /dev/null) ++GNOME_PREFIX:= ++KDE_PREFIX:= ++KDE_ICON_PREFIX:= ++DESKTOP_ICON_PREFIX:=$(PREFIX)/share/icons ++ ++ENABLE_GETTEXT:=0 + + # Maemo flag + MAEMOFLAG:= +@@ -200,7 +203,7 @@ + + #-ffast-math + OPTFLAGS:=-O2 +-CFLAGS:=$(CPPFLAGS) $(OPTFLAGS) -W -Wall -fno-common -ffloat-store \ ++CFLAGS:=$(CPPFLAGS) -W -Wall -fno-common -ffloat-store \ + $(call comptest,-fvisibility=hidden,) \ + -Wcast-align -Wredundant-decls \ + -Wbad-function-cast -Wwrite-strings \ +@@ -232,7 +235,10 @@ + # "make" with no arguments builds the program and man page from sources: + # + .PHONY: all +-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 +@@ -390,7 +396,7 @@ + windows_ARCH_INSTALL:= + osx_ARCH_INSTALL:= + beos_ARCH_INSTALL:= +-linux_ARCH_INSTALL:=install-gnome install-kde install-kde-icons ++linux_ARCH_INSTALL:=install-desktop-data + ARCH_INSTALL:=$($(OS)_ARCH_INSTALL) + + # "make install" installs all of the various parts +@@ -400,10 +406,13 @@ + 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 \ + $(ARCH_INSTALL) ++ @if [ -n "$(ENABLE_GETTEXT)" ] && [ $(ENABLE_GETTEXT) -eq 1 ]; then \ ++ make install-gettext ; \ ++ fi + @echo + @echo "--------------------------------------------------------------" + @echo +@@ -581,17 +590,50 @@ + + # Install a launcher icon in the Gnome menu + .PHONY: install-gnome +-install-gnome: ++install-desktop-data: + @echo +- @echo "...Installing launcher icon into GNOME..." +- @if [ "x$(GNOME_PREFIX)" != "x" ]; then \ +- install -d $(DESTDIR)$(GNOME_PREFIX)/share/pixmaps; \ +- cp data/images/icon.png $(DESTDIR)/$(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \ +- chmod 644 $(DESTDIR)$(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \ +- install -d $(DESTDIR)$(GNOME_PREFIX)/share/applications; \ +- cp src/tuxpaint.desktop $(DESTDIR)$(GNOME_PREFIX)/share/applications/; \ +- chmod 644 $(DESTDIR)$(GNOME_PREFIX)/share/applications/tuxpaint.desktop; \ +- fi ++ @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 + + + # Install a launcher icon for the Nokia 770. +@@ -684,9 +726,6 @@ + @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: +Only in tuxpaint-0.9.20: Makefile.bak diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch new file mode 100644 index 000000000000..3370d6725d58 --- /dev/null +++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch @@ -0,0 +1,22 @@ +=== modified file 'Makefile' +--- Makefile 2011-08-09 15:19:01 +0000 ++++ Makefile 2011-08-09 15:19:43 +0000 +@@ -871,7 +871,7 @@ + $(ARCH_LIBS) + @echo + @echo "...Linking Tux Paint..." +- $(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(FRIBIDI_CFLAGS) $(DEFS) \ ++ $(CC) $(CFLAGS) $(LDFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(FRIBIDI_CFLAGS) $(DEFS) \ + -o tuxpaint $^ \ + $(SDL_LIBS) $(SVG_LIB) $(ARCH_LINKS) + @$(RSRC_CMD) +@@ -1043,7 +1043,7 @@ + MAGIC_SO:=$(patsubst magic/src/%.c,magic/%.$(SO_TYPE),$(MAGIC_C)) + + $(MAGIC_SO): magic/%.$(SO_TYPE): magic/src/%.c +- $(CC) $(MAGIC_CFLAGS) $(SHARED_FLAGS) -o $@ $< $(PLUGIN_LIBS) ++ $(CC) $(MAGIC_CFLAGS) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $< $(PLUGIN_LIBS) + # Probably should separate the various flags like the following: + # $(CC) $(PLUG_CPPFLAGS) $(PLUG_CFLAGS) $(PLUG_LDFLAGS) -o $@ $< $(PLUG_LIBS) + + diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch new file mode 100644 index 000000000000..25e80cd2a488 --- /dev/null +++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch @@ -0,0 +1,19 @@ +http://tuxpaint.cvs.sourceforge.net/viewvc/tuxpaint/tuxpaint/src/tuxpaint.c?r1=1.828&r2=1.829 +No longer directly accessing PNG structure members directly, now using png_set_IHDR(). (Patch from SF.net Bug #3386433) + +--- src/tuxpaint.c 2011/07/29 21:27:39 1.828 ++++ src/tuxpaint.c 2011/08/08 17:59:12 1.829 +@@ -13425,12 +13425,7 @@ + { + png_init_io(png_ptr, fi); + +- info_ptr->width = surf->w; +- info_ptr->height = surf->h; +- info_ptr->bit_depth = 8; +- info_ptr->color_type = PNG_COLOR_TYPE_RGB; +- info_ptr->interlace_type = 1; +- info_ptr->valid = 0; /* will be updated by various png_set_FOO() functions */ ++ png_set_IHDR(png_ptr, info_ptr, surf->w, surf->h, 8, PNG_COLOR_TYPE_RGB, 1, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); + + png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr, + PNG_sRGB_INTENT_PERCEPTUAL); diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-underlinking.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-underlinking.patch new file mode 100644 index 000000000000..295684918f50 --- /dev/null +++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-underlinking.patch @@ -0,0 +1,17 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Sat Oct 26 19:16:54 UTC 2013 +Subject: fix underlinking + +https://bugs.gentoo.org/show_bug.cgi?id=484434 + +--- tuxpaint-0.9.21/Makefile ++++ tuxpaint-0.9.21/Makefile +@@ -80,7 +80,7 @@ + windows_ARCH_LINKS:=-lintl $(PNG) -lwinspool -lshlwapi $(FRIBIDI_LIB) + osx_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB) + beos_ARCH_LINKS:="-lintl $(PNG) -lz -lbe -liconv $(FRIBIDI_LIB)" +-linux_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB) ++linux_ARCH_LINKS:=$(PAPER_LIB) $(PNG) $(FRIBIDI_LIB) + ARCH_LINKS:=$($(OS)_ARCH_LINKS) + + # Install a launcher icon for the Nokia 770. diff --git a/media-gfx/tuxpaint/metadata.xml b/media-gfx/tuxpaint/metadata.xml new file mode 100644 index 000000000000..251afdaea786 --- /dev/null +++ b/media-gfx/tuxpaint/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>graphics</herd> + <longdescription> + Tux Paint is a free drawing program designed for young children + (kids ages 3 and up). It has a simple, easy-to-use interface, fun + sound effects, and an encouraging cartoon mascot who helps guide + children as they use the program. It provides a blank canvas and a + variety of drawing tools to help your child be creative. +</longdescription> + <upstream> + <remote-id type="sourceforge">tuxpaint</remote-id> + </upstream> +</pkgmetadata> diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.21-r1.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.21-r1.ebuild new file mode 100644 index 000000000000..72014f9da5c2 --- /dev/null +++ b/media-gfx/tuxpaint/tuxpaint-0.9.21-r1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="2" + +inherit eutils gnome2-utils multilib toolchain-funcs + +DESCRIPTION="Drawing program designed for young children" +HOMEPAGE="http://www.tuxpaint.org/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc x86" + +IUSE="nls" + +RDEPEND=" + app-text/libpaper + dev-libs/fribidi + gnome-base/librsvg + >=media-libs/libpng-1.2 + >=media-libs/freetype-2 + media-libs/libsdl + media-libs/sdl-image[png] + media-libs/sdl-mixer + media-libs/sdl-pango + media-libs/sdl-ttf + x11-libs/cairo" + +DEPEND=" + ${RDEPEND} + nls? ( sys-devel/gettext )" + +src_prepare() { + # Sanitize the Makefile and correct a few other issues. + epatch "${FILESDIR}/${PN}-0.9.20-gentoo.patch" + epatch "${FILESDIR}/${P}-libpng1.5.patch" #378199 + epatch "${FILESDIR}/${P}-LDFLAGS.patch" #334571 + epatch "${FILESDIR}/${P}-underlinking.patch" #484434 + + sed -i \ + -e "s|linux_PREFIX:=/usr/local|linux_PREFIX:=/usr|" \ + -e "s:/lib/:/$(get_libdir)/:" \ + -e "s:/share/doc/tuxpaint.*:/share/doc/${PF}:g" \ + Makefile || die +} + +src_compile() { + # emake may break things + make CC="$(tc-getCC)" \ + $(use nls && echo ENABLE_GETTEXT=1) || die "Compilation failed" +} + +src_install () { + make PKG_ROOT="${D}" \ + $(use nls && echo ENABLE_GETTEXT=1) install || die "Installation failed" + + rm -f docs/COPYING.txt docs/INSTALL.txt + dodoc docs/*.txt +} + +pkg_postinst() { + gnome2_icon_cache_update + + elog "" + elog "For additional graphic stamps, you can emerge the" + elog "media-gfx/tuxpaint-stamps package." + elog "" +} |