diff options
author | Markus Meier <maekke@gentoo.org> | 2008-09-18 19:59:21 +0000 |
---|---|---|
committer | Markus Meier <maekke@gentoo.org> | 2008-09-18 19:59:21 +0000 |
commit | d6084fe6c877bffa1c81abac795b1a9166e8b802 (patch) | |
tree | 1d65af3114567755b55922b2b844dc4f3fe3468a /media-gfx/tuxpaint/files | |
parent | Fix manifest (diff) | |
download | historical-d6084fe6c877bffa1c81abac795b1a9166e8b802.tar.gz historical-d6084fe6c877bffa1c81abac795b1a9166e8b802.tar.bz2 historical-d6084fe6c877bffa1c81abac795b1a9166e8b802.zip |
bump to 0.9.19 by Denis Dupeyron in bug #200740
Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc6 i686
Diffstat (limited to 'media-gfx/tuxpaint/files')
-rw-r--r-- | media-gfx/tuxpaint/files/tuxpaint-0.9.19-gentoo.patch | 163 |
1 files changed, 163 insertions, 0 deletions
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.19-gentoo.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.19-gentoo.patch new file mode 100644 index 000000000000..cf702a8e58b7 --- /dev/null +++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.19-gentoo.patch @@ -0,0 +1,163 @@ +diff -NurdpB tuxpaint-0.9.19/Makefile tuxpaint-0.9.19-patched/Makefile +--- tuxpaint-0.9.19/Makefile 2008-02-19 01:45:37.000000000 +0100 ++++ tuxpaint-0.9.19-patched/Makefile 2008-03-16 16:53:28.000000000 +0100 +@@ -20,7 +20,7 @@ SO_TYPE=so + + # Where to install things: + +-PREFIX=/usr/local ++PREFIX=/usr + + + # Root directory to place files when creating packages. +@@ -42,7 +42,7 @@ DATA_PREFIX=$(PKG_ROOT)$(PREFIX)/share/t + # Magic Tool plug-ins + + INCLUDE_PREFIX=$(PKG_ROOT)$(PREFIX)/include +-MAGIC_PREFIX=$(PKG_ROOT)$(PREFIX)/lib/tuxpaint/plugins ++MAGIC_PREFIX=$(PKG_ROOT)$(PREFIX)/GET_LIBDIR/tuxpaint/plugins + + + # Docs and man page: +@@ -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 +@@ -123,7 +126,7 @@ SVG_LIB=-lrsvg-2 -lcairo + SVG_CFLAGS=-I/usr/include/librsvg-2/librsvg \ + -I/usr/include/gtk-2.0 \ + -I/usr/include/glib-2.0 \ +- -I/usr/lib/glib-2.0/include \ ++ -I/usr/GET_LIBDIR/glib-2.0/include \ + -I/usr/include/cairo + + PAPER_LIB=-lpaper +@@ -134,7 +137,7 @@ ARCH_LIBS=obj/postscript_print.o + + #-ffast-math + 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 \ +@@ -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 +@@ -360,10 +366,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 +@@ -635,16 +644,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 + + +@@ -738,9 +780,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: +diff -NurdpB tuxpaint-0.9.19/src/tuxpaint.desktop tuxpaint-0.9.19-patched/src/tuxpaint.desktop +--- tuxpaint-0.9.19/src/tuxpaint.desktop 2008-02-14 16:44:17.000000000 +0100 ++++ tuxpaint-0.9.19-patched/src/tuxpaint.desktop 2008-03-16 16:18:14.000000000 +0100 +@@ -205,3 +205,4 @@ Comment[xh]=Inkqubo yokuzoba yabantwana. + Comment[zh_cn]=孩子的绘图程序。 + Comment[zh_tw]=適合兒童的畫圖程式 + Comment[zw]=Diif program paar keé men Dibuj paar biét biss ++Categories=Application;Graphics; + |