Hello community, here is the log from the commit of package libkipi for openSUSE:Factory checked in at 2013-07-08 07:27:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkipi (Old) and /work/SRC/openSUSE:Factory/.libkipi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkipi" Changes: -------- --- /work/SRC/openSUSE:Factory/libkipi/libkipi.changes 2013-06-11 09:33:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libkipi.new/libkipi.changes 2013-07-08 07:27:12.000000000 +0200 @@ -1,0 +2,19 @@ +Thu Jul 4 08:42:47 UTC 2013 - co...@suse.com + +- fix source url + +------------------------------------------------------------------- +Thu Jun 27 18:12:52 UTC 2013 - tittiatc...@gmail.com + +- Update to 4.10.90 + * KDE 4.11 Beta 1 release + * See http://www.kde.org/announcements/announce-4.11-beta2.php + +------------------------------------------------------------------- +Thu Jun 13 19:16:26 UTC 2013 - tittiatc...@gmail.com + +- Update to 4.10.80 + * KDE 4.11 Beta 1 release + * See http://www.kde.org/announcements/announce-4.11-beta1.php + +------------------------------------------------------------------- Old: ---- libkipi-4.10.4.tar.xz New: ---- libkipi-4.10.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkipi.spec ++++++ --- /var/tmp/diff_new_pack.c99JJW/_old 2013-07-08 07:27:12.000000000 +0200 +++ /var/tmp/diff_new_pack.c99JJW/_new 2013-07-08 07:27:12.000000000 +0200 @@ -16,7 +16,7 @@ # -%define _so 10 +%define _so 11 Name: libkipi BuildRequires: libkde4-devel @@ -26,9 +26,9 @@ License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT Group: Development/Libraries/KDE Url: http://www.kde.org -Version: 4.10.4 +Version: 4.10.90 Release: 0 -Source0: http://download.kde.org/stable/%{version}/src/%{name}-%{version}.tar.xz +Source0: http://download.kde.org/unstable/%{version}/src/%{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires @@ -66,9 +66,9 @@ %_kde4_datadir/icons/hicolor/*/apps/kipi.png %_kde4_servicetypes/kipiplugin.desktop -%post -n libkipi10 -p /sbin/ldconfig +%post -n libkipi%{_so} -p /sbin/ldconfig -%postun -n libkipi10 -p /sbin/ldconfig +%postun -n libkipi%{_so} -p /sbin/ldconfig %package devel Summary: KDE Image Plugin Interface ++++++ libkipi-4.10.4.tar.xz -> libkipi-4.10.90.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkipi-4.10.4/CMakeLists.txt new/libkipi-4.10.90/CMakeLists.txt --- old/libkipi-4.10.4/CMakeLists.txt 2013-05-28 21:27:59.000000000 +0200 +++ new/libkipi-4.10.90/CMakeLists.txt 2013-06-10 20:53:26.000000000 +0200 @@ -70,10 +70,11 @@ # angle(), and setAngle()). # 1.6.0 => 9.1.0 (released with KDE 4.8.1 - Minor API fix) # 2.0.0 => 10.0.0 (released with KDE 4.10.0 - Including GoSC2012) +# 2.1.0 => 11.0.0 (released with KDE 4.11.0 - Add edit hints) # Library API version SET(KIPI_LIB_MAJOR_VERSION "2") -SET(KIPI_LIB_MINOR_VERSION "0") +SET(KIPI_LIB_MINOR_VERSION "1") SET(KIPI_LIB_PATCH_VERSION "0") # Suffix to add at end of version string. Usual values are: @@ -87,7 +88,7 @@ # Library ABI version used by linker. # For details : http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info -SET(KIPI_LIB_SO_CUR_VERSION "10") +SET(KIPI_LIB_SO_CUR_VERSION "11") SET(KIPI_LIB_SO_REV_VERSION "0") SET(KIPI_LIB_SO_AGE_VERSION "0") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkipi-4.10.4/libkipi/configwidget.cpp new/libkipi-4.10.90/libkipi/configwidget.cpp --- old/libkipi-4.10.4/libkipi/configwidget.cpp 2013-05-28 21:27:59.000000000 +0200 +++ new/libkipi-4.10.90/libkipi/configwidget.cpp 2013-06-10 20:53:26.000000000 +0200 @@ -178,7 +178,7 @@ connect(d->clearBtn, SIGNAL(clicked()), this, SLOT(slotClearList())); - connect(d->pluginsList, SIGNAL(itemClicked(QTreeWidgetItem*, int)), + connect(d->pluginsList, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this, SLOT(slotItemClicked())); connect(d->pluginsList, SIGNAL(signalSearchResult(bool)), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkipi-4.10.4/libkipi/imageinfo.cpp new/libkipi-4.10.90/libkipi/imageinfo.cpp --- old/libkipi-4.10.4/libkipi/imageinfo.cpp 2013-05-28 21:27:59.000000000 +0200 +++ new/libkipi-4.10.90/libkipi/imageinfo.cpp 2013-06-10 20:53:26.000000000 +0200 @@ -7,7 +7,7 @@ * @date 2004-07-22 * @brief image info * - * @author Copyright (C) 2004-2012 by Gilles Caulier + * @author Copyright (C) 2004-2013 by Gilles Caulier * <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a> * @author Copyright (C) 2004-2005 by Renchi Raju * <a href="mailto:renchi dot raju at gmail dot com">renchi dot raju at gmail dot com</a> @@ -50,6 +50,7 @@ ImageInfo::ImageInfo() { + d = 0; } ImageInfo::~ImageInfo() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkipi-4.10.4/libkipi/interface.cpp new/libkipi-4.10.90/libkipi/interface.cpp --- old/libkipi-4.10.4/libkipi/interface.cpp 2013-05-28 21:27:59.000000000 +0200 +++ new/libkipi-4.10.90/libkipi/interface.cpp 2013-06-10 20:53:26.000000000 +0200 @@ -313,6 +313,15 @@ return 0; } +void Interface::aboutToEdit(const KUrl&, EditHints) +{ +} + +void Interface::editingFinished(const KUrl&, EditHints) +{ +} + + // ----------------------------------------------------------------------------------------------------------- FileReadLocker::FileReadLocker(Interface* const iface, const KUrl& url) @@ -393,4 +402,29 @@ } } +// ----------------------------------------------------------------------------------------------------------- + +EditHintScope::EditHintScope(Interface* const iface, const KUrl& url, EditHints hints) + : iface(iface), url(url), hints(hints) +{ + if (iface) + { + iface->aboutToEdit(url, hints); + } +} + +EditHintScope::~EditHintScope() +{ + if (iface) + { + iface->editingFinished(url, hints); + } +} + +void EditHintScope::changeAborted() +{ + hints |= HintEditAborted; +} + + } // namespace KIPI diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkipi-4.10.4/libkipi/interface.h new/libkipi-4.10.90/libkipi/interface.h --- old/libkipi-4.10.4/libkipi/interface.h 2013-05-28 21:27:59.000000000 +0200 +++ new/libkipi-4.10.90/libkipi/interface.h 2013-06-10 20:53:26.000000000 +0200 @@ -36,6 +36,7 @@ // Qt includes +#include <QtCore/QFlags> #include <QtCore/QObject> #include <QtCore/QVariant> #include <QtCore/QList> @@ -96,6 +97,26 @@ // NOTE: When a new item is add to Features, please don't forget to patch Interface::hasFeature(). +enum EditHint +{ + UndefinedEditHint = 0, + /** The image data (pixels) have been edited */ + HintPixelContentChanged = 1 << 0, + /** Metadata have been edited */ + HintMetadataChanged = 1 << 1, + /** All changes done (typically, to the metadata) are also communicated via image attributes. + * In other words, if the host updates its internal storage from attribute changes + * and ignores changes on disk, it already has all information. */ + HintChangeReflectedByAttributes + = 1 << 2, + /** The operation indicated as "about to be done" has been aborted / did not result in a change. */ + HintEditAborted = 1 << 3, + + /** Short name, implies that only metadata changed, and all metadata changes are communicated via attributes. */ + HintMetadataOnlyChange = HintMetadataChanged | HintChangeReflectedByAttributes +}; +Q_DECLARE_FLAGS(EditHints, EditHint) + // --------------------------------------------------------------------------------------------------------------- class LIBKIPI_EXPORT FileReadWriteLock @@ -327,6 +348,18 @@ virtual FileReadWriteLock* createReadWriteLock(const KUrl& url) const; /** + * Supported if HostSupportsEditHints + * + * Before an edit operation starts when it has finished, specify a hint for it. + * Change hints are optional and may allow optimizations. + * + * When aboutToEdit has been called, editingFinished must be called afterwards. + * It is strongly recommended to use the EditHintScope instead of these methods. + */ + virtual void aboutToEdit(const KUrl& url, EditHints hints); + virtual void editingFinished(const KUrl& url, EditHints hints); + + /** * Returns a string version of libkipi release ID. */ static QString version(); @@ -431,6 +464,26 @@ FileReadWriteLock* const d; }; +// --------------------------------------------------------------------------------------------------------------- + +class LIBKIPI_EXPORT EditHintScope +{ +public: + + EditHintScope(Interface* const iface, const KUrl& url, EditHints hints); + ~EditHintScope(); + + void changeAborted(); + +private: + + Interface* const iface; + KUrl const url; + EditHints hints; +}; + } // namespace KIPI +Q_DECLARE_OPERATORS_FOR_FLAGS(KIPI::EditHints) + #endif /* KIPI_INTERFACE_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkipi-4.10.4/libkipi/plugin.cpp new/libkipi-4.10.90/libkipi/plugin.cpp --- old/libkipi-4.10.4/libkipi/plugin.cpp 2013-05-28 21:27:59.000000000 +0200 +++ new/libkipi-4.10.90/libkipi/plugin.cpp 2013-06-10 20:53:26.000000000 +0200 @@ -306,7 +306,8 @@ void Plugin::setUiBaseName(const char* name) { - d->uiBaseName = QString(name); + if (name && *name) + d->uiBaseName = QString(name); } QString Plugin::uiBaseName() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkipi-4.10.4/libkipi/pluginloader.cpp new/libkipi-4.10.90/libkipi/pluginloader.cpp --- old/libkipi-4.10.4/libkipi/pluginloader.cpp 2013-05-28 21:27:59.000000000 +0200 +++ new/libkipi-4.10.90/libkipi/pluginloader.cpp 2013-06-10 20:53:26.000000000 +0200 @@ -15,7 +15,7 @@ * <a href="mailto:andi dot clemens at googlemail dot com">andi dot clemens at googlemail dot com</a> * @author Copyright (C) 2009 by Aleix Pol Gonzalez * <a href="mailto:aleixpol at kde dot org">aleixpol at kde dot org</a> - * @author Copyright (C) 2012 by Victor Dodon + * @author Copyright (C) 2012-2013 by Victor Dodon * <a href="mailto:dodonvictor at gmail dot com">dodonvictor at gmail dot com</a> * * This program is free software; you can redistribute it @@ -304,19 +304,20 @@ { KService::Ptr service = *iter; QString name = service->name(); + QString uname = service->untranslatedGenericName(); QString library = service->library(); QStringList reqFeatures = service->property(QString::fromLatin1("X-KIPI-ReqFeatures")).toStringList(); int binVersion = service->property(QString::fromLatin1("X-KIPI-BinaryVersion")).toInt(); - if (library.isEmpty() || name.isEmpty()) + if (library.isEmpty() || uname.isEmpty()) { kWarning(51001) << "Plugin had an empty name or library file - this should not happen."; continue; } - if (d->ignoredPlugins.contains(name)) + if (d->ignoredPlugins.contains(uname)) { - kDebug(51001) << "Plugin " << name << " is in the ignore list from host application"; + kDebug(51001) << "Plugin " << name << " (generic name: " << uname << ") is in the ignore list from host application"; continue; } @@ -343,7 +344,7 @@ } } - bool load = group.readEntry(name, true); + bool load = group.readEntry(uname, true); if (!appHasAllReqFeatures) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkipi-4.10.4/tests/kipiinterface.cpp new/libkipi-4.10.90/tests/kipiinterface.cpp --- old/libkipi-4.10.4/tests/kipiinterface.cpp 2013-05-28 21:27:59.000000000 +0200 +++ new/libkipi-4.10.90/tests/kipiinterface.cpp 2013-06-10 20:53:26.000000000 +0200 @@ -216,8 +216,8 @@ KIO::PreviewJob *job = KIO::filePreview(KUrl::List() << url, 256); #endif - connect(job, SIGNAL(gotPreview(KFileItem, QPixmap)), - this, SLOT(slotGotKDEPreview(KFileItem, QPixmap))); + connect(job, SIGNAL(gotPreview(KFileItem,QPixmap)), + this, SLOT(slotGotKDEPreview(KFileItem,QPixmap))); connect(job, SIGNAL(failed(KFileItem)), this, SLOT(slotFailedKDEPreview(KFileItem))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkipi-4.10.4/tests/kxmlhelloworld/plugin/kipiplugin_kxmlhelloworld.desktop.cmake new/libkipi-4.10.90/tests/kxmlhelloworld/plugin/kipiplugin_kxmlhelloworld.desktop.cmake --- old/libkipi-4.10.4/tests/kxmlhelloworld/plugin/kipiplugin_kxmlhelloworld.desktop.cmake 2013-05-28 21:27:59.000000000 +0200 +++ new/libkipi-4.10.90/tests/kxmlhelloworld/plugin/kipiplugin_kxmlhelloworld.desktop.cmake 2013-06-10 20:53:26.000000000 +0200 @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 +UntranslatedGenericName=KXMLHelloWorld Name=KXMLHelloWorld -Name[bs]=KXMLHelloWorld Name[ca]=KXMLHelloWorld Name[ca@valencia]=KXMLHelloWorld Name[cs]=KXMLHelloWorld @@ -30,17 +30,18 @@ Name[ro]=KXMLHelloWorld Name[ru]=KXMLHelloWorld Name[sk]=KXMLHelloWorld +Name[sl]=KXMLHelloWorld Name[sr]=КДЕ‑ИксМЛ-здраво-свете Name[sr@ijekavian]=КДЕ‑ИксМЛ-здраво-свете Name[sr@ijekavianlatin]=KDE-XML-zdravo-svete Name[sr@latin]=KDE-XML-zdravo-svete Name[sv]=KXML Hello World +Name[tr]=KXMLHelloWorld Name[uk]=KXMLHelloWorld Name[x-test]=xxKXMLHelloWorldxx Name[zh_CN]=KXMLHelloWorld Name[zh_TW]=KXMLHelloWorld Comment=A demo kipi tool using KDE XML-GUI technology -Comment[bs]=Demo kipi alat koji koristi KDE XML-GUI tehnologiju Comment[ca]=Una demostració de l'eina kipi que utilitza la tecnologia XML-GUI del KDE Comment[ca@valencia]=Una demostració de l'eina kipi que utilitza la tecnologia XML-GUI del KDE Comment[cs]=Ukázkový nástroj kipi využívající technologii KDE XML-GUI @@ -51,7 +52,6 @@ Comment[et]=KIPI demotööriist, mis kasutab KDE XML-GUI tehnoloogiat Comment[fi]=KDE:n XML-GUI-teknologiaa käyttävä KIPI-työkaludemo Comment[fr]=Un outil KIPI de démonstration utilisante la technologie d'interface dgraphique XML de KDE -Comment[ga]=Taispeántas kipi a úsáideann teicneolaíocht XML-GUI KDE Comment[gl]=Unha ferramenta de demostración de kipi que emprega a tecnoloxía XML-GUI de KDE Comment[hu]=Egy KDE XML-GUI technológiát használó demó kipi eszköz Comment[ia]=Un instrumento de demonstration de kipi que usa technologia KDE XML-GUI @@ -69,11 +69,13 @@ Comment[ro]=Unealtă kipi demonstrativă folosind tehnologia KDE XML-GUI Comment[ru]=Тестовый инструмент KIPI по использованию технологии XML-GUI KDE Comment[sk]=Ukážkový kipi nástroj používajúci technológiu KDE XML-GUI +Comment[sl]=Predstavitveno orodje KIPI, ki uporablja tehnologijo KDE XML-GUI Comment[sr]=Демонстрациона КИПИ алатка на технологији КДЕ‑овог ИксМЛ ГУИ‑ја Comment[sr@ijekavian]=Демонстрациона КИПИ алатка на технологији КДЕ‑овог ИксМЛ ГУИ‑ја Comment[sr@ijekavianlatin]=Demonstraciona KIPI alatka na tehnologiji KDE‑ovog XML GUI‑ja Comment[sr@latin]=Demonstraciona KIPI alatka na tehnologiji KDE‑ovog XML GUI‑ja Comment[sv]=Ett KIPI-verktyg för demonstration av KDE:s XML-GUI-teknologi +Comment[tr]=KDE XML-GUI teknolojisini kullanan bir demo kipi aracı Comment[uk]=Тестовий інструмент KIPI щодо використання технології XML-GUI KDE Comment[x-test]=xxA demo kipi tool using KDE XML-GUI technologyxx Comment[zh_CN]=使用 KDE XML-GUI 技术的 kipi 演示程序 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
