Attachment 2266 Details for Bug 2127 – tdeutils: fix FTBFS due to renamed knewstuff

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] tdeutils: fix FTBFS due to renamed knewstuff

tdeutils-14.0.0-ftbfs.patch (text/plain), 14.53 KB, created by Francois Andriot on 2014-09-25 16:19:58 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Francois Andriot

Created: 2014-09-25 16:19:58 CDT

Size: 14.53 KB

patch

obsolete

>diff --git a/CMakeLists.txt b/CMakeLists.txt
>index f51f3fa..6030d90 100644
>--- a/CMakeLists.txt
>+++ b/CMakeLists.txt
>@@ -57,7 +57,7 @@ option( WITH_I8K "Enable dell laptop support" OFF )
> option( WITH_SNMP "Enable SNMP support" OFF )
> option( WITH_SENSORS "Enable lm_sensors support" OFF )
> option( WITH_XMMS "Enable xmms support" OFF )
>-option( WITH_KNEWSTUFF "Enable knewstuff support" OFF )
>+option( WITH_TDENEWSTUFF "Enable tdenewstuff support" OFF )
> 
> # option( WITH_NV "Enable nv support" OFF )
> 
>@@ -85,10 +85,10 @@ option( WITH_KNEWSTUFF "Enable knewstuff support" OFF )
> # WITH_XMMS         affects superkaramba
> # WITH_XMMS         description enables supercaramba applets to gain 
> #                               information about now playing track etc.
>-# WITH_KNEWSTUFF    affects superkaramba
>-# WITH_KNEWSTUFF    description enebles support for downloadable content
>+# WITH_TDENEWSTUFF    affects superkaramba
>+# WITH_TDENEWSTUFF    description enebles support for downloadable content
> #                               from kdelooks.
>-# FIXME: test if WITH_KNEWSTUFF works in trinity or not
>+# FIXME: test if WITH_TDENEWSTUFF works in trinity or not
> 
> # NOTE: In addition to affects DPMS and XScreenSaver backend options for 
> #       klaptopdaemon there is some XIdle code but it wasn't compleatly 
>diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
>index 2766533..765f608 100644
>--- a/ConfigureChecks.cmake
>+++ b/ConfigureChecks.cmake
>@@ -177,10 +177,10 @@ if ( BUILD_SUPERKARAMBA )
>     tde_message_fatal( "python is required, but was not found on your system" )
>   endif( NOT PYTHONLIBS_FOUND )
> 
>-  if( WITH_KNEWSTUFF )
>-    set( HAVE_KNEWSTUFF 1 )
>-    set( KNEWSTUFF_LIBRARIES knewstuff-shared )
>-  endif( WITH_KNEWSTUFF )
>+  if( WITH_TDENEWSTUFF )
>+    set( HAVE_TDENEWSTUFF 1 )
>+    set( TDENEWSTUFF_LIBRARIES tdenewstuff-shared )
>+  endif( WITH_TDENEWSTUFF )
> 
>   if( WITH_XMMS )
>     set( HAVE_XMMS 1 )
>diff --git a/config.h.cmake b/config.h.cmake
>index caff6e3..91bc6ea 100644
>--- a/config.h.cmake
>+++ b/config.h.cmake
>@@ -84,7 +84,7 @@
> // superkaramba
> 
> #cmakedefine HAVE_XMMS
>-#cmakedefine HAVE_KNEWSTUFF
>+#cmakedefine HAVE_TDENEWSTUFF
> 
> #if !defined( HAVE_SYS_TYPES_H )
> #cmakedefine HAVE_SYS_TYPES_H
>diff --git a/superkaramba/ChangeLog b/superkaramba/ChangeLog
>index 8cc4296..37c8a7f 100644
>--- a/superkaramba/ChangeLog
>+++ b/superkaramba/ChangeLog
>@@ -269,7 +269,7 @@ readThemeFile added to python api.
> ------------------------------------------------------------------------
> r422675 | nickell | 2005-06-06 00:57:45 -0400 (Mon, 06 Jun 2005) | 2 lines
> 
>-Initial support for KNewStuff.  Install code has not been completed yet.
>+Initial support for TDENewStuff.  Install code has not been completed yet.
> 
> ------------------------------------------------------------------------
> r422865 | pdamsten | 2005-06-06 14:54:37 -0400 (Mon, 06 Jun 2005) | 1 line
>@@ -278,7 +278,7 @@ Add warning when running non local theme.
> ------------------------------------------------------------------------
> r422947 | nickell | 2005-06-06 20:14:17 -0400 (Mon, 06 Jun 2005) | 4 lines
> 
>-More knewstuff.  Install is now working, but it's limited to non-zipped
>+More tdenewstuff.  Install is now working, but it's limited to non-zipped
> themes and they get installed into:
> ~/.kde/share/apps/superkaramba/themes/
> 
>@@ -707,4 +707,4 @@ SuperKaramba v0.35
> * asyncronous image loading. karamba.setImagePath should now work with net files.
> * fixed bug in meterClicked()
> * fixed bug in setRichTextWidth() / getRichTextSize()
>-* much more code cleanup, bug fixes, and internal documentation
>\ No newline at end of file
>+* much more code cleanup, bug fixes, and internal documentation
>diff --git a/superkaramba/configure.in.in b/superkaramba/configure.in.in
>index 4ff9f27..9b59909 100644
>--- a/superkaramba/configure.in.in
>+++ b/superkaramba/configure.in.in
>@@ -63,11 +63,11 @@ AC_SUBST(XMMS_LIBS)
> AC_SUBST(XMMS_LDFLAGS)
> AC_SUBST(XMMS_INCLUDES)
> 
>-kde_have_knewstuff=yes
>-KDE_CHECK_LIB(knewstuff, main, [MY_LIBKNEWSTUFF="-lknewstuff"], kde_have_knewstuff=no)
>-if test "$kde_have_knewstuff" = "yes"; then
>-  AC_DEFINE(HAVE_KNEWSTUFF, 1, [Define if you have knewstuff])
>-  AC_SUBST(MY_LIBKNEWSTUFF)
>+kde_have_tdenewstuff=yes
>+KDE_CHECK_LIB(tdenewstuff, main, [MY_LIBTDENEWSTUFF="-ltdenewstuff"], kde_have_tdenewstuff=no)
>+if test "$kde_have_tdenewstuff" = "yes"; then
>+  AC_DEFINE(HAVE_TDENEWSTUFF, 1, [Define if you have tdenewstuff])
>+  AC_SUBST(MY_LIBTDENEWSTUFF)
> fi
> 
> AC_CHECK_LIB(kvm, main, [LIBKVM="-lkvm"])
>diff --git a/superkaramba/src/CMakeLists.txt b/superkaramba/src/CMakeLists.txt
>index 07b7ec5..b0f9a4e 100644
>--- a/superkaramba/src/CMakeLists.txt
>+++ b/superkaramba/src/CMakeLists.txt
>@@ -55,7 +55,7 @@ tde_add_executable( superkaramba AUTOMOC
>     input.cpp sklineedit.cpp input_python.cpp
>     svcgrp_python.cpp
>   LINK tdeio-shared ${PYTHON_LIBRARIES} 
>-    ${KNEWSTUFF_LIBRARIES}
>+    ${TDENEWSTUFF_LIBRARIES}
>   DESTINATION ${BIN_INSTALL_DIR}
> )
> 
>diff --git a/superkaramba/src/Makefile.am b/superkaramba/src/Makefile.am
>index 191ebc7..e7d7be6 100644
>--- a/superkaramba/src/Makefile.am
>+++ b/superkaramba/src/Makefile.am
>@@ -41,8 +41,7 @@ superkaramba_SOURCES = main.cpp karamba.cpp meter.cpp bar.cpp sensor.cpp \
> # kde_cfg_DATA = superkaramba.kcfg
> 
> superkaramba_LDFLAGS = -Wl,-export-dynamic  $(KDE_RPATH) $(all_libraries) $(PYTHONLIB) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
>-#superkaramba_LDADD = -ltdeio $(LIB_TDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)
>-superkaramba_LDADD = -ltdeio $(LIB_TDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)
>+superkaramba_LDADD = -ltdeio $(LIB_TDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBTDENEWSTUFF)
> 
> # this is where the desktop file will go
> shelldesktopdir = $(kde_appsdir)/Utilities
>diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp
>index 316d0f4..0cfd256 100644
>--- a/superkaramba/src/karamba.cpp
>+++ b/superkaramba/src/karamba.cpp
>@@ -2038,7 +2038,7 @@ void karamba::showMenuExtension()
>                                          TQT_SLOT(slotToggleSystemTray()),
>                                          CTRL+Key_S);
> 
>-  trayMenuThemeId = kglobal->insertItem(SmallIconSet("knewstuff"),
>+  trayMenuThemeId = kglobal->insertItem(SmallIconSet("tdenewstuff"),
>                                         i18n("&Manage Themes..."), this,
>                                         TQT_SLOT(slotShowTheme()), CTRL+Key_M);
> 
>diff --git a/superkaramba/src/sknewstuff.cpp b/superkaramba/src/sknewstuff.cpp
>index e5a413b..0316b80 100644
>--- a/superkaramba/src/sknewstuff.cpp
>+++ b/superkaramba/src/sknewstuff.cpp
>@@ -36,11 +36,11 @@
> 
> #include "karambaapp.h"
> #include "themesdlg.h"
>-#ifdef HAVE_KNEWSTUFF
>+#ifdef HAVE_TDENEWSTUFF
> #include "sknewstuff.h"
> 
> SKNewStuff::SKNewStuff( ThemesDlg *dlg ) :
>-  KNewStuff( "superkaramba/themes", dlg ),
>+  TDENewStuff( "superkaramba/themes", dlg ),
>   mDlg( dlg )
> {
> }
>@@ -137,4 +137,4 @@ TQString SKNewStuff::downloadDestination( KNS::Entry *entry )
>   }
>   return TDEGlobal::dirs()->saveLocation( "tmp" ) + source.fileName();
> }
>-#endif //HAVE_KNEWSTUFF
>+#endif //HAVE_TDENEWSTUFF
>diff --git a/superkaramba/src/sknewstuff.h b/superkaramba/src/sknewstuff.h
>index 9c10d2b..95cfa5c 100644
>--- a/superkaramba/src/sknewstuff.h
>+++ b/superkaramba/src/sknewstuff.h
>@@ -28,14 +28,14 @@
>   #include <config.h>
> #endif
> 
>-#ifdef HAVE_KNEWSTUFF
>-#include "knewstuff/knewstuff.h"
>-#include "knewstuff/entry.h"
>+#ifdef HAVE_TDENEWSTUFF
>+#include "tdenewstuff/knewstuff.h"
>+#include "tdenewstuff/entry.h"
> 
> class ThemesDlg;
> class KArchiveDirectory;
> 
>-class SKNewStuff : public KNewStuff
>+class SKNewStuff : public TDENewStuff
> {
>   public:
>     SKNewStuff( ThemesDlg * );
>@@ -49,5 +49,5 @@ class SKNewStuff : public KNewStuff
>     KURL m_sourceLink;
> };
> 
>-#endif //HAVE_KNEWSTUFF
>+#endif //HAVE_TDENEWSTUFF
> #endif //SKNEWSTUFF_H
>diff --git a/superkaramba/src/themesdlg.cpp b/superkaramba/src/themesdlg.cpp
>index 055cbdf..97e7a7c 100644
>--- a/superkaramba/src/themesdlg.cpp
>+++ b/superkaramba/src/themesdlg.cpp
>@@ -29,7 +29,7 @@
>   #include <config.h>
> #endif
> 
>-#ifdef HAVE_KNEWSTUFF
>+#ifdef HAVE_TDENEWSTUFF
>   #include "sknewstuff.h"
> #endif
> 
>@@ -55,7 +55,7 @@ ThemesDlg::ThemesDlg(TQWidget *parent, const char *name)
>  : ThemesLayout(parent, name)
> {
>   populateListbox();
>-#ifdef HAVE_KNEWSTUFF
>+#ifdef HAVE_TDENEWSTUFF
>   mNewStuff = 0;
> #endif
> }
>@@ -64,7 +64,7 @@ ThemesDlg::~ThemesDlg()
> {
>   //kdDebug() << k_funcinfo << endl;
>   saveUserAddedThemes();
>-#ifdef HAVE_KNEWSTUFF
>+#ifdef HAVE_TDENEWSTUFF
>   if(mNewStuff)
>   {
>     delete mNewStuff;
>@@ -126,13 +126,13 @@ void ThemesDlg::populateListbox()
>   tableThemes->clear();
> 
>   item = new ThemeWidget;
>-  item->icon->setPixmap(TDEGlobal::iconLoader()->loadIcon("knewstuff",
>+  item->icon->setPixmap(TDEGlobal::iconLoader()->loadIcon("tdenewstuff",
>                         TDEIcon::NoGroup, TDEIcon::SizeHuge));
>   item->setHeaderText(i18n("Get New Stuff"));
>   item->setDescriptionText(i18n("Download new themes."));
> 
>   item->buttonGo->setText(i18n("New Stuff..."));
>-#ifdef HAVE_KNEWSTUFF
>+#ifdef HAVE_TDENEWSTUFF
>   item->buttonGo->setEnabled(true);
>   connect(item->buttonGo, TQT_SIGNAL(clicked()),
>           this, TQT_SLOT(getNewStuff()));
>@@ -216,14 +216,14 @@ void ThemesDlg::openLocalTheme()
> 
> void ThemesDlg::getNewStuff()
> {
>-#ifdef HAVE_KNEWSTUFF
>+#ifdef HAVE_TDENEWSTUFF
>   TDEConfig* config = TDEGlobal::config();
>-  config->setGroup("KNewStuff");
>+  config->setGroup("TDENewStuff");
>   config->writePathEntry("ProvidersUrl",
>       TQString::fromLatin1("http://download.kde.org/khotnewstuff/karamba-providers.xml"));
>   config->sync();
>-  m_newStuffStatus = config->entryMap("KNewStuffStatus").keys();
>-  //This check is b/c KNewStuff will download, throw an error, 
>+  m_newStuffStatus = config->entryMap("TDENewStuffStatus").keys();
>+  //This check is b/c TDENewStuff will download, throw an error, 
>   //and still have the entry in the config that it was successful
>   configSanityCheck();
> 
>@@ -300,9 +300,9 @@ void ThemesDlg::addThemeToDialog(const KArchiveDirectory *archiveDir,
> 
> void ThemesDlg::writeNewStuffConfig(const TQString &file)
> {
>-#ifdef HAVE_KNEWSTUFF
>+#ifdef HAVE_TDENEWSTUFF
>   TDEConfig* config = TDEGlobal::config();
>-  TQStringList keys = config->entryMap("KNewStuffStatus").keys();
>+  TQStringList keys = config->entryMap("TDENewStuffStatus").keys();
> 
>   for(TQStringList::Iterator it = m_newStuffStatus.begin();
>       it != m_newStuffStatus.end(); ++it)
>@@ -311,7 +311,7 @@ void ThemesDlg::writeNewStuffConfig(const TQString &file)
>   }
>   if(!keys.isEmpty())
>   {
>-    config->setGroup("KNewStuffNames");
>+    config->setGroup("TDENewStuffNames");
>     config->writeEntry(file, keys[0]);
>     config->sync();
>   }
>@@ -320,10 +320,10 @@ void ThemesDlg::writeNewStuffConfig(const TQString &file)
> 
> void ThemesDlg::configSanityCheck()
> {
>-#ifdef HAVE_KNEWSTUFF
>+#ifdef HAVE_TDENEWSTUFF
>   TDEConfig* config = TDEGlobal::config();
>-  TQStringList statusKeys = config->entryMap("KNewStuffStatus").keys();
>-  TQStringList nameKeys = config->entryMap("KNewStuffNames").keys();
>+  TQStringList statusKeys = config->entryMap("TDENewStuffStatus").keys();
>+  TQStringList nameKeys = config->entryMap("TDENewStuffNames").keys();
>   TQStringList removeList;
> 
>   for(TQStringList::Iterator it = statusKeys.begin();
>@@ -331,7 +331,7 @@ void ThemesDlg::configSanityCheck()
>   {
>     TQString keyName(*it);
>     bool removeKey = true;
>-    config->setGroup("KNewStuffNames");
>+    config->setGroup("TDENewStuffNames");
>     for(TQStringList::Iterator it2 = nameKeys.begin();
>         it2 != nameKeys.end(); ++it2)
>     {
>@@ -345,7 +345,7 @@ void ThemesDlg::configSanityCheck()
>     if( removeKey )
>     {
>       kdDebug() << "sanityCheck() deleting entry " << keyName << endl;
>-      config->setGroup("KNewStuffStatus");
>+      config->setGroup("TDENewStuffStatus");
>       config->deleteEntry( keyName );
>     }
>   }
>@@ -428,7 +428,7 @@ bool ThemesDlg::isDownloaded( const TQString& path )
> {
>   kdDebug() << "isDownloaded path: " << path << endl;
>   TDEConfig* config = TDEGlobal::config();
>-  config->setGroup("KNewStuffNames");
>+  config->setGroup("TDENewStuffNames");
>   return !config->readEntry(path).isEmpty();
> }
> 
>@@ -476,18 +476,18 @@ void ThemesDlg::uninstall()
>       karambaApp->dcopIface()->closeTheme(twPtr->themeFile()->name());
>       tableThemes->removeItem( twPtr );
>     }
>-#ifdef HAVE_KNEWSTUFF
>-    // Remove theme from KNewStuffStatus
>+#ifdef HAVE_TDENEWSTUFF
>+    // Remove theme from TDENewStuffStatus
>     TDEConfig* config = TDEGlobal::config();
>-    config->setGroup("KNewStuffNames");
>+    config->setGroup("TDENewStuffNames");
>     TQString name = config->readEntry(tempPath);
>     if(!name.isEmpty())
>     {
>-      kdDebug() << "removing " << tempPath << " under KNewStuffNames from superkarambarc" 
>+      kdDebug() << "removing " << tempPath << " under TDENewStuffNames from superkarambarc" 
>                 << endl;
>       kapp->config()->deleteEntry(tempPath);
>-      config->setGroup("KNewStuffStatus");
>-      kdDebug() << "removing " << name << " under KNewStuffStatus from superkarambarc" 
>+      config->setGroup("TDENewStuffStatus");
>+      kdDebug() << "removing " << name << " under TDENewStuffStatus from superkarambarc" 
>                 << endl;
>       kapp->config()->deleteEntry(name);
>       kapp->config()->sync();
>@@ -506,16 +506,16 @@ void ThemesDlg::uninstall()
>       TDEIO::move(remDir.path(), trash);
>     }
>     tableThemes->removeItem(w);
>-#ifdef HAVE_KNEWSTUFF
>-    // Remove theme from KNewStuffStatus
>+#ifdef HAVE_TDENEWSTUFF
>+    // Remove theme from TDENewStuffStatus
>     TDEConfig* config = TDEGlobal::config();
>-    config->setGroup("KNewStuffNames");
>+    config->setGroup("TDENewStuffNames");
>     TQString name = config->readEntry(theme.path());
>     if(!name.isEmpty())
>     {
>       kdDebug() << "removing " << theme.path() << " from superkarambarc" << endl;
>       kapp->config()->deleteEntry(theme.path());
>-      config->setGroup("KNewStuffStatus");
>+      config->setGroup("TDENewStuffStatus");
>       kdDebug() << "removing " << name << " from superkarambarc" << endl;
>       kapp->config()->deleteEntry(name);
>       kapp->config()->sync();
>diff --git a/superkaramba/src/themesdlg.h b/superkaramba/src/themesdlg.h
>index 22eb4c0..1e73288 100644
>--- a/superkaramba/src/themesdlg.h
>+++ b/superkaramba/src/themesdlg.h
>@@ -31,7 +31,7 @@
> /**
> @author See README for the list of authors
> */
>-#ifdef HAVE_KNEWSTUFF
>+#ifdef HAVE_TDENEWSTUFF
> class SKNewStuff;
> #endif
> class ThemeFile;
>@@ -71,7 +71,7 @@ class ThemesDlg : public ThemesLayout
>     int themeIndex(TQString file);
>     TQStringList themes();
> 
>-#ifdef HAVE_KNEWSTUFF
>+#ifdef HAVE_TDENEWSTUFF
>   private:
>     SKNewStuff *mNewStuff;
>     TQStringList m_newStuffStatus;

Actions: View | Diff

Attachments on bug 2127: 2262 | 2263 | 2264 | 2265 | 2266 | 2268 | 2271 | 2272 | 2273 | 2275 | 2330