rpms/kdevelop/FC-4 kdevelop-3.2.1-gcc4.patch, NONE, 1.1 kdevelop-3.2.1-symbol.patch, NONE, 1.1 kdevelop.spec, 1.31, 1.32

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Jun 30 16:22:21 UTC 2005 

Author: than

Update of /cvs/dist/rpms/kdevelop/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv21290

Modified Files:
	kdevelop.spec 
Added Files:
	kdevelop-3.2.1-gcc4.patch kdevelop-3.2.1-symbol.patch 
Log Message:
apply patch to fix undefined symbol issue #162146



kdevelop-3.2.1-gcc4.patch:
 snippetitem.h |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE kdevelop-3.2.1-gcc4.patch ---
--- kdevelop-3.2.1/parts/snippet/snippetitem.h.tn	2005-06-29 15:57:01.000000000 +0200
+++ kdevelop-3.2.1/parts/snippet/snippetitem.h	2005-06-29 15:57:22.000000000 +0200
@@ -13,6 +13,7 @@
 #include <klocale.h>
 
 class QString;
+class SnippetGroup;
 
 /**
 This class represents one CodeSnippet-Item in the listview.

kdevelop-3.2.1-symbol.patch:
 lib/Makefile.am               |    7 ++++---
 lib/interfaces/Makefile.am    |    4 ++++
 lib/widgets/Makefile.am       |    1 +
 parts/outputviews/Makefile.am |    2 ++
 vcs/clearcase/Makefile.am     |    3 ++-
 vcs/cvsservice/Makefile.am    |    4 +++-
 vcs/perforce/Makefile.am      |    3 ++-
 7 files changed, 18 insertions(+), 6 deletions(-)

--- NEW FILE kdevelop-3.2.1-symbol.patch ---
--- kdevelop-3.2.1/lib/interfaces/Makefile.am.bak	2005-06-30 03:20:47.977028712 +0200
+++ kdevelop-3.2.1/lib/interfaces/Makefile.am	2005-06-30 03:21:46.469136560 +0200
@@ -12,6 +12,10 @@ libkdevinterfaces_la_SOURCES = kdevcore.
 	kdevprojectiface.cpp kdevprojectiface.skel kdevdesignerintegrationiface.cpp \
 	kdevdesignerintegrationiface.skel
 
+libkdevinterfaces_la_LDFLAGS = -no-undefined $(all_libraries) $(LIB_KDEUI) $(LIB_KHTML) $(LIB_KPARTS) -lktexteditor -lkscript \
+	$(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la \
+	$(top_builddir)/lib/util/libkdevutil.la
+
 kdevelopincludedir = $(includedir)/kdevelop/interfaces
 kdevelopinclude_HEADERS = kdevlanguagesupport.h kdevmainwindow.h \
 	kdevpartcontroller.h kdevplugin.h kdevproject.h kdevcore.h kdevcoderepository.h codemodel.h \
--- kdevelop-3.2.1/lib/widgets/Makefile.am.bak	2005-06-30 03:22:08.450794840 +0200
+++ kdevelop-3.2.1/lib/widgets/Makefile.am	2005-06-30 03:22:34.210878712 +0200
@@ -14,6 +14,7 @@ kdevwidgetsinclude_HEADERS = klistviewac
 	processwidget.h
 SUBDIRS = propeditor
 libkdevwidgets_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la
+libkdevwidgets_la_LDFLAGS = -no-undefined $(all_libraries)
 rcdir = $(kde_datadir)/kdevelop
 
 rc_DATA =  kdevhtml_partui.rc
--- kdevelop-3.2.1/lib/Makefile.am.bak	2005-06-30 03:22:49.430564968 +0200
+++ kdevelop-3.2.1/lib/Makefile.am	2005-06-30 03:24:38.757944680 +0200
@@ -16,9 +16,10 @@ endif
 lib_LTLIBRARIES = libkdevelop.la
 libkdevelop_la_LDFLAGS = -no-undefined $(all_libraries) -version-info 1:0
 libkdevelop_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la \
-	$(top_builddir)/lib/util/libkdevutil.la $(top_builddir)/lib/widgets/propeditor/libkdevpropertyeditor.la \
-	$(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la \
-	$(LIB_KDEVCOMPAT) -lktexteditor $(LIB_KPARTS) $(LIB_KIO)  -lkscript
+	$(top_builddir)/lib/widgets/propeditor/libkdevpropertyeditor.la $(LIB_KDEVCOMPAT) $(LIB_KIO)
+#	$(top_builddir)/lib/util/libkdevutil.la $(top_builddir)/lib/widgets/propeditor/libkdevpropertyeditor.la \
+#	$(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la \
+#	$(LIB_KDEVCOMPAT) -lktexteditor $(LIB_KPARTS) $(LIB_KIO)  -lkscript
 libkdevelop_la_SOURCES = dummy.cpp
 
 
--- kdevelop-3.2.1/parts/outputviews/Makefile.am.bak	2005-06-30 03:56:34.645685472 +0200
+++ kdevelop-3.2.1/parts/outputviews/Makefile.am	2005-06-30 03:59:15.723197968 +0200
@@ -22,6 +22,7 @@ noinst_HEADERS = filterdlg.h
 libkdevmakeview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 libkdevmakeview_la_LIBADD = $(top_builddir)/lib/widgets/libkdevwidgets.la \
 	$(top_builddir)/lib/interfaces/extensions/dcop/libkdevdcopextensions.la $(top_builddir)/lib/libkdevelop.la \
+	$(top_builddir)/lib/interfaces/extensions/libkdevextensions.la \
 	$(LIB_KHTML)
 libkdevmakeview_la_SOURCES = makeviewpart.cpp makewidget.cpp directorystatusmessagefilter.cpp \
 	outputfilter.cpp compileerrorfilter.cpp commandcontinuationfilter.cpp makeitem.cpp \
@@ -30,6 +31,7 @@ libkdevmakeview_la_SOURCES = makeviewpar
 libkdevappview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 libkdevappview_la_LIBADD = $(top_builddir)/lib/widgets/libkdevwidgets.la \
 	$(top_builddir)/lib/interfaces/extensions/dcop/libkdevdcopextensions.la $(top_builddir)/lib/libkdevelop.la \
+	$(top_builddir)/lib/interfaces/extensions/libkdevextensions.la \
 	$(LIB_KHTML)
 libkdevappview_la_SOURCES = appoutputviewpart.cpp appoutputwidget.cpp directorystatusmessagefilter.cpp \
 	outputfilter.cpp compileerrorfilter.cpp commandcontinuationfilter.cpp makeitem.cpp \
--- kdevelop-3.2.1/vcs/clearcase/Makefile.am.bak	2005-06-30 11:02:52.507259472 +0200
+++ kdevelop-3.2.1/vcs/clearcase/Makefile.am	2005-06-30 11:04:21.386747736 +0200
@@ -5,7 +5,8 @@ INCLUDES = -I$(top_srcdir)/lib/interface
 
 kde_module_LTLIBRARIES = libkdevclearcase.la
 libkdevclearcase_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevclearcase_la_LIBADD = $(top_builddir)/lib/libkdevelop.la
+libkdevclearcase_la_LIBADD = $(top_builddir)/lib/libkdevelop.la \
+	$(top_builddir)/lib/interfaces/extensions/libkdevextensions.la
 
 libkdevclearcase_la_SOURCES = clearcasepart.cpp commentdlg.cpp
 
--- kdevelop-3.2.1/vcs/cvsservice/Makefile.am.bak	2005-06-30 11:10:43.562648168 +0200
+++ kdevelop-3.2.1/vcs/cvsservice/Makefile.am	2005-06-30 11:22:21.832495016 +0200
@@ -6,7 +6,9 @@ INCLUDES = -I$(top_srcdir)/lib/interface
 kde_module_LTLIBRARIES = libkdevcvsservice.la
 libkdevcvsservice_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 libkdevcvsservice_la_LIBADD = $(top_builddir)/lib/libkdevelop.la \
-	$(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_KHTML) -lcvsservice
+	$(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_KHTML) \
+	$(top_builddir)/lib/interfaces/extensions/libkdevextensions.la \
+	-lcvsservice
 
 libkdevcvsservice_la_SOURCES = cvspart.cpp cvspartimpl.cpp cvsformbase.ui \
 	cvsform.cpp commitdialogbase.ui commitdlg.cpp cvsoptionswidgetbase.ui \
--- kdevelop-3.2.1/vcs/perforce/Makefile.am.bak	2005-06-30 11:25:54.890105336 +0200
+++ kdevelop-3.2.1/vcs/perforce/Makefile.am	2005-06-30 11:28:31.903235712 +0200
@@ -5,7 +5,8 @@ INCLUDES = -I$(top_srcdir)/lib/interface
 
 kde_module_LTLIBRARIES = libkdevperforce.la
 libkdevperforce_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevperforce_la_LIBADD = $(top_builddir)/lib/libkdevelop.la
+libkdevperforce_la_LIBADD = $(top_builddir)/lib/libkdevelop.la \
+	$(top_builddir)/lib/interfaces/extensions/libkdevextensions.la
 
 libkdevperforce_la_SOURCES = perforcepart.cpp commitdlg.cpp
 


Index: kdevelop.spec
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/FC-4/kdevelop.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- kdevelop.spec	16 Jun 2005 10:06:21 -0000	1.31
+++ kdevelop.spec	30 Jun 2005 16:22:18 -0000	1.32
@@ -9,7 +9,7 @@
 Name: kdevelop
 Summary: Integrated Development Environment for C++/C
 Version: 3.2.1
-Release: 0.fc4.1
+Release: 0.fc4.2
 Epoch: 9
 URL: http://www.kdevelop.org/
 Group: Development/Tools
@@ -25,6 +25,8 @@
 Patch3: kdevelop-2.1.5_for_KDE_3.1-doc.patch
 Patch4: kdevelop-3.1.92-fpic.patch
 Patch5: admin-visibility.patch
+Patch6: kdevelop-3.2.1-gcc4.patch
+Patch7: kdevelop-3.2.1-symbol.patch
 
 Prereq: /sbin/ldconfig
 
@@ -73,6 +75,8 @@
 %patch3 -p1 -b .doc
 %patch4 -p1
 %patch5 -p1 -b .gcc
+%patch6 -p1 -b .gcc4
+%patch7 -p1 -b .symbol
 
 %build
 export KDEDIR=%{_prefix}
@@ -101,6 +105,7 @@
   --with-qt-libraries=$QTDIR/lib \
   --with-extra-libs=%{_libdir}
 
+make %{?_smp_mflags} -C lib/util
 make %{?_smp_mflags}
 
 # c references
@@ -148,6 +153,9 @@
 %{_datadir}/servicetypes/*
 
 %changelog
+* Thu Jun 30 2005 Than Ngo <than at redhat.com> 9:3.2.1-0.fc4.2
+- apply patch to fix undefined symbol issue #162146
+
 * Thu Jun 16 2005 Than Ngo <than at redhat.com> 3.2.1-0.fc4.1
 - 3.2.1

More information about the fedora-cvs-commits mailing list