[Pkg-tcltk-commits] r751 - in tk8.5/trunk/debian: . patches

[sgolovan-guest at alioth.debian.org]

Author: sgolovan-guest
Date: 2008-11-08 16:45:42 +0000 (Sat, 08 Nov 2008)
New Revision: 751

Added:
   tk8.5/trunk/debian/patches/fontsize.diff
Modified:
   tk8.5/trunk/debian/changelog
   tk8.5/trunk/debian/patches/series
   tk8.5/trunk/debian/rules
Log:
[tk8.5]
  * Fixed bug with mirrored text in canvas postscript output
    (closes: #498408).
  * Install ttk private headers which are necessary to develop ttk extensions
    or themes (closes: #500934, #504981).


Modified: tk8.5/trunk/debian/changelog
===================================================================
--- tk8.5/trunk/debian/changelog	2008-10-17 09:56:43 UTC (rev 750)
+++ tk8.5/trunk/debian/changelog	2008-11-08 16:45:42 UTC (rev 751)
@@ -1,8 +1,11 @@
-tk8.5 (8.5.3-4) UNRELEASED; urgency=low
+tk8.5 (8.5.3-4) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Fixed bug with mirrored text in canvas postscript output
+    (closes: #498408).
+  * Install ttk private headers which are necessary to develop ttk extensions
+    or themes (closes: #500934, #504981).
 
- -- Sergei Golovan <sgolovan at debian.org>  Thu, 31 Jul 2008 09:21:46 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Sat, 08 Nov 2008 19:31:30 +0300
 
 tk8.5 (8.5.3-3) unstable; urgency=low
 

Added: tk8.5/trunk/debian/patches/fontsize.diff
===================================================================
--- tk8.5/trunk/debian/patches/fontsize.diff	                        (rev 0)
+++ tk8.5/trunk/debian/patches/fontsize.diff	2008-11-08 16:45:42 UTC (rev 751)
@@ -0,0 +1,21 @@
+Patch by Sergei Golovan fixes mirroring font in canvas postscript when its
+size is specified in pixels (negative).
+
+--- tk8.5-8.5.3.orig/unix/tkUnixRFont.c
++++ tk8.5-8.5.3/unix/tkUnixRFont.c
+@@ -260,6 +260,7 @@
+     ftFont = GetFont(fontPtr, 0);
+     fontPtr->font.fid = XLoadFont(Tk_Display(tkwin), "fixed");
+     GetTkFontAttributes(ftFont, &fontPtr->font.fa);
++    fontPtr->font.fa.size = TkFontGetPoints(tkwin, fontPtr->font.fa.size);
+     GetTkFontMetrics(ftFont, &fontPtr->font.fm);
+ 
+     return fontPtr;
+@@ -517,6 +518,7 @@
+ 				/* Actual font used to render the character */
+ 
+     GetTkFontAttributes(ftFont, faPtr);
++    faPtr->size = TkFontGetPoints(tkwin, faPtr->size);
+     faPtr->underline = fontPtr->font.fa.underline;
+     faPtr->overstrike = fontPtr->font.fa.overstrike;
+ }

Modified: tk8.5/trunk/debian/patches/series
===================================================================
--- tk8.5/trunk/debian/patches/series	2008-10-17 09:56:43 UTC (rev 750)
+++ tk8.5/trunk/debian/patches/series	2008-11-08 16:45:42 UTC (rev 751)
@@ -6,3 +6,4 @@
 rpath.diff
 non-linux.diff
 manpages.diff
+fontsize.diff

Modified: tk8.5/trunk/debian/rules
===================================================================
--- tk8.5/trunk/debian/rules	2008-10-17 09:56:43 UTC (rev 750)
+++ tk8.5/trunk/debian/rules	2008-11-08 16:45:42 UTC (rev 751)
@@ -83,8 +83,9 @@
 	ln -sf libtk$(v).so.0 debian/tmp/usr/lib/libtk$(v).so
 	mv debian/tmp/usr/lib/*.sh debian/tmp/usr/share/tcltk/tk$(v)
 	# Fix up the include files.
-	install -d debian/tmp/usr/include/tcl$(v)/tk-private/generic
+	install -d debian/tmp/usr/include/tcl$(v)/tk-private/generic/ttk
 	cp generic/*.h debian/tmp/usr/include/tcl$(v)/tk-private/generic
+	cp generic/ttk/*.h debian/tmp/usr/include/tcl$(v)/tk-private/generic/ttk
 	install -d debian/tmp/usr/include/tcl$(v)/tk-private/unix
 	cp unix/*.h debian/tmp/usr/include/tcl$(v)/tk-private/unix
 	install -d debian/tmp/usr/include/tcl$(v)/tk-private/compat