Update of /cvsroot/fink/dists/10.2-gcc3.3/unstable/main/finkinfo/kde
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5118/10.2-gcc3.3/unstable/main/finkinfo/kde
Modified Files:
kdegraphics3.patch
Log Message:
more freetype build fixes?
Index: kdegraphics3.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.2-gcc3.3/unstable/main/finkinfo/kde/kdegraphics3.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kdegraphics3.patch 4 Mar 2004 22:07:54 -0000 1.4
+++ kdegraphics3.patch 5 Mar 2004 14:07:53 -0000 1.5
@@ -1,13 +1,23 @@
+diff -uNr ../kdegraphics-3.2.0/kdvi/Makefile.am ./kdvi/Makefile.am
+--- ../kdegraphics-3.2.0/kdvi/Makefile.am Sun Nov 30 04:46:00 2003
++++ ./kdvi/Makefile.am Fri Mar 5 09:07:01 2004
+@@ -1,5 +1,5 @@
+ # set the include path for X, qt and KDE
+-INCLUDES= -I$(top_srcdir)/kviewshell $(all_includes) $(LIBFREETYPE_CFLAGS)
++INCLUDES= -I/usr/X11R6/include/freetype2 -I$(top_srcdir)/kviewshell $(all_includes)
$(LIBFREETYPE_CFLAGS)
+ # claim, which subdirectories you want to install
+ SUBDIRS = . pix
+
diff -uNr ../kdegraphics-3.2.0/kfile-plugins/configure.in.in
./kfile-plugins/configure.in.in
--- ../kdegraphics-3.2.0/kfile-plugins/configure.in.in Fri Oct 11 04:25:30 2002
-+++ ./kfile-plugins/configure.in.in Thu Mar 4 17:01:11 2004
++++ ./kfile-plugins/configure.in.in Fri Mar 5 09:06:19 2004
@@ -1,2 +1,3 @@
DO_NOT_COMPILE="$DO_NOT_COMPILE gif"
AC_CHECK_PROG(PDFINFO, pdfinfo, yes, no)
+KDE_TRY_TIFFLIB
diff -uNr ../kdegraphics-3.2.0/kghostview/Makefile.am ./kghostview/Makefile.am
--- ../kdegraphics-3.2.0/kghostview/Makefile.am Tue Sep 2 10:02:44 2003
-+++ ./kghostview/Makefile.am Thu Mar 4 17:01:11 2004
++++ ./kghostview/Makefile.am Fri Mar 5 09:06:19 2004
@@ -4,16 +4,16 @@
####### Files
@@ -57,7 +67,7 @@
libdscparse_la_LIBADD = $(LIB_QT)
diff -uNr ../kdegraphics-3.2.0/kghostview/main.cpp ./kghostview/main.cpp
--- ../kdegraphics-3.2.0/kghostview/main.cpp Sun Sep 21 04:38:18 2003
-+++ ./kghostview/main.cpp Thu Mar 4 17:01:11 2004
++++ ./kghostview/main.cpp Fri Mar 5 09:06:19 2004
@@ -43,7 +43,7 @@
KCmdLineLastOption
};
@@ -67,9 +77,18 @@
{
KCmdLineArgs::init( argc, argv, KGVPart::createAboutData() );
KCmdLineArgs::addCmdLineOptions( options );
+diff -uNr ../kdegraphics-3.2.0/kpdf/xpdf/Makefile.am ./kpdf/xpdf/Makefile.am
+--- ../kdegraphics-3.2.0/kpdf/xpdf/Makefile.am Sun Sep 21 08:28:13 2003
++++ ./kpdf/xpdf/Makefile.am Fri Mar 5 09:06:34 2004
+@@ -1,4 +1,4 @@
+-INCLUDES = -I.. -I$(top_srcdir)/kpdf/goo $(all_includes) $(LIBFREETYPE_CFLAGS)
++INCLUDES = -I/usr/X11R6/include/freetype2 -I.. -I$(top_srcdir)/kpdf/goo
$(all_includes) $(LIBFREETYPE_CFLAGS)
+
+ libxpdf_la_LDFLAGS = $(all_libraries) -no-undefined
+ libxpdf_la_LIBADD = $(LIB_X11) $(LIBFREETYPE_LIBS) $(LIBPAPER_LIBS) ../goo/libgoo.la
diff -uNr ../kdegraphics-3.2.0/kpovmodeler/Makefile.am ./kpovmodeler/Makefile.am
--- ../kdegraphics-3.2.0/kpovmodeler/Makefile.am Sat Jan 17 07:52:15 2004
-+++ ./kpovmodeler/Makefile.am Thu Mar 4 17:02:18 2004
++++ ./kpovmodeler/Makefile.am Fri Mar 5 09:06:19 2004
@@ -1,5 +1,5 @@
-INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
@@ -79,7 +98,7 @@
diff -uNr ../kdegraphics-3.2.0/ksvg/impl/libs/libtext2path/src/Makefile.am
./ksvg/impl/libs/libtext2path/src/Makefile.am
--- ../kdegraphics-3.2.0/ksvg/impl/libs/libtext2path/src/Makefile.am Sun Oct 26
05:52:43 2003
-+++ ./ksvg/impl/libs/libtext2path/src/Makefile.am Thu Mar 4 17:01:11 2004
++++ ./ksvg/impl/libs/libtext2path/src/Makefile.am Fri Mar 5 09:06:19 2004
@@ -1,7 +1,7 @@
lib_LTLIBRARIES = libtext2path.la
@@ -91,7 +110,7 @@
libtext2path_include_HEADERS = BezierPath.h Glyph.h GlyphTracer.h
diff -uNr ../kdegraphics-3.2.0/ksvg/plugin/backends/libart/Makefile.am
./ksvg/plugin/backends/libart/Makefile.am
--- ../kdegraphics-3.2.0/ksvg/plugin/backends/libart/Makefile.am Sun Oct 26
05:52:43 2003
-+++ ./ksvg/plugin/backends/libart/Makefile.am Thu Mar 4 17:01:11 2004
++++ ./ksvg/plugin/backends/libart/Makefile.am Fri Mar 5 09:06:19 2004
@@ -8,4 +8,4 @@
kde_services_DATA = ksvglibartcanvas.desktop
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
