[prev in list] [next in list] [prev in thread] [next in thread] 

List:       koffice-devel
Subject:    Patch for Karbon (fontconfig)
From:       Marco Wegner <mail () marcowegner ! de>
Date:       2003-06-27 12:28:10
[Download RAW message or body]

[Attachment #2 (multipart/signed)]

[Attachment #4 (multipart/mixed)]


Hi,

I have attached a patch which IMHO is necessary for Karbon to correctly use 
libfontconfig during compilation. Right now configure tells me fontconfig 
1.0.1 is not present although it is and even config.log tells me something 
else. This happens due to a variable mixup between FONTCONFIG_LIBS and 
LIBFONTCONFIG_LIBS.

Regards,
Marco

P.S.: Please CC me since I'm not on the list.

["karbon-fontconfig.diff" (text/x-diff)]

Index: Makefile.am
===================================================================
RCS file: /home/kde/koffice/karbon/Makefile.am,v
retrieving revision 1.60
diff -u -3 -p -r1.60 Makefile.am
--- Makefile.am	31 May 2003 08:39:02 -0000	1.60
+++ Makefile.am	26 Jun 2003 10:07:38 -0000
@@ -40,7 +40,7 @@ libkarbonpart_la_LIBADD = $(LIB_KOFFICEU
 	dialogs/libkarbondialogs.la \
 	libkarbonbase.la \
 	$(LIBART_LIBS) \
-	$(FONTCONFIG_LIBS) \
+	$(LIBFONTCONFIG_LIBS) \
 	$(LIBFREETYPE_LIBS)
 
 libkarbonpart_la_METASOURCES = AUTO
Index: configure.in.bot
===================================================================
RCS file: /home/kde/koffice/karbon/configure.in.bot,v
retrieving revision 1.3
diff -u -3 -p -r1.3 configure.in.bot
--- configure.in.bot	2 May 2003 17:56:39 -0000	1.3
+++ configure.in.bot	26 Jun 2003 10:07:38 -0000
@@ -6,7 +6,7 @@ if test -z "$LIBART_LIBS"; then
   echo ""
   all_tests=bad
 else
-  if test -z "$FONTCONFIG_LIBS"; then
+  if test -z "$LIBFONTCONFIG_LIBS"; then
     echo ""
     echo "You're missing fontconfig 1.0.1 or newer. karbon will not have text \
support."  echo "You can download fontconfig from http://fontconfig.org/"
Index: configure.in.in
===================================================================
RCS file: /home/kde/koffice/karbon/configure.in.in,v
retrieving revision 1.27
diff -u -3 -p -r1.27 configure.in.in
--- configure.in.in	23 Jun 2003 02:51:57 -0000	1.27
+++ configure.in.in	26 Jun 2003 10:07:38 -0000
@@ -114,6 +114,6 @@ if test -z "$LIBART_LIBS"; then
 	DO_NOT_COMPILE="$DO_NOT_COMPILE karbon"
 fi
 
-if test -n "$LIBFREETYPE_LIBS" -a -n "$FONTCONFIG_LIBS"; then
+if test -n "$LIBFREETYPE_LIBS" -a -n "$LIBFONTCONFIG_LIBS"; then
 	AC_DEFINE_UNQUOTED(HAVE_KARBONTEXT, 1, [Defines if your system has the fontconfig \
and freetype libraries])  fi


[Attachment #8 (application/pgp-signature)]

_______________________________________________
koffice-devel mailing list
koffice-devel@mail.kde.org
http://mail.kde.org/mailman/listinfo/koffice-devel


[prev in list] [next in list] [prev in thread] [next in thread]