Hello community,
here is the log from the commit of package kxmlgui for openSUSE:Factory checked in at 2014-11-11 01:10:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kxmlgui (Old)
and /work/SRC/openSUSE:Factory/.kxmlgui.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kxmlgui"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kxmlgui/kxmlgui.changes 2014-10-07 16:00:45.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kxmlgui.new/kxmlgui.changes 2014-11-11 01:10:26.000000000 +0100
@@ -1,0 +2,9 @@
+Sun Nov 2 17:47:50 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Update to 5.4.0
+ * Now supports finding ui files in resources
+ (default location: :/kxmlgui5/<componentname>)
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.4.0.php
+
+-------------------------------------------------------------------
Old:
----
kxmlgui-5.3.0.tar.xz
New:
----
kxmlgui-5.4.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kxmlgui.spec ++++++
--- /var/tmp/diff_new_pack.D17f0O/_old 2014-11-11 01:10:27.000000000 +0100
+++ /var/tmp/diff_new_pack.D17f0O/_new 2014-11-11 01:10:27.000000000 +0100
@@ -18,12 +18,12 @@
%define lname libKF5XmlGui5
Name: kxmlgui
-Version: 5.3.0
+Version: 5.4.0
Release: 0
%define kf5_version %{version}
BuildRequires: attica-qt5-devel >= %{kf5_version}
BuildRequires: cmake >= 2.8.12
-BuildRequires: extra-cmake-modules >= 1.3.0
+BuildRequires: extra-cmake-modules >= 1.4.0
BuildRequires: fdupes
BuildRequires: kconfig-devel >= %{kf5_version}
BuildRequires: kconfigwidgets-devel >= %{kf5_version}
@@ -47,7 +47,7 @@
License: LGPL-2.1+ and GPL-2.0+
Group: System/GUI/KDE
Url: http://www.kde.org
-Source: http://download.kde.org/stable/frameworks/%{version}/%{name}-%{version}.tar.xz
+Source: http://download.kde.org/stable/frameworks/5.4/%{name}-%{version}.tar.xz
Source1: baselibs.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ kxmlgui-5.3.0.tar.xz -> kxmlgui-5.4.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.3.0/CMakeLists.txt new/kxmlgui-5.4.0/CMakeLists.txt
--- old/kxmlgui-5.3.0/CMakeLists.txt 2014-10-04 19:15:13.000000000 +0200
+++ new/kxmlgui-5.4.0/CMakeLists.txt 2014-11-02 13:21:45.000000000 +0100
@@ -3,7 +3,7 @@
project(KXmlGui)
# ECM setup
-find_package(ECM 1.3.0 REQUIRED NO_MODULE)
+find_package(ECM 1.4.0 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
@@ -16,8 +16,8 @@
include(KDEFrameworkCompilerSettings)
include(KDECMakeSettings)
-set(KF5_VERSION "5.3.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.3.0") # handled by release scripts
+set(KF5_VERSION "5.4.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.4.0") # handled by release scripts
ecm_setup_version(${KF5_VERSION}
VARIABLE_PREFIX KXMLGUI
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.3.0/po/fi/kxmlgui5.po new/kxmlgui-5.4.0/po/fi/kxmlgui5.po
--- old/kxmlgui-5.3.0/po/fi/kxmlgui5.po 2014-10-04 19:15:13.000000000 +0200
+++ new/kxmlgui-5.4.0/po/fi/kxmlgui5.po 2014-11-02 13:21:45.000000000 +0100
@@ -27,9 +27,9 @@
"Project-Id-Version: kdelibs4\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2014-09-08 07:58+0000\n"
-"PO-Revision-Date: 2014-08-01 20:08+0300\n"
+"PO-Revision-Date: 2014-10-19 17:16+0300\n"
"Last-Translator: Lasse Liehu
KDE katılımcı bir girişimdir ve KDE ürünlerini ya da çalışmalarını kontrol "
-"eden tekil bir kişilik yoktur. KDE Projesine siz de dahil herkes katkıda "
-"bulunabilir.<br /><br />KDE topluluğu ve ürettiği yazılımlar hakkında daha "
-"fazla bilgi almak için %2</a> adresini ziyaret edin.</html>"
+"<html><b>KDE</b> dünyanın dört bir yanında bulunan ve Özgür "
+"Yazılım</a> geliştirme felsefesini benimsemiş olan mühendislerin, "
+"sanatçıların, yazarların ve çevirmenlerin katılımı ile geliştiriliyor. Bu "
+"topluluk KDE geliştirme ortamının, çalışma alanlarının ve uygulamalrın bir "
+"parçası olarak yüzlerce Özgür Yazılım oluşturdu.<br /><br />KDE katılımcı "
+"bir girişimdir ve KDE ürünlerini ya da çalışmalarını kontrol eden tekil bir "
+"kişilik yoktur. KDE Projesine siz de dahil herkes katkıda bulunabilir.
<br />KDE topluluğu ve ürettiği yazılımlar hakkında daha fazla bilgi almak "
+"için %2</a> adresini ziyaret edin.</html>"
#: kaboutkdedialog_p.cpp:75
#, kde-format
@@ -570,17 +555,12 @@
msgstr "<h2>Hızlandırıcılar değiştirildi</h2>"
#: kcheckaccelerators.cpp:275 kcheckaccelerators.cpp:286
-#, fuzzy
-#| msgid "Find Text"
msgid "Old Text"
-msgstr "Metni Bul"
+msgstr "Eski Metin"
#: kcheckaccelerators.cpp:277 kcheckaccelerators.cpp:295
-#, fuzzy
-#| msgctxt "@title:menu"
-#| msgid "Show Text"
msgid "New Text"
-msgstr "Metni Göster"
+msgstr "Yeni Metin"
#: kcheckaccelerators.cpp:284
msgid "<h2>Accelerators removed</h2>"
@@ -801,17 +781,12 @@
"tane seçin.</qt>"
#: kkeysequencewidget.cpp:273
-#, fuzzy
-#| msgid ""
-#| "Click on the button, then enter the shortcut like you would in the "
-#| "program.\n"
-#| "Example for Ctrl+a: hold the Ctrl key and press a."
msgid ""
"Click on the button, then enter the shortcut like you would in the program.\n"
"Example for Ctrl+A: hold the Ctrl key and press A."
msgstr ""
"Düğmeye tıklayın, ardından kısayol tuşlarına basın.\n"
-"Ctrl+a örneği için: Ctrl tuşuna basılı tutun ve a tuşuna basın."
+"Ctrl+A örneği için: Ctrl tuşuna basılı tutun ve A tuşuna basın."
#: kkeysequencewidget.cpp:465
msgid "Reserved Shortcut"
@@ -870,48 +845,35 @@
msgstr "Kısayolu Yapılandır..."
#: ksendbugmail/main.cpp:45
-#, fuzzy
-#| msgid "Create content on server"
msgid "Error connecting to server."
-msgstr "Sunucuda içerik oluştur"
+msgstr "Sunucuya bağlanılamadı."
#: ksendbugmail/main.cpp:48
-#, fuzzy
-#| msgid "Not found"
msgid "Not connected."
-msgstr "Bulunamadı"
+msgstr "Bağlı değil."
#: ksendbugmail/main.cpp:51
-#, fuzzy
-#| msgid "Connection timed out"
msgid "Connection timed out."
-msgstr "Bağlantıda zaman aşımı oluştu"
+msgstr "Bağlantı zaman aşımına uğradı."
#: ksendbugmail/main.cpp:54
msgid "Time out waiting for server interaction."
-msgstr ""
+msgstr "Sunucudan yanıt beklenirken zaman aşımı oluştu."
#: ksendbugmail/main.cpp:58
-#, fuzzy, kde-format
-#| msgid "Server: %1"
+#, kde-format
msgid "Server said: \"%1\""
-msgstr "Sunucu: %1"
+msgstr "Sunucunun yanıtı: \"%1\""
#: ksendbugmail/main.cpp:89
-#, fuzzy
-#| msgid "Send bug report."
msgid "Sends a bug report by email."
-msgstr "Hata raporu gönder."
+msgstr "E-posta ile bir hata raporu gönderir."
#: ksendbugmail/main.cpp:91
-#, fuzzy
-#| msgid "The size of the dialog"
msgid "The subject line of the email."
-msgstr "Pencerenin boyutu"
+msgstr "E-postanın konu satırı."
#: ksendbugmail/main.cpp:92
-#, fuzzy
-#| msgid "The email address this bug report is sent to."
msgid "The email address to send the bug report to."
msgstr "Bu hata raporunun gönderileceği e-posta adresi."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.3.0/src/kactioncollection.h new/kxmlgui-5.4.0/src/kactioncollection.h
--- old/kxmlgui-5.3.0/src/kactioncollection.h 2014-10-04 19:15:13.000000000 +0200
+++ new/kxmlgui-5.4.0/src/kactioncollection.h 2014-11-02 13:21:45.000000000 +0100
@@ -484,7 +484,7 @@
* @param shortcuts the shortcuts to use for the given action in its specified shortcutContext()
* @since 5.0
*/
- void setDefaultShortcuts(QAction *action, const QList<QKeySequence> &shortcuts);
+ Q_INVOKABLE void setDefaultShortcuts(QAction *action, const QList<QKeySequence> &shortcuts);
/**
* Returns true if the given action's shortcuts may be configured by the user.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.3.0/src/kxmlguiclient.cpp new/kxmlgui-5.4.0/src/kxmlguiclient.cpp
--- old/kxmlgui-5.3.0/src/kxmlguiclient.cpp 2014-10-04 19:15:13.000000000 +0200
+++ new/kxmlgui-5.4.0/src/kxmlguiclient.cpp 2014-11-02 13:21:45.000000000 +0100
@@ -222,10 +222,21 @@
allFiles.append(file);
} else {
const QString filter = componentName() + QLatin1Char('/') + _file;
- allFiles = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("kxmlgui5/") + filter); // KF >= 5.1
+
+ // files on filesystem
+ allFiles << QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("kxmlgui5/") + filter); // KF >= 5.1
+
+ // KF >= 5.4 (resource file)
+ const QString qrcFile(QStringLiteral(":/kxmlgui5/") + filter);
+ if (QFile::exists(qrcFile)) {
+ allFiles << qrcFile;
+ }
+
+ // then compat locations
const QStringList compatFiles =
QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, filter) + // kdelibs4, KF 5.0
QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, _file); // kdelibs4, KF 5.0, caller passes component name
+
if (allFiles.isEmpty() && !compatFiles.isEmpty()) {
qWarning() << "KXMLGUI file found at deprecated location" << compatFiles << "-- please use ${KXMLGUI_INSTALL_DIR} to install this file instead.";
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.3.0/src/kxmlguiclient.h new/kxmlgui-5.4.0/src/kxmlguiclient.h
--- old/kxmlgui-5.3.0/src/kxmlguiclient.h 2014-10-04 19:15:13.000000000 +0200
+++ new/kxmlgui-5.4.0/src/kxmlguiclient.h 2014-11-02 13:21:45.000000000 +0100
@@ -321,11 +321,15 @@
* @param setXMLDoc Specify whether to call setXML. Default is true.
*
* The preferred way to call this method is with a simple filename for the @p file argument.
+ *
* Since KF 5.1, the file will then be assumed to be installed in DATADIR/kxmlgui5/, under a directory
* named after the component name.
* You should use ${KXMLGUI_INSTALL_DIR}/componentname in your CMakeLists.txt file, to install
* the .rc file(s).
*
+ * Since KF 5.4, the file will then be assumed to be installed in a Qt resource in :/kxmlgui5/,
+ * under a directory named after the component name.
+ *
* Compatibility notes:
* Fallback lookups exist to older locations: DATADIR/componentname/file and DATADIR/file.
* The latter was there so that setXMLFile("componentname/filename") worked (but this was
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.3.0/src/kxmlguifactory.cpp new/kxmlgui-5.4.0/src/kxmlguifactory.cpp
--- old/kxmlgui-5.3.0/src/kxmlguifactory.cpp 2014-10-04 19:15:13.000000000 +0200
+++ new/kxmlgui-5.4.0/src/kxmlguifactory.cpp 2014-11-02 13:21:45.000000000 +0100
@@ -125,12 +125,18 @@
} else {
// KF >= 5.1 (KXMLGUI_INSTALL_DIR)
xml_file = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kxmlgui5/") + componentName + QLatin1Char('/') + filename);
+ if (!QFile::exists(xml_file)) {
+ // KF >= 5.4 (resource file)
+ xml_file = QStringLiteral(":/kxmlgui5/") + componentName + QLatin1Char('/') + filename;
+ }
+
bool warn = false;
if (!QFile::exists(xml_file)) {
// kdelibs4 / KF 5.0 solution
xml_file = QStandardPaths::locate(QStandardPaths::GenericDataLocation, componentName + QLatin1Char('/') + filename);
warn = true;
}
+
if (!QFile::exists(xml_file)) {
// kdelibs4 / KF 5.0 solution, and the caller includes the component name
// This was broken (lead to component/component/ in kdehome) and unnecessary
@@ -138,6 +144,7 @@
xml_file = QStandardPaths::locate(QStandardPaths::GenericDataLocation, filename);
warn = true;
}
+
if (warn) {
qWarning() << "KXMLGUI file found at deprecated location" << xml_file << "-- please use ${KXMLGUI_INSTALL_DIR} to install these files instead.";
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org