Update of /cvsroot/fink/experimental/rangerrick/3rdparty/main/finkinfo/x11
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24695/3rdparty/main/finkinfo/x11
Added Files:
fontconfig2-dev.info fontconfig2-dev.patch
Log Message:
udpated fontconfig
--- NEW FILE: fontconfig2-dev.patch ---
diff -uNr fontconfig-2.2.3/fontconfig/fontconfig.h
fontconfig-2.2.3-new/fontconfig/fontconfig.h
--- fontconfig-2.2.3/fontconfig/fontconfig.h Wed Jun 30 14:45:31 2004
+++ fontconfig-2.2.3-new/fontconfig/fontconfig.h Tue Jan 18 11:30:25 2005
@@ -70,6 +70,7 @@
#define FC_FOUNDRY "foundry" /* String */
#define FC_ANTIALIAS "antialias" /* Bool (depends) */
#define FC_HINTING "hinting" /* Bool (true) */
+#define FC_HINT_STYLE "hintstyle" /* Int */
#define FC_VERTICAL_LAYOUT "verticallayout" /* Bool (false) */
#define FC_AUTOHINT "autohint" /* Bool (false) */
#define FC_GLOBAL_ADVANCE "globaladvance" /* Bool (true) */
@@ -138,6 +139,12 @@
#define FC_RGBA_VBGR 4
#define FC_RGBA_NONE 5
+/* hinting style */
+#define FC_HINT_NONE 0
+#define FC_HINT_SLIGHT 1
+#define FC_HINT_MEDIUM 2
+#define FC_HINT_FULL 3
+
typedef enum _FcType {
FcTypeVoid,
FcTypeInteger,
diff -uNr fontconfig-2.2.3/src/fcdefault.c fontconfig-2.2.3-new/src/fcdefault.c
--- fontconfig-2.2.3/src/fcdefault.c Wed Mar 12 17:16:25 2003
+++ fontconfig-2.2.3-new/src/fcdefault.c Tue Jan 18 11:30:25 2005
@@ -144,4 +144,9 @@
{
FcPatternAddInteger (pattern, FC_FONTVERSION, 0x7fffffff);
}
+
+ if (FcPatternGet (pattern, FC_HINT_STYLE, 0, &v) == FcResultNoMatch)
+ {
+ FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
+ }
}
diff -uNr fontconfig-2.2.3/src/fcname.c fontconfig-2.2.3-new/src/fcname.c
--- fontconfig-2.2.3/src/fcname.c Wed Mar 12 17:16:25 2003
+++ fontconfig-2.2.3-new/src/fcname.c Tue Jan 18 11:30:25 2005
@@ -41,6 +41,7 @@
{ FC_FOUNDRY, FcTypeString, },
/* { FC_CORE, FcTypeBool, }, */
{ FC_ANTIALIAS, FcTypeBool, },
+ { FC_HINT_STYLE, FcTypeInteger, },
{ FC_HINTING, FcTypeBool, },
{ FC_VERTICAL_LAYOUT, FcTypeBool, },
{ FC_AUTOHINT, FcTypeBool, },
@@ -175,6 +176,11 @@
{ (FcChar8 *) "vrgb", "rgba", FC_RGBA_VRGB },
{ (FcChar8 *) "vbgr", "rgba", FC_RGBA_VBGR },
{ (FcChar8 *) "none", "rgba", FC_RGBA_NONE },
+
+ { (FcChar8 *) "hintnone", "hintstyle", FC_HINT_NONE },
+ { (FcChar8 *) "hintslight", "hintstyle", FC_HINT_SLIGHT },
+ { (FcChar8 *) "hintmedium", "hintstyle", FC_HINT_MEDIUM },
+ { (FcChar8 *) "hintfull", "hintstyle", FC_HINT_FULL },
};
#define NUM_FC_CONSTANTS (sizeof _FcBaseConstants/sizeof _FcBaseConstants[0])
--- NEW FILE: fontconfig2-dev.info ---
Package: fontconfig2-dev
Version: 2.3.2
Revision: 1
Maintainer: Alexander Strange <[EMAIL PROTECTED]>
BuildDependsOnly: true
Depends: expat-shlibs, fontconfig1-shlibs
Source-MD5: 7354f9f125ea78a8f2851cb9c31d4866
Source: http://www.fontconfig.org/release/fontconfig-%v.tar.gz
BuildDepends: expat, x11-dev, freetype219
SetCFLAGS: -fno-common -g
ConfigureParams:
--with-freetype-config="%p/lib/freetype219/bin/freetype-config"
--prefix=%p/lib/fontconfig2 --with-confdir=/etc/fonts --disable-docs
--disable-dependency-tracking
CompileScript: <<
#export FREETYPE_CONFIG="%p/lib/freetype219/bin/freetype-config"
./configure %c
(cd src && make)
<<
InstallScript: <<
(cd fontconfig && make install DESTDIR=%d)
(cd src && make install DESTDIR=%d)
make install-pkgconfigDATA DESTDIR=%d
(cd %i/lib/fontconfig2/lib; ar x libfontconfig.a; rm libfontconfig.a; touch
blah; ld -r -all_load -exported_symbols_list blah -o fontconfig.o fc*.o; printf
"_FcIdentityMatrix\n__fcConfig" > blah; nmedit -R blah fontconfig.o; nmedit -p
fontconfig.o; ar cqv libfontconfig.a fontconfig.o; rm *.o "__.SYMDEF SORTED"
blah; ranlib libfontconfig.a)
<<
SplitOff: <<
Package: fontconfig2-shlibs
Depends: expat-shlibs, freetype219-shlibs
Files: lib/fontconfig2/lib/libfontconfig.1*dylib
Shlibs: %p/lib/fontconfig2/lib/libfontconfig.1.dylib 1.0.0 %n (>=
2.2.3-10)
DocFiles: README
Description: Fontconfig 2, shared libs
<<
DocFiles: README NEWS
Description: Fontconfig 2 for Gimp
DescDetail: <<
A library for font customization and configuration.
<<
DescPackaging: <<
We do NOT want this to replace the system fontconfig.
The .pc file is missing -lexpat in its Libs field.
Adding it after having it absent for a long time is
likely to propagate into packages that didn't have
it before and create linking noise or failures, so
we'll just let other packages add the flag manually
on the rare occasion it is needed.
<<
DescUsage: <<
You may need to pass -lexpat manually when linking
to libfontconfig, especially if you are using the
static (.a) lib and/or are not using libtool in order
to resolve some _XML_* and _xml* symbols.
<<
License: Restrictive/Distributable
Homepage: http://www.fontconfig.org
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
