fix segfault in kfontinst when using fontconfig enabled Xft

2 files changed, 27 insertions, 22 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 5b0335d4c42a..db677394e8b7 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.43 2002/12/25 00:51:49 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.44 2002/12/25 02:01:57 azarah Exp $
+
+  25 Dec 2002; Martin Schlemmer <azarah@gentoo.org> kdebase-3.0.5a-xft2.0-fix.diff :
+
+  Fix segfault if compiled agaist Xft2, and the user clicked on:
+
+    System->Font Installer->Anti-Alias->Advanced
 
   25 Dec 2002; Martin Schlemmer <azarah@gentoo.org> kscreensaver.pam :
 
@@ -13,7 +19,7 @@
 
   Patch kdebase-3.0.5a to compile with Xft2.0 installed.  Also add a function to
   detect if we have Xft1 or Xft2 installed, and against what QT was compiled.
-  The System->Font Installer->Anti-Alias->Advance do crash though, will see if
+  The System->Font Installer->Anti-Alias->Advanced do crash though, will see if
   I can get this fixed.  This should close bug #9423 again.
 
 *kdebase-3.0.5a (21 Dec 2002)
diff --git a/kde-base/kdebase/files/3.0.5a-r1/kdebase-3.0.5a-xft2.0-fix.diff b/kde-base/kdebase/files/3.0.5a-r1/kdebase-3.0.5a-xft2.0-fix.diff
index 715c06e7c9e7..940b20968a0f 100644
--- a/kde-base/kdebase/files/3.0.5a-r1/kdebase-3.0.5a-xft2.0-fix.diff
+++ b/kde-base/kdebase/files/3.0.5a-r1/kdebase-3.0.5a-xft2.0-fix.diff
@@ -14,11 +14,11 @@
          If we have Xft2.0, define HAVE_XFT2 somehow.
 
 
-   Martin Schlemmer <azarah@gentoo.org> (24 Dec 2002)
+   Martin Schlemmer <azarah@gentoo.org> (25 Dec 2002)
 
 
---- kdebase-3.0.5a/kcontrol/kfontinst/kfontinst/XftConfig.cpp.orig	2002-10-30 00:53:18.000000000 +0200
-+++ kdebase-3.0.5a/kcontrol/kfontinst/kfontinst/XftConfig.cpp	2002-10-30 01:01:49.000000000 +0200
+--- kdebase-3.0.5a/kcontrol/kfontinst/kfontinst/XftConfig.cpp.orig	2002-12-25 04:06:47.000000000 +0200
++++ kdebase-3.0.5a/kcontrol/kfontinst/kfontinst/XftConfig.cpp	2002-12-25 04:07:27.000000000 +0200
 @@ -276,7 +276,11 @@
              }
              case XftTypeString:
@@ -26,49 +26,49 @@
 +#ifndef XFT_WITH_FONTCONFIG
                  str+=test->value.u.s;
 +#else
-+                str+=(QCString &)test->value.u.s;
++                str+=(const char *)test->value.u.s;
 +#endif
                  str+="\"";
                  break;
              case XftTypeBool:
-@@ -554,7 +554,11 @@
+@@ -554,7 +558,11 @@
      XftValue           value;
      CXftConfig::TEntry *entry=new CXftConfig::TEntry;
  
 +#ifndef XFT_WITH_FONTCONFIG
      value.u.s=sval;
 +#else
-+    (char *)value.u.s=sval;
++    value.u.s=(FcChar8 *)sval;
 +#endif
      value.type=XftTypeString;
      entry->test=XftTestCreate(XftQualAny, "family", XftOpEqual, value);
  
-@@ -780,7 +780,11 @@
+@@ -780,7 +788,11 @@
  
      for(entry=itsList.first(); entry; entry=itsList.next())
          if(entry->test && 0==CMisc::stricmp(entry->test->field, "family") && XftTypeString==entry->test->value.type &&
 +#ifndef XFT_WITH_FONTCONFIG
             0==CMisc::stricmp(entry->test->value.u.s, family.latin1()) && entry->edit &&
 +#else
-+           0==CMisc::stricmp((char *)entry->test->value.u.s, family.latin1()) && entry->edit &&
++           0==CMisc::stricmp((const char *)entry->test->value.u.s, family.latin1()) && entry->edit &&
 +#endif
             0==CMisc::stricmp(entry->edit->field, field) && XftOpAssign==entry->edit->op && entry->edit->expr)
              break;
  
