[arch-commits] Commit in kdegraphics/trunk (PKGBUILD fix-libkipi-crash.patch)

[Andrea Scarpino]

    Date: Monday, November 29, 2010 @ 18:19:16
  Author: andrea
Revision: 101627

KDE 4.5.4 (re-tagged)

Modified:
  kdegraphics/trunk/PKGBUILD
Deleted:
  kdegraphics/trunk/fix-libkipi-crash.patch

-------------------------+
 PKGBUILD                |   10 ----
 fix-libkipi-crash.patch |  101 ----------------------------------------------
 2 files changed, 2 insertions(+), 109 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-29 23:19:12 UTC (rev 101626)
+++ PKGBUILD	2010-11-29 23:19:16 UTC (rev 101627)
@@ -21,16 +21,10 @@
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-runtime' 'poppler-qt'
 	'libspectre' 'sane' 'chmlib' 'djvulibre' 'lcms' 'qimageblitz' 'ebook-tools'
 	'libxxf86vm' 'docbook-xsl')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'fix-libkipi-crash.patch')
-sha1sums=('22ef0708995eff82951991365aba030af6cb08a0'
-          'e7d5661fa488b295368d2258462ab56eef85d8c0')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+sha1sums=('1effe5c72577c9f63aa4959777c1dd6df5c54d9c')
 
 build() {
-    # Already fixed upstream
-    cd ${srcdir}/${pkgbase}-${pkgver}
-    patch -Np4 -i ${srcdir}/fix-libkipi-crash.patch
-	
     cd ${srcdir}
 	mkdir build
 	cd build

Deleted: fix-libkipi-crash.patch
===================================================================
--- fix-libkipi-crash.patch	2010-11-29 23:19:12 UTC (rev 101626)
+++ fix-libkipi-crash.patch	2010-11-29 23:19:16 UTC (rev 101627)
@@ -1,101 +0,0 @@
---- branches/KDE/4.5/kdegraphics/libs/libkipi/libkipi/pluginloader.cpp	2010/06/27 18:59:06	1143427
-+++ branches/KDE/4.5/kdegraphics/libs/libkipi/libkipi/pluginloader.cpp	2010/11/09 08:30:14	1194513
-@@ -168,9 +168,16 @@
- QIcon PluginLoader::Info::icon() const
- {
-     if(d->m_service->icon().isEmpty() && d->m_plugin)
--        return QIcon(d->m_plugin->actions()[0]->icon());
-+    {
-+        if (d->m_plugin->actions()[0])
-+            return d->m_plugin->actions()[0]->icon();
-+        else
-+            return QIcon();
-+    }
-     else
-+    {
-         return KIcon(d->m_service->icon());
-+    }
- }
- 
- Plugin* PluginLoader::Info::plugin() const
-@@ -178,7 +185,7 @@
-     if ( !d->m_plugin && shouldLoad() )
-     {
-         QString error;
--        Plugin *plugin = d->m_service->createInstance<Plugin>(PluginLoader::instance()->interface(), QVariantList(), &error);
-+        Plugin* plugin = d->m_service->createInstance<Plugin>(PluginLoader::instance()->interface(), QVariantList(), &error);
-         if (plugin)
-         {
-             kDebug( 51001 ) << "KIPI::PluginLoader: Loaded plugin " << plugin->objectName() << endl;
-@@ -191,25 +198,25 @@
-                               << " with error: "
-                               << error;
-         }
--        d->m_plugin=plugin;
--        
-+        d->m_plugin = plugin;
-+
-         if ( d->m_plugin ) // Do not emit if we had trouble loading the plugin.
-             emit PluginLoader::instance()->plug( const_cast<Info*>(this) );
-     }
--    
-+
-     return d->m_plugin;
- }
- 
- void PluginLoader::Info::reload()
- {
-     delete d->m_plugin;
--    d->m_plugin=0;
-+    d->m_plugin = 0;
- }
- 
- void PluginLoader::Info::setPlugin(Plugin* plugin)
- {
-     delete d->m_plugin;
--    d->m_plugin=plugin;
-+    d->m_plugin = plugin;
- }
- 
- bool PluginLoader::Info::shouldLoad() const
-@@ -219,7 +226,7 @@
- 
- void PluginLoader::Info::setShouldLoad(bool value)
- {
--    d->m_shouldLoad=value;
-+    d->m_shouldLoad = value;
- }
- 
- //---------------------------------------------------------------------
-@@ -254,6 +261,7 @@
- void PluginLoader::construct( const QStringList& ignores, Interface* interface, const QString& constraint )
- {
-     Q_ASSERT( s_instance == 0 );
-+
-     s_instance                  = this;
-     d->m_interface              = interface;
-     const KService::List offers = KServiceTypeTrader::self()->query("KIPI/Plugin", constraint);
-@@ -338,7 +346,6 @@
-     return d->m_interface;
- }
- 
--
- //---------------------------------------------------------------------
- 
- ConfigWidget* PluginLoader::configWidget(QWidget* parent)
-@@ -358,6 +365,7 @@
-         setFlags(Qt::ItemIsUserCheckable|Qt::ItemIsEnabled);
-         setCheckState(info->shouldLoad() ? Qt::Checked : Qt::Unchecked);
-     }
-+
-     PluginLoader::Info* info;
- };
- 
-@@ -412,6 +420,7 @@
-                 emit PluginLoader::instance()->unplug( (*it)->info); 
-         }
-     }
-+
-     emit PluginLoader::instance()->replug();
- }
-