rpms/kdesdk/devel kdesdk-3.97.0-fix-kompare.patch, NONE, 1.1 kdesdk.spec, 1.83, 1.84 kdesdk-3.96.2-fix-kompare.patch, 1.3, NONE kdesdk-3.97.0-kompare-static-fPIC.patch, 1.3, NONE
Kevin Kofler (kkofler)
fedora-extras-commits at redhat.com
Sun Dec 16 00:40:47 UTC 2007
Author: kkofler
Update of /cvs/pkgs/rpms/kdesdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13498/devel
Modified Files:
kdesdk.spec
Added Files:
kdesdk-3.97.0-fix-kompare.patch
Removed Files:
kdesdk-3.96.2-fix-kompare.patch
kdesdk-3.97.0-kompare-static-fPIC.patch
Log Message:
* Sun Dec 16 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-6
- update Kompare from SVN (rev 748928)
- Kompare now installs unversioned (private) shared libs, package them properly
kdesdk-3.97.0-fix-kompare.patch:
--- NEW FILE kdesdk-3.97.0-fix-kompare.patch ---
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt (revision 745228)
+++ CMakeLists.txt (revision 748928)
@@ -43,9 +43,9 @@
macro_optional_add_subdirectory(strigi-analyzer)
macro_optional_add_subdirectory(kioslave)
macro_optional_add_subdirectory(kmtrace)
-#message(STATUS "remember to port kompare to editinterface")
-MESSAGE(STATUS "Kompare from the branches/work/kompare/3-way-kompare will replace this version, so do not spend too much time on getting this version to work as it will be replaced.")
-#add_subdirectory(kompare)
+if( UNIX )
+macro_optional_add_subdirectory(kompare)
+endif( UNIX )
macro_optional_add_subdirectory(kprofilemethod)
message(STATUS "remember to port kspy to Qt4's metaobjects")
#add_subdirectory(kspy)
Index: kompare/libdiff2/diffmodel.h
===================================================================
--- kompare/libdiff2/diffmodel.h (revision 745228)
+++ kompare/libdiff2/diffmodel.h (revision 748928)
@@ -25,6 +25,7 @@
#include "diffhunk.h"
#include "kompare.h"
+#include "diff2export.h"
namespace Diff2
{
@@ -32,7 +33,7 @@
class DiffHunk;
class Difference;
-class DiffModel : public QObject
+class DIFF2_EXPORT DiffModel : public QObject
{
Q_OBJECT
public:
Index: kompare/libdiff2/difference.h
===================================================================
--- kompare/libdiff2/difference.h (revision 745228)
+++ kompare/libdiff2/difference.h (revision 748928)
@@ -24,6 +24,7 @@
#include <q3valuevector.h>
#include <kdebug.h>
+#include "diff2export.h"
class QString;
@@ -32,7 +33,7 @@
class LevenshteinTable;
-class Marker
+class DIFF2_EXPORT Marker
{
public:
enum Type { Start = 0, End = 1 };
@@ -66,7 +67,7 @@
typedef Q3ValueList<Marker*>::iterator MarkerListIterator;
typedef Q3ValueList<Marker*>::const_iterator MarkerListConstIterator;
-class DifferenceString
+class DIFF2_EXPORT DifferenceString
{
public:
DifferenceString()
@@ -152,7 +153,7 @@
typedef Q3ValueVector<DifferenceString*>::iterator DifferenceStringListIterator;
typedef Q3ValueVector<DifferenceString*>::const_iterator DifferenceStringListConstIterator;
-class Difference
+class DIFF2_EXPORT Difference
{
public:
enum Type { Change, Insert, Delete, Unchanged };
Index: kompare/libdiff2/diff2export.h
===================================================================
--- kompare/libdiff2/diff2export.h (revision 0)
+++ kompare/libdiff2/diff2export.h (revision 748928)
@@ -0,0 +1,37 @@
+/***************************************************************************
+ * Copyright 2007 Andreas Pakulat <apaku at gmx.de> *
+ * Copyright 2006 Matt Rogers <mattr at kde.org> *
+ * Copyright 2004 Jaroslaw Staniek <js at iidea.pl> *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU Library General Public License as *
+ * published by the Free Software Foundation; either version 2 of the *
+ * License, or (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Library General Public *
+ * License along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
+ ***************************************************************************/
+
+#ifndef LIBDIFF2EXPORT_H
+#define LIBDIFF2EXPORT_H
+
+/* needed for KDE_EXPORT macros */
+#include <kdemacros.h>
+
+#ifndef DIFF2_EXPORT
+# ifdef MAKE_KOMPAREDIFF2_LIB
+# define DIFF2_EXPORT KDE_EXPORT
+# else
+# define DIFF2_EXPORT KDE_IMPORT
+# endif
+#endif
+
+#endif
+
Index: kompare/libdiff2/kompare.h
===================================================================
--- kompare/libdiff2/kompare.h (revision 745228)
+++ kompare/libdiff2/kompare.h (revision 748928)
@@ -22,6 +22,8 @@
#include <kurl.h>
+#include "diff2export.h"
+
namespace Kompare
{
enum Format {
@@ -111,7 +113,7 @@
/*
** This should be removed and put somewhere else
*/
-class KompareFunctions
+class DIFF2_EXPORT KompareFunctions
{
public:
static QString constructRelativePath( const QString& from, const QString& to )
Index: kompare/libdiff2/komparemodellist.cpp
===================================================================
--- kompare/libdiff2/komparemodellist.cpp (revision 745228)
+++ kompare/libdiff2/komparemodellist.cpp (revision 748928)
@@ -4,8 +4,10 @@
begin : Tue Jun 26 2001
copyright : (C) 2001-2004 Otto Bruggeman
(C) 2001-2003 John Firebaugh
+ (C) 2007 Kevin Kofler
email : jfirebaugh at kde.org
otto.bruggeman at home.nl
+ kevin.kofler at chello.at
***************************************************************************/
/***************************************************************************
@@ -23,15 +25,17 @@
#include <qtextcodec.h>
#include <q3valuelist.h>
#include <QTextStream>
+#include <QLinkedList>
#include <kaction.h>
+#include <kactioncollection.h>
#include <kcharsets.h>
#include <kdebug.h>
#include <kdirwatch.h>
#include <kio/netaccess.h>
#include <klocale.h>
#include <kmimetype.h>
-#include <ktempfile.h>
+#include <ktemporaryfile.h>
#include <kstandardaction.h>
#include "difference.h"
@@ -58,30 +62,39 @@
m_info( info ),
m_textCodec( 0 )
{
- m_applyDifference = new KAction( i18n("&Apply Difference"), "1rightarrow", Qt::Key_Space,
- this, SLOT(slotActionApplyDifference()),
- (( KomparePart* )parent)->actionCollection(), "difference_apply" );
- m_unApplyDifference = new KAction( i18n("Un&apply Difference"), "1leftarrow", Qt::Key_Backspace,
- this, SLOT(slotActionUnApplyDifference()),
- (( KomparePart* )parent)->actionCollection(), "difference_unapply" );
- m_applyAll = new KAction( i18n("App&ly All"), "2rightarrow", Qt::CTRL + Qt::Key_A,
- this, SLOT(slotActionApplyAllDifferences()),
- (( KomparePart* )parent)->actionCollection(), "difference_applyall" );
- m_unapplyAll = new KAction( i18n("&Unapply All"), "2leftarrow", Qt::CTRL + Qt::Key_U,
- this, SLOT(slotActionUnapplyAllDifferences()),
- (( KomparePart* )parent)->actionCollection(), "difference_unapplyall" );
- m_previousFile = new KAction( i18n("P&revious File"), "2uparrow", Qt::CTRL + Qt::Key_PageUp,
- this, SLOT(slotPreviousModel()),
- (( KomparePart* )parent)->actionCollection(), "difference_previousfile" );
- m_nextFile = new KAction( i18n("N&ext File"), "2downarrow", Qt::CTRL + Qt::Key_PageDown,
- this, SLOT(slotNextModel()),
- (( KomparePart* )parent)->actionCollection(), "difference_nextfile" );
- m_previousDifference = new KAction( i18n("&Previous Difference"), "1uparrow", Qt::CTRL + Qt::Key_Up,
- this, SLOT(slotPreviousDifference()),
[...4678 lines suppressed...]
Index: kompare/komparenavtreepart/komparenavtreepart.cpp
===================================================================
--- kompare/komparenavtreepart/komparenavtreepart.cpp (revision 745228)
+++ kompare/komparenavtreepart/komparenavtreepart.cpp (revision 748928)
@@ -4,8 +4,10 @@
begin : Sun Mar 4 2001
copyright : (C) 2001-2004 Otto Bruggeman
(C) 2001-2003 John Firebaugh
+ (C) 2007 Kevin Kofler
email : otto.bruggeman at home.nl
jfirebaugh at kde.org
+ kevin.kofler at chello.at
****************************************************************************/
/***************************************************************************
@@ -677,12 +679,12 @@
s_instance = 0L;
}
-KParts::Part* KompareNavTreePartFactory::createPartObject( QWidget* parentWidget, const char* widgetName,
- QObject* /*parent*/, const char* /*name*/,
+KParts::Part* KompareNavTreePartFactory::createPartObject( QWidget* parentWidget,
+ QObject* /*parent*/,
const char* /*classname*/, const QStringList & /*args*/ )
{
// Create an instance of our Part
- KompareNavTreePart* obj = new KompareNavTreePart( parentWidget, widgetName );
+ KompareNavTreePart* obj = new KompareNavTreePart( parentWidget, 0 );
KGlobal::locale()->insertCatalog("kompare");
@@ -701,20 +703,7 @@
return *s_instance;
}
-extern "C"
-{
- KDE_EXPORT void* init_libkomparenavtreepart()
- {
-/* TODO:
-/home/kde4dev/kde/src/kdesdk/kompare/komparenavtreepart/komparenavtreepart.cpp:708: error: cannot allocate an object of type `KompareNavTreePartFactory'
-/home/kde4dev/kde/src/kdesdk/kompare/komparenavtreepart/komparenavtreepart.cpp:708: error: because the following virtual functions are abstract:
-/home/kde4dev/kde/include/kparts/factory.h:118: error: virtual KParts::Part* KParts::Factory::createPartObject(QWidget*, QObject*, const char*, const QStringList&)
-make[2]: *** [kompare/komparenavtreepart/CMakeFiles/komparenavtreepart.dir/komparenavtreepart.o] Error 1
+K_EXPORT_COMPONENT_FACTORY( libkomparenavtreepart, KompareNavTreePartFactory )
+K_EXPORT_PLUGIN( KompareNavTreePartFactory )
-
- return new KompareNavTreePartFactory;
-*/
- }
-}
-
#include "komparenavtreepart.moc"
Index: kompare/komparenavtreepart/CMakeLists.txt
===================================================================
--- kompare/komparenavtreepart/CMakeLists.txt (revision 745228)
+++ kompare/komparenavtreepart/CMakeLists.txt (revision 748928)
@@ -11,7 +11,7 @@
-target_link_libraries(komparenavtreepart ${KDE4_KPARTS_LIBS} diff2 )
+target_link_libraries(komparenavtreepart ${KDE4_KPARTS_LIBS} komparediff2 ${KDE4_KDE3SUPPORT_LIBS} )
install(TARGETS komparenavtreepart DESTINATION ${PLUGIN_INSTALL_DIR} )
Index: kompare/kompare_shell.h
===================================================================
--- kompare/kompare_shell.h (revision 745228)
+++ kompare/kompare_shell.h (revision 748928)
@@ -4,8 +4,10 @@
begin : Sun Mar 4 2001
copyright : (C) 2001-2003 by Otto Bruggeman
and John Firebaugh
+ (C) 2007 Kevin Kofler
email : otto.bruggeman at home.nl
jfirebaugh at kde.org
+ kevin.kofler at chello.at
****************************************************************************/
/***************************************************************************
@@ -118,6 +120,7 @@
void optionsConfigureToolbars();
void slotSetDiffString( const QString& diffString );
void newToolbarConfig();
+ void slotVisibilityChanged( bool visible );
private:
void setupAccel();
@@ -136,7 +139,6 @@
// KTextEditor::EditInterface* m_textEditIface;
QDockWidget* m_textViewWidget;
- QDockWidget* m_mainViewDock;
QDockWidget* m_navTreeDock;
KToggleAction* m_showTextView;
@@ -144,6 +146,8 @@
enum Kompare::Mode m_mode;
// This is the statusbarwidget for displaying the general stuff
KSqueezedTextLabel* m_generalLabel;
+
+ QString m_diffString;
};
#endif // KOMPARE_H
Index: kompare/CMakeLists.txt
===================================================================
--- kompare/CMakeLists.txt (revision 745228)
+++ kompare/CMakeLists.txt (revision 748928)
@@ -15,35 +15,13 @@
main.cpp
kompare_shell.cpp
kompareurldialog.cpp
-
-${CMAKE_CURRENT_SOURCE_DIR}/libdialogpages/settingsbase.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/libdialogpages/viewsettings.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/libdialogpages/diffpage.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/libdialogpages/filespage.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/libdialogpages/pagebase.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/libdialogpages/viewpage.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/libdialogpages/diffsettings.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/libdialogpages/filessettings.cpp
-
-${CMAKE_CURRENT_SOURCE_DIR}/libdiff2/diffmodel.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/libdiff2/komparemodellist.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/libdiff2/cvsdiffparser.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/libdiff2/parser.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/libdiff2/diffmodellist.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/libdiff2/kompareprocess.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/libdiff2/difference.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/libdiff2/perforceparser.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/libdiff2/diffparser.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/libdiff2/levenshteintable.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/libdiff2/diffhunk.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/libdiff2/parserbase.cpp
)
kde4_add_executable(kompare ${kompare_SRCS})
-target_link_libraries(kompare kompareinterface dialogpages ${KDE4_KTEXTEDITOR_LIBS} )
+target_link_libraries(kompare kompareinterface komparediff2 komparedialogpages ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KDE3SUPPORT_LIBS} )
install(TARGETS kompare DESTINATION ${BIN_INSTALL_DIR} )
@@ -54,51 +32,3 @@
install( FILES kompareui.rc DESTINATION ${DATA_INSTALL_DIR}/kompare )
install( FILES komparenavigationpart.desktop kompareviewpart.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
-
-
-
-#original Makefile.am contents follow:
-
-#SUBDIRS = interfaces libdiff2 libdialogpages komparenavtreepart komparepart pics
-#
-#INCLUDES = \
-# -I$(srcdir)/libdiff2 \
-# -I$(srcdir)/libdialogpages \
-# -I$(srcdir)/komparenavtreepart \
-# -I$(srcdir)/komparepart \
-# -I$(srcdir)/interfaces \
-# $(all_includes)
-#
-#noinst_HEADERS = kompare_shell.h kompareurldialog.h
-#
-## let automoc handle all of the meta source files (moc)
-#METASOURCES = AUTO
-#
-#messages: rc.cpp
-# $(EXTRACTRC) */*.rc */*.ui >> rc.cpp
-# $(XGETTEXT) `find . -name "*.cpp" -o -name "*.h"` -o $(podir)/kompare.pot
-#
-##########################################################################
-## APPLICATION SECTION
-##########################################################################
-## this is the program that gets installed. it's name is used for all
-## of the other Makefile.am variables
-#bin_PROGRAMS = kompare
-#
-## the application source, library search path, and link libraries
-#kompare_SOURCES = main.cpp kompare_shell.cpp kompareurldialog.cpp
-#kompare_LDFLAGS = $(all_libraries)
-#kompare_LDADD = $(LIB_KPARTS) \
-# $(top_builddir)/kompare/interfaces/libkompareinterface.la \
-# $(top_builddir)/kompare/libdialogpages/libdialogpages.la \
-# -lktexteditor
-#
-## this is where the desktop file will go
-#xdg_apps_DATA = kompare.desktop
-#
-## this is where the shell's XML-GUI resource file goes
-#shellrcdir = $(kde_datadir)/kompare
-#shellrc_DATA = kompareui.rc
-#
-#kompareservicedir = $(kde_servicetypesdir)
-#kompareservice_DATA = komparenavigationpart.desktop kompareviewpart.desktop
Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- kdesdk.spec 12 Dec 2007 08:03:20 -0000 1.83
+++ kdesdk.spec 16 Dec 2007 00:40:08 -0000 1.84
@@ -1,6 +1,6 @@
Name: kdesdk
Version: 3.97.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: The KDE Software Development Kit (SDK)
Group: User Interface/Desktops
@@ -8,8 +8,7 @@
License: GPLv2
URL: http://www.kde.org/
Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
-Patch0: kdesdk-3.96.2-fix-kompare.patch
-Patch1: kdesdk-3.97.0-kompare-static-fPIC.patch
+Patch0: kdesdk-3.97.0-fix-kompare.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: kde-filesystem >= 4
@@ -66,8 +65,7 @@
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
+%patch0 -p0
%build
@@ -94,7 +92,8 @@
for i in lib*.so
do
case "$i" in
- libkdeinit4_*.so)
+ # all these are not symlinks
+ libkdeinit4_*.so|libkomparedialogpages.so|libkomparediff2.so|libkomparenavtreepart.so|libkomparepart.so)
;;
*)
linktarget=`readlink "$i"`
@@ -166,6 +165,10 @@
%files libs
%defattr(-,root,root,-)
%{_kde4_libdir}/lib*.so.*
+%{_kde4_libdir}/libkomparedialogpages.so
+%{_kde4_libdir}/libkomparediff2.so
+%{_kde4_libdir}/libkomparenavtreepart.so
+%{_kde4_libdir}/libkomparepart.so
%files devel
%defattr(-,root,root,-)
@@ -173,6 +176,10 @@
%{_kde4_libdir}/kde4/devel/*
%changelog
+* Sun Dec 16 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-6
+- update Kompare from SVN (rev 748928)
+- Kompare now installs unversioned (private) shared libs, package them properly
+
* Wed Dec 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-5
- rebuild for changed _kde4_includedir
--- kdesdk-3.96.2-fix-kompare.patch DELETED ---
--- kdesdk-3.97.0-kompare-static-fPIC.patch DELETED ---
More information about the fedora-extras-commits
mailing list