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

List:       kde-commits
Subject:    koffice
From:       Laurent Montel <montel () kde ! org>
Date:       2004-11-28 12:42:48
Message-ID: 20041128124248.A5FDD1B439 () office ! kde ! org
[Download RAW message or body]

CVS commit by mlaurent: 

Add patch from David Faure to fix start of krita/kivio
CCMAIL: Michael Thaler <michael.thaler@ph.tum.de>
CCMAIL: faure@kde.org


  A            kivio/kiviopart/kivio_part_init.cc   1.1 [GPL (v2+)]
  A            krita/krita_part_init.cc   1.1 [GPL (v2+)]
  M +1 -1      kivio/kiviopart/Makefile.am   1.59
  M +0 -1      kivio/kiviopart/kivio_factory.cpp   1.16
  M +1 -1      krita/Makefile.am   1.103
  M +0 -2      krita/core/kis_factory.cc   1.40


--- koffice/kivio/kiviopart/Makefile.am  #1.58:1.59
@@ -31,5 +31,5 @@
 libkiviopart_la_LDFLAGS = -avoid-version $(all_libraries) -module
 libkiviopart_la_LIBADD  = libkiviocommon.la
-libkiviopart_la_SOURCES = dummy.cpp
+libkiviopart_la_SOURCES = kivio_part_init.cc
 
 dummy.cpp:

--- koffice/kivio/kiviopart/kivio_factory.cpp  #1.15:1.16
@@ -26,5 +26,4 @@
 #include <kiconloader.h>
 
-K_EXPORT_COMPONENT_FACTORY( libkiviopart, KivioFactory )
 
 KInstance* KivioFactory::s_global = 0;

--- koffice/krita/Makefile.am  #1.102:1.103
@@ -9,5 +9,5 @@
 ## The part
 kde_module_LTLIBRARIES = libkritapart.la
-libkritapart_la_SOURCES = dummy.cc
+libkritapart_la_SOURCES = krita_part_init.cc
 libkritapart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 libkritapart_la_LIBADD = libkritacommon.la

--- koffice/krita/core/kis_factory.cc  #1.39:1.40
@@ -30,6 +30,4 @@
 #include "kis_doc.h"
 
-K_EXPORT_COMPONENT_FACTORY( libkritapart, KisFactory )
-
 KAboutData* KisFactory::s_aboutData = 0;
 KInstance* KisFactory::s_global = 0;


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