Added patch to fix printing issue (bug #191987)

Package-Manager: portage-2.1.3.9

5 files changed, 137 insertions, 5 deletions

diff --git a/media-gfx/tuxpaint/ChangeLog b/media-gfx/tuxpaint/ChangeLog
index 4750e8d46b74..6b09d49113f3 100644
--- a/media-gfx/tuxpaint/ChangeLog
+++ b/media-gfx/tuxpaint/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/tuxpaint
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/ChangeLog,v 1.35 2007/08/16 03:48:00 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/ChangeLog,v 1.36 2007/09/11 20:30:37 leonardop Exp $
+
+*tuxpaint-0.9.17-r1 (11 Sep 2007)
+
+  11 Sep 2007; Leonardo Boshell <leonardop@gentoo.org>
+  +files/tuxpaint-0.9.17-printing.patch, +tuxpaint-0.9.17-r1.ebuild:
+  Added patch to fix printing on localised systems (bug #191987).
 
   16 Aug 2007; Leonardo Boshell <leonardop@gentoo.org>
   tuxpaint-0.9.17.ebuild:
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index 7ad72e084043..6fb12ad1ca31 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -6,20 +6,28 @@ AUX tuxpaint-0.9.17-gentoo.patch 6283 RMD160 9f4dbb3201dccf111d44235c77d5c9e6d60
 MD5 587bd83c1590b7fc0f4e143582982200 files/tuxpaint-0.9.17-gentoo.patch 6283
 RMD160 9f4dbb3201dccf111d44235c77d5c9e6d607a351 files/tuxpaint-0.9.17-gentoo.patch 6283
 SHA256 dec610e931b7ae507b976d3b18a00970e66000f90e8dad1aeeaff78e2f29419b files/tuxpaint-0.9.17-gentoo.patch 6283
+AUX tuxpaint-0.9.17-printing.patch 1523 RMD160 9ec54087ac22b8de0e439bf014f1b6908c2e465a SHA1 597b4f215af2a13293e002c116b632f5e550fe70 SHA256 b653979d753231537272d5c70e0ee3df642c792537014598887a6f42220983c3
+MD5 5df5c206db336fab4342e5eeea526178 files/tuxpaint-0.9.17-printing.patch 1523
+RMD160 9ec54087ac22b8de0e439bf014f1b6908c2e465a files/tuxpaint-0.9.17-printing.patch 1523
+SHA256 b653979d753231537272d5c70e0ee3df642c792537014598887a6f42220983c3 files/tuxpaint-0.9.17-printing.patch 1523
 DIST tuxpaint-0.9.16.tar.gz 6785134 RMD160 f263455fa3bd4d51e7280a5451d7cc021b2c9639 SHA1 7c09582abe69d0fc6f0e1077c839b8931899fbe7 SHA256 af2dd9dcac7c7377e344bb964b8a523402aeffde877522c844f98c9e1e5881e0
 DIST tuxpaint-0.9.17.tar.gz 7570223 RMD160 c7cf3636875cad87646cda4df978f9adbbf18630 SHA1 88e42d19339bb1faa03bce45a28d3fe11fbe05b4 SHA256 d01159625fa475739f79f6a5cb2a7dd65e486d165c52d6d8d56cf5222a6fe1ad
 EBUILD tuxpaint-0.9.16-r1.ebuild 1337 RMD160 741dd82d5ab85bcbc0ab1ce2caed9e90bba31705 SHA1 0ddf2f0db2d52dbc44618b672847f658626fca9c SHA256 247982f464ce8b3bf173dd3175fce95512e9be365fa06f4211360656a5642c9b
 MD5 4c22ee0325c902bbd87886b031ed1b5a tuxpaint-0.9.16-r1.ebuild 1337
 RMD160 741dd82d5ab85bcbc0ab1ce2caed9e90bba31705 tuxpaint-0.9.16-r1.ebuild 1337
 SHA256 247982f464ce8b3bf173dd3175fce95512e9be365fa06f4211360656a5642c9b tuxpaint-0.9.16-r1.ebuild 1337
+EBUILD tuxpaint-0.9.17-r1.ebuild 1520 RMD160 a694714251e0907d7e61a15c59e62522d10dc825 SHA1 4e7b31a923da24d651073ccd2a1c7cac92fb5837 SHA256 731246ff7a65994a611c9afb5a8ce89de924688067d2ac93a666e7f59a7d0c6a
+MD5 4dc120b096c9763feb178f52198c54a6 tuxpaint-0.9.17-r1.ebuild 1520
+RMD160 a694714251e0907d7e61a15c59e62522d10dc825 tuxpaint-0.9.17-r1.ebuild 1520
+SHA256 731246ff7a65994a611c9afb5a8ce89de924688067d2ac93a666e7f59a7d0c6a tuxpaint-0.9.17-r1.ebuild 1520
 EBUILD tuxpaint-0.9.17.ebuild 1423 RMD160 aad580b498266de8f2333b111d2c571bec68cc96 SHA1 743f4071c6a575c1958dd93b172ba0d72a9c9caf SHA256 6ea328a21b5a25f05762475c56e8a4156d3b91481b88db978c9801d06d178779
 MD5 ab8092dc2842ee1717828dfb50166cd3 tuxpaint-0.9.17.ebuild 1423
 RMD160 aad580b498266de8f2333b111d2c571bec68cc96 tuxpaint-0.9.17.ebuild 1423
 SHA256 6ea328a21b5a25f05762475c56e8a4156d3b91481b88db978c9801d06d178779 tuxpaint-0.9.17.ebuild 1423
-MISC ChangeLog 5660 RMD160 6588a9c0cdd224eb5659b6051c8f9368071e5b8c SHA1 88c5a01a5a9da51658a739690cbeee90c2ac5c83 SHA256 317fdb8515d1ae8637e923d0794aecd85330bb87c861a49b099a5d611b4940c0
-MD5 097b634fd94eded2686dd3c5dce95450 ChangeLog 5660
-RMD160 6588a9c0cdd224eb5659b6051c8f9368071e5b8c ChangeLog 5660
-SHA256 317fdb8515d1ae8637e923d0794aecd85330bb87c861a49b099a5d611b4940c0 ChangeLog 5660
+MISC ChangeLog 5886 RMD160 4807379e725f89e299b4a303bef982b6267a47e0 SHA1 6bd2b5e74bb775b8d322495e18cf61378c38eb01 SHA256 d913329520f6778190b9e20a94a6c3f91ee2ab565ceace25327d541ac11c69d1
+MD5 b7592eb06ad0bbc209689504aea57f41 ChangeLog 5886
+RMD160 4807379e725f89e299b4a303bef982b6267a47e0 ChangeLog 5886
+SHA256 d913329520f6778190b9e20a94a6c3f91ee2ab565ceace25327d541ac11c69d1 ChangeLog 5886
 MISC metadata.xml 648 RMD160 9637df32ab38d7c4e98c32194c34393eae4786fb SHA1 710e2dfd4045a91e222ac33769adf2d74512ac86 SHA256 5f951324251b981f6dd24414b0b34a590a8ff051f29f2f24a6e1d08c71c82025
 MD5 60d69ee439da76dbf4d88951ef86236a metadata.xml 648
 RMD160 9637df32ab38d7c4e98c32194c34393eae4786fb metadata.xml 648
@@ -30,3 +38,6 @@ SHA256 3f8153732e3be38b013c8f45b54a01fa488fb8dacedbfbc27b282e9566f9c641 files/di
 MD5 19159d6dcfd4bfddc19a62c0e7405425 files/digest-tuxpaint-0.9.17 250
 RMD160 10b9413f796eaccbbe38cb29b1cd944aece5320e files/digest-tuxpaint-0.9.17 250
 SHA256 af62b5d28b94db9d2c0d60cf25eadf30b70cf44a936c8fce6409040a16c4da24 files/digest-tuxpaint-0.9.17 250
+MD5 19159d6dcfd4bfddc19a62c0e7405425 files/digest-tuxpaint-0.9.17-r1 250
+RMD160 10b9413f796eaccbbe38cb29b1cd944aece5320e files/digest-tuxpaint-0.9.17-r1 250
+SHA256 af62b5d28b94db9d2c0d60cf25eadf30b70cf44a936c8fce6409040a16c4da24 files/digest-tuxpaint-0.9.17-r1 250
diff --git a/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.17-r1 b/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.17-r1
new file mode 100644
index 000000000000..e1777f0d1869
--- /dev/null
+++ b/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.17-r1
@@ -0,0 +1,3 @@
+MD5 e98e4f1b3421ffcb0e1a1cbbf7c93dc4 tuxpaint-0.9.17.tar.gz 7570223
+RMD160 c7cf3636875cad87646cda4df978f9adbbf18630 tuxpaint-0.9.17.tar.gz 7570223
+SHA256 d01159625fa475739f79f6a5cb2a7dd65e486d165c52d6d8d56cf5222a6fe1ad tuxpaint-0.9.17.tar.gz 7570223
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.17-printing.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.17-printing.patch
new file mode 100644
index 000000000000..63fc8912656f
--- /dev/null
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.17-printing.patch
@@ -0,0 +1,44 @@
+diff -NurdpB tuxpaint-0.9.17/src/postscript_print.c tuxpaint-0.9.17-patched/src/postscript_print.c
+--- tuxpaint-0.9.17/src/postscript_print.c	2007-06-25 13:00:50.000000000 -0500
++++ tuxpaint-0.9.17-patched/src/postscript_print.c	2007-09-10 17:46:06.000000000 -0500
+@@ -63,6 +63,19 @@
+ 
+ #define my_min(x,y) ((x < y) ? (x) : (y))
+ 
++int f2int(float f);
++int f2dec(float f);
++
++int f2int(float f)
++{
++  return ((int)f);
++}
++
++int f2dec(float f)
++{
++  return (int)((f - f2int(f)) * 100);
++}
++
+ /* Actually save the PostScript data to the file stream: */
+ int do_ps_save(FILE * fi,
+ 		// const char *restrict const fname,
+@@ -234,14 +247,16 @@ int do_ps_save(FILE * fi,
+   /* 'translate' moves the user space origin to a new position with
+   respect to the current page, leaving the orientation of the axes and
+   the unit lengths unchanged. */
+-  fprintf(fi, "%.2f %.2f translate\n", tlate_x, tlate_y);
++  fprintf(fi, "%d.%02d %d.%02d translate\n",
++	  f2int(tlate_x), f2dec(tlate_x),
++	  f2int(tlate_y), f2dec(tlate_y));
+ 
+   /* 'scale' modifies the unit lengths independently along the current
+   x and y axes, leaving the origin location and the orientation of the
+   axes unchanged. */
+-  fprintf(fi, "%.2f %.2f scale\n",
+-	  (float) printed_img_w * scale,
+-	  (float) printed_img_h * scale);
++  fprintf(fi, "%d.%02d %d.%02d scale\n",
++          f2int(printed_img_w * scale), f2dec(printed_img_w * scale),
++          f2int(printed_img_h * scale), f2dec(printed_img_h * scale));
+ 
+   /* Rotate the image */
+   if (rotate)
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.17-r1.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.17-r1.ebuild
new file mode 100644
index 000000000000..78ab04c6bab8
--- /dev/null
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.17-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/tuxpaint-0.9.17-r1.ebuild,v 1.1 2007/09/11 20:30:37 leonardop Exp $
+
+inherit eutils gnome2-utils
+
+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 svg"
+
+DEPEND="media-libs/libsdl
+	media-libs/sdl-image
+	media-libs/sdl-ttf
+	media-libs/sdl-mixer
+	>=media-libs/libpng-1.2
+	>=media-libs/freetype-2
+	app-text/libpaper
+	nls? ( sys-devel/gettext )
+	svg? (
+		gnome-base/librsvg
+		x11-libs/cairo )"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# Sanitize the Makefile and correct a few other issues.
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+
+	# Fix printing on localised systems (bug #191987)
+	epatch "${FILESDIR}"/${P}-printing.patch
+}
+
+src_compile() {
+	local myopts=""
+
+	use nls && myopts="${myopts} ENABLE_GETTEXT=1"
+	use svg || myopts="${myopts} nosvg"
+
+	# emake may break things
+	make ${myopts} || die "Compilation failed"
+}
+
+src_install () {
+	local myopts=""
+
+	use nls && myopts="${myopts} ENABLE_GETTEXT=1"
+
+	make PKG_ROOT="${D}" ${myopts} 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 ""
+}