Hello community, here is the log from the commit of package kio for openSUSE:Factory checked in at 2015-09-02 07:50:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kio (Old) and /work/SRC/openSUSE:Factory/.kio.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kio" Changes: -------- --- /work/SRC/openSUSE:Factory/kio/kio.changes 2015-07-14 17:28:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kio.new/kio.changes 2015-09-02 07:50:05.000000000 +0200 @@ -1,0 +2,17 @@ +Tue Aug 18 16:16:22 UTC 2015 - [email protected] + +- Added show-custom-folder-icons-sgain.patch (kde#350612) + +------------------------------------------------------------------- +Tue Aug 4 19:20:31 UTC 2015 - [email protected] + +- Update to 5.13.0 + * The Qt version requirement has been bumped from 5.2 to 5.3 + * Debug output has been ported to categorized output, for less + noise by default + * Docbook documentation has been reviewed and updated + * Kill unneeded QUrl wrappers + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.13.0.php + +------------------------------------------------------------------- Old: ---- kio-5.12.0.tar.xz New: ---- kio-5.13.0.tar.xz show-custom-folder-icons-sgain.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kio.spec ++++++ --- /var/tmp/diff_new_pack.AsRDsg/_old 2015-09-02 07:50:06.000000000 +0200 +++ /var/tmp/diff_new_pack.AsRDsg/_new 2015-09-02 07:50:06.000000000 +0200 @@ -17,9 +17,9 @@ %bcond_without lang -%define _tar_path 5.12 +%define _tar_path 5.13 Name: kio -Version: 5.12.0 +Version: 5.13.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 @@ -49,15 +49,15 @@ BuildRequires: libacl-devel BuildRequires: libattr-devel BuildRequires: solid-devel >= %{_tar_path} -BuildRequires: pkgconfig(Qt5Concurrent) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 -BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Network) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Script) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 -BuildRequires: pkgconfig(Qt5X11Extras) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Xml) >= 5.2.0 +BuildRequires: cmake(Qt5Concurrent) >= 5.3.0 +BuildRequires: cmake(Qt5Core) >= 5.3.0 +BuildRequires: cmake(Qt5DBus) >= 5.3.0 +BuildRequires: cmake(Qt5Network) >= 5.3.0 +BuildRequires: cmake(Qt5Script) >= 5.3.0 +BuildRequires: cmake(Qt5Test) >= 5.3.0 +BuildRequires: cmake(Qt5Widgets) >= 5.3.0 +BuildRequires: cmake(Qt5X11Extras) >= 5.3.0 +BuildRequires: cmake(Qt5Xml) >= 5.3.0 BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(x11) Requires: %{name}-core = %{version} @@ -75,6 +75,8 @@ Source1: baselibs.conf # PATCH-FIX-OPENSUSE kio_help-fallback-to-kde4-docs.patch -- allow kio_help to see into kde4 documentation, needed especially for khelpcenter5 Patch0: kio_help-fallback-to-kde4-docs.patch +# PATCH-FIX-UPSTREAM show-custom-folder-icons-sgain.patch +Patch1: show-custom-folder-icons-sgain.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -109,7 +111,7 @@ Requires: kservice-devel >= %{_tar_path} Requires: kxmlgui-devel >= %{_tar_path} Requires: solid-devel >= %{_tar_path} -Requires: pkgconfig(Qt5Network) >= 5.2.0 +Requires: cmake(Qt5Network) >= 5.3.0 %description devel This framework implements almost all the file management functions you @@ -121,6 +123,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %cmake_kf5 -d build ++++++ kio-5.12.0.tar.xz -> kio-5.13.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-5.12.0/CMakeLists.txt new/kio-5.13.0/CMakeLists.txt --- old/kio-5.12.0/CMakeLists.txt 2015-07-05 11:06:31.000000000 +0200 +++ new/kio-5.13.0/CMakeLists.txt 2015-08-04 13:03:40.000000000 +0200 @@ -3,7 +3,7 @@ project(KIO) include(FeatureSummary) -find_package(ECM 5.12.0 NO_MODULE) +find_package(ECM 5.13.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -22,8 +22,8 @@ include(ECMGenerateHeaders) include(ECMMarkNonGuiExecutable) -set(KF5_VERSION "5.12.0") # handled by release scripts -set(KF5_DEP_VERSION "5.12.0") # handled by release scripts +set(KF5_VERSION "5.13.0") # handled by release scripts +set(KF5_DEP_VERSION "5.13.0") # handled by release scripts ecm_setup_version( ${KF5_VERSION} @@ -60,7 +60,7 @@ add_definitions(-DQT_NO_URL_CAST_FROM_STRING) -set(REQUIRED_QT_VERSION 5.2.0) +set(REQUIRED_QT_VERSION 5.3.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus Network Concurrent Xml Test) find_package(GSSAPI) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-5.12.0/autotests/CMakeLists.txt new/kio-5.13.0/autotests/CMakeLists.txt --- old/kio-5.12.0/autotests/CMakeLists.txt 2015-07-05 11:06:31.000000000 +0200 +++ new/kio-5.13.0/autotests/CMakeLists.txt 2015-08-04 13:03:40.000000000 +0200 @@ -12,7 +12,7 @@ ########### unittests ############### -find_package(Qt5Concurrent 5.2.0 REQUIRED NO_MODULE) +find_package(Qt5Concurrent ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) ecm_add_tests( kacltest.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-5.12.0/autotests/kfileplacesmodeltest.cpp new/kio-5.13.0/autotests/kfileplacesmodeltest.cpp --- old/kio-5.12.0/autotests/kfileplacesmodeltest.cpp 2015-07-05 11:06:31.000000000 +0200 +++ new/kio-5.13.0/autotests/kfileplacesmodeltest.cpp 2015-08-04 13:03:40.000000000 +0200 @@ -39,7 +39,7 @@ #endif QT_BEGIN_NAMESPACE -// Avoid QHash randomization so that the order of the devicees is stable +// Avoid QHash randomization so that the order of the devices is stable extern Q_CORE_EXPORT QBasicAtomicInt qt_qhash_seed; // from qhash.cpp QT_END_NAMESPACE @@ -52,6 +52,7 @@ void cleanupTestCase(); void testInitialState(); + void testFileCreatedExternally(); void testReparse(); void testInitialList(); void testInternalBookmarksHaveIds(); @@ -75,20 +76,21 @@ QMap<QString, QDBusInterface *> m_interfacesMap; }; +static QString bookmarksFile() +{ + return QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/user-places.xbel"; +} + void KFilePlacesModelTest::initTestCase() { // Make sure we always use 0 as seed qt_qhash_seed.fetchAndStoreRelaxed(0); + qputenv("KDE_FORK_SLAVES", "yes"); // to avoid a runtime dependency on klauncher + QStandardPaths::setTestModeEnabled(true); + // Ensure we'll have a clean bookmark file to start - const QString file = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/kfileplaces/bookmarks.xml"; - QFile f(file); - f.remove(); - - // Erase the shared bookmarks file also - const QString sharedBookmarksFile = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/user-places.xbel"; - QFile f2(sharedBookmarksFile); - f2.remove(); + QFile::remove(bookmarksFile()); qRegisterMetaType<QModelIndex>(); const QString fakeHw = QFINDTESTDATA("fakecomputer.xml"); @@ -103,6 +105,7 @@ delete m_places; delete m_places2; qDeleteAll(m_interfacesMap); + QFile::remove(bookmarksFile()); } QStringList KFilePlacesModelTest::placesUrls() const @@ -162,12 +165,33 @@ QCOMPARE(m_places->rowCount(), 9); } +static const QStringList initialListOfUrls() +{ + return QStringList() << QDir::homePath() << "remote:/" << KDE_ROOT_PATH << "trash:/" + << "/media/nfs" << "/foreign" << "/media/XO-Y4" << "/media/floppy0" << "/media/cdrom"; +} + void KFilePlacesModelTest::testInitialList() { - QStringList urls; - urls << QDir::homePath() << "remote:/" << KDE_ROOT_PATH << "trash:/" - << "/media/nfs" << "/foreign" << "/media/XO-Y4" << "/media/floppy0" << "/media/cdrom"; + const QStringList urls = initialListOfUrls(); + CHECK_PLACES_URLS(urls); +} +void KFilePlacesModelTest::testFileCreatedExternally() +{ + QFile file(bookmarksFile()); + QVERIFY(file.open(QIODevice::WriteOnly)); + file.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?><xbel version=\"1.0\"><bookmark href=\"file:///external\"><title>external</title></bookmark></xbel>"); + file.close(); + + QStringList urls = initialListOfUrls(); + urls << "/external"; + QTRY_COMPARE(placesUrls(), urls); // give a bit of time for the file watch to work + CHECK_PLACES_URLS(urls); + + file.remove(); + urls = initialListOfUrls(); + QTRY_COMPARE(placesUrls(), urls); // give a bit of time for the file watch to work CHECK_PLACES_URLS(urls); } @@ -180,15 +204,13 @@ m_places->addPlace("foo", QUrl::fromLocalFile("/foo"), QString(), QString()); - urls << QDir::homePath() << "remote:/" << KDE_ROOT_PATH << "trash:/" - << "/media/nfs" << "/foreign" << "/media/XO-Y4" << "/media/floppy0" << "/media/cdrom" << "/foo"; - + urls = initialListOfUrls(); + urls << "/foo"; CHECK_PLACES_URLS(urls); // reparse the bookmark file - const QString file = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1Char('/') + "kfileplaces/bookmarks.xml"; - KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(file, "kfilePlaces"); + KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(bookmarksFile(), "kfilePlaces"); bookmarkManager->notifyCompleteChange(QString()); @@ -200,18 +222,13 @@ m_places->removePlace(m_places->index(9, 0)); - urls.clear(); - - urls << QDir::homePath() << "remote:/" << KDE_ROOT_PATH << "trash:/" - << "/media/nfs" << "/foreign" << "/media/XO-Y4" << "/media/floppy0" << "/media/cdrom"; - + urls = initialListOfUrls(); CHECK_PLACES_URLS(urls); } void KFilePlacesModelTest::testInternalBookmarksHaveIds() { - const QString file = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1Char('/') + "kfileplaces/bookmarks.xml"; - KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(file, "kfilePlaces"); + KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(bookmarksFile(), "kfilePlaces"); KBookmarkGroup root = bookmarkManager->root(); // Verify every entry has an id or an udi @@ -314,8 +331,7 @@ QSignalSpy spy_inserted(m_places, SIGNAL(rowsInserted(QModelIndex,int,int))); QSignalSpy spy_removed(m_places, SIGNAL(rowsRemoved(QModelIndex,int,int))); - const QString file = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1Char('/') + "kfileplaces/bookmarks.xml"; - KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(file, "kfilePlaces"); + KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(bookmarksFile(), "kfilePlaces"); KBookmarkGroup root = bookmarkManager->root(); KBookmark trash = m_places->bookmarkForIndex(m_places->index(3, 0)); KBookmark before_trash = m_places->bookmarkForIndex(m_places->index(2, 0)); @@ -485,8 +501,7 @@ QCOMPARE(args.at(2).toInt(), 9); QCOMPARE(spy_removed.count(), 0); - const QString file = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1Char('/') + "kfileplaces/bookmarks.xml"; - KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(file, "kfilePlaces"); + KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(bookmarksFile(), "kfilePlaces"); KBookmarkGroup root = bookmarkManager->root(); KBookmark before_trash = m_places->bookmarkForIndex(m_places->index(2, 0)); KBookmark foo = m_places->bookmarkForIndex(m_places->index(9, 0)); @@ -602,8 +617,7 @@ // Move the device in the list, and check that it memorizes the position across plug/unplug - const QString file = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1Char('/') + "kfileplaces/bookmarks.xml"; - KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(file, "kfilePlaces"); + KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(bookmarksFile(), "kfilePlaces"); KBookmarkGroup root = bookmarkManager->root(); KBookmark before_trash = m_places->bookmarkForIndex(m_places->index(2, 0)); KBookmark device = root.first(); // The device we'll move is the 7th bookmark diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-5.12.0/docs/kcookiejar5/man-kcookiejar5.8.docbook new/kio-5.13.0/docs/kcookiejar5/man-kcookiejar5.8.docbook --- old/kio-5.12.0/docs/kcookiejar5/man-kcookiejar5.8.docbook 2015-07-05 11:06:31.000000000 +0200 +++ new/kio-5.13.0/docs/kcookiejar5/man-kcookiejar5.8.docbook 2015-08-04 13:03:40.000000000 +0200 @@ -3,10 +3,10 @@ <!ENTITY % English "INCLUDE"><!-- change language only here --> ]> -<refentry> +<refentry lang="&language;"> <refentryinfo> -<title>&kde; User's Manual</title> +<title>kcookiejar5 User's Manual</title> <author> <firstname>Waldo</firstname> <surname> Bastian</surname> @@ -23,8 +23,8 @@ </affiliation> </author> -<date>2008-10-14</date> -<releaseinfo>0.01.01</releaseinfo> +<date>2015-07-31</date> +<releaseinfo>Frameworks 5.13</releaseinfo> </refentryinfo> @@ -44,10 +44,8 @@ <cmdsynopsis> <command>kcookiejar5</command> -<arg choice="opt">--help</arg> -<arg choice="opt">Generic-options</arg> -<arg choice="opt">Qt-options</arg> -<arg choice="opt">KDE-options</arg> +<arg choice="opt">-h, --help</arg> +<arg choice="opt">-v, --version</arg> <arg choice="opt">--shutdown</arg> <arg choice="opt">--remove<replaceable> domain</replaceable></arg> <arg choice="opt">--remove-all</arg> @@ -64,69 +62,24 @@ </refsect1> <refsect1> -<title>Generic Options</title> -<para> -<variablelist> +<title>Options</title> -<varlistentry> -<term><option>--author</option></term> -<listitem> -<para>Show author information.</para> -</listitem> -</varlistentry> +<variablelist> <varlistentry> -<term><option>--help</option></term> +<term><option>-h</option><option>--help</option></term> <listitem> <para>Show help about options.</para> </listitem> </varlistentry> <varlistentry> -<term><option>--help-all</option></term> -<listitem> -<para>Show all options.</para> -</listitem> -</varlistentry> - -<varlistentry> -<term><option>--help-kde</option></term> -<listitem> -<para>Show KDE specific options.</para> - - -</listitem> -</varlistentry> - -<varlistentry> -<term><option>--help-qt</option></term> -<listitem> -<para>Show Qt specific options.</para> -</listitem> -</varlistentry> - -<varlistentry> -<term><option>--license</option></term> -<listitem> -<para>Show license information.</para> -</listitem> -</varlistentry> - -<varlistentry> <term><option>-v</option><option>--version</option></term> <listitem> <para>Show version information</para> </listitem> </varlistentry> -</variablelist> -</para> -</refsect1> - -<refsect1> -<title>Application Options</title> -<variablelist> - <varlistentry> <term><option>--shutdown</option></term> <listitem> @@ -181,13 +134,13 @@ <refsect1> <title>See Also</title> -<para><replaceable>kdeoptions</replaceable>(7), <replaceable>qtoptions</replaceable>(7) +<para><replaceable>kf5options</replaceable>(7), <replaceable>qt5options</replaceable>(7) </para> </refsect1> <refsect1> <title>Bugs</title> -<para>There are probably tons of bugs. Use <ulink url="http://bugs.kde.org";>bugs.kde.org</ulink> to report them.</para> +<para>Please use <ulink url="http://bugs.kde.org";>KDE's bugtracker</ulink> to report bugs.</para> </refsect1> </refentry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-5.12.0/docs/kioslave/help/documentationnotfound/index.docbook new/kio-5.13.0/docs/kioslave/help/documentationnotfound/index.docbook --- old/kio-5.12.0/docs/kioslave/help/documentationnotfound/index.docbook 2015-07-05 11:06:31.000000000 +0200 +++ new/kio-5.13.0/docs/kioslave/help/documentationnotfound/index.docbook 2015-08-04 13:03:40.000000000 +0200 @@ -18,7 +18,7 @@ </authorgroup> <date>2014-04-02</date> -<releaseinfo>5.0</releaseinfo> +<releaseinfo>Frameworks 5.0</releaseinfo> </articleinfo> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-5.12.0/po/ca/kio5.po new/kio-5.13.0/po/ca/kio5.po --- old/kio-5.12.0/po/ca/kio5.po 2015-07-05 11:06:31.000000000 +0200 +++ new/kio-5.13.0/po/ca/kio5.po 2015-08-04 13:03:40.000000000 +0200 @@ -13,7 +13,7 @@ "Project-Id-Version: kio5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-05-11 09:05+0000\n" -"PO-Revision-Date: 2015-07-02 23:31+0200\n" +"PO-Revision-Date: 2015-08-01 18:08+0200\n" "Last-Translator: Josep Ma. Ferrer <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca\n" @@ -4688,6 +4688,7 @@ msgid "No Proxy" msgstr "Sense intermediari" +# skip-rule: acronyms-faq #. i18n: ectx: property (whatsThis), widget (QRadioButton, autoDiscoverProxyRadioButton) #: kcms/kio/kproxydlg.ui:46 msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-5.12.0/po/de/docs/kcookiejar5/man-kcookiejar5.8.docbook new/kio-5.13.0/po/de/docs/kcookiejar5/man-kcookiejar5.8.docbook --- old/kio-5.12.0/po/de/docs/kcookiejar5/man-kcookiejar5.8.docbook 2015-07-05 11:06:31.000000000 +0200 +++ new/kio-5.13.0/po/de/docs/kcookiejar5/man-kcookiejar5.8.docbook 2015-08-04 13:03:40.000000000 +0200 @@ -4,11 +4,11 @@ ><!-- change language only here --> ]> -<refentry> +<refentry lang="&language;"> <refentryinfo> <title ->&kde;-Benutzerhandbuch</title> +>kcookiejar5-Benutzerhandbuch</title> <author ><firstname >Waldo</firstname @@ -36,9 +36,9 @@ </author> <date ->2008-10-14</date> +>2015-07-31</date> <releaseinfo ->0.01.01</releaseinfo> +>Frameworks 5.13</releaseinfo> </refentryinfo> @@ -68,13 +68,9 @@ ><command >kcookiejar5</command > <arg choice="opt" ->--help</arg +>-h, --help</arg > <arg choice="opt" ->Generic-options</arg -> <arg choice="opt" ->Qt-options</arg -> <arg choice="opt" ->KDE-options</arg +>-v, --version</arg > <arg choice="opt" >--shutdown</arg > <arg choice="opt" @@ -100,23 +96,14 @@ <refsect1> <title ->Allgemeine Optionen</title> -<para> +>Optionen</title> + <variablelist> <varlistentry> <term ><option ->--author</option -></term> -<listitem> -<para ->Zeigt Informationen über den Autor.</para> -</listitem> -</varlistentry> - -<varlistentry> -<term +>-h</option ><option >--help</option ></term> @@ -129,52 +116,6 @@ <varlistentry> <term ><option ->--help-all</option -></term> -<listitem> -<para ->Alle Optionen anzeigen</para> -</listitem> -</varlistentry> - -<varlistentry> -<term -><option ->--help-kde</option -></term> -<listitem> -<para ->Spezielle Optionen für KDE anzeigen</para> - - -</listitem> -</varlistentry> - -<varlistentry> -<term -><option ->--help-qt</option -></term> -<listitem> -<para ->Spezielle Optionen für Qt anzeigen</para> -</listitem> -</varlistentry> - -<varlistentry> -<term -><option ->--license</option -></term> -<listitem> -<para ->Lizenz-Informationen anzeigen</para> -</listitem> -</varlistentry> - -<varlistentry> -<term -><option >-v</option ><option >--version</option @@ -185,15 +126,6 @@ </listitem> </varlistentry> -</variablelist> -</para> -</refsect1> - -<refsect1> -<title ->Anwendungsoptionen</title> -<variablelist> - <varlistentry> <term ><option @@ -272,9 +204,9 @@ >Siehe auch</title> <para ><replaceable ->kdeoptions</replaceable +>kf5options</replaceable >(7), <replaceable ->qtoptions</replaceable +>qt5options</replaceable >(7) </para> </refsect1> @@ -282,9 +214,9 @@ <title >Fehler</title> <para ->Berichten Sie Fehler auf <ulink url="http://bugs.kde.org"; ->bugs.kde.org</ulink ->.</para> +>Please use <ulink url="http://bugs.kde.org"; +>KDE's bugtracker</ulink +> to report bugs.</para> </refsect1> </refentry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-5.12.0/po/it/kio5.po new/kio-5.13.0/po/it/kio5.po --- old/kio-5.12.0/po/it/kio5.po 2015-07-05 11:06:31.000000000 +0200 +++ new/kio-5.13.0/po/it/kio5.po 2015-08-04 13:03:40.000000000 +0200 @@ -12,15 +12,15 @@ "Project-Id-Version: kio4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-05-11 09:05+0000\n" -"PO-Revision-Date: 2015-05-23 08:36+0100\n" -"Last-Translator: Vincenzo Reale <[email protected]>\n" +"PO-Revision-Date: 2015-07-17 23:51+0200\n" +"Last-Translator: Luigi Toscano <[email protected]>\n" "Language-Team: Italian <[email protected]>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 1.5\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" @@ -6084,7 +6084,7 @@ #. i18n: ectx: property (text), widget (QLabel, organizationalUnitTag) #: widgets/certificateparty.ui:68 msgid "Organizational unit:" -msgstr "Unità organizzazione:" +msgstr "Unità organizzativa:" #. i18n: ectx: property (text), widget (QLabel, organizationalUnit) #: widgets/certificateparty.ui:78 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-5.12.0/po/nl/docs/kcookiejar5/man-kcookiejar5.8.docbook new/kio-5.13.0/po/nl/docs/kcookiejar5/man-kcookiejar5.8.docbook --- old/kio-5.12.0/po/nl/docs/kcookiejar5/man-kcookiejar5.8.docbook 2015-07-05 11:06:31.000000000 +0200 +++ new/kio-5.13.0/po/nl/docs/kcookiejar5/man-kcookiejar5.8.docbook 2015-08-04 13:03:40.000000000 +0200 @@ -8,7 +8,7 @@ <refentryinfo> <title ->&kde;-gebruikershandleiding</title> +>kcookiejar5-gebruikershandleiding</title> <author ><firstname >Waldo</firstname @@ -36,9 +36,9 @@ </author> <date ->2008-10-14</date> +>2015-07-31</date> <releaseinfo ->0.01.01</releaseinfo> +>Frameworks 5.13</releaseinfo> </refentryinfo> @@ -68,13 +68,9 @@ ><command >kcookiejar5</command > <arg choice="opt" ->--help</arg +>-h, --help</arg > <arg choice="opt" ->Generic-options</arg -> <arg choice="opt" ->Qt-options</arg -> <arg choice="opt" ->KDE-options</arg +>-v, --version</arg > <arg choice="opt" >--shutdown</arg > <arg choice="opt" @@ -100,23 +96,14 @@ <refsect1> <title ->Algemene opties</title> -<para> +>Opties</title> + <variablelist> <varlistentry> <term ><option ->--author</option -></term> -<listitem> -<para ->Auteurinformatie tonen.</para> -</listitem> -</varlistentry> - -<varlistentry> -<term +>-h</option ><option >--help</option ></term> @@ -129,52 +116,6 @@ <varlistentry> <term ><option ->--help-all</option -></term> -<listitem> -<para ->Alle opties tonen.</para> -</listitem> -</varlistentry> - -<varlistentry> -<term -><option ->--help-kde</option -></term> -<listitem> -<para ->KDE specifieke opties tonen.</para> - - -</listitem> -</varlistentry> - -<varlistentry> -<term -><option ->--help-qt</option -></term> -<listitem> -<para ->Qt-specifieke opties tonen.</para> -</listitem> -</varlistentry> - -<varlistentry> -<term -><option ->--license</option -></term> -<listitem> -<para ->Licentie-informatie tonen.</para> -</listitem> -</varlistentry> - -<varlistentry> -<term -><option >-v</option ><option >--version</option @@ -185,15 +126,6 @@ </listitem> </varlistentry> -</variablelist> -</para> -</refsect1> - -<refsect1> -<title ->Programma-opties</title> -<variablelist> - <varlistentry> <term ><option @@ -272,9 +204,9 @@ >Zie ook</title> <para ><replaceable ->kdeopties</replaceable +>kf5options</replaceable >(7), <replaceable ->qtopties</replaceable +>qt5options</replaceable >(7) </para> </refsect1> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-5.12.0/po/pt_BR/kio5.po new/kio-5.13.0/po/pt_BR/kio5.po --- old/kio-5.12.0/po/pt_BR/kio5.po 2015-07-05 11:06:31.000000000 +0200 +++ new/kio-5.13.0/po/pt_BR/kio5.po 2015-08-04 13:03:40.000000000 +0200 @@ -16,7 +16,7 @@ "Project-Id-Version: kio5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-05-11 09:05+0000\n" -"PO-Revision-Date: 2015-07-04 18:51-0300\n" +"PO-Revision-Date: 2015-07-26 09:11-0300\n" "Last-Translator: André Marcelo Alvarenga <[email protected]>\n" "Language-Team: Brazilian Portuguese <[email protected]>\n" "Language: pt_BR\n" @@ -6231,8 +6231,8 @@ #, kde-format msgid "Do you really want to move this item to the trash?" msgid_plural "Do you really want to move these %1 items to the trash?" -msgstr[0] "Deseja realmente mover este item para a Lixeira?" -msgstr[1] "Deseja realmente mover estes %1 itens para a Lixeira?" +msgstr[0] "Deseja mover este item para a Lixeira?" +msgstr[1] "Deseja mover estes %1 itens para a Lixeira?" #: widgets/jobuidelegate.cpp:252 msgctxt "Verb" @@ -7764,7 +7764,7 @@ "Please enter a new file name:" msgstr "" "Esta ação sobrescreveria '%1' por ele mesmo.\n" -"Por favor, entre com um novo nome para o arquivo:" +"Digite um novo nome para o arquivo:" #: widgets/renamedialog.cpp:176 msgid "C&ontinue" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-5.12.0/po/sv/docs/kcookiejar5/man-kcookiejar5.8.docbook new/kio-5.13.0/po/sv/docs/kcookiejar5/man-kcookiejar5.8.docbook --- old/kio-5.12.0/po/sv/docs/kcookiejar5/man-kcookiejar5.8.docbook 2015-07-05 11:06:31.000000000 +0200 +++ new/kio-5.13.0/po/sv/docs/kcookiejar5/man-kcookiejar5.8.docbook 2015-08-04 13:03:40.000000000 +0200 @@ -8,7 +8,7 @@ <refentryinfo> <title ->&kde;:s användarhandbok</title> +>kcookiejar5 användarhandbok</title> <author ><firstname >Waldo</firstname @@ -36,9 +36,9 @@ </author> <date ->2008-10-14</date> +>2015-07-31</date> <releaseinfo ->0.01.01</releaseinfo> +>Frameworks 5.13</releaseinfo> </refentryinfo> @@ -68,13 +68,9 @@ ><command >kcookiejar5</command > <arg choice="opt" ->--help</arg +>-h, --help</arg > <arg choice="opt" ->Generella väljare</arg -> <arg choice="opt" ->Qt-väljare</arg -> <arg choice="opt" ->KDE-väljare</arg +>-v, --version</arg > <arg choice="opt" >--shutdown</arg > <arg choice="opt" @@ -100,23 +96,14 @@ <refsect1> <title ->Allmänna väljare</title> -<para> +>Väljare</title> + <variablelist> <varlistentry> <term ><option ->--author</option -></term> -<listitem> -<para ->Visa information om upphovsman.</para> -</listitem> -</varlistentry> - -<varlistentry> -<term +>-h</option ><option >--help</option ></term> @@ -129,52 +116,6 @@ <varlistentry> <term ><option ->--help-all</option -></term> -<listitem> -<para ->Visa alla väljare.</para> -</listitem> -</varlistentry> - -<varlistentry> -<term -><option ->--help-kde</option -></term> -<listitem> -<para ->Visa KDE-specifika väljare.</para> - - -</listitem> -</varlistentry> - -<varlistentry> -<term -><option ->--help-qt</option -></term> -<listitem> -<para ->Visa Qt-specifika väljare.</para> -</listitem> -</varlistentry> - -<varlistentry> -<term -><option ->--license</option -></term> -<listitem> -<para ->Visa licensinformation.</para> -</listitem> -</varlistentry> - -<varlistentry> -<term -><option >-v</option ><option >--version</option @@ -185,15 +126,6 @@ </listitem> </varlistentry> -</variablelist> -</para> -</refsect1> - -<refsect1> -<title ->Programväljare</title> -<variablelist> - <varlistentry> <term ><option @@ -272,9 +204,9 @@ >Se också</title> <para ><replaceable ->kdeoptions</replaceable +>kf5options</replaceable >(7), <replaceable ->qtoptions</replaceable +>qt5options</replaceable >(7) </para> </refsect1> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-5.12.0/po/uk/docs/kcookiejar5/man-kcookiejar5.8.docbook new/kio-5.13.0/po/uk/docs/kcookiejar5/man-kcookiejar5.8.docbook --- old/kio-5.12.0/po/uk/docs/kcookiejar5/man-kcookiejar5.8.docbook 2015-07-05 11:06:31.000000000 +0200 +++ new/kio-5.13.0/po/uk/docs/kcookiejar5/man-kcookiejar5.8.docbook 2015-08-04 13:03:40.000000000 +0200 @@ -8,7 +8,7 @@ <refentryinfo> <title ->Інструкція користувача &kde;</title> +>Інструкція користувача kcookiejar5</title> <author ><firstname >Waldo</firstname @@ -36,9 +36,9 @@ </author> <date ->14 жовтня 2008 року</date> +>31 липня 2015 року</date> <releaseinfo ->0.01.01</releaseinfo> +>Frameworks 5.13</releaseinfo> </refentryinfo> @@ -68,18 +68,14 @@ ><command >kcookiejar5</command > <arg choice="opt" ->--help</arg +>-h, --help</arg > <arg choice="opt" ->Загальні параметри</arg -> <arg choice="opt" ->Параметри Qt</arg -> <arg choice="opt" ->Параметри KDE</arg +>-v, --version</arg > <arg choice="opt" >--shutdown</arg > <arg choice="opt" ->--remove <replaceable ->домен</replaceable +>--remove<replaceable +> домен</replaceable ></arg > <arg choice="opt" >--remove-all</arg @@ -100,23 +96,14 @@ <refsect1> <title ->Загальні параметри</title> -<para> +>Параметри</title> + <variablelist> <varlistentry> <term ><option ->--author</option -></term> -<listitem> -<para ->Показати інформацію щодо автора.</para> -</listitem> -</varlistentry> - -<varlistentry> -<term +>-h</option ><option >--help</option ></term> @@ -129,52 +116,6 @@ <varlistentry> <term ><option ->--help-all</option -></term> -<listitem> -<para ->Показати всі параметри.</para> -</listitem> -</varlistentry> - -<varlistentry> -<term -><option ->--help-kde</option -></term> -<listitem> -<para ->Показати параметри, що стосуються KDE.</para> - - -</listitem> -</varlistentry> - -<varlistentry> -<term -><option ->--help-qt</option -></term> -<listitem> -<para ->Показати параметри, що стосуються Qt.</para> -</listitem> -</varlistentry> - -<varlistentry> -<term -><option ->--license</option -></term> -<listitem> -<para ->Показує інформацію про умови ліцензування програми.</para> -</listitem> -</varlistentry> - -<varlistentry> -<term -><option >-v</option ><option >--version</option @@ -185,15 +126,6 @@ </listitem> </varlistentry> -</variablelist> -</para> -</refsect1> - -<refsect1> -<title ->Параметри програми</title> -<variablelist> - <varlistentry> <term ><option @@ -272,9 +204,9 @@ >Прочитайте також</title> <para ><replaceable ->kdeoptions</replaceable +>kf5options</replaceable >(7), <replaceable ->qtoptions</replaceable +>qt5options</replaceable >(7) </para> </refsect1> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-5.12.0/src/filewidgets/kfileplacesitem.cpp new/kio-5.13.0/src/filewidgets/kfileplacesitem.cpp --- old/kio-5.12.0/src/filewidgets/kfileplacesitem.cpp 2015-07-05 11:06:31.000000000 +0200 +++ new/kio-5.13.0/src/filewidgets/kfileplacesitem.cpp 2015-08-04 13:03:40.000000000 +0200 @@ -161,7 +161,7 @@ return QVariant(); } case KFilePlacesModel::UrlRole: - return QUrl(b.url()); + return b.url(); case KFilePlacesModel::SetupNeededRole: return false; case KFilePlacesModel::HiddenRole: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-5.12.0/src/filewidgets/kfileplacesmodel.cpp new/kio-5.13.0/src/filewidgets/kfileplacesmodel.cpp --- old/kio-5.12.0/src/filewidgets/kfileplacesmodel.cpp 2015-07-05 11:06:31.000000000 +0200 +++ new/kio-5.13.0/src/filewidgets/kfileplacesmodel.cpp 2015-08-04 13:03:40.000000000 +0200 @@ -175,7 +175,7 @@ QUrl KFilePlacesModel::url(const QModelIndex &index) const { - return QUrl(data(index, UrlRole).toUrl()); + return data(index, UrlRole).toUrl(); } bool KFilePlacesModel::setupNeeded(const QModelIndex &index) const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-5.12.0/src/ioslaves/help/CMakeLists.txt new/kio-5.13.0/src/ioslaves/help/CMakeLists.txt --- old/kio-5.12.0/src/ioslaves/help/CMakeLists.txt 2015-07-05 11:06:31.000000000 +0200 +++ new/kio-5.13.0/src/ioslaves/help/CMakeLists.txt 2015-08-04 13:03:40.000000000 +0200 @@ -28,7 +28,7 @@ #macro_additional_clean_files( ${CMAKE_CURRENT_BINARY_DIR}/checkXML ) -find_package(Qt5Core 5.2.0 REQUIRED NO_MODULE) +find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) ########### next target ############### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-5.12.0/src/ioslaves/http/kcookiejar/kcookieserver.cpp new/kio-5.13.0/src/ioslaves/http/kcookiejar/kcookieserver.cpp --- old/kio-5.12.0/src/ioslaves/http/kcookiejar/kcookieserver.cpp 2015-07-05 11:06:31.000000000 +0200 +++ new/kio-5.13.0/src/ioslaves/http/kcookiejar/kcookieserver.cpp 2015-08-04 13:03:40.000000000 +0200 @@ -88,17 +88,7 @@ mCookieJar->loadConfig(mConfig); const QString filename = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1Char('/') + "kcookiejar/cookies"; - - // Stay backwards compatible! - const QString filenameOld = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kfm/cookies"); - if (!filenameOld.isEmpty()) { - mCookieJar->loadCookies(filenameOld); - if (mCookieJar->saveCookies(filename)) { - QFile::remove(filenameOld); // Remove old kfm cookie file - } - } else { - mCookieJar->loadCookies(filename); - } + mCookieJar->loadCookies(filename); connect(this, SIGNAL(windowUnregistered(qlonglong)), this, SLOT(slotDeleteSessionCookies(qlonglong))); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kio-5.12.0/src/urifilters/ikws/searchproviders/archpkg.desktop new/kio-5.13.0/src/urifilters/ikws/searchproviders/archpkg.desktop --- old/kio-5.12.0/src/urifilters/ikws/searchproviders/archpkg.desktop 2015-07-05 11:06:31.000000000 +0200 +++ new/kio-5.13.0/src/urifilters/ikws/searchproviders/archpkg.desktop 2015-08-04 13:03:40.000000000 +0200 @@ -3,6 +3,7 @@ Name=Arch Linux Package Search Name[ca]=Cerca paquets a Arch Linux Name[cs]=Hledání balíčků pro Arch Linux +Name[da]=Arch Linux pakkesøgning Name[de]=Arch-Linux-Paketsuche Name[en_GB]=Arch Linux Package Search Name[es]=Búsqueda de paquetes de Arch Linux @@ -31,6 +32,7 @@ Query=http://www.archlinux.org/packages/?q=\\{@} Query[ca]=http://www.archlinux.org/packages/?q=\\{@} Query[cs]=http://www.archlinux.org/packages/?q=\\{@} +Query[da]=http://www.archlinux.org/packages/?q=\\{@} Query[de]=http://www.archlinux.org/packages/?q=\\{@} Query[en_GB]=http://www.archlinux.org/packages/?q=\\{@} Query[es]=http://www.archlinux.org/packages/?q=\\{@} ++++++ show-custom-folder-icons-sgain.patch ++++++ From: Emmanuel Pescosta <[email protected]> Date: Tue, 11 Aug 2015 18:13:52 +0000 Subject: Show custom folder icons again --- Show custom folder icons again Set mimetype as known when we assign the mime type for inode/directory This bug was introduced by commit 46cd152f BUG: 350612 FIXED-IN: 5.14 REVIEW: 124690 --- --- a/autotests/kfileitemtest.cpp +++ b/autotests/kfileitemtest.cpp @@ -25,6 +25,8 @@ #include <qtemporarydir.h> #include <qtemporaryfile.h> #include <kuser.h> +#include <kdesktopfile.h> +#include <kconfiggroup.h> QTEST_MAIN(KFileItemTest) @@ -472,6 +474,25 @@ QCOMPARE(fileItem.currentMimeType().name(), udsMimeType); } +void KFileItemTest::testIconNameForCustomFolderIcons() +{ + // Custom folder icons should be displayed (bug 350612) + + const QString iconName = QStringLiteral("folder-music"); + + QTemporaryDir tempDir; + const QUrl url = QUrl::fromLocalFile(tempDir.path()); + KDesktopFile cfg(tempDir.path() + QString::fromLatin1("/.directory")); + cfg.desktopGroup().writeEntry("Icon", iconName); + cfg.sync(); + + KIO::UDSEntry entry; + entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR); + KFileItem fileItem(entry, url); + + QCOMPARE(fileItem.iconName(), iconName); +} + #ifndef Q_OS_WIN // user/group/other write permissions are not handled on windows void KFileItemTest::testIsReadable_data() --- a/autotests/kfileitemtest.h +++ b/autotests/kfileitemtest.h @@ -41,6 +41,7 @@ void testMimetypeForRemoteFolderWithFileType(); void testCurrentMimetypeForRemoteFolder(); void testCurrentMimetypeForRemoteFolderWithFileType(); + void testIconNameForCustomFolderIcons(); #ifndef Q_OS_WIN void testIsReadable_data(); --- a/src/core/kfileitem.cpp +++ b/src/core/kfileitem.cpp @@ -732,15 +732,15 @@ QMimeDatabase db; if (isDir()) { d->m_mimeType = db.mimeTypeForName("inode/directory"); - return d->m_mimeType; - } - bool isLocalUrl; - const QUrl url = mostLocalUrl(&isLocalUrl); - d->m_mimeType = db.mimeTypeForUrl(url); - // was: d->m_mimeType = KMimeType::findByUrl( url, d->m_fileMode, isLocalUrl ); - // => we are no longer using d->m_fileMode for remote URLs. - Q_ASSERT(d->m_mimeType.isValid()); - //qDebug() << d << "finding final mimetype for" << url << ":" << d->m_mimeType.name(); + } else { + bool isLocalUrl; + const QUrl url = mostLocalUrl(&isLocalUrl); + d->m_mimeType = db.mimeTypeForUrl(url); + // was: d->m_mimeType = KMimeType::findByUrl( url, d->m_fileMode, isLocalUrl ); + // => we are no longer using d->m_fileMode for remote URLs. + Q_ASSERT(d->m_mimeType.isValid()); + //qDebug() << d << "finding final mimetype for" << url << ":" << d->m_mimeType.name(); + } d->m_bMimeTypeKnown = true; }
