Bruce Dubbs wrote:
Ken Moffat wrote:
On Fri, Feb 17, 2017 at 11:50:25AM -0600, Bruce Dubbs wrote:
Pierre Labastie wrote:
Forgot:
[1]
https://lists.freedesktop.org/archives/fontconfig/2016-December/005892.html
The following sed's allow building fontconfig, and building libXft
unmodified.
sed -e '/FC_CHAR_WIDTH/s/CHAR_WIDTH/CHARWIDTH/' \
-e '/FC_CHARWIDTH/a #define FC_CHAR_WIDTH FC_CHARWIDTH' \
-i fontconfig/fontconfig.h
sed 's/CHAR_WIDTH/CHARWIDTH/' -i src/fcobjs.h
We already have the equivalent in the book.
-- Bruce
I took what is now in the book, copied the sed into my script for
fontconfig and removed the sed from my libXft script. Rebuilt
fontconfig, failed to rebuild libXft.
For fontconfig:
sed -e '/FC_CHAR_WIDTH/s/CHAR_WIDTH/CHARWIDTH/' \
-e '/FC_CHARWIDTH/a #define FC_CHAR_WIDTH FC_CHARWIDTH' \
-i fontconfig/fontconfig.h
sed 's/CHAR_WIDTH/CHARWIDTH/' -i src/fcobjs.h
in libXft:
make[2]: Entering directory '/scratch/working/libXft-2.3.2/src'
CC xftfreetype.lo
xftfreetype.c: In function 'XftFontInfoFill':
xftfreetype.c:675:43: error: 'FC_CHAR_WIDTH' undeclared (first use
in this function)
switch (FcPatternGetInteger (pattern, FC_CHAR_WIDTH, 0,
&fi->char_width)) {
^~~~~~~~~~~~~
ken@plexi ~ $grep WIDTH /usr/include/fontconfig/fontconfig.h
#define FC_WIDTH "width" /* Int */
#define FC_CHARWIDTH "charwidth" /* Int */
#define FC_WIDTH_ULTRACONDENSED 50
#define FC_WIDTH_EXTRACONDENSED 63
#define FC_WIDTH_CONDENSED 75
#define FC_WIDTH_SEMICONDENSED 87
#define FC_WIDTH_NORMAL 100
#define FC_WIDTH_SEMIEXPANDED 113
#define FC_WIDTH_EXPANDED 125
#define FC_WIDTH_EXTRAEXPANDED 150
#define FC_WIDTH_ULTRAEXPANDED 200
So it looks as if the append did not happen. Have I miscopied ?
AFAICS all I did was copy the first sed, without the && because my
scripts fail on error, and then copy the second sed.
I suspect this is another example of why I think patches are more
maintainable : a sed only visibly fails if the file is missing.
But whatever the reason, I'm now stalled.
Give me a few minutes to finish up what I'm doing and I'll get back to
you. Should be less than a half hour.
OK, I expanded the tarball and applied the first sed:
sed -e '/FC_CHAR_WIDTH/s/CHAR_WIDTH/CHARWIDTH/' \
-e '/FC_CHARWIDTH/a #define FC_CHAR_WIDTH FC_CHARWIDTH' \
-i fontconfig/fontconfig.h
Then I looked at fontconfig/fontconfig.h. What I got was:
/* Adjust outline rasterizer */
#define FC_CHARWIDTH "charwidth" /* Int */
#define FC_CHAR_WIDTH FC_CHARWIDTH
#define FC_CHAR_HEIGHT "charheight"/* Int */
#define FC_MATRIX "matrix" /* FcMatrix */
which looks right to me. Can you double check that?
-- Bruce
--
http://lists.linuxfromscratch.org/listinfo/blfs-dev
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
