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

List:       kde-commits
Subject:    kdewebdev
From:       Andras Mantia <amantia () kde ! org>
Date:       2005-02-08 12:30:35
Message-ID: 20050208123035.81AF51CEC2 () office ! kde ! org
[Download RAW message or body]

CVS commit by amantia: 

I was too quick with removing the compatibility KNewStuff. It's needed for 3.3, so \
add it back. Now tested and compilation works against KDE 3.3 libraries.


  A            lib/compatibility/knewstuff/.cvsignore   1.3
  A            lib/compatibility/knewstuff/knewstuffsecure.cpp   1.1 [LGPL]
  A            lib/compatibility/knewstuff/knewstuffsecure.h   1.1 [LGPL]
  A            lib/compatibility/knewstuff/provider.cpp   1.3 [LGPL (v2+)]
  A            lib/compatibility/knewstuff/provider.h   1.3 [LGPL (v2+)]
  A            lib/compatibility/knewstuff/providerdialog.h   1.3 [LGPL (v2+)]
  A            lib/compatibility/knewstuff/security.cpp   1.1 [LGPL]
  A            lib/compatibility/knewstuff/security.h   1.1 [LGPL]
  A            lib/compatibility/knewstuff/uploaddialog.h   1.3 [LGPL (v2+)]
  M +7 -8      configure.in.in   1.78
  M +1 -5      lib/Makefile.am   1.5
  M +6 -1      lib/compatibility/Makefile.am   1.6
  M +3 -0      lib/compatibility/kmdi/qextmdi/kdelibs_export.h   1.2
  M +1 -1      lib/compatibility/knewstuff/Makefile.am   1.3
  M            lib/compatibility/knewstuff/cr16-action-knewstuff.png   1.3
  M            lib/compatibility/knewstuff/cr32-action-knewstuff.png   1.3
  M            lib/compatibility/knewstuff/cr64-action-knewstuff.png   1.3
  M +90 -21    lib/compatibility/knewstuff/downloaddialog.cpp   1.4
  M +58 -3     lib/compatibility/knewstuff/downloaddialog.h   1.3
  M +34 -14    lib/compatibility/knewstuff/engine.cpp   1.4
  M +16 -2     lib/compatibility/knewstuff/engine.h   1.3
  M +24 -7     lib/compatibility/knewstuff/entry.cpp   1.3
  M +1 -1      lib/compatibility/knewstuff/entry.h   1.3
  M +11 -2     lib/compatibility/knewstuff/knewstuff.cpp   1.3
  M +23 -2     lib/compatibility/knewstuff/knewstuff.h   1.3
  M +47 -7     lib/compatibility/knewstuff/knewstuffgeneric.cpp   1.3
  M +4 -2      lib/compatibility/knewstuff/knewstuffgeneric.h   1.3
  M +5 -0      lib/compatibility/knewstuff/providerdialog.cpp   1.3
  M +1 -1      lib/compatibility/knewstuff/uploaddialog.cpp   1.3
  M +2 -2      quanta/src/Makefile.am   1.26
  M +1 -2      quanta/utility/Makefile.am   1.12
  M +1 -5      quanta/utility/newstuff.h   1.7


--- kdewebdev/configure.in.in  #1.77:1.78
@@ -129,15 +129,14 @@
 
 #check for KNewStuffSecure headers
-QNEWSTUFF_INCLUDES=""
-LIB_QNEWSTUFF=""
+KNEWSTUFF_INCLUDES=""
+LIB_KNEWSTUFF="-lknewstuff"
 KDE_CHECK_HEADER(knewstuff/knewstuffsecure.h, [knewstuffsecure_h="found"], \
                [knewstuffsecure_h="none"])
-AM_CONDITIONAL(include_qnewstuff, test "$knewstuffsecure_h" != "found")
+AM_CONDITIONAL(include_knewstuff, test "$knewstuffsecure_h" != "found")
 if test "$knewstuffsecure_h" != "found"; then
