diff --git a/kdegraphics-4.1.3-libkipi-0.3.0.patch b/kdegraphics-4.1.3-libkipi-0.3.0.patch new file mode 100644 index 0000000..8bdd51d --- /dev/null +++ b/kdegraphics-4.1.3-libkipi-0.3.0.patch @@ -0,0 +1,756 @@ +Index: kipiplugin.desktop +=================================================================== +--- kipiplugin.desktop (.../tags/KDE/4.1.3/kdegraphics/libs/libkipi) (revision 900398) ++++ kipiplugin.desktop (.../trunk/KDE/kdegraphics/libs/libkipi) (revision 900398) +@@ -3,18 +3,21 @@ + X-KDE-ServiceType=KIPI/Plugin + X-KDE-DerivedName=KIPI Plugin + Name=KIPIPlugin ++Name[ar]=كايْبِيبْلوغِن + Name[de]=KIPI-Modul + Name[el]=Πρόσθετο KIPI + Name[et]=KIPI plugin + Name[fr]=Module externe KIPI + Name[is]=KIPI-íforrit + Name[ja]=Kipi プラグイン ++Name[lt]=KIPIPriedas + Name[nds]=KIPI-Moduul + Name[sv]=KIPI-insticksprogram + Name[tr]=KIPI Eklentisi + Name[x-test]=xxKIPIPluginxx + Name[zh_TW]=KIPI 外掛程式 + Comment=A KIPI Plugin ++Comment[ar]=ملحق كايْبي + Comment[ca]=Un connector KIPI + Comment[cs]=KIPI modul + Comment[da]=Et KIPI-plugin +@@ -25,19 +28,20 @@ + Comment[fr]=Un module externe pour KIPI + Comment[ga]=Breiseán KIPI + Comment[gl]=Unha extension de KIPI +-Comment[hr]=Dodatak za KIPI +-Comment[hu]=Egy KIPI-bővítmény + Comment[is]=KIPI íforrit + Comment[it]=Un plugin di KIPI + Comment[ja]=Kipi プラグイン + Comment[km]=កម្មវិធី​ជំនួយ KIPI + Comment[ko]=KIPI 플러그인 ++Comment[lt]=KIPI priedas + Comment[lv]=KIPI spraudnis + Comment[nds]=En KIPI-Moduul + Comment[nl]=Een KIPI-plugin ++Comment[nn]=Eit programtillegg til KIPI + Comment[pl]=Wtyczka KIPI + Comment[pt]=Um 'Plugin' do KIPI + Comment[pt_BR]=Um Plug-in do KIPI ++Comment[ro]=Un modul KIPI + Comment[ru]=Модуль KIPI + Comment[sl]=Vstavek KIPI + Comment[sv]=Ett KIPI-insticksprogram +Index: libkipi/interface.cpp +=================================================================== +--- libkipi/interface.cpp (.../tags/KDE/4.1.3/kdegraphics/libs/libkipi) (revision 900398) ++++ libkipi/interface.cpp (.../trunk/KDE/kdegraphics/libs/libkipi) (revision 900398) +@@ -4,7 +4,7 @@ + * http://www.kipi-plugins.org + * + * Date : 2004-02-01 +- * Description : main kipi host application interface . ++ * Description : main kipi host application interface. + * + * Copyright (C) 2004-2008 by Gilles Caulier + * Copyright (C) 2004-2005 by Renchi Raju +@@ -15,12 +15,12 @@ + * and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; + * either version 2, 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. +- * ++ * + * ============================================================ */ + + /** @file interface.cpp */ +@@ -28,7 +28,6 @@ + // Qt includes. + + #include +-#include + + // KDE includes. + +@@ -38,88 +37,14 @@ + #include + + // Local includes. +- ++ + #include "version.h" + #include "pluginloader.h" +-#include "interface.h" + #include "imagecollectionselector.h" + #include "uploadwidget.h" ++#include "interface.h" + #include "interface.moc" + +-/*! +- @enum KIPI::Features +- Not all host applications support the full subset of features that KIPI +- allows access to. As an example KimDaBa do not support comments +- for albums. Thus before a plugin expect a decant value for the comment, +- it should check whether KIPI::CollectionsHaveComments are set. It does so +- using KIPI::Interface::hasFeature() +- When adding new items, remember to update "hasFeature( const QString& feature )" +- and the hello world plugin. +- */ +- +-/*! +- \enum KIPI::CollectionsHaveComments +- This feature specify that albums have descriptions associated to them. +- */ +- +-/*! +- \enum KIPI::ImagesHasComments +- This feature specifies that images in the host application has descriptions associated to them. +- */ +- +-/*! +- \enum KIPI::ImagesHasTime +- This feature specifies that images has a date associated with it, which the host application can display and set. +-*/ +- +-/*! +- \enum KIPI::HostSupportsDateRanges +- This feature specify whether the host application supports that the user can specify a date range for images, like 1998-2000. +-*/ +- +-/*! +- \enum KIPI::HostAcceptNewImages +- This feature specifies that the host application do accept new images. +- Use \ref ImageCollection::uploadPath to find the location to place the image, and +- \ref KIPI::Interface::addImage() to tell the host application about the new image. +-*/ +- +-/*! +- \enum KIPI::ImagesHasTitlesWritable +- This features specifies whether the plugin can change the title for images. +-*/ +- +-/*! +- \enum KIPI::CollectionHaveCategory +- This feature specify that collections are category associated to them ('travels', 'friends', 'monuments', etc.). +-*/ +- +-/*! +- \enum KIPI::CollectionsHaveCreationDate +- This feature specify that collections are a creation date associated to them. +-*/ +- +-/*! +- \enum KIPI::HostSupportsProgressBar +- This feature specify whether the host application has a progress bar available for batch operations. +-*/ +- +-/*! +- \enum KIPI::HostSupportsTags +- This feature specify whether the host application supports keywords for images. +-*/ +- +-/*! +- \enum KIPI::HostSupportsRating +- This feature specify whether the host application supports rating values for images. +-*/ +- +-/*! +- \enum KIPI::HostSupportsThumbnails +- This feature specifies that host application can provide image thumbnails. +- */ +- + namespace KIPI + { + +@@ -133,23 +58,15 @@ + { + } + +-/** Returns a string version of libkipi release */ + QString KIPI::Interface::version() + { + return QString(kipi_version); + } + +-/** +- Tells the host app that the following images has changed on disk +-*/ + void Interface::refreshImages( const KUrl::List& ) + { + } + +-/** +- Tells whether the host application under which the plugin currently executes a given feature. +- See KIPI::Features for details on the individual features. +-*/ + bool Interface::hasFeature( KIPI::Features feature ) const + { + return ( features() & feature ) != 0; +@@ -188,11 +105,6 @@ + } + } + +-/*! +- Tell the host application that a new image has been made available to it. +- Returns true if the host application did accept the new image, otherwise err will be filled with +- an error description. +-*/ + bool Interface::addImage( const KUrl&, QString& /*err*/ ) + { + kWarning(51000) << "Interface::addImage should only be invoked if the host application supports the KIPI::Features\n" +@@ -205,63 +117,30 @@ + { + } + +-/** +- Returns list of all images in current album. +- If there are no current album, the returned +- KIPI::ImageCollection::isValid() will return false. +-*/ + KIPI::ImageCollection KIPI::Interface::currentAlbum() + { + // This implementation is just to be able to write documentation above. + return ImageCollection(); + } + +-/** +- Current selection in a thumbnail view for example. +- If there are no current selection, the returned +- KIPI::ImageCollection::isValid() will return false. +-*/ + ImageCollection Interface::currentSelection() + { + // This implementation is just to be able to write documentation above. + return KIPI::ImageCollection(); + } + +-/** +- Returns a list of albums. +-*/ + QList Interface::allAlbums() + { + // This implementation is just to be able to write documentation above. + return QList(); + } + +-/** +- Return a bitwise or of the KIPI::Features that thus application support. +-*/ + int Interface::features() const + { + // This implementation is just to be able to write documentation above. + return 0; + } + +-/** +- Return a list of images file extension will be used in the plugins for +- to sort the files list before a treatment. The default implementation return, +- the supported images formats by KDE. +-*/ +-QString Interface::fileExtensions() +-{ +- QStringList KDEImagetypes = KImageIO::mimeTypes( KImageIO::Reading ); +- QString imagesFileFilter = KDEImagetypes.join(" "); +- return ( imagesFileFilter.toLower() + " " + imagesFileFilter.toUpper() ); +-} +- +-/** +- Ask to Kipi host application to render a thumbnail for an image. If this method is not +- re-implemented in host, standard KIO::filePreview is used to generated a thumbnail. +- Use gotThumbnail() signal to take thumb. +-*/ + void Interface::thumbnail( const KUrl& url, int size ) + { + KUrl::List list; +@@ -269,11 +148,6 @@ + thumbnails(list, size); + } + +-/** +- Ask to Kipi host application to render thumbnails for a list of images. If this method is not +- re-implemented in host, standard KIO::filePreview is used to generated a thumbnail. +- Use gotThumbnail() signal to take thumbs. +-*/ + void Interface::thumbnails( const KUrl::List& list, int size ) + { + KIO::PreviewJob *job = KIO::filePreview(list, size); +@@ -295,4 +169,30 @@ + emit gotThumbnail(item.url(), QPixmap()); + } + ++QString Interface::fileExtensions() ++{ ++ return (KDEfileExtensions()); ++} ++ ++QVariant Interface::hostSetting(const QString& settingName) ++{ ++ if (settingName == QString("WriteMetadataToRAW")) ++ { ++ return false; ++ } ++ else if (settingName == QString("FileExtensions")) ++ { ++ return KDEfileExtensions(); ++ } ++ ++ return QVariant(); ++} ++ ++QString Interface::KDEfileExtensions() const ++{ ++ QStringList KDEImagetypes = KImageIO::mimeTypes( KImageIO::Reading ); ++ QString imagesFileFilter = KDEImagetypes.join(" "); ++ return ( imagesFileFilter.toLower() + " " + imagesFileFilter.toUpper() ); ++} ++ + } // namespace KIPI +Index: libkipi/interface.h +=================================================================== +--- libkipi/interface.h (.../tags/KDE/4.1.3/kdegraphics/libs/libkipi) (revision 900398) ++++ libkipi/interface.h (.../trunk/KDE/kdegraphics/libs/libkipi) (revision 900398) +@@ -15,12 +15,12 @@ + * and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; + * either version 2, 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. +- * ++ * + * ============================================================ */ + + /** @file interface.h */ +@@ -31,6 +31,7 @@ + // Qt includes. + + #include ++#include + #include + + // KDE includes. +@@ -55,7 +56,81 @@ + class ImageCollectionSelector; + class UploadWidget; + +-enum Features ++/*! ++ @enum KIPI::Features ++ Not all host applications support the full subset of features that KIPI ++ allows access to. As an example digiKam support comments ++ for albums. Thus before a plugin expect a decant value for the comment, ++ it should check whether KIPI::CollectionsHaveComments are set. It does so ++ using KIPI::Interface::hasFeature() ++ When adding new items, remember to update "hasFeature( const QString& feature )" ++ and the hello world plugin. ++ */ ++ ++/*! ++ \enum KIPI::CollectionsHaveComments ++ This feature specify that albums have descriptions associated to them. ++ */ ++ ++/*! ++ \enum KIPI::ImagesHasComments ++ This feature specifies that images in the host application has descriptions associated to them. ++ */ ++ ++/*! ++ \enum KIPI::ImagesHasTime ++ This feature specifies that images has a date associated with it, which the host application can display and set. ++*/ ++ ++/*! ++ \enum KIPI::HostSupportsDateRanges ++ This feature specify whether the host application supports that the user can specify a date range for images, like 1998-2000. ++*/ ++ ++/*! ++ \enum KIPI::HostAcceptNewImages ++ This feature specifies that the host application do accept new images. ++ Use \ref ImageCollection::uploadPath to find the location to place the image, and ++ \ref KIPI::Interface::addImage() to tell the host application about the new image. ++*/ ++ ++/*! ++ \enum KIPI::ImagesHasTitlesWritable ++ This features specifies whether the plugin can change the title for images. ++*/ ++ ++/*! ++ \enum KIPI::CollectionHaveCategory ++ This feature specify that collections are category associated to them ('travels', 'friends', 'monuments', etc.). ++*/ ++ ++/*! ++ \enum KIPI::CollectionsHaveCreationDate ++ This feature specify that collections are a creation date associated to them. ++*/ ++ ++/*! ++ \enum KIPI::HostSupportsProgressBar ++ This feature specify whether the host application has a progress bar available for batch operations. ++*/ ++ ++/*! ++ \enum KIPI::HostSupportsTags ++ This feature specify whether the host application supports keywords for images. ++*/ ++ ++/*! ++ \enum KIPI::HostSupportsRating ++ This feature specify whether the host application supports rating values for images. ++*/ ++ ++/*! ++ \enum KIPI::HostSupportsThumbnails ++ This feature specifies that host application can provide image thumbnails. ++ */ ++ ++enum Features + { + CollectionsHaveComments = 1 << 0, + ImagesHasComments = 1 << 1, +@@ -82,36 +157,95 @@ + Interface(QObject *parent, const char *name=0); + virtual ~Interface(); + ++ /** ++ Returns list of all images in current album. ++ If there are no current album, the returned ++ KIPI::ImageCollection::isValid() will return false. ++ */ + virtual ImageCollection currentAlbum() = 0; ++ ++ /** ++ Current selection in a thumbnail view for example. ++ If there are no current selection, the returned ++ KIPI::ImageCollection::isValid() will return false. ++ */ + virtual ImageCollection currentSelection() = 0; ++ ++ /** ++ Returns a list of albums. ++ */ + virtual QList allAlbums() = 0; + +- virtual ImageInfo info( const KUrl& ) = 0; +- virtual bool addImage( const KUrl&, QString& err ); +- virtual void delImage( const KUrl& ); ++ virtual ImageInfo info(const KUrl&) = 0; + +- virtual void refreshImages( const KUrl::List& ); ++ /** ++ Tell the host application that a new image has been made available to it. ++ Returns true if the host application did accept the new image, otherwise err will be filled with ++ an error description. ++ */ ++ virtual bool addImage(const KUrl&, QString& err); ++ virtual void delImage(const KUrl&); + +- virtual QString fileExtensions(); ++ /** ++ Tells the host app that the following images has changed on disk ++ */ ++ virtual void refreshImages(const KUrl::List&); + +- virtual void thumbnail( const KUrl& url, int size ); +- virtual void thumbnails( const KUrl::List& list, int size ); ++ /** ++ Return a list of images file extensions which will be used in the plugins ++ to sort the files list before treatements. The default implementation return, ++ the supported images formats by KDE. ++ Use hostSetting("FileExtensions") instead. ++ */ ++ KDE_DEPRECATED virtual QString fileExtensions(); + ++ /** ++ Ask to Kipi host application to render a thumbnail for an image. If this method is not ++ re-implemented in host, standard KIO::filePreview is used to generated a thumbnail. ++ Use gotThumbnail() signal to take thumb. ++ */ ++ virtual void thumbnail(const KUrl& url, int size); ++ /** ++ Ask to Kipi host application to render thumbnails for a list of images. If this method is not ++ re-implemented in host, standard KIO::filePreview is used to generated a thumbnail. ++ Use gotThumbnail() signal to take thumbs. ++ */ ++ virtual void thumbnails(const KUrl::List& list, int size); ++ + virtual ImageCollectionSelector* imageCollectionSelector(QWidget *parent)=0; + virtual UploadWidget* uploadWidget(QWidget *parent)=0; + +- bool hasFeature( KIPI::Features feature ) const; ++ /** ++ Ask to Kipi host application to return a setting to share with plugins, for example to write ++ metadata on RAW files. ++ Current setting names are: ++ "WriteMetadataToRAW" (bool) is true if RAW files metadata can be changed. ++ "FileExtensions" (QString) same than fileExtensions(). ++ */ ++ virtual QVariant hostSetting(const QString& settingName); + ++ /** ++ Tells whether the host application under which the plugin currently executes a given feature. ++ See KIPI::Features for details on the individual features. ++ */ ++ bool hasFeature(KIPI::Features feature) const; ++ ++ /** ++ Returns a string version of libkipi release ++ */ + static QString version(); + + Q_SIGNALS: + +- void selectionChanged( bool hasSelection ); +- void currentAlbumChanged( bool anyAlbum ); +- void gotThumbnail( const KUrl&, const QPixmap& ); ++ void selectionChanged(bool hasSelection); ++ void currentAlbumChanged(bool anyAlbum); ++ void gotThumbnail(const KUrl&, const QPixmap&); + + protected: + ++ /** ++ Return a bitwise or of the KIPI::Features that thus application support. ++ */ + virtual int features() const = 0; + + private Q_SLOTS: +@@ -122,7 +256,13 @@ + private: + + friend class PluginLoader; +- bool hasFeature( const QString& feature ) const; ++ ++ bool hasFeature(const QString& feature) const; ++ ++ /** ++ Return a list of images file extensions supported by KDE ++ */ ++ QString KDEfileExtensions() const; + }; + + } // namespace KIPI +Index: libkipi/imagecollectionshared.cpp +=================================================================== +--- libkipi/imagecollectionshared.cpp (.../tags/KDE/4.1.3/kdegraphics/libs/libkipi) (revision 900398) ++++ libkipi/imagecollectionshared.cpp (.../trunk/KDE/kdegraphics/libs/libkipi) (revision 900398) +@@ -15,12 +15,12 @@ + * and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; + * either version 2, 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. +- * ++ * + * ============================================================ */ + + // KDE Includes. +@@ -49,7 +49,7 @@ + _count--; + if ( _count == 0 ) + { +- // qDebug("Deleting!"); ++ // kDebug(51000) << "Deleting!" << endl; + delete this; + } + } +Index: libkipi/pluginloader.cpp +=================================================================== +--- libkipi/pluginloader.cpp (.../tags/KDE/4.1.3/kdegraphics/libs/libkipi) (revision 900398) ++++ libkipi/pluginloader.cpp (.../trunk/KDE/kdegraphics/libs/libkipi) (revision 900398) +@@ -228,7 +228,7 @@ + } + + bool appHasAllReqFeatures=true; +- for( QStringList::Iterator featureIt = reqFeatures.begin(); featureIt != reqFeatures.end(); ++featureIt ) ++ for( QStringList::const_iterator featureIt = reqFeatures.constBegin(); featureIt != reqFeatures.constEnd(); ++featureIt ) + { + if ( !d->m_interface->hasFeature( *featureIt ) ) + { +@@ -333,8 +333,8 @@ + lay->setMargin(KDialog::marginHint()); + lay->setSpacing(KDialog::spacingHint()); + +- PluginLoader::PluginList list = PluginLoader::instance()->d->m_pluginList; +- for( PluginLoader::PluginList::Iterator it = list.begin(); it != list.end(); ++it ) ++ const PluginLoader::PluginList list = PluginLoader::instance()->d->m_pluginList; ++ for( PluginLoader::PluginList::ConstIterator it = list.constBegin(); it != list.constEnd(); ++it ) + { + PluginCheckBox* cb = new PluginCheckBox( *it, top ); + lay->addWidget( cb ); +Index: ChangeLog +=================================================================== +--- ChangeLog (.../tags/KDE/4.1.3/kdegraphics/libs/libkipi) (revision 900398) ++++ ChangeLog (.../trunk/KDE/kdegraphics/libs/libkipi) (revision 900398) +@@ -242,7 +242,7 @@ + trunk/extragear/libs/libkipi/libkipi/plugin.h, + trunk/extragear/libs/libkipi/libkipi/pluginloader.cpp: Made some + minor changes to generate the Dox for some classes. It is +- documented better then I thought. ++ documented better than I thought. + + 2005-06-22 13:34 lunakl + +Index: NEWS +=================================================================== +--- NEWS (.../tags/KDE/4.1.3/kdegraphics/libs/libkipi) (revision 900398) ++++ NEWS (.../trunk/KDE/kdegraphics/libs/libkipi) (revision 900398) +@@ -1,15 +1,21 @@ +-0.2.0 ++0.3.0 - Released with KDE 4.2.0 + ------------------------------------------------------------------------ + +- o Port to CMake/KDE4/QT4 ++- Added new method top get settings from kipi host. + ++0.2.0 - Released with KDE 4.1.0 ++------------------------------------------------------------------------ ++ ++- Port to CMake/KDE4/QT4 ++- Moved from extragear/libs to kdegraphics/libs ++ + API changes: + +- o new virtual method ImageInfoShared::delAttributes() +- o new virtual method Interface::imagecollectionselector() +- o BatchProcessDialog moved to KIPIPlugins common library. +- o ImageDialog moved to KIPIPlugins common library. +- o Removed all i18n. libkipi is now a low level interface. ++- new virtual method ImageInfoShared::delAttributes() ++- new virtual method Interface::imagecollectionselector() ++- BatchProcessDialog moved to KIPIPlugins common library. ++- ImageDialog moved to KIPIPlugins common library. ++- Removed all i18n. libkipi is now a low level interface. + + Bugs fixed: + +@@ -17,47 +23,44 @@ + 002 ==> 147865 : Image>email image>add image dialog does not show most thumbnails - but does show some. + 003 ==> 131429 : Selection of target album is "batch resize" has strange behavior. + 004 ==> 088118 : Target image options should select new folder when created. +-005 ==> + +-0.1.6-svn ++0.1.6 + ------------------------------------------------------------------------ +-New features: + +-Bugs fixed: +- + API changes: ++- Added a version method to get runtime library version. + + ------------------------------------------------------------------------- + 0.1.5 +- o changed icons and added new kipi logo +- o changed uploadwidget ++- changed icons and added new kipi logo ++- changed uploadwidget + + API changes: +- o added KIPI::Features enum value: HostSupportsTags ++- added KIPI::Features enum value: HostSupportsTags + + ------------------------------------------------------------------------- + 0.1.4 + + Bugs fixed: + +- o fix FTBFS (fails to build from source) when libkipi is +- build the first time on a system. ++- fix FTBFS (fails to build from source) when libkipi is ++ build the first time on a system. + + ------------------------------------------------------------------------- + 0.1.3 + + New features: + +- o Make loadPlugin() public, so that it's possible to load plugins +- selectively, and raise version to 1.0.1, so that this API change +- can be detected ++- Make loadPlugin() public, so that it's possible to load plugins ++ selectively, and raise version to 1.0.1, so that this API change ++ can be detected + + Bugs fixed: + +- o various build fixes ++- various build fixes + +- o batchprogressdialog: Removed help button. It does not point to +- any usefull documentation. BUG: 99418 ++- batchprogressdialog: Removed help button. It does not point to ++ any usefull documentation. BUG: 99418 + + ------------------------------------------------------------------------- + For details and info about previous versions, see ChangeLog. +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt (.../tags/KDE/4.1.3/kdegraphics/libs/libkipi) (revision 900398) ++++ CMakeLists.txt (.../trunk/KDE/kdegraphics/libs/libkipi) (revision 900398) +@@ -13,11 +13,12 @@ + # 0.1.5 => 1.1.1 + # 0.1.6 => 2.0.0 + # ... here we can have new releases from KDE3 branch +-# 0.2.0 => 5.0.0 ++# 0.2.0 => 5.0.0 (released with KDE 4.1.0) ++# 0.3.0 => 6.0.0 (released with KDE 4.2.0) + + # Library API version + SET(KIPI_LIB_MAJOR_VERSION "0") +-SET(KIPI_LIB_MINOR_VERSION "2") ++SET(KIPI_LIB_MINOR_VERSION "3") + SET(KIPI_LIB_PATCH_VERSION "0") + + # Suffix to add at end of version string. Usual values are: +@@ -27,11 +28,11 @@ + # "-beta3" : beta3 release. + # "-rc" : release candidate. + # "" : final relase. Can be used in production. +-SET(KIPI_LIB_SUFFIX_VERSION "-svn") ++SET(KIPI_LIB_SUFFIX_VERSION "") + + # Library ABI version used by linker. + # For details : http://www.gnu.org/software/libtool/manual.html#Updating-version-info +-SET(KIPI_LIB_SO_CUR_VERSION "5") ++SET(KIPI_LIB_SO_CUR_VERSION "6") + SET(KIPI_LIB_SO_REV_VERSION "0") + SET(KIPI_LIB_SO_AGE_VERSION "0") + +Index: README +=================================================================== +--- README (.../tags/KDE/4.1.3/kdegraphics/libs/libkipi) (revision 900398) ++++ README (.../trunk/KDE/kdegraphics/libs/libkipi) (revision 900398) +@@ -52,7 +52,7 @@ + + IMPORTANT : the bugreports and wishlist are hosted by the KDE bugs report + system who can be contacted by the standard Kde help menu of plugins dialog. +-A mail will be automaticly sent to the Kipi mailing list. ++A mail will be automatically sent to the Kipi mailing list. + There is no need to contact directly the Kipi mailing list for a bug report + or a devel wish. + diff --git a/kdegraphics.spec b/kdegraphics.spec index 1ba5e57..dc585a2 100644 --- a/kdegraphics.spec +++ b/kdegraphics.spec @@ -8,7 +8,7 @@ Summary: K Desktop Environment - Graphics Applications Epoch: 7 Version: 4.1.3 -Release: 4%{?dist} +Release: 5%{?dist} Name: kdegraphics #Obsoletes: kdegraphics4 < %{version}-%{release} @@ -30,6 +30,9 @@ Patch200: kdegraphics-4.1.3-libkexiv2-0.5.0.patch # LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/4.1.3/kdegraphics/libs/libkdcraw \ # svn://anonsvn.kde.org/home/kde/trunk/KDE/kdegraphics/libs/libkdcraw >kdegraphics-4.1.3-libkdcraw-0.4.0.patch Patch201: kdegraphics-4.1.3-libkdcraw-0.4.0.patch +# LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/4.1.3/kdegraphics/libs/libkipi \ +# svn://anonsvn.kde.org/home/kde/trunk/KDE/kdegraphics/libs/libkipi >kdegraphics-4.1.3-libkipi-0.3.0.patch +Patch202: kdegraphics-4.1.3-libkipi-0.3.0.patch BuildRequires: kde-filesystem >= 4 BuildRequires: kdelibs4-devel >= %{version} @@ -98,7 +101,7 @@ Requires: kdelibs4-devel Requires: pkgconfig %if ! 0%{?omit_kde3_conflicts} Obsoletes: libkdcraw-devel < 0.4.0, libkexiv2-devel < 0.4.0, libkipi-devel < 0.2.0 -Provides: libkdcraw-devel = 0.4.0-2, libkexiv2-devel = 0.5.0-1, libkipi-devel = 0.2.0-1 +Provides: libkdcraw-devel = 0.4.0-2, libkexiv2-devel = 0.5.0-1, libkipi-devel = 0.3.0-1 %endif %description devel %{summary}. @@ -108,14 +111,18 @@ Provides: libkdcraw-devel = 0.4.0-2, libkexiv2-devel = 0.5.0-1, libkipi-devel = %setup -q -n kdegraphics-%{version} # upstream patches -# libkexiv2 4.2 backport +# libkexiv2 backport pushd libs/libkexiv2 %patch200 -p0 popd -# libkdcraw 4.2 backport +# libkdcraw backport pushd libs/libkdcraw %patch201 -p0 popd +# libkipi backport +pushd libs/libkipi +%patch202 -p0 +popd %build @@ -221,6 +228,9 @@ rm -rf %{buildroot} %changelog +* Mon Dec 22 2008 Rex Dieter 4.1.3-5 +- libkipi backport too (makes kde42 transition easier later) + * Mon Dec 01 2008 Rex Dieter 4.1.3-4 - cleanup Obsoletes: kdegraphics-extras