callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Guard the FC_HINT_STYLE stuff with an #ifdef, so we still build with most

Browse Source 
Sat Feb 21 19:09:55 2004  Manish Singh  <yosh@gimp.org>

        * gtk/gtksettings.c (gtk_default_substitute): Guard the FC_HINT_STYLE
        stuff with an #ifdef, so we still build with most fontconfig versions.

        * configure.in: Bump the fontconfig version requirement down to 1.0.1,
        to match pango (probably isn't needed at all, but doesn't hurt).
This commit is contained in:
Manish Singh
2004-02-22 03:15:45 +00:00
committed by Manish Singh
parent 4c471cb7d1
commit 6d1bd9e1e9
6 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Sat Feb 21 19:09:55 2004 Manish Singh <yosh@gimp.org>
* gtk/gtksettings.c (gtk_default_substitute): Guard the FC_HINT_STYLE
stuff with an #ifdef, so we still build with most fontconfig versions.
* configure.in: Bump the fontconfig version requirement down to 1.0.1,
to match pango (probably isn't needed at all, but doesn't hurt).
Sun Feb 22 03:03:29 2004 Matthias Clasen <maclas@gmx.de> Sun Feb 22 03:03:29 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkaction.c: (gtk_action_finalize): * gtk/gtkaction.c: (gtk_action_finalize):

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,11 @@
Sat Feb 21 19:09:55 2004 Manish Singh <yosh@gimp.org>
* gtk/gtksettings.c (gtk_default_substitute): Guard the FC_HINT_STYLE
stuff with an #ifdef, so we still build with most fontconfig versions.
* configure.in: Bump the fontconfig version requirement down to 1.0.1,
to match pango (probably isn't needed at all, but doesn't hurt).
Sun Feb 22 03:03:29 2004 Matthias Clasen <maclas@gmx.de> Sun Feb 22 03:03:29 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkaction.c: (gtk_action_finalize): * gtk/gtkaction.c: (gtk_action_finalize):

8
ChangeLog.pre-2-4
View File

@ -1,3 +1,11 @@
Sat Feb 21 19:09:55 2004 Manish Singh <yosh@gimp.org>
* gtk/gtksettings.c (gtk_default_substitute): Guard the FC_HINT_STYLE
stuff with an #ifdef, so we still build with most fontconfig versions.
* configure.in: Bump the fontconfig version requirement down to 1.0.1,
to match pango (probably isn't needed at all, but doesn't hurt).
Sun Feb 22 03:03:29 2004 Matthias Clasen <maclas@gmx.de> Sun Feb 22 03:03:29 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkaction.c: (gtk_action_finalize): * gtk/gtkaction.c: (gtk_action_finalize):

8
ChangeLog.pre-2-6
View File

@ -1,3 +1,11 @@
Sat Feb 21 19:09:55 2004 Manish Singh <yosh@gimp.org>
* gtk/gtksettings.c (gtk_default_substitute): Guard the FC_HINT_STYLE
stuff with an #ifdef, so we still build with most fontconfig versions.
* configure.in: Bump the fontconfig version requirement down to 1.0.1,
to match pango (probably isn't needed at all, but doesn't hurt).
Sun Feb 22 03:03:29 2004 Matthias Clasen <maclas@gmx.de> Sun Feb 22 03:03:29 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkaction.c: (gtk_action_finalize): * gtk/gtkaction.c: (gtk_action_finalize):

8
ChangeLog.pre-2-8
View File

@ -1,3 +1,11 @@
Sat Feb 21 19:09:55 2004 Manish Singh <yosh@gimp.org>
* gtk/gtksettings.c (gtk_default_substitute): Guard the FC_HINT_STYLE
stuff with an #ifdef, so we still build with most fontconfig versions.
* configure.in: Bump the fontconfig version requirement down to 1.0.1,
to match pango (probably isn't needed at all, but doesn't hurt).
Sun Feb 22 03:03:29 2004 Matthias Clasen <maclas@gmx.de> Sun Feb 22 03:03:29 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkaction.c: (gtk_action_finalize): * gtk/gtkaction.c: (gtk_action_finalize):

2
gtk/gtksettings.c
View File

@ -154,6 +154,7 @@ gtk_default_substitute (FcPattern *pattern,
FcPatternGet (pattern, FC_HINTING, 0, &v) == FcResultNoMatch) FcPatternGet (pattern, FC_HINTING, 0, &v) == FcResultNoMatch)
FcPatternAddBool (pattern, FC_HINTING, hinting != 0); FcPatternAddBool (pattern, FC_HINTING, hinting != 0);
#ifdef FC_HINT_STYLE
if (hintstyle && FcPatternGet (pattern, FC_HINT_STYLE, 0, &v) == FcResultNoMatch) if (hintstyle && FcPatternGet (pattern, FC_HINT_STYLE, 0, &v) == FcResultNoMatch)
{ {
int val = FC_HINT_FULL; /* Quiet GCC */ int val = FC_HINT_FULL; /* Quiet GCC */
@ -173,6 +174,7 @@ gtk_default_substitute (FcPattern *pattern,
if (found) if (found)
FcPatternAddInteger (pattern, FC_HINT_STYLE, val); FcPatternAddInteger (pattern, FC_HINT_STYLE, val);
} }
#endif /* FC_HINT_STYLE */
if (rgba && FcPatternGet (pattern, FC_RGBA, 0, &v) == FcResultNoMatch) if (rgba && FcPatternGet (pattern, FC_RGBA, 0, &v) == FcResultNoMatch)
{ {