Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv29237
Modified Files:
kdegraphics3.info kdegraphics3.patch
Log Message:
local -I before global (caught by jfm)
Index: kdegraphics3.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde/kdegraphics3.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- kdegraphics3.patch 26 Jul 2010 06:55:37 -0000 1.10
+++ kdegraphics3.patch 8 Aug 2010 17:46:43 -0000 1.11
@@ -150,8 +150,18 @@
KFAXVERSION, description, KAboutData::License_GPL,
diff -Nurd kdegraphics-3.5.10/kfaxview/Makefile.am
kdegraphics-3.5.10-new/kfaxview/Makefile.am
--- kdegraphics-3.5.10/kfaxview/Makefile.am 2005-09-10 04:18:44.000000000
-0400
-+++ kdegraphics-3.5.10-new/kfaxview/Makefile.am 2010-07-26
02:13:26.000000000 -0400
-@@ -13,7 +13,7 @@
++++ kdegraphics-3.5.10-new/kfaxview/Makefile.am 2010-08-08
13:24:03.000000000 -0400
+@@ -1,8 +1,7 @@
+ INCLUDES = -I$(top_srcdir)/kviewshell \
+ -I$(top_builddir)/kviewshell \
+- -I$(kde_includes)/kviewshell \
+ -I$(srcdir)/libkfaximage \
+- -I$(top_srcdir) $(all_includes)
++ -I$(top_srcdir) -I$(kde_includes)/kviewshell $(all_includes)
+
+ SUBDIRS = libkfaximage .
+
+@@ -13,7 +12,7 @@
bin_PROGRAMS = kfaxview
kfaxview_SOURCES = main.cpp
kfaxview_LDFLAGS = $(all_libraries) $(KDE_RPATH)
@@ -160,7 +170,7 @@
# this is where the desktop file will go
kde_services_DATA = kfaxmultipage.desktop kfaxmultipage_tiff.desktop
-@@ -23,7 +23,7 @@
+@@ -23,7 +22,7 @@
kde_module_LTLIBRARIES = kfaxviewpart.la
kfaxviewpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
@@ -833,7 +843,7 @@
diff -Nurd kdegraphics-3.5.10/ksvg/core/Makefile.am
kdegraphics-3.5.10-new/ksvg/core/Makefile.am
--- kdegraphics-3.5.10/ksvg/core/Makefile.am 2005-09-10 04:19:11.000000000
-0400
-+++ kdegraphics-3.5.10-new/ksvg/core/Makefile.am 2010-07-25
19:04:56.000000000 -0400
++++ kdegraphics-3.5.10-new/ksvg/core/Makefile.am 2010-08-08
12:31:49.000000000 -0400
@@ -2,6 +2,7 @@
libksvgcore_la_SOURCES = KSVGLoader.cpp KSVGCanvas.cpp KSVGReader.cc
KSVGTextChunk.cpp CanvasFactory.cpp CanvasItems.cpp KSVGHelper.cpp
DocumentFactory.cpp
@@ -842,13 +852,33 @@
servicetypedir = $(kde_servicetypesdir)
servicetype_DATA = ksvgrenderer.desktop
+@@ -10,7 +11,7 @@
+ ksvgincludedir = $(includedir)/ksvg
+
+ KDE_CXXFLAGS = $(USE_EXCEPTIONS)
+-INCLUDES = $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) -I$(top_srcdir)/ksvg/dom
-I$(top_srcdir)/ksvg/impl -I$(top_srcdir)/ksvg/ecma
-I$(top_srcdir)/ksvg/impl/libs/art_support
-I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(all_includes)
++INCLUDES = -I$(top_srcdir)/ksvg/dom -I$(top_srcdir)/ksvg/impl
-I$(top_srcdir)/ksvg/ecma -I$(top_srcdir)/ksvg/impl/libs/art_support
-I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(all_includes)
$(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS)
+
+ KDE_OPTIONS = nofinal
+
+diff -Nurd kdegraphics-3.5.10/ksvg/ecma/Makefile.am
kdegraphics-3.5.10-new/ksvg/ecma/Makefile.am
+--- kdegraphics-3.5.10/ksvg/ecma/Makefile.am 2005-09-10 04:19:17.000000000
-0400
++++ kdegraphics-3.5.10-new/ksvg/ecma/Makefile.am 2010-08-08
12:31:43.000000000 -0400
+@@ -1,4 +1,4 @@
+-INCLUDES = $(FREETYPE_CFLAGS) -I$(top_srcdir)/ksvg/dom
-I$(top_srcdir)/ksvg/impl -I$(top_srcdir)/ksvg/core -I$(top_srcdir)/ksvg/data
-I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(all_includes)
++INCLUDES = -I$(top_srcdir)/ksvg/dom -I$(top_srcdir)/ksvg/impl
-I$(top_srcdir)/ksvg/core -I$(top_srcdir)/ksvg/data
-I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(all_includes)
$(FREETYPE_CFLAGS)
+ METASOURCES = AUTO
+ KDE_CXXFLAGS = $(USE_EXCEPTIONS)
+
diff -Nurd kdegraphics-3.5.10/ksvg/impl/Makefile.am
kdegraphics-3.5.10-new/ksvg/impl/Makefile.am
--- kdegraphics-3.5.10/ksvg/impl/Makefile.am 2005-09-10 04:19:17.000000000
-0400
-+++ kdegraphics-3.5.10-new/ksvg/impl/Makefile.am 2010-07-25
19:07:29.000000000 -0400
-@@ -114,3 +114,4 @@
++++ kdegraphics-3.5.10-new/ksvg/impl/Makefile.am 2010-08-08
12:31:35.000000000 -0400
+@@ -113,4 +113,5 @@
+
libksvgdomimpl_la_METASOURCES = AUTO
- INCLUDES = $(FREETYPE_CFLAGS) -I$(top_srcdir)/ksvg/core
-I$(top_srcdir)/ksvg/dom -I$(top_srcdir)/ksvg/ecma -I$(top_srcdir)/ksvg/data
-I$(top_srcdir)/ksvg/impl/libs/art_support
-I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(all_includes)
+-INCLUDES = $(FREETYPE_CFLAGS) -I$(top_srcdir)/ksvg/core
-I$(top_srcdir)/ksvg/dom -I$(top_srcdir)/ksvg/ecma -I$(top_srcdir)/ksvg/data
-I$(top_srcdir)/ksvg/impl/libs/art_support
-I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(all_includes)
++INCLUDES = -I$(top_srcdir)/ksvg/core -I$(top_srcdir)/ksvg/dom
-I$(top_srcdir)/ksvg/ecma -I$(top_srcdir)/ksvg/data
-I$(top_srcdir)/ksvg/impl/libs/art_support
-I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(all_includes)
$(FREETYPE_CFLAGS)
+libksvgdomimpl_la_LIBADD = $(LIB_KDECORE) $(LIB_KDEUI)
diff -Nurd kdegraphics-3.5.10/ksvg/impl/libs/art_support/Makefile.am
kdegraphics-3.5.10-new/ksvg/impl/libs/art_support/Makefile.am
--- kdegraphics-3.5.10/ksvg/impl/libs/art_support/Makefile.am 2005-09-10
04:19:14.000000000 -0400
@@ -877,8 +907,15 @@
+libtext2path_la_LDFLAGS = $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(FRIBIDI_LIBS)
diff -Nurd kdegraphics-3.5.10/ksvg/plugin/Makefile.am
kdegraphics-3.5.10-new/ksvg/plugin/Makefile.am
--- kdegraphics-3.5.10/ksvg/plugin/Makefile.am 2005-09-10 04:19:12.000000000
-0400
-+++ kdegraphics-3.5.10-new/ksvg/plugin/Makefile.am 2010-07-26
01:40:11.000000000 -0400
-@@ -7,7 +7,7 @@
++++ kdegraphics-3.5.10-new/ksvg/plugin/Makefile.am 2010-08-08
12:31:05.000000000 -0400
+@@ -1,13 +1,13 @@
+ SUBDIRS = backends .
+
+-INCLUDES = $(FREETYPE_CFLAGS) -I$(top_srcdir)/ksvg -I$(top_srcdir)/ksvg/dom
-I$(top_srcdir)/ksvg/impl -I$(top_srcdir)/ksvg/ecma -I$(top_srcdir)/ksvg/core
-I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(all_includes)
++INCLUDES = -I$(top_srcdir)/ksvg -I$(top_srcdir)/ksvg/dom
-I$(top_srcdir)/ksvg/impl -I$(top_srcdir)/ksvg/ecma -I$(top_srcdir)/ksvg/core
-I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(all_includes)
$(FREETYPE_CFLAGS)
+ METASOURCES = AUTO
+ KDE_CXXFLAGS = $(USE_EXCEPTIONS)
+
kde_module_LTLIBRARIES = libksvgplugin.la svgthumbnail.la
libksvgplugin_la_SOURCES = ksvg_plugin.cpp ksvg_factory.cpp ksvg_widget.cpp
@@ -889,27 +926,28 @@
ksvginclude_HEADERS = ksvg_plugin.h
diff -Nurd kdegraphics-3.5.10/ksvg/plugin/backends/agg/Makefile.am
kdegraphics-3.5.10-new/ksvg/plugin/backends/agg/Makefile.am
--- kdegraphics-3.5.10/ksvg/plugin/backends/agg/Makefile.am 2005-09-10
04:19:12.000000000 -0400
-+++ kdegraphics-3.5.10-new/ksvg/plugin/backends/agg/Makefile.am
2010-07-25 19:04:30.000000000 -0400
++++ kdegraphics-3.5.10-new/ksvg/plugin/backends/agg/Makefile.am
2010-08-08 12:31:29.000000000 -0400
@@ -12,4 +12,4 @@
kde_services_DATA = ksvgaggcanvas.desktop
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
-INCLUDES = $(KDE_INCLUDES) $(AGG_CFLAGS) $(FREETYPE_CFLAGS)
$(FONTCONFIG_CFLAGS) -I$(top_srcdir)/ksvg/dom -I$(top_srcdir)/ksvg/impl
-I$(top_srcdir)/ksvg/ecma -I$(top_srcdir)/ksvg/core
-I$(top_srcdir)/ksvg/impl/libs/art_support
-I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(all_includes)
-+INCLUDES = $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) $(KDE_INCLUDES)
$(AGG_CFLAGS) -I$(top_srcdir)/ksvg/dom -I$(top_srcdir)/ksvg/impl
-I$(top_srcdir)/ksvg/ecma -I$(top_srcdir)/ksvg/core
-I$(top_srcdir)/ksvg/impl/libs/art_support
-I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(all_includes)
++INCLUDES = -I$(top_srcdir)/ksvg/dom -I$(top_srcdir)/ksvg/impl
-I$(top_srcdir)/ksvg/ecma -I$(top_srcdir)/ksvg/core
-I$(top_srcdir)/ksvg/impl/libs/art_support
-I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(all_includes)
$(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) $(KDE_INCLUDES) $(AGG_CFLAGS)
diff -Nurd kdegraphics-3.5.10/ksvg/plugin/backends/libart/Makefile.am
kdegraphics-3.5.10-new/ksvg/plugin/backends/libart/Makefile.am
--- kdegraphics-3.5.10/ksvg/plugin/backends/libart/Makefile.am 2005-09-10
04:19:11.000000000 -0400
-+++ kdegraphics-3.5.10-new/ksvg/plugin/backends/libart/Makefile.am
2010-07-25 19:04:30.000000000 -0400
++++ kdegraphics-3.5.10-new/ksvg/plugin/backends/libart/Makefile.am
2010-08-08 12:31:19.000000000 -0400
@@ -8,4 +8,4 @@
kde_services_DATA = ksvglibartcanvas.desktop
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
-INCLUDES = $(LIBART_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS)
-I$(top_srcdir)/ksvg/dom -I$(top_srcdir)/ksvg/impl -I$(top_srcdir)/ksvg/ecma
-I$(top_srcdir)/ksvg/core -I$(top_srcdir)/ksvg/impl/libs/art_support
-I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(KDE_INCLUDES) $(all_includes)
-+INCLUDES = $(FREETYPE_CFLAGS) $(LIBART_CFLAGS) $(FONTCONFIG_CFLAGS)
-I$(top_srcdir)/ksvg/dom -I$(top_srcdir)/ksvg/impl -I$(top_srcdir)/ksvg/ecma
-I$(top_srcdir)/ksvg/core -I$(top_srcdir)/ksvg/impl/libs/art_support
-I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(KDE_INCLUDES) $(all_includes)
++INCLUDES = -I$(top_srcdir)/ksvg/dom -I$(top_srcdir)/ksvg/impl
-I$(top_srcdir)/ksvg/ecma -I$(top_srcdir)/ksvg/core
-I$(top_srcdir)/ksvg/impl/libs/art_support
-I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(KDE_INCLUDES) $(all_includes)
$(FREETYPE_CFLAGS) $(LIBART_CFLAGS) $(FONTCONFIG_CFLAGS)
diff -Nurd kdegraphics-3.5.10/ksvg/test/external/Makefile.am
kdegraphics-3.5.10-new/ksvg/test/external/Makefile.am
--- kdegraphics-3.5.10/ksvg/test/external/Makefile.am 2005-09-10
04:19:09.000000000 -0400
-+++ kdegraphics-3.5.10-new/ksvg/test/external/Makefile.am 2010-07-25
19:04:30.000000000 -0400
++++ kdegraphics-3.5.10-new/ksvg/test/external/Makefile.am 2010-08-08
12:30:57.000000000 -0400
@@ -1,13 +1,16 @@
- INCLUDES = $(FREETYPE_CFLAGS) -I$(top_srcdir)/ksvg -I$(top_srcdir)/ksvg/dom
-I$(top_srcdir)/ksvg/impl -I$(top_srcdir)/ksvg/ecma -I$(top_srcdir)/ksvg/core
-I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(all_includes)
+-INCLUDES = $(FREETYPE_CFLAGS) -I$(top_srcdir)/ksvg -I$(top_srcdir)/ksvg/dom
-I$(top_srcdir)/ksvg/impl -I$(top_srcdir)/ksvg/ecma -I$(top_srcdir)/ksvg/core
-I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(all_includes)
++INCLUDES = -I$(top_srcdir)/ksvg -I$(top_srcdir)/ksvg/dom
-I$(top_srcdir)/ksvg/impl -I$(top_srcdir)/ksvg/ecma -I$(top_srcdir)/ksvg/core
-I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(all_includes)
$(FREETYPE_CFLAGS)
+LDFLAGS = $(FREETYPE_LDFLAGS)
METASOURCES = AUTO
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
@@ -1168,7 +1206,19 @@
description, KAboutData::License_GPL,
diff -Nurd kdegraphics-3.5.10/kviewshell/plugins/djvu/Makefile.am
kdegraphics-3.5.10-new/kviewshell/plugins/djvu/Makefile.am
--- kdegraphics-3.5.10/kviewshell/plugins/djvu/Makefile.am 2005-09-10
04:19:21.000000000 -0400
-+++ kdegraphics-3.5.10-new/kviewshell/plugins/djvu/Makefile.am 2010-07-26
01:28:08.000000000 -0400
++++ kdegraphics-3.5.10-new/kviewshell/plugins/djvu/Makefile.am 2010-08-08
13:23:31.000000000 -0400
+@@ -1,8 +1,8 @@
+-INCLUDES = -I$(top_srcdir) $(all_includes) \
++INCLUDES = -I$(top_srcdir) \
+ -I$(top_srcdir)/kviewshell \
+ -I$(top_builddir)/kviewshell \
+- -I$(kde_includes)/kviewshell \
+- -I$(srcdir)/libdjvu
++ -I$(srcdir)/libdjvu \
++ -I$(kde_includes)/kviewshell $(all_includes)
+
+ SUBDIRS = libdjvu .
+
@@ -18,7 +18,7 @@
kde_module_LTLIBRARIES = djvuviewpart.la
Index: kdegraphics3.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde/kdegraphics3.info,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- kdegraphics3.info 26 Jul 2010 06:55:36 -0000 1.34
+++ kdegraphics3.info 8 Aug 2010 17:46:43 -0000 1.35
@@ -88,7 +88,7 @@
perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g;
s,/usr/share/doc/packages/qt3/html,%p/share/doc/qt3/html,g;' admin/*
<<
PatchFile: %n.patch
-PatchFile-MD5: 14c8a20b40db3b085aa61aca54a0fb3b
+PatchFile-MD5: 8aa2a4ced35ebb5b7db255af607dfacb
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
------------------------------------------------------------------------------
This SF.net email is sponsored by
Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