-@@ -798,7 +798,11 @@
+@@ -798,7 +810,11 @@
              free(test->field);
  
          if(XftTypeString==test->value.type)
 +#ifndef XFT_WITH_FONTCONFIG
              free(test->value.u.s);
 +#else
-+            free((void *)test->value.u.s);
++            free((FcChar8 *)test->value.u.s);
 +#endif
      }
  }
  
---- kdebase-3.0.5a/kcontrol/kfontinst/kfontinst/XftConfigEditor.cpp.orig	2002-10-30 01:03:25.000000000 +0200
-+++ kdebase-3.0.5a/kcontrol/kfontinst/kfontinst/XftConfigEditor.cpp	2002-10-30 01:07:27.000000000 +0200
+--- kdebase-3.0.5a/kcontrol/kfontinst/kfontinst/XftConfigEditor.cpp.orig	2002-12-25 04:07:06.000000000 +0200
++++ kdebase-3.0.5a/kcontrol/kfontinst/kfontinst/XftConfigEditor.cpp	2002-12-25 04:07:27.000000000 +0200
 @@ -469,7 +469,11 @@
                      break;
                  case XftTypeString:
@@ -81,14 +81,14 @@
                      break;
                  case XftTypeBool:
                  default:
-@@ -655,12 +655,24 @@
+@@ -655,12 +659,24 @@
      if("foundry"==field || "family"==field || "encoding"==field || "style"==field)
      {
          val.type=XftTypeString;
 +#ifndef XFT_WITH_FONTCONFIG
          val.u.s=(char *)malloc(edit ? strVal.length()+1 : strVal.length()-1);
 +#else
-+        (char *)val.u.s=(char *)malloc(edit ? strVal.length()+1 : strVal.length()-1);
++        val.u.s=(FcChar8 *)malloc(edit ? strVal.length()+1 : strVal.length()-1);
 +#endif
  
          if(edit)
@@ -106,7 +106,7 @@
      }
      else if("spacing"==field)
      {
-@@ -747,8 +747,13 @@
+@@ -747,8 +763,13 @@
          {
              // Not sure about this...
              val.type=XftTypeString;
@@ -114,14 +114,14 @@
              val.u.s=(char *)malloc(strVal.length()+1);
              strcpy(val.u.s, strVal.local8Bit());
 +#else
-+            (char *)val.u.s=(char *)malloc(strVal.length()+1);
++            val.u.s=(FcChar8 *)malloc(strVal.length()+1);
 +            strcpy((char *)val.u.s, strVal.local8Bit());
 +#endif
          }
          else if("rgba"==field)
          {
---- kdebase-3.0.5a/kcontrol/kfontinst/kfontinst/xftint.h.orig	2002-12-24 23:34:28.000000000 +0200
-+++ kdebase-3.0.5a/kcontrol/kfontinst/kfontinst/xftint.h	2002-12-24 23:35:22.000000000 +0200
+--- kdebase-3.0.5a/kcontrol/kfontinst/kfontinst/xftint.h.orig	2002-12-25 04:07:17.000000000 +0200
++++ kdebase-3.0.5a/kcontrol/kfontinst/kfontinst/xftint.h	2002-12-25 04:07:27.000000000 +0200
 @@ -276,8 +276,10 @@
  XftSubstPrint (XftSubst *subst);
  
@@ -133,7 +133,7 @@
  
  /* xftdpy.c */
  int
-@@ -388,11 +390,13 @@
+@@ -388,10 +390,12 @@
  XftListValueCompare (XftValue	v1,
  		     XftValue	v2);
  
@@ -146,4 +146,3 @@
  
  Bool
  XftListMatch (XftPattern    *p,
- 	      XftPattern    *font,