-  QNEWSTUFF_INCLUDES='-I$(top_srcdir)/lib/newstuff'
-  LIB_QNEWSTUFF='$(top_builddir)/lib/newstuff/libqnewstuff.la'
-  CXXFLAGS="$CXXFLAGS -DCOMPAT_NEWSTUFFSECURE"
+  KNEWSTUFF_INCLUDES='-I$(top_srcdir)/lib/compatibility'
+  LIB_KNEWSTUFF='$(top_builddir)/lib/compatibility/knewstuff/libknewstuff.la'
 fi
-AC_SUBST(QNEWSTUFF_INCLUDES)
-AC_SUBST(LIB_QNEWSTUFF)
+AC_SUBST(KNEWSTUFF_INCLUDES)
+AC_SUBST(LIB_KNEWSTUFF)
 
 

--- kdewebdev/lib/Makefile.am  #1.4:1.5
@@ -1,7 +1,3 @@
-if include_qnewstuff
-QNEWSTUFF_SUBDIR = newstuff
-endif
-
-SUBDIRS = compatibility $(QNEWSTUFF_SUBDIR)
+SUBDIRS = compatibility
 
 

--- kdewebdev/lib/compatibility/Makefile.am  #1.5:1.6
@@ -3,5 +3,10 @@
 endif
 
-SUBDIRS = $(KMDI_SUBDIR)
+if include_knewstuff
+KNEWSTUFF_SUBDIR = knewstuff
+endif
+
+
+SUBDIRS = $(KMDI_SUBDIR) $(KNEWSTUFF_SUBDIR)
 
 #enable the below when there is something in the compatibility lib

--- kdewebdev/lib/compatibility/kmdi/qextmdi/kdelibs_export.h  #1.1:1.2
@@ -32,4 +32,7 @@
 #else /* Q_OS_UNIX */
 
+#undef KDE_EXPORT
+#define KDE_EXPORT 
+
 /* export statements for unix */
 #define KDECORE_EXPORT KDE_EXPORT

--- kdewebdev/quanta/src/Makefile.am  #1.25:1.26
@@ -30,5 +30,5 @@
         $(top_builddir)/quanta/utility/libutility.la \
         $(top_builddir)/lib/libquantamodule.la \
-        -lkatepartinterfaces -lknewstuff $(LIB_KAFKA) $(LIB_CVSSERVICE)  \
+        -lkatepartinterfaces $(LIB_KNEWSTUFF) $(LIB_KAFKA) $(LIB_CVSSERVICE)  \
         $(LIB_KMDI) $(LIBXML_LIBS) $(LIBXSLT_LIBS) $(LIB_KABC) $(LIB_KSPELL) \
$(LIB_KHTML)  #       $(top_builddir)/lib/compatibility/libcompat.la
@@ -59,5 +59,5 @@
         -I$(top_builddir)/quanta/plugins \
         $(KAFKAINCLUDE) $(CVSSERVICE_INCLUDE) $(KMDI_INCLUDES) \
-         $(QNEWSTUFF_INCLUDES) $(all_includes)
+         $(KNEWSTUFF_INCLUDES) $(all_includes)
 #       -I$(top_srcdir)/lib/compatibility
 

--- kdewebdev/quanta/utility/Makefile.am  #1.11:1.12
@@ -13,8 +13,7 @@
         -I$(top_srcdir)/quanta/project \
         -I$(top_srcdir)/lib \
-        $(QNEWSTUFF_INCLUDES) \
+        $(KNEWSTUFF_INCLUDES) \
         $(KMDI_INCLUDES) $(all_includes)
 
 libutility_la_LDFLAGS = $(all_libraries)
-libutility_la_LIBADD = $(LIB_QNEWSTUFF)
 noinst_HEADERS = qpevents.h

--- kdewebdev/quanta/utility/newstuff.h  #1.6:1.7
@@ -20,10 +20,6 @@
 #include <qobject.h>
 
-//app includes
-#ifdef COMPAT_NEWSTUFFSECURE
-#include "qnewstuff.h"
-#else
+//kde includes
 #include <knewstuff/knewstuffsecure.h>
-#endif
 /**
 Makes possible downloading and installing a DTEP resource files from a server.


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