head	1.2;
access;
symbols
	pkgsrc-2017Q3:1.1.0.92
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.88
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.86
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.84
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.82
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.80
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.78
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.76
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.74
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.72
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.70
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.68
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.66
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.64
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.62
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.60
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.58
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.56
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.54
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.52
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.50
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.48
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.46
	pkgsrc-2012Q1-base:1.1
	pkgsrc-2011Q4:1.1.0.44
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.42
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.40
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.38
	pkgsrc-2011Q1-base:1.1
	pkgsrc-2010Q4:1.1.0.36
	pkgsrc-2010Q4-base:1.1
	pkgsrc-2010Q3:1.1.0.34
	pkgsrc-2010Q3-base:1.1
	pkgsrc-2010Q2:1.1.0.32
	pkgsrc-2010Q2-base:1.1
	pkgsrc-2010Q1:1.1.0.30
	pkgsrc-2010Q1-base:1.1
	pkgsrc-2009Q4:1.1.0.28
	pkgsrc-2009Q4-base:1.1
	pkgsrc-2009Q3:1.1.0.26
	pkgsrc-2009Q3-base:1.1
	pkgsrc-2009Q2:1.1.0.24
	pkgsrc-2009Q2-base:1.1
	pkgsrc-2009Q1:1.1.0.22
	pkgsrc-2009Q1-base:1.1
	pkgsrc-2008Q4:1.1.0.20
	pkgsrc-2008Q4-base:1.1
	pkgsrc-2008Q3:1.1.0.18
	pkgsrc-2008Q3-base:1.1
	cube-native-xorg:1.1.0.16
	cube-native-xorg-base:1.1
	pkgsrc-2008Q2:1.1.0.14
	pkgsrc-2008Q2-base:1.1
	cwrapper:1.1.0.12
	pkgsrc-2008Q1:1.1.0.10
	pkgsrc-2008Q1-base:1.1
	pkgsrc-2007Q4:1.1.0.8
	pkgsrc-2007Q4-base:1.1
	pkgsrc-2007Q3:1.1.0.6
	pkgsrc-2007Q3-base:1.1
	pkgsrc-2007Q2:1.1.0.4
	pkgsrc-2007Q2-base:1.1
	pkgsrc-2007Q1:1.1.0.2
	pkgsrc-2007Q1-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2017.09.26.10.27.22;	author wiz;	state dead;
branches;
next	1.1;
commitid	9ARpkXTuh9Wg2H8A;

1.1
date	2007.03.18.20.59.35;	author markd;	state Exp;
branches;
next	;


desc
@@


1.2
log
@*: remove qt3 and the packages using it, including KDE3

Announced in https://mail-index.netbsd.org/pkgsrc-users/2017/09/10/msg025556.html
@
text
@$NetBSD: patch-ao,v 1.1 2007/03/18 20:59:35 markd Exp $

Asian font selection issues fix from Dirk Mueller

--- src/kernel/qfontdatabase_x11.cpp.orig	2007-02-03 03:01:12.000000000 +1300
+++ src/kernel/qfontdatabase_x11.cpp
@@@@ -1589,15 +1589,6 @@@@ QFontEngine *loadEngine( QFont::Script s
 	    if (script == QFont::Latin)
 		// add Euro character
 		FcCharSetAddChar(cs, 0x20ac);
-	    if (script == QFont::Han_SimplifiedChinese)
-		FcCharSetAddChar(cs, 0x3400);
-	    if (script == QFont::Han_TraditionalChinese){
-		FcCharSetAddChar(cs, 0x3435);
-		FcCharSetAddChar(cs, 0xE000);
-		FcCharSetAddChar(cs, 0xF6B1);
-	    }
-	    if (script == QFont::MiscellaneousSymbols)
-		FcCharSetAddChar(cs, 0x2714);
 	    FcPatternAddCharSet(pattern, FC_CHARSET, cs);
 	    FcCharSetDestroy(cs);
 	}
@@@@ -1813,7 +1804,11 @@@@ static QFontEngine *loadFontConfigFont(c
     FcPatternPrint(pattern);
 #endif
 
+    // XftFontMatch calls the right ConfigSubstitute variants, but as we use
+    // FcFontMatch/Sort here we have to do it manually.
     FcConfigSubstitute(0, pattern, FcMatchPattern);
+    XftDefaultSubstitute(QPaintDevice::x11AppDisplay(), QPaintDevice::x11AppScreen(), pattern);
+
 //     qDebug("1: pattern contains:");
 //     FcPatternPrint(pattern);
 
@@@@ -1847,10 +1842,6 @@@@ static QFontEngine *loadFontConfigFont(c
 	    value.u.s = (const FcChar8 *)cs.data();
 	    FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue);
 	}
-#ifdef FONT_MATCH_DEBUG
-	printf("final pattern contains:\n");
-	FcPatternPrint(pattern);
-#endif
     }
 
     if (script != QFont::Unicode) {
@@@@ -1860,19 +1851,15 @@@@ static QFontEngine *loadFontConfigFont(c
         if (script == QFont::Latin)
             // add Euro character
             FcCharSetAddChar(cs, 0x20ac);
-	if (script == QFont::Han_SimplifiedChinese)
-	    FcCharSetAddChar(cs, 0x3400);
-	if (script == QFont::Han_TraditionalChinese) {
-	    FcCharSetAddChar(cs, 0x3435);
-	    FcCharSetAddChar(cs, 0xE000);
-	    FcCharSetAddChar(cs, 0xF6B1);
-	}
-	if (script == QFont::MiscellaneousSymbols)
-	    FcCharSetAddChar(cs, 0x2714);
         FcPatternAddCharSet(pattern, FC_CHARSET, cs);
         FcCharSetDestroy(cs);
     }
 
+#ifdef FONT_MATCH_DEBUG
+	printf("final pattern contains:\n");
+	FcPatternPrint(pattern);
+#endif
+
     QFontEngine *fe = 0;
 
     for( int jj = (FcGetVersion() >= 20392 ? 0 : 1); jj < 2; ++jj ) {
@


1.1
log
@Add patches from Dirk Mueller of KDE to fix font selection issues
with Asian fonts.  Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD$
@