[Pkg-tcltk-commits] r557 - in tk8.5/trunk/debian: . patches
sgolovan-guest at alioth.debian.org
sgolovan-guest at alioth.debian.org
Tue Apr 1 11:52:16 UTC 2008
Author: sgolovan-guest
Date: 2008-04-01 11:52:15 +0000 (Tue, 01 Apr 2008)
New Revision: 557
Removed:
tk8.5/trunk/debian/patches/font.diff
Modified:
tk8.5/trunk/debian/changelog
tk8.5/trunk/debian/patches/confsearch.diff
tk8.5/trunk/debian/patches/manpages.diff
tk8.5/trunk/debian/patches/non-linux.diff
tk8.5/trunk/debian/patches/rpath.diff
tk8.5/trunk/debian/patches/series
tk8.5/trunk/debian/patches/tklibrary.diff
tk8.5/trunk/debian/patches/tkprivate.diff
tk8.5/trunk/debian/rules
Log:
[tk8.5]
* New upstream release.
* Removed a font patch because its lighter version was included into
upstream distribution.
Modified: tk8.5/trunk/debian/changelog
===================================================================
--- tk8.5/trunk/debian/changelog 2008-04-01 11:27:18 UTC (rev 556)
+++ tk8.5/trunk/debian/changelog 2008-04-01 11:52:15 UTC (rev 557)
@@ -1,12 +1,15 @@
-tk8.5 (8.5.1-3) unstable; urgency=low
+tk8.5 (8.5.2-1) unstable; urgency=low
+ * New upstream release.
+ * Removed a font patch because its lighter version was included into
+ upstream distribution.
* Quoted CFLAGS in debian/rules when passing to the shell, not when
assigning to a make variable; otherwise the quotes end up as part of
the variable and many things go wrong, leading to a build failure.
* Explicitly specified configure options --host and --build to make build
results more predictable.
- -- Sergei Golovan <sgolovan at debian.org> Mon, 25 Feb 2008 10:29:34 +0300
+ -- Sergei Golovan <sgolovan at debian.org> Tue, 01 Apr 2008 15:51:47 +0400
tk8.5 (8.5.1-2) unstable; urgency=low
Modified: tk8.5/trunk/debian/patches/confsearch.diff
===================================================================
--- tk8.5/trunk/debian/patches/confsearch.diff 2008-04-01 11:27:18 UTC (rev 556)
+++ tk8.5/trunk/debian/patches/confsearch.diff 2008-04-01 11:52:15 UTC (rev 557)
@@ -2,10 +2,8 @@
and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
installation.
-Index: tk8.5-8.5.0/unix/configure
-===================================================================
---- tk8.5-8.5.0.orig/unix/configure 2007-12-19 11:22:32.000000000 +0300
-+++ tk8.5-8.5.0/unix/configure 2007-12-19 11:22:41.000000000 +0300
+--- tk8.5-8.5.2.orig/unix/configure
++++ tk8.5-8.5.2/unix/configure
@@ -1430,6 +1430,7 @@
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
@@ -14,10 +12,8 @@
`ls -d /usr/lib 2>/dev/null` \
; do
if test -f "$i/tclConfig.sh" ; then
-Index: tk8.5-8.5.0/unix/tcl.m4
-===================================================================
---- tk8.5-8.5.0.orig/unix/tcl.m4 2007-12-17 20:57:25.000000000 +0300
-+++ tk8.5-8.5.0/unix/tcl.m4 2007-12-19 11:22:41.000000000 +0300
+--- tk8.5-8.5.2.orig/unix/tcl.m4
++++ tk8.5-8.5.2/unix/tcl.m4
@@ -93,6 +93,7 @@
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
Deleted: tk8.5/trunk/debian/patches/font.diff
===================================================================
--- tk8.5/trunk/debian/patches/font.diff 2008-04-01 11:27:18 UTC (rev 556)
+++ tk8.5/trunk/debian/patches/font.diff 2008-04-01 11:52:15 UTC (rev 557)
@@ -1,172 +0,0 @@
---- unix/tkUnixRFont.c.orig 2008-02-14 21:38:54.000000000 +0300
-+++ unix/tkUnixRFont.c 2008-02-15 22:37:06.000000000 +0300
-@@ -20,6 +20,7 @@
- XftFont *ftFont;
- FcPattern *source;
- FcCharSet *charset;
-+ int failed;
- } UnixFtFace;
-
- typedef struct {
-@@ -60,6 +61,31 @@
- }
-
- static XftFont *
-+GetFontFallback(
-+ UnixFtFont *fontPtr)
-+{
-+ double size;
-+ int pxsize;
-+ char *type;
-+
-+ if (XftPatternGetDouble(fontPtr->pattern, XFT_SIZE, 0,
-+ &size) == XftResultMatch) {
-+ type = XFT_SIZE;
-+ } else if (XftPatternGetInteger(fontPtr->pattern, XFT_PIXEL_SIZE, 0,
-+ &pxsize) == XftResultMatch) {
-+ type = XFT_PIXEL_SIZE;
-+ size = pxsize;
-+ } else {
-+ type = XFT_SIZE;
-+ size = 12.0;
-+ }
-+ return XftFontOpen(fontPtr->display, fontPtr->screen,
-+ FC_FAMILY, FcTypeString, "sans",
-+ type, XftTypeDouble, size,
-+ NULL);
-+}
-+
-+static XftFont *
- GetFont(
- UnixFtFont *fontPtr,
- FcChar32 ucs4)
-@@ -69,23 +95,57 @@
- if (ucs4) {
- for (i = 0; i < fontPtr->nfaces; i++) {
- FcCharSet *charset = fontPtr->faces[i].charset;
-- if (charset && FcCharSetHasChar(charset, ucs4)) {
-- break;
-+ if (!(charset && FcCharSetHasChar(charset, ucs4))) {
-+ continue;
-+ }
-+ if (fontPtr->faces[i].ftFont) {
-+ return fontPtr->faces[i].ftFont;
-+ } else {
-+ if (!fontPtr->faces[i].failed) {
-+ FcPattern *pat = FcFontRenderPrepare(0, fontPtr->pattern,
-+ fontPtr->faces[i].source);
-+
-+ fontPtr->faces[i].ftFont = XftFontOpenPattern(fontPtr->display, pat);
-+ }
-+ if (fontPtr->faces[i].ftFont) {
-+ return fontPtr->faces[i].ftFont;
-+ } else {
-+ fontPtr->faces[i].failed = 1;
-+ }
- }
- }
-- if (i == fontPtr->nfaces) {
-- i = 0;
-+ }
-+
-+ for (i = 0; i < fontPtr->nfaces; i++) {
-+ if (fontPtr->faces[i].ftFont) {
-+ return fontPtr->faces[i].ftFont;
-+ } else {
-+ if (!fontPtr->faces[i].failed) {
-+ FcPattern *pat = FcFontRenderPrepare(0, fontPtr->pattern,
-+ fontPtr->faces[i].source);
-+
-+ fontPtr->faces[i].ftFont = XftFontOpenPattern(fontPtr->display, pat);
-+ }
-+ if (fontPtr->faces[i].ftFont) {
-+ return fontPtr->faces[i].ftFont;
-+ } else {
-+ fontPtr->faces[i].failed = 1;
-+ }
- }
-- } else {
-- i = 0;
- }
-- if (!fontPtr->faces[i].ftFont) {
-- FcPattern *pat = FcFontRenderPrepare(0, fontPtr->pattern,
-- fontPtr->faces[i].source);
-
-- fontPtr->faces[i].ftFont = XftFontOpenPattern(fontPtr->display, pat);
-+ if (fontPtr->faces[fontPtr->nfaces].ftFont) {
-+ return fontPtr->faces[fontPtr->nfaces].ftFont;
-+ } else {
-+ fontPtr->faces[fontPtr->nfaces].ftFont = GetFontFallback(fontPtr);
-+ if (fontPtr->faces[fontPtr->nfaces].ftFont) {
-+ return fontPtr->faces[fontPtr->nfaces].ftFont;
-+ } else {
-+ Tcl_Panic("Cannot find a usable font. Check your fontconfig settings");
-+ /* Never reached */
-+ return NULL;
-+ }
- }
-- return fontPtr->faces[i].ftFont;
- }
-
- /*
-@@ -184,7 +244,7 @@
- FcCharSet *charset;
- FcResult result;
- XftFont *ftFont;
-- int i;
-+ int i, nfont;
-
- if (!fontPtr) {
- fontPtr = (UnixFtFont *) ckalloc(sizeof(UnixFtFont));
-@@ -199,21 +259,22 @@
-
- set = FcFontSort(0, pattern, FcTrue, NULL, &result);
- if (!set) {
-- FcPatternDestroy(pattern);
-- ckfree((char *)fontPtr);
-- return NULL;
-+ nfont = 0;
-+ } else {
-+ nfont = set->nfont;
- }
-
- fontPtr->fontset = set;
- fontPtr->pattern = pattern;
-- fontPtr->faces = (UnixFtFace *) ckalloc(set->nfont * sizeof(UnixFtFace));
-- fontPtr->nfaces = set->nfont;
-+ /* Extra slot for possible fallback */
-+ fontPtr->faces = (UnixFtFace *) ckalloc((nfont + 1) * sizeof(UnixFtFace));
-+ fontPtr->nfaces = nfont;
-
- /*
- * Fill in information about each returned font
- */
-
-- for (i = 0; i < set->nfont; i++) {
-+ for (i = 0; i < nfont; i++) {
- fontPtr->faces[i].ftFont = 0;
- fontPtr->faces[i].source = set->fonts[i];
- if (FcPatternGetCharSet(set->fonts[i], FC_CHARSET, 0,
-@@ -222,7 +283,13 @@
- } else {
- fontPtr->faces[i].charset = 0;
- }
-+ fontPtr->faces[i].failed = 0;
- }
-+ /* Fill in a fallback slot */
-+ fontPtr->faces[nfont].ftFont = 0;
-+ fontPtr->faces[nfont].source = 0;
-+ fontPtr->faces[nfont].charset = 0;
-+ fontPtr->faces[nfont].failed = 0;
-
- fontPtr->display = Tk_Display(tkwin);
- fontPtr->screen = Tk_ScreenNumber(tkwin);
-@@ -253,7 +320,7 @@
- Tk_ErrorHandler handler = Tk_CreateErrorHandler(display, -1, -1, -1, NULL,
- (ClientData) NULL);
-
-- for (i = 0; i < fontPtr->nfaces; i++) {
-+ for (i = 0; i <= fontPtr->nfaces; i++) {
- if (fontPtr->faces[i].ftFont) {
- XftFontClose(fontPtr->display, fontPtr->faces[i].ftFont);
- }
Modified: tk8.5/trunk/debian/patches/manpages.diff
===================================================================
--- tk8.5/trunk/debian/patches/manpages.diff 2008-04-01 11:27:18 UTC (rev 556)
+++ tk8.5/trunk/debian/patches/manpages.diff 2008-04-01 11:52:15 UTC (rev 557)
@@ -2,10 +2,8 @@
aren't installed by upstream script but are referenced inside other
manual pages.
-Index: tk8.5-8.5.0/unix/installManPage
-===================================================================
---- tk8.5-8.5.0.orig/unix/installManPage 2007-12-17 20:57:25.000000000 +0300
-+++ tk8.5-8.5.0/unix/installManPage 2007-12-19 11:22:49.000000000 +0300
+--- tk8.5-8.5.2.orig/unix/installManPage
++++ tk8.5-8.5.2/unix/installManPage
@@ -51,7 +51,16 @@
}' $MANPAGE`
Modified: tk8.5/trunk/debian/patches/non-linux.diff
===================================================================
--- tk8.5/trunk/debian/patches/non-linux.diff 2008-04-01 11:27:18 UTC (rev 556)
+++ tk8.5/trunk/debian/patches/non-linux.diff 2008-04-01 11:52:15 UTC (rev 557)
@@ -1,10 +1,8 @@
Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
building on non-linux Debian architectures.
-Index: tk8.5-8.5.0/unix/configure
-===================================================================
---- tk8.5-8.5.0.orig/unix/configure 2007-12-19 11:22:44.000000000 +0300
-+++ tk8.5-8.5.0/unix/configure 2007-12-19 11:22:47.000000000 +0300
+--- tk8.5-8.5.2.orig/unix/configure
++++ tk8.5-8.5.2/unix/configure
@@ -4741,6 +4741,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
@@ -24,10 +22,8 @@
SHLIB_CFLAGS="-fPIC"
SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
-Index: tk8.5-8.5.0/unix/tcl.m4
-===================================================================
---- tk8.5-8.5.0.orig/unix/tcl.m4 2007-12-19 11:22:44.000000000 +0300
-+++ tk8.5-8.5.0/unix/tcl.m4 2007-12-19 11:22:47.000000000 +0300
+--- tk8.5-8.5.2.orig/unix/tcl.m4
++++ tk8.5-8.5.2/unix/tcl.m4
@@ -962,6 +962,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
Modified: tk8.5/trunk/debian/patches/rpath.diff
===================================================================
--- tk8.5/trunk/debian/patches/rpath.diff 2008-04-01 11:27:18 UTC (rev 556)
+++ tk8.5/trunk/debian/patches/rpath.diff 2008-04-01 11:52:15 UTC (rev 557)
@@ -3,10 +3,8 @@
Also, it fixes Makefile.in to put correct Tk library filename to pkgIndex.tcl
-Index: tk8.5-8.5.0/unix/configure
-===================================================================
---- tk8.5-8.5.0.orig/unix/configure 2007-12-19 11:22:41.000000000 +0300
-+++ tk8.5-8.5.0/unix/configure 2007-12-19 11:22:44.000000000 +0300
+--- tk8.5-8.5.2.orig/unix/configure
++++ tk8.5-8.5.2/unix/configure
@@ -5549,6 +5549,9 @@
# get rid of the warnings.
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
@@ -17,23 +15,19 @@
SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
-Index: tk8.5-8.5.0/unix/Makefile.in
-===================================================================
---- tk8.5-8.5.0.orig/unix/Makefile.in 2007-12-17 20:57:25.000000000 +0300
-+++ tk8.5-8.5.0/unix/Makefile.in 2007-12-19 11:22:44.000000000 +0300
-@@ -710,7 +710,7 @@
+--- tk8.5-8.5.2.orig/unix/Makefile.in
++++ tk8.5-8.5.2/unix/Makefile.in
+@@ -708,7 +708,7 @@
$(TCLVERSION)$(TCLPATCHL)}]} { return }";\
relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\
echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL)\
- [list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\
+ [list load [file join $(LIB_RUNTIME_DIR) $(TK_LIB_FILE).0] Tk]";\
- ) > $(PKG_INDEX); \
+ ) > "$(PKG_INDEX)"; \
fi
@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
-Index: tk8.5-8.5.0/unix/tcl.m4
-===================================================================
---- tk8.5-8.5.0.orig/unix/tcl.m4 2007-12-19 11:22:41.000000000 +0300
-+++ tk8.5-8.5.0/unix/tcl.m4 2007-12-19 11:22:44.000000000 +0300
+--- tk8.5-8.5.2.orig/unix/tcl.m4
++++ tk8.5-8.5.2/unix/tcl.m4
@@ -1429,6 +1429,9 @@
# get rid of the warnings.
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
Modified: tk8.5/trunk/debian/patches/series
===================================================================
--- tk8.5/trunk/debian/patches/series 2008-04-01 11:27:18 UTC (rev 556)
+++ tk8.5/trunk/debian/patches/series 2008-04-01 11:52:15 UTC (rev 557)
@@ -4,4 +4,3 @@
rpath.diff
non-linux.diff
manpages.diff
-font.diff -p0
Modified: tk8.5/trunk/debian/patches/tklibrary.diff
===================================================================
--- tk8.5/trunk/debian/patches/tklibrary.diff 2008-04-01 11:27:18 UTC (rev 556)
+++ tk8.5/trunk/debian/patches/tklibrary.diff 2008-04-01 11:52:15 UTC (rev 557)
@@ -1,8 +1,6 @@
-Index: tk8.5-8.5.0/unix/configure
-===================================================================
---- tk8.5-8.5.0.orig/unix/configure 2007-12-17 20:57:25.000000000 +0300
-+++ tk8.5-8.5.0/unix/configure 2007-12-19 11:22:32.000000000 +0300
-@@ -10554,7 +10554,7 @@
+--- tk8.5-8.5.2.orig/unix/configure
++++ tk8.5-8.5.2/unix/configure
+@@ -10546,7 +10546,7 @@
TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
fi
@@ -11,10 +9,8 @@
PRIVATE_INCLUDE_DIR='$(includedir)'
HTML_DIR='$(DISTDIR)/html'
TK_PKG_DIR='tk$(VERSION)'
-Index: tk8.5-8.5.0/unix/configure.in
-===================================================================
---- tk8.5-8.5.0.orig/unix/configure.in 2007-12-17 20:57:25.000000000 +0300
-+++ tk8.5-8.5.0/unix/configure.in 2007-12-19 11:22:32.000000000 +0300
+--- tk8.5-8.5.2.orig/unix/configure.in
++++ tk8.5-8.5.2/unix/configure.in
@@ -558,7 +558,7 @@
TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
fi
Modified: tk8.5/trunk/debian/patches/tkprivate.diff
===================================================================
--- tk8.5/trunk/debian/patches/tkprivate.diff 2008-04-01 11:27:18 UTC (rev 556)
+++ tk8.5/trunk/debian/patches/tkprivate.diff 2008-04-01 11:52:15 UTC (rev 557)
@@ -2,10 +2,8 @@
with Tk sources to a subdirectory of /usr/include/tcl8.4 (debian/rules
puts private Tk headers there).
-Index: tk8.5-8.5.0/unix/tkConfig.sh.in
-===================================================================
---- tk8.5-8.5.0.orig/unix/tkConfig.sh.in 2007-12-17 20:57:25.000000000 +0300
-+++ tk8.5-8.5.0/unix/tkConfig.sh.in 2007-12-19 11:22:39.000000000 +0300
+--- tk8.5-8.5.2.orig/unix/tkConfig.sh.in
++++ tk8.5-8.5.2/unix/tkConfig.sh.in
@@ -55,7 +55,7 @@
# String to pass to linker to pick up the Tk library from its
Modified: tk8.5/trunk/debian/rules
===================================================================
--- tk8.5/trunk/debian/rules 2008-04-01 11:27:18 UTC (rev 556)
+++ tk8.5/trunk/debian/rules 2008-04-01 11:52:15 UTC (rev 557)
@@ -176,8 +176,8 @@
binary: binary-indep binary-arch
get-orig-source:
- wget -O tk8.5_8.5.1.orig.tar.gz \
- http://prdownloads.sourceforge.net/tcl/tk8.5.1-src.tar.gz
+ wget -O tk8.5_8.5.2.orig.tar.gz \
+ http://prdownloads.sourceforge.net/tcl/tk8.5.2-src.tar.gz
.PHONY: patch unpatch clean-patched build clean binary-indep binary-arch binary install get-orig-source
More information about the Pkg-tcltk-commits
mailing list