openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
April 2014
- 1 participants
- 1084 discussions
Hello community,
here is the log from the commit of package kplotting for openSUSE:Factory checked in at 2014-04-02 17:22:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kplotting (Old)
and /work/SRC/openSUSE:Factory/.kplotting.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kplotting"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kplotting/kplotting.changes 2014-03-10 12:…
[View More]17:33.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kplotting.new/kplotting.changes 2014-04-02 17:22:32.000000000 +0200
@@ -1,0 +2,9 @@
+Sat Mar 29 19:47:48 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 4.98.0
+ * API improvements and cleanups
+ * Buildsystem fixes
+ * For more details please see:
+ http://www.kde.org/announcements/announce-frameworks5-beta1.php
+
+-------------------------------------------------------------------
Old:
----
kplotting-4.97.0.tar.xz
New:
----
kplotting-4.98.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kplotting.spec ++++++
--- /var/tmp/diff_new_pack.5qJOXk/_old 2014-04-02 17:22:33.000000000 +0200
+++ /var/tmp/diff_new_pack.5qJOXk/_new 2014-04-02 17:22:33.000000000 +0200
@@ -18,10 +18,10 @@
%define lname libKF5Plotting5
Name: kplotting
-Version: 4.97.0
+Version: 4.98.0
Release: 0
BuildRequires: cmake >= 2.8.12
-BuildRequires: extra-cmake-modules >= 0.0.11
+BuildRequires: extra-cmake-modules >= 0.0.12
BuildRequires: fdupes
BuildRequires: kf5-filesystem
BuildRequires: pkgconfig(Qt5Test) >= 5.2.0
++++++ kplotting-4.97.0.tar.xz -> kplotting-4.98.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kplotting-4.97.0/CMakeLists.txt new/kplotting-4.98.0/CMakeLists.txt
--- old/kplotting-4.97.0/CMakeLists.txt 2014-03-01 12:51:27.000000000 +0100
+++ new/kplotting-4.98.0/CMakeLists.txt 2014-03-28 19:17:23.000000000 +0100
@@ -2,7 +2,7 @@
project(KPlotting)
-find_package(ECM 0.0.11 REQUIRED NO_MODULE)
+find_package(ECM 0.0.12 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
@@ -19,7 +19,7 @@
include(ECMSetupVersion)
include(ECMGenerateHeaders)
-set(KF5_VERSION "4.97.0")
+set(KF5_VERSION "4.98.0")
ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KPLOTTING
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kplotting_version.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kplotting-4.97.0/MAINTAINER new/kplotting-4.98.0/MAINTAINER
--- old/kplotting-4.97.0/MAINTAINER 2014-03-01 12:51:27.000000000 +0100
+++ new/kplotting-4.98.0/MAINTAINER 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-
-Current kplotting maintainer is: Benjamin Port <benjamin.port(a)ben2367.fr>
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kplotting-4.97.0/src/kplotobject.h new/kplotting-4.98.0/src/kplotobject.h
--- old/kplotting-4.97.0/src/kplotobject.h 2014-03-01 12:51:27.000000000 +0100
+++ new/kplotting-4.98.0/src/kplotobject.h 2014-03-28 19:17:23.000000000 +0100
@@ -83,7 +83,7 @@
Hexagon = 6,
Asterisk = 7,
Star = 8,
- UnknwonPoint
+ UnknownPoint
};
/**
@@ -95,7 +95,7 @@
* @param size the size to use for plotted points, in pixels
* @param ps The PointStyle describing the shape for plotted points
*/
- explicit KPlotObject(const QColor &color = Qt::white, PlotType otype = Points, double size = 2, PointStyle ps = Circle);
+ explicit KPlotObject(const QColor &color = Qt::white, PlotType otype = Points, double size = 2.0, PointStyle ps = Circle);
/**
* Destructor.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kplotting-4.97.0/src/kplotwidget.h new/kplotting-4.98.0/src/kplotwidget.h
--- old/kplotting-4.97.0/src/kplotwidget.h 2014-03-01 12:51:27.000000000 +0100
+++ new/kplotting-4.98.0/src/kplotwidget.h 2014-03-28 19:17:23.000000000 +0100
@@ -370,7 +370,7 @@
* @param value Allows you to determine how strongly the rectangle
* should be avoided. Larger values are avoided more strongly.
*/
- void maskRect(const QRectF &r, float value = 1.0);
+ void maskRect(const QRectF &r, float value = 1.0f);
/**
* Indicate that object labels should try to avoid the line
@@ -383,7 +383,7 @@
* @param value Allows you to determine how strongly the line
* should be avoided. Larger values are avoided more strongly.
*/
- void maskAlongLine(const QPointF &p1, const QPointF &p2, float value = 1.0);
+ void maskAlongLine(const QPointF &p1, const QPointF &p2, float value = 1.0f);
/**
* Place an object label optimally in the plot. This function will
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
[View Less]
1
0
Hello community,
here is the log from the commit of package kparts for openSUSE:Factory checked in at 2014-04-02 17:22:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kparts (Old)
and /work/SRC/openSUSE:Factory/.kparts.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kparts"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kparts/kparts.changes 2014-03-10 12:18:13.000000000 +…
[View More]0100
+++ /work/SRC/openSUSE:Factory/.kparts.new/kparts.changes 2014-04-02 17:22:30.000000000 +0200
@@ -1,0 +2,9 @@
+Sat Mar 29 19:47:48 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 4.98.0
+ * API improvements and cleanups
+ * Buildsystem fixes
+ * For more details please see:
+ http://www.kde.org/announcements/announce-frameworks5-beta1.php
+
+-------------------------------------------------------------------
Old:
----
kparts-4.97.0.tar.xz
New:
----
kparts-4.98.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kparts.spec ++++++
--- /var/tmp/diff_new_pack.pqMpmk/_old 2014-04-02 17:22:32.000000000 +0200
+++ /var/tmp/diff_new_pack.pqMpmk/_new 2014-04-02 17:22:32.000000000 +0200
@@ -18,10 +18,10 @@
%define lname libKF5Parts5
Name: kparts
-Version: 4.97.0
+Version: 4.98.0
Release: 0
BuildRequires: cmake >= 2.8.12
-BuildRequires: extra-cmake-modules >= 0.0.11
+BuildRequires: extra-cmake-modules >= 0.0.12
BuildRequires: fdupes
BuildRequires: kbookmarks-devel >= %{_kf5_version}
BuildRequires: kcompletion-devel >= %{_kf5_version}
++++++ kparts-4.97.0.tar.xz -> kparts-4.98.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-4.97.0/CMakeLists.txt new/kparts-4.98.0/CMakeLists.txt
--- old/kparts-4.97.0/CMakeLists.txt 2014-03-01 12:51:25.000000000 +0100
+++ new/kparts-4.98.0/CMakeLists.txt 2014-03-29 08:15:31.000000000 +0100
@@ -2,7 +2,7 @@
project(KParts)
-find_package(ECM 0.0.11 REQUIRED NO_MODULE)
+find_package(ECM 0.0.12 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
@@ -17,7 +17,7 @@
include(ECMSetupVersion)
-set(KF5_VERSION "4.97.0")
+set(KF5_VERSION "4.98.0")
ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KPARTS
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kparts_version.h"
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5PartsConfigVersion.cmake"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-4.97.0/autotests/openorsavequestion_unittest.cpp new/kparts-4.98.0/autotests/openorsavequestion_unittest.cpp
--- old/kparts-4.97.0/autotests/openorsavequestion_unittest.cpp 2014-03-01 12:51:25.000000000 +0100
+++ new/kparts-4.98.0/autotests/openorsavequestion_unittest.cpp 2014-03-29 08:15:31.000000000 +0100
@@ -23,6 +23,7 @@
#include <qtest_widgets.h>
#include <kconfiggroup.h>
+#include <ksharedconfig.h>
#include <QDebug>
#include <QDialog>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-4.97.0/src/Messages.sh new/kparts-4.98.0/src/Messages.sh
--- old/kparts-4.97.0/src/Messages.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/kparts-4.98.0/src/Messages.sh 2014-03-29 08:15:31.000000000 +0100
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Invoke the extractrc script on all .ui, .rc, and .kcfg files in the sources.
+# The results are stored in a pseudo .cpp file to be picked up by xgettext.
+lst=`find . -name \*.rc -o -name \*.ui -o -name \*.kcfg`
+if [ -n "$lst" ] ; then
+ $EXTRACTRC $lst >> rc.cpp
+fi
+
+# If your framework contains tips-of-the-day, call preparetips as well.
+if [ -f "data/tips" ] ; then
+ ( cd data && $PREPARETIPS > ../tips.cpp )
+fi
+
+# Extract strings from all source files.
+# If your framework depends on KI18n, use $XGETTEXT. If it uses Qt translation
+# system, use $EXTRACT_TR_STRINGS.
+$XGETTEXT `find . -name \*.cpp -o -name \*.h -name \*.qml` -o $podir/kparts5.pot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-4.97.0/src/browserextension.cpp new/kparts-4.98.0/src/browserextension.cpp
--- old/kparts-4.97.0/src/browserextension.cpp 2014-03-01 12:51:25.000000000 +0100
+++ new/kparts-4.98.0/src/browserextension.cpp 2014-03-29 08:15:31.000000000 +0100
@@ -125,25 +125,15 @@
BrowserExtensionPrivate::createActionSlotMap();
}
- // Build list with this extension's slot names.
- QList<QByteArray> slotNames;
- int methodCount = metaObject()->methodCount();
- int methodOffset = metaObject()->methodOffset();
- for (int i = 0; i < methodCount; ++i) {
- QMetaMethod method = metaObject()->method(methodOffset + i);
- if (method.methodType() == QMetaMethod::Slot) {
- slotNames.append(method.methodSignature());
- }
- }
-
// Set the initial status of the actions depending on whether
// they're supported or not
+ const QMetaObject *metaobj = metaObject();
ActionSlotMap::ConstIterator it = s_actionSlotMap()->constBegin();
ActionSlotMap::ConstIterator itEnd = s_actionSlotMap()->constEnd();
for (int i = 0; it != itEnd; ++it, ++i) {
// Does the extension have a slot with the name of this action ?
- // ######### KDE4 TODO: use QMetaObject::indexOfMethod() #######
- d->m_actionStatus.setBit(i, slotNames.contains(it.key() + "()"));
+ QByteArray slotSig = it.key() + "()";
+ d->m_actionStatus.setBit(i, metaobj->indexOfMethod(slotSig.constData()) != -1);
}
connect(d->m_part, SIGNAL(completed()),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-4.97.0/src/browseropenorsavequestion.cpp new/kparts-4.98.0/src/browseropenorsavequestion.cpp
--- old/kparts-4.97.0/src/browseropenorsavequestion.cpp 2014-03-01 12:51:25.000000000 +0100
+++ new/kparts-4.98.0/src/browseropenorsavequestion.cpp 2014-03-29 08:15:31.000000000 +0100
@@ -21,6 +21,7 @@
#include "browseropenorsavequestion.h"
#include <kconfiggroup.h>
+#include <ksharedconfig.h>
#include <klocalizedstring.h>
#include <kfileitemactions.h>
#include <ksqueezedtextlabel.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-4.97.0/src/browserrun.cpp new/kparts-4.98.0/src/browserrun.cpp
--- old/kparts-4.97.0/src/browserrun.cpp 2014-03-01 12:51:25.000000000 +0100
+++ new/kparts-4.98.0/src/browserrun.cpp 2014-03-29 08:15:31.000000000 +0100
@@ -22,6 +22,7 @@
#include "browseropenorsavequestion.h"
#include <kconfiggroup.h>
+#include <ksharedconfig.h>
#include <kmessagebox.h>
#include <kio/job.h>
#include <kio/jobuidelegate.h>
@@ -513,11 +514,6 @@
newURL.setFragment(cleanedOrigUrl);
return newURL;
-
- // The kde3 approach broke with invalid urls, now that they become empty in qt4.
- //QList<QUrl> lst;
- //lst << newURL << runURL;
- //return KUrl::join(lst);
}
void BrowserRun::redirectToError(int error, const QString &errorText)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-4.97.0/src/mainwindow.h new/kparts-4.98.0/src/mainwindow.h
--- old/kparts-4.97.0/src/mainwindow.h 2014-03-01 12:51:25.000000000 +0100
+++ new/kparts-4.98.0/src/mainwindow.h 2014-03-29 08:15:31.000000000 +0100
@@ -81,10 +81,8 @@
/**
* Rebuilds the GUI after KEditToolbar changed the toolbar layout.
* @see configureToolbars()
- * KDE4: make this virtual. (For now we rely on the fact that it's called
- * as a slot, so the metaobject finds it here).
*/
- void saveNewToolbarConfig();
+ void saveNewToolbarConfig() Q_DECL_OVERRIDE;
protected:
virtual void createShellGUI(bool create = true);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-4.97.0/src/partmanager.h new/kparts-4.98.0/src/partmanager.h
--- old/kparts-4.97.0/src/partmanager.h 2014-03-01 12:51:25.000000000 +0100
+++ new/kparts-4.98.0/src/partmanager.h 2014-03-29 08:15:31.000000000 +0100
@@ -139,9 +139,7 @@
/**
* Adds a part to the manager.
*
- * Sets it to the active part automatically if @p setActive is true (default ).
- * Behavior fix in KDE3.4: the part's widget is shown only if setActive is true,
- * it used to be shown in all cases before.
+ * Sets it to the active part automatically if @p setActive is true (default).
*/
virtual void addPart(Part *part, bool setActive = true);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kparts-4.97.0/src/plugin.cpp new/kparts-4.98.0/src/plugin.cpp
--- old/kparts-4.97.0/src/plugin.cpp 2014-03-01 12:51:25.000000000 +0100
+++ new/kparts-4.98.0/src/plugin.cpp 2014-03-29 08:15:31.000000000 +0100
@@ -27,6 +27,7 @@
#include <kxmlguifactory.h>
#include <klocalizedstring.h>
#include <kdesktopfile.h>
+#include <ksharedconfig.h>
#include <kconfiggroup.h>
#include <kaboutdata.h>
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
[View Less]
1
0
Hello community,
here is the log from the commit of package knotifyconfig for openSUSE:Factory checked in at 2014-04-02 17:22:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/knotifyconfig (Old)
and /work/SRC/openSUSE:Factory/.knotifyconfig.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "knotifyconfig"
Changes:
--------
--- /work/SRC/openSUSE:Factory/knotifyconfig/…
[View More]knotifyconfig.changes 2014-03-10 12:18:12.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.knotifyconfig.new/knotifyconfig.changes 2014-04-02 17:22:30.000000000 +0200
@@ -1,0 +2,9 @@
+Sat Mar 29 19:47:47 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 4.98.0
+ * API improvements and cleanups
+ * Buildsystem fixes
+ * For more details please see:
+ http://www.kde.org/announcements/announce-frameworks5-beta1.php
+
+-------------------------------------------------------------------
Old:
----
knotifyconfig-4.97.0.tar.xz
New:
----
knotifyconfig-4.98.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ knotifyconfig.spec ++++++
--- /var/tmp/diff_new_pack.YQqC2W/_old 2014-04-02 17:22:30.000000000 +0200
+++ /var/tmp/diff_new_pack.YQqC2W/_new 2014-04-02 17:22:30.000000000 +0200
@@ -18,10 +18,10 @@
%define lname libKF5NotifyConfig5
Name: knotifyconfig
-Version: 4.97.0
+Version: 4.98.0
Release: 0
BuildRequires: cmake >= 2.8.12
-BuildRequires: extra-cmake-modules >= 0.0.11
+BuildRequires: extra-cmake-modules >= 0.0.12
BuildRequires: fdupes
BuildRequires: kbookmarks-devel >= %{_kf5_version}
BuildRequires: kcompletion-devel >= %{_kf5_version}
++++++ knotifyconfig-4.97.0.tar.xz -> knotifyconfig-4.98.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifyconfig-4.97.0/CMakeLists.txt new/knotifyconfig-4.98.0/CMakeLists.txt
--- old/knotifyconfig-4.97.0/CMakeLists.txt 2014-03-01 12:51:23.000000000 +0100
+++ new/knotifyconfig-4.98.0/CMakeLists.txt 2014-03-28 19:17:20.000000000 +0100
@@ -3,11 +3,11 @@
project(KNotifyConfig)
# Dependencies
-find_package(ECM 0.0.11 REQUIRED NO_MODULE)
+find_package(ECM 0.0.12 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
set(REQUIRED_QT_VERSION "5.2.0")
-set(KF5_VERSION "4.97.0")
+set(KF5_VERSION "4.98.0")
# Required Qt5 components to build this framework
find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Widgets DBus)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifyconfig-4.97.0/src/Messages.sh new/knotifyconfig-4.98.0/src/Messages.sh
--- old/knotifyconfig-4.97.0/src/Messages.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/knotifyconfig-4.98.0/src/Messages.sh 2014-03-28 19:17:20.000000000 +0100
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Invoke the extractrc script on all .ui, .rc, and .kcfg files in the sources.
+# The results are stored in a pseudo .cpp file to be picked up by xgettext.
+lst=`find . -name \*.rc -o -name \*.ui -o -name \*.kcfg`
+if [ -n "$lst" ] ; then
+ $EXTRACTRC $lst >> rc.cpp
+fi
+
+# If your framework contains tips-of-the-day, call preparetips as well.
+if [ -f "data/tips" ] ; then
+ ( cd data && $PREPARETIPS > ../tips.cpp )
+fi
+
+# Extract strings from all source files.
+# If your framework depends on KI18n, use $XGETTEXT. If it uses Qt translation
+# system, use $EXTRACT_TR_STRINGS.
+$XGETTEXT `find . -name \*.cpp -o -name \*.h -name \*.qml` -o $podir/knotifyconfig5.pot
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
[View Less]
1
0
Hello community,
here is the log from the commit of package knotifications for openSUSE:Factory checked in at 2014-04-02 17:22:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/knotifications (Old)
and /work/SRC/openSUSE:Factory/.knotifications.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "knotifications"
Changes:
--------
--- /work/SRC/openSUSE:Factory/knotifications/…
[View More]knotifications.changes 2014-03-10 12:17:47.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.knotifications.new/knotifications.changes 2014-04-02 17:22:29.000000000 +0200
@@ -1,0 +2,9 @@
+Sat Mar 29 19:47:47 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 4.98.0
+ * API improvements and cleanups
+ * Buildsystem fixes
+ * For more details please see:
+ http://www.kde.org/announcements/announce-frameworks5-beta1.php
+
+-------------------------------------------------------------------
Old:
----
knotifications-4.97.0.tar.xz
New:
----
knotifications-4.98.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ knotifications.spec ++++++
--- /var/tmp/diff_new_pack.pym5Fx/_old 2014-04-02 17:22:29.000000000 +0200
+++ /var/tmp/diff_new_pack.pym5Fx/_new 2014-04-02 17:22:29.000000000 +0200
@@ -18,10 +18,10 @@
%define lname libKF5Notifications5
Name: knotifications
-Version: 4.97.0
+Version: 4.98.0
Release: 0
BuildRequires: cmake >= 2.8.12
-BuildRequires: extra-cmake-modules >= 0.0.11
+BuildRequires: extra-cmake-modules >= 0.0.12
BuildRequires: fdupes
BuildRequires: kcodecs-devel >= %{_kf5_version}
BuildRequires: kconfig-devel >= %{_kf5_version}
++++++ knotifications-4.97.0.tar.xz -> knotifications-4.98.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/CMakeLists.txt new/knotifications-4.98.0/CMakeLists.txt
--- old/knotifications-4.97.0/CMakeLists.txt 2014-03-03 17:23:43.000000000 +0100
+++ new/knotifications-4.98.0/CMakeLists.txt 2014-03-28 19:17:18.000000000 +0100
@@ -3,15 +3,15 @@
project(KNotifications)
# ECM setup
-find_package(ECM 0.0.11 REQUIRED NO_MODULE)
-set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+find_package(ECM 0.0.12 REQUIRED NO_MODULE)
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
include(FeatureSummary)
include(GenerateExportHeader)
include(ECMSetupVersion)
include(ECMGenerateHeaders)
-set(KF5_VERSION "4.97.0")
+set(KF5_VERSION "4.98.0")
ecm_setup_version(${KF5_VERSION}
VARIABLE_PREFIX KNOTIFICATIONS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/cmake/FindDBusMenuQt5.cmake new/knotifications-4.98.0/cmake/FindDBusMenuQt5.cmake
--- old/knotifications-4.97.0/cmake/FindDBusMenuQt5.cmake 2014-03-03 17:23:43.000000000 +0100
+++ new/knotifications-4.98.0/cmake/FindDBusMenuQt5.cmake 1970-01-01 01:00:00.000000000 +0100
@@ -1,71 +0,0 @@
-# - Try to find dbusmenu-qt5
-# This module helps finding an installation of the DBusMenuQt library (see https://launchpad.net/libdbusmenu-qt/)
-# Once done this will define
-#
-# DBusMenuQt5_FOUND - system has dbusmenu-qt
-# DBusMenuQt5_INCLUDE_DIRS - the dbusmenu-qt include directory
-# DBusMenuQt5_LIBRARIES - the libraries needed to use dbusmenu-qt
-# DBusMenuQt5_DEFINITIONS - Compiler switches required for using dbusmenu-qt
-#
-# The minimum required version of DBusMenuQt can be specified using the
-# standard syntax, e.g. find_package(DBusMenuQt5 0.6)
-#
-
-# Copyright (c) 2009, Canonical Ltd.
-# - Author: Aurélien Gâteau <aurelien.gateau(a)canonical.com>
-#
-# Based on FindQCA2.cmake
-# Copyright (c) 2006, Michael Larouche, <michael.larouche(a)kdemail.net>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-include(FindPackageHandleStandardArgs)
-
-find_package(PkgConfig)
-pkg_check_modules(PC_DBusMenuQt5 QUIET dbusmenu-qt5)
-
-
-set(DBusMenuQt5_DEFINITIONS ${PC_DBusMenuQt5_CFLAGS_OTHER})
-
-find_library(DBusMenuQt5_LIBRARY
- NAMES dbusmenu-qt5 dbusmenu-qt5d
- HINTS ${PC_DBusMenuQt5_LIBDIR} ${PC_DBusMenuQt5_LIBRARY_DIRS}
- )
-
-find_path(DBusMenuQt5_INCLUDE_DIR dbusmenuexporter.h
- HINTS ${PC_DBusMenuQt5_INCLUDEDIR} ${PC_DBusMenuQt5_INCLUDE_DIRS}
- PATH_SUFFIXES dbusmenu-qt5 dbusmenu-qt
- )
-
- message(STATUS "DBusMenuQt5_INCLUDE_DIR=${DBusMenuQt5_INCLUDE_DIR} DBusMenuQt5_LIBRARY=${DBusMenuQt5_LIBRARY} DBusMenuQt5_VERSION=${DBusMenuQt5_VERSION}")
-
-# find the version number from dbusmenu_version.h and store it in the cache
-if(DBusMenuQt5_INCLUDE_DIR AND NOT DBusMenuQt5_VERSION)
- # parse the version number out from dbusmenu_version:
- if(EXISTS ${DBusMenuQt5_INCLUDE_DIR}/dbusmenu_version.h)
- file(READ "${DBusMenuQt5_INCLUDE_DIR}/dbusmenu_version.h" DBusMenuQt5_VERSION_CONTENT)
-
- string(REGEX MATCH "#define +DBUSMENUQT_VERSION_MAJOR +([0-9]+)" _dummy "${DBusMenuQt5_VERSION_CONTENT}")
- set(DBusMenuQt5_VERSION_MAJOR "${CMAKE_MATCH_1}")
-
- string(REGEX MATCH "#define +DBUSMENUQT_VERSION_MINOR +([0-9]+)" _dummy "${DBusMenuQt5_VERSION_CONTENT}")
- set(DBusMenuQt5_VERSION_MINOR "${CMAKE_MATCH_1}")
-
- string(REGEX MATCH "#define +DBUSMENUQT_VERSION_PATCH +([0-9]+)" _dummy "${DBusMenuQt5_VERSION_CONTENT}")
- set(DBusMenuQt5_VERSION_PATCH "${CMAKE_MATCH_1}")
-
- endif()
-
- set(DBusMenuQt5_VERSION "${DBusMenuQt5_VERSION_MAJOR}.${DBusMenuQt5_VERSION_MINOR}.${DBusMenuQt5_VERSION_PATCH}" CACHE STRING "Version number of DBusMenuQt5" FORCE)
- message(STATUS "NOW DBusMenuQt5_VERSION=${DBusMenuQt5_VERSION}")
-endif()
-
-
-find_package_handle_standard_args(DBusMenuQt5 REQUIRED_VARS DBusMenuQt5_LIBRARY DBusMenuQt5_INCLUDE_DIR
- VERSION_VAR DBusMenuQt5_VERSION FOUND_VAR DBusMenuQt5_FOUND)
-
-set(DBusMenuQt5_LIBRARIES ${DBusMenuQt5_LIBRARY})
-set(DBusMenuQt5_INCLUDE_DIRS ${DBusMenuQt5_INCLUDE_DIR})
-
-mark_as_advanced(DBusMenuQt5_INCLUDE_DIR DBusMenuQt5_LIBRARY DBusMenuQt5_VERSION)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/knotifications.yaml new/knotifications-4.98.0/knotifications.yaml
--- old/knotifications-4.97.0/knotifications.yaml 2014-03-03 17:23:43.000000000 +0100
+++ new/knotifications-4.98.0/knotifications.yaml 2014-03-28 19:17:18.000000000 +0100
@@ -1 +1 @@
-tier: 2
+tier: 3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/CMakeLists.txt new/knotifications-4.98.0/src/CMakeLists.txt
--- old/knotifications-4.97.0/src/CMakeLists.txt 2014-03-03 17:23:43.000000000 +0100
+++ new/knotifications-4.98.0/src/CMakeLists.txt 2014-03-28 19:17:18.000000000 +0100
@@ -19,13 +19,14 @@
notifybyaudio.cpp
)
-find_package(DBusMenuQt5)
-set_package_properties(DBusMenuQt5 PROPERTIES DESCRIPTION "DBusMenuQt"
+find_package(dbusmenu-qt5 CONFIG)
+set_package_properties(dbusmenu-qt5 PROPERTIES DESCRIPTION "DBusMenuQt"
URL "https://launchpad.net/libdbusmenu-qt" TYPE OPTIONAL
PURPOSE "Support for notification area menus via the DBusMenu protocol")
-if (DBusMenuQt5_FOUND)
+if (dbusmenu-qt5_FOUND)
+ message("dbusmenu-qt5_FOUND")
set(HAVE_DBUSMENUQT 1)
- include_directories(${DBusMenuQt5_INCLUDE_DIRS})
+ include_directories(${dbusmenu-qt5_INCLUDE_DIRS})
else()
set(HAVE_DBUSMENUQT 0)
endif()
@@ -70,7 +71,7 @@
endif()
if(HAVE_DBUSMENUQT)
- target_link_libraries(KF5Notifications PRIVATE ${DBusMenuQt5_LIBRARIES})
+ target_link_libraries(KF5Notifications PRIVATE dbusmenu-qt5)
endif()
set_target_properties(KF5Notifications PROPERTIES VERSION ${KNOTIFICATIONS_VERSION_STRING}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/Messages.sh new/knotifications-4.98.0/src/Messages.sh
--- old/knotifications-4.97.0/src/Messages.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/knotifications-4.98.0/src/Messages.sh 2014-03-28 19:17:18.000000000 +0100
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Invoke the extractrc script on all .ui, .rc, and .kcfg files in the sources.
+# The results are stored in a pseudo .cpp file to be picked up by xgettext.
+lst=`find . -name \*.rc -o -name \*.ui -o -name \*.kcfg`
+if [ -n "$lst" ] ; then
+ $EXTRACTRC $lst >> rc.cpp
+fi
+
+# If your framework contains tips-of-the-day, call preparetips as well.
+if [ -f "data/tips" ] ; then
+ ( cd data && $PREPARETIPS > ../tips.cpp )
+fi
+
+# Extract strings from all source files.
+# If your framework depends on KI18n, use $XGETTEXT. If it uses Qt translation
+# system, use $EXTRACT_TR_STRINGS.
+$EXTRACT_TR_STRINGS `find . -name \*.cpp -o -name \*.h -name \*.qml` -o $podir/knotifications5.pot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/knotificationmanager.cpp new/knotifications-4.98.0/src/knotificationmanager.cpp
--- old/knotifications-4.97.0/src/knotificationmanager.cpp 2014-03-03 17:23:43.000000000 +0100
+++ new/knotifications-4.98.0/src/knotificationmanager.cpp 2014-03-28 19:17:18.000000000 +0100
@@ -106,7 +106,7 @@
void KNotificationManager::notifyPluginFinished(KNotification *notification)
{
- if (!d->notifications.contains(notification->id())) {
+ if (!notification || !d->notifications.contains(notification->id())) {
return;
}
@@ -118,8 +118,8 @@
if (d->notifications.contains(id)) {
qDebug() << id << " " << action;
KNotification *n = d->notifications[id];
- d->notifications.remove(id);
n->activate(action);
+ close(id);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/knotifyconfig.cpp new/knotifications-4.98.0/src/knotifyconfig.cpp
--- old/knotifications-4.97.0/src/knotifyconfig.cpp 2014-03-03 17:23:43.000000000 +0100
+++ new/knotifications-4.98.0/src/knotifyconfig.cpp 2014-03-28 19:17:18.000000000 +0100
@@ -1,20 +1,21 @@
/*
Copyright (C) 2005-2009 by Olivier Goffart <ogoffart at kde.org>
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
- This program is free software; you can redistribute it 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,
+ This library 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.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/knotifyconfig.h new/knotifications-4.98.0/src/knotifyconfig.h
--- old/knotifications-4.97.0/src/knotifyconfig.h 2014-03-03 17:23:43.000000000 +0100
+++ new/knotifications-4.98.0/src/knotifyconfig.h 2014-03-28 19:17:18.000000000 +0100
@@ -1,20 +1,21 @@
/*
Copyright (C) 2005-2009 by Olivier Goffart <ogoffart at kde.org>
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
- This program is free software; you can redistribute it 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,
+ This library 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.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/knotifyplugin.cpp new/knotifications-4.98.0/src/knotifyplugin.cpp
--- old/knotifications-4.97.0/src/knotifyplugin.cpp 2014-03-03 17:23:43.000000000 +0100
+++ new/knotifications-4.98.0/src/knotifyplugin.cpp 2014-03-28 19:17:18.000000000 +0100
@@ -1,20 +1,21 @@
/*
Copyright (C) 2005-2006 by Olivier Goffart <ogoffart at kde.org>
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
- This program is free software; you can redistribute it 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,
+ This library 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.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/knotifyplugin.h new/knotifications-4.98.0/src/knotifyplugin.h
--- old/knotifications-4.97.0/src/knotifyplugin.h 2014-03-03 17:23:43.000000000 +0100
+++ new/knotifications-4.98.0/src/knotifyplugin.h 2014-03-28 19:17:18.000000000 +0100
@@ -1,20 +1,21 @@
/*
Copyright (C) 2005-2006 by Olivier Goffart <ogoffart at kde.org>
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
- This program is free software; you can redistribute it 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,
+ This library 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.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/kstatusnotifieritem.cpp new/knotifications-4.98.0/src/kstatusnotifieritem.cpp
--- old/knotifications-4.97.0/src/kstatusnotifieritem.cpp 2014-03-03 17:23:43.000000000 +0100
+++ new/knotifications-4.98.0/src/kstatusnotifieritem.cpp 2014-03-28 19:17:18.000000000 +0100
@@ -721,7 +721,7 @@
q->setContextMenu(m);
QAction *action = new QAction(q);
- action->setText(q->tr("Quit"));
+ action->setText(KStatusNotifierItem::tr("Quit"));
action->setIcon(QIcon::fromTheme("application-exit"));
QObject::connect(action, SIGNAL(triggered()), q, SLOT(maybeQuit()));
actionCollection.insert("quit", action);
@@ -894,9 +894,9 @@
if (associatedWidget && associatedWidget != menu) {
QAction *action = actionCollection.value("minimizeRestore");
if (checkVisibility(QPoint(0, 0), false)) {
- action->setText(q->tr("&Restore"));
+ action->setText(KStatusNotifierItem::tr("&Restore"));
} else {
- action->setText(q->tr("&Minimize"));
+ action->setText(KStatusNotifierItem::tr("&Minimize"));
}
}
}
@@ -908,10 +908,10 @@
caption = QCoreApplication::applicationName();
}
- QString query = q->tr("<qt>Are you sure you want to quit <b>%1</b>?</qt>", caption.toUtf8());
+ QString query = KStatusNotifierItem::tr("<qt>Are you sure you want to quit <b>%1</b>?</qt>").arg(caption);
if (QMessageBox::question(associatedWidget,
- q->tr("Confirm Quit From System Tray"), query)) {
+ KStatusNotifierItem::tr("Confirm Quit From System Tray"), query)) {
qApp->quit();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/notifybyaudio.cpp new/knotifications-4.98.0/src/notifybyaudio.cpp
--- old/knotifications-4.97.0/src/notifybyaudio.cpp 2014-03-03 17:23:43.000000000 +0100
+++ new/knotifications-4.98.0/src/notifybyaudio.cpp 2014-03-28 19:17:18.000000000 +0100
@@ -2,20 +2,21 @@
Copyright 2014 by Martin Klapetek <mklapetek(a)kde.org>
This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License (LGPL) as published by the Free Software Foundation;
- either version 2 of the License, or (at your option) any later
- version.
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
This library 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
- Library General Public License for more details.
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
*/
#include "notifybyaudio.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/notifybyaudio.h new/knotifications-4.98.0/src/notifybyaudio.h
--- old/knotifications-4.97.0/src/notifybyaudio.h 2014-03-03 17:23:43.000000000 +0100
+++ new/knotifications-4.98.0/src/notifybyaudio.h 2014-03-28 19:17:18.000000000 +0100
@@ -2,20 +2,21 @@
Copyright 2014 by Martin Klapetek <mklapetek(a)kde.org>
This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License (LGPL) as published by the Free Software Foundation;
- either version 2 of the License, or (at your option) any later
- version.
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
This library 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
- Library General Public License for more details.
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/notifybyexecute.cpp new/knotifications-4.98.0/src/notifybyexecute.cpp
--- old/knotifications-4.97.0/src/notifybyexecute.cpp 2014-03-03 17:23:43.000000000 +0100
+++ new/knotifications-4.98.0/src/notifybyexecute.cpp 2014-03-28 19:17:18.000000000 +0100
@@ -1,20 +1,21 @@
/*
Copyright (C) 2005-2006 by Olivier Goffart <ogoffart at kde.org>
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
- This program is free software; you can redistribute it 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,
+ This library 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.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/notifybyexecute.h new/knotifications-4.98.0/src/notifybyexecute.h
--- old/knotifications-4.97.0/src/notifybyexecute.h 2014-03-03 17:23:43.000000000 +0100
+++ new/knotifications-4.98.0/src/notifybyexecute.h 2014-03-28 19:17:18.000000000 +0100
@@ -1,20 +1,21 @@
/*
Copyright (C) 2005-2006 by Olivier Goffart <ogoffart at kde.org>
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
- This program is free software; you can redistribute it 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,
+ This library 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.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/notifybyktts.cpp new/knotifications-4.98.0/src/notifybyktts.cpp
--- old/knotifications-4.97.0/src/notifybyktts.cpp 2014-03-03 17:23:43.000000000 +0100
+++ new/knotifications-4.98.0/src/notifybyktts.cpp 2014-03-28 19:17:18.000000000 +0100
@@ -2,20 +2,21 @@
Copyright (C) 2007 by Olivier Goffart <ogoffart at kde.org>
Copyright (C) 2009 by Laurent Montel <montel(a)kde.org>
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
- This program is free software; you can redistribute it 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,
+ This library 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.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "notifybyktts.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/notifybyktts.h new/knotifications-4.98.0/src/notifybyktts.h
--- old/knotifications-4.97.0/src/notifybyktts.h 2014-03-03 17:23:43.000000000 +0100
+++ new/knotifications-4.98.0/src/notifybyktts.h 2014-03-28 19:17:18.000000000 +0100
@@ -2,19 +2,21 @@
Copyright (C) 2007 by Olivier Goffart <ogoffart at kde.org>
Copyright (C) 2009 by Laurent Montel <montel(a)kde.org>
- This program is free software; you can redistribute it 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 library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
- This program is distributed in the hope that it will be useful,
+ This library 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.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/notifybylogfile.cpp new/knotifications-4.98.0/src/notifybylogfile.cpp
--- old/knotifications-4.97.0/src/notifybylogfile.cpp 2014-03-03 17:23:43.000000000 +0100
+++ new/knotifications-4.98.0/src/notifybylogfile.cpp 2014-03-28 19:17:18.000000000 +0100
@@ -1,20 +1,21 @@
/*
Copyright (C) 2005-2006 by Olivier Goffart <ogoffart at kde.org>
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
- This program is free software; you can redistribute it 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,
+ This library 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.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/notifybylogfile.h new/knotifications-4.98.0/src/notifybylogfile.h
--- old/knotifications-4.97.0/src/notifybylogfile.h 2014-03-03 17:23:43.000000000 +0100
+++ new/knotifications-4.98.0/src/notifybylogfile.h 2014-03-28 19:17:18.000000000 +0100
@@ -1,20 +1,21 @@
/*
Copyright (C) 2005-2006 by Olivier Goffart <ogoffart at kde.org>
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
- This program is free software; you can redistribute it 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,
+ This library 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.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/notifybypopup.cpp new/knotifications-4.98.0/src/notifybypopup.cpp
--- old/knotifications-4.97.0/src/notifybypopup.cpp 2014-03-03 17:23:43.000000000 +0100
+++ new/knotifications-4.98.0/src/notifybypopup.cpp 2014-03-28 19:17:18.000000000 +0100
@@ -3,19 +3,21 @@
Copyright (C) 2008 by Dmitry Suzdalev <dimsuz(a)gmail.com>
Copyright (C) 2014 by Martin Klapetek <mklapetek(a)kde.org>
- This program is free software; you can redistribute it 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 library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
- This program is distributed in the hope that it will be useful,
+ This library 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.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -447,6 +449,12 @@
}
d->galagoNotifications.remove(dbus_id);
finished(n);
+ // The popup bubble is the only user facing part of a notification,
+ // if the user closes the popup, it means he wants to get rid
+ // of the notification completely, including playing sound etc
+ // Therefore we close the KNotification completely after closing
+ // the popup
+ n->close();
}
void NotifyByPopup::onGalagoServerReply(QDBusPendingCallWatcher *watcher)
@@ -645,7 +653,9 @@
void NotifyByPopupPrivate::closeGalagoNotification(KNotification *notification)
{
- if (notification->id() == 0) {
+ uint galagoId = galagoNotifications.key(notification, 0);
+
+ if (galagoId == 0) {
qDebug() << "not found dbus id to close" << notification->id();
return;
}
@@ -653,7 +663,7 @@
QDBusMessage m = QDBusMessage::createMethodCall(dbusServiceName, dbusPath,
dbusInterfaceName, "CloseNotification");
QList<QVariant> args;
- args.append(notification->id());
+ args.append(galagoId);
m.setArguments(args);
// send(..) does not block
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/notifybypopup.h new/knotifications-4.98.0/src/notifybypopup.h
--- old/knotifications-4.97.0/src/notifybypopup.h 2014-03-03 17:23:43.000000000 +0100
+++ new/knotifications-4.98.0/src/notifybypopup.h 2014-03-28 19:17:18.000000000 +0100
@@ -3,20 +3,21 @@
Copyright (C) 2008 by Dmitry Suzdalev <dimsuz(a)gmail.com>
Copyright (C) 2014 by Martin Klapetek <mklapetek(a)kde.org>
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
- This program is free software; you can redistribute it 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,
+ This library 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.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/notifybypopupgrowl.cpp new/knotifications-4.98.0/src/notifybypopupgrowl.cpp
--- old/knotifications-4.97.0/src/notifybypopupgrowl.cpp 2014-03-03 17:23:43.000000000 +0100
+++ new/knotifications-4.98.0/src/notifybypopupgrowl.cpp 2014-03-28 19:17:18.000000000 +0100
@@ -1,19 +1,21 @@
/*
Copyright (C) 2010 by Sjors Gielen <dazjorz(a)dazjorz.com>
- This program is free software; you can redistribute it 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 library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
- This program is distributed in the hope that it will be useful,
+ This library 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.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/notifybypopupgrowl.h new/knotifications-4.98.0/src/notifybypopupgrowl.h
--- old/knotifications-4.97.0/src/notifybypopupgrowl.h 2014-03-03 17:23:43.000000000 +0100
+++ new/knotifications-4.98.0/src/notifybypopupgrowl.h 2014-03-28 19:17:18.000000000 +0100
@@ -1,19 +1,21 @@
/*
Copyright (C) 2010 by Sjors Gielen <dazjorz(a)dazjorz.com>
- This program is free software; you can redistribute it 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 library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
- This program is distributed in the hope that it will be useful,
+ This library 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.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/notifybytaskbar.cpp new/knotifications-4.98.0/src/notifybytaskbar.cpp
--- old/knotifications-4.97.0/src/notifybytaskbar.cpp 2014-03-03 17:23:43.000000000 +0100
+++ new/knotifications-4.98.0/src/notifybytaskbar.cpp 2014-03-28 19:17:18.000000000 +0100
@@ -1,20 +1,21 @@
/*
Copyright (C) 2005-2006 by Olivier Goffart <ogoffart at kde.org>
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
- This program is free software; you can redistribute it 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,
+ This library 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.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/notifybytaskbar.h new/knotifications-4.98.0/src/notifybytaskbar.h
--- old/knotifications-4.97.0/src/notifybytaskbar.h 2014-03-03 17:23:43.000000000 +0100
+++ new/knotifications-4.98.0/src/notifybytaskbar.h 2014-03-28 19:17:18.000000000 +0100
@@ -1,20 +1,21 @@
/*
Copyright (C) 2005-2006 by Olivier Goffart <ogoffart at kde.org>
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
- This program is free software; you can redistribute it 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,
+ This library 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.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/org.freedesktop.Notifications.xml new/knotifications-4.98.0/src/org.freedesktop.Notifications.xml
--- old/knotifications-4.97.0/src/org.freedesktop.Notifications.xml 2014-03-03 17:23:43.000000000 +0100
+++ new/knotifications-4.98.0/src/org.freedesktop.Notifications.xml 2014-03-28 19:17:18.000000000 +0100
@@ -10,7 +10,7 @@
<arg name="action_key" type="s" direction="out"/>
</signal>
<method name="Notify">
- <annotation name="com.trolltech.QtDBus.QtTypeName.In6" value="QVariantMap"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.In6" value="QVariantMap"/>
<arg type="u" direction="out"/>
<arg name="app_name" type="s" direction="in"/>
<arg name="replaces_id" type="u" direction="in"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/org.kde.StatusNotifierItem.xml new/knotifications-4.98.0/src/org.kde.StatusNotifierItem.xml
--- old/knotifications-4.97.0/src/org.kde.StatusNotifierItem.xml 2014-03-03 17:23:43.000000000 +0100
+++ new/knotifications-4.98.0/src/org.kde.StatusNotifierItem.xml 2014-03-28 19:17:18.000000000 +0100
@@ -20,13 +20,13 @@
<!--struct containing width, height and image data-->
<property name="IconPixmap" type="(iiay)" access="read">
- <annotation name="com.trolltech.QtDBus.QtTypeName" value="KDbusImageVector"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName" value="KDbusImageVector"/>
</property>
<property name="OverlayIconName" type="s" access="read"/>
<property name="OverlayIconPixmap" type="(iiay)" access="read">
- <annotation name="com.trolltech.QtDBus.QtTypeName" value="KDbusImageVector"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName" value="KDbusImageVector"/>
</property>
@@ -35,7 +35,7 @@
<!--same definition as image-->
<property name="AttentionIconPixmap" type="(iiay)" access="read">
- <annotation name="com.trolltech.QtDBus.QtTypeName" value="KDbusImageVector"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName" value="KDbusImageVector"/>
</property>
<property name="AttentionMovieName" type="s" access="read"/>
@@ -46,7 +46,7 @@
<!--(iiay) is an image-->
<property name="ToolTip" type="(s(iiay)ss)" access="read">
- <annotation name="com.trolltech.QtDBus.QtTypeName" value="KDbusToolTipStruct"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName" value="KDbusToolTipStruct"/>
</property>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/org.kde.StatusNotifierWatcher.xml new/knotifications-4.98.0/src/org.kde.StatusNotifierWatcher.xml
--- old/knotifications-4.97.0/src/org.kde.StatusNotifierWatcher.xml 2014-03-03 17:23:43.000000000 +0100
+++ new/knotifications-4.98.0/src/org.kde.StatusNotifierWatcher.xml 2014-03-28 19:17:18.000000000 +0100
@@ -15,7 +15,7 @@
<!-- properties -->
<property name="RegisteredStatusNotifierItems" type="as" access="read">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QStringList"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QStringList"/>
</property>
<property name="IsStatusNotifierHostRegistered" type="b" access="read"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/tests/CMakeLists.txt new/knotifications-4.98.0/tests/CMakeLists.txt
--- old/knotifications-4.97.0/tests/CMakeLists.txt 2014-03-03 17:23:43.000000000 +0100
+++ new/knotifications-4.98.0/tests/CMakeLists.txt 2014-03-28 19:17:18.000000000 +0100
@@ -7,7 +7,7 @@
macro(knotifications_executable_tests)
foreach(_testname ${ARGN})
add_executable(${_testname} ${_testname}.cpp)
- target_link_libraries(${_testname} Qt5::Test KF5::Notifications)
+ target_link_libraries(${_testname} Qt5::Test Qt5::DBus KF5::Notifications)
ecm_mark_as_test(${_testname})
endforeach(_testname)
endmacro()
@@ -16,6 +16,7 @@
knotificationrestrictionstest
kpassivepopuptest
kstatusnotifieritemtest
+ knotificationdbustest
)
target_link_libraries(kpassivepopuptest KF5::WindowSystem)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/tests/knotificationdbustest.cpp new/knotifications-4.98.0/tests/knotificationdbustest.cpp
--- old/knotifications-4.97.0/tests/knotificationdbustest.cpp 1970-01-01 01:00:00.000000000 +0100
+++ new/knotifications-4.98.0/tests/knotificationdbustest.cpp 2014-03-28 19:17:18.000000000 +0100
@@ -0,0 +1,103 @@
+/*
+ Copyright 2014 Martin Klapetek <mklapetek(a)kde.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#include <knotification.h>
+#include <QTimer>
+
+#include <QApplication>
+#include <QLabel>
+#include <QDebug>
+#include <QtDBus/QDBusConnection>
+#include <QtDBus/QDBusMessage>
+
+static const char dbusServiceName[] = "org.freedesktop.Notifications";
+static const char dbusInterfaceName[] = "org.freedesktop.Notifications";
+static const char dbusPath[] = "/org/freedesktop/Notifications";
+
+void notificationDBusCall(const QString &iconName, const QString &title, const QString &body, const QStringList &actions, bool persistent = false)
+{
+ QDBusMessage dbusNotificationMessage = QDBusMessage::createMethodCall(dbusServiceName, dbusPath, dbusInterfaceName, "Notify");
+
+ QList<QVariant> args;
+
+ args.append(QString()); // app_name
+ args.append((uint)0); // notification to update
+ args.append(iconName); // app_icon
+ args.append(title); // summary
+ args.append(body); // body
+
+ QStringList actionList;
+ int actId = 0;
+ Q_FOREACH (const QString &actionName, actions) {
+ actId++;
+ actionList.append(QString::number(actId));
+ actionList.append(actionName);
+ }
+
+ args.append(actionList); // actions
+
+ args.append(QVariantMap()); // hints
+
+ // Persistent => 0 == infinite timeout
+ // CloseOnTimeout => -1 == let the server decide
+ int timeout = persistent ? 0 : -1;
+
+ args.append(timeout); // expire timout
+
+ dbusNotificationMessage.setArguments(args);
+
+ QDBusMessage reply = QDBusConnection::sessionBus().call(dbusNotificationMessage, QDBus::Block, 4000);
+ if (reply.type() == QDBusMessage::ErrorMessage) {
+ qDebug() << "Error sending notification:" << reply.errorMessage();
+ }
+}
+
+int main(int argc, char *argv[])
+{
+ QApplication app(argc, argv);
+
+ notificationDBusCall("amarok",
+ "Testing notification #1",
+ "Lorem ipsum dolor sit amet, consectetur adipiscing elit. In condimentum",
+ QStringList() << "action1" << "action2");
+
+ // wait a little before sending another notification
+ QEventLoop a;
+ QTimer::singleShot(500, &a, SLOT(quit()));
+ a.exec();
+
+ notificationDBusCall("kwalletmanager",
+ "Testing notification #2",
+ "Praesent odio ipsum, posuere a magna ac, egestas vehicula lectus",
+ QStringList() << "action1" << "action2");
+
+ QTimer::singleShot(1000, &a, SLOT(quit()));
+ a.exec();
+
+ notificationDBusCall("preferences-desktop-accessibility",
+ "Testing notification #3",
+ "Fusce hendrerit egestas pellentesque",
+ QStringList(),
+ true);
+
+ return app.exec();
+
+ QTimer::singleShot(2000, &app, SLOT(quit()));
+}
+
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
[View Less]
1
0
Hello community,
here is the log from the commit of package knewstuff for openSUSE:Factory checked in at 2014-04-02 17:22:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/knewstuff (Old)
and /work/SRC/openSUSE:Factory/.knewstuff.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "knewstuff"
Changes:
--------
--- /work/SRC/openSUSE:Factory/knewstuff/knewstuff.changes 2014-03-10 12:…
[View More]18:11.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.knewstuff.new/knewstuff.changes 2014-04-02 17:22:28.000000000 +0200
@@ -1,0 +2,9 @@
+Sat Mar 29 19:47:46 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 4.98.0
+ * API improvements and cleanups
+ * Buildsystem fixes
+ * For more details please see:
+ http://www.kde.org/announcements/announce-frameworks5-beta1.php
+
+-------------------------------------------------------------------
Old:
----
knewstuff-4.97.0.tar.xz
New:
----
knewstuff-4.98.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ knewstuff.spec ++++++
--- /var/tmp/diff_new_pack.heiiJS/_old 2014-04-02 17:22:28.000000000 +0200
+++ /var/tmp/diff_new_pack.heiiJS/_new 2014-04-02 17:22:28.000000000 +0200
@@ -18,11 +18,11 @@
%define lname libKF5NewStuff5
Name: knewstuff
-Version: 4.97.0
+Version: 4.98.0
Release: 0
BuildRequires: attica-qt5-devel >= %{_kf5_version}
BuildRequires: cmake >= 2.8.12
-BuildRequires: extra-cmake-modules >= 0.0.11
+BuildRequires: extra-cmake-modules >= 0.0.12
BuildRequires: fdupes
BuildRequires: karchive-devel >= %{_kf5_version}
BuildRequires: kcompletion-devel >= %{_kf5_version}
++++++ knewstuff-4.97.0.tar.xz -> knewstuff-4.98.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knewstuff-4.97.0/CMakeLists.txt new/knewstuff-4.98.0/CMakeLists.txt
--- old/knewstuff-4.97.0/CMakeLists.txt 2014-03-01 12:51:19.000000000 +0100
+++ new/knewstuff-4.98.0/CMakeLists.txt 2014-03-28 19:17:16.000000000 +0100
@@ -2,7 +2,7 @@
project(KNewStuff)
-find_package(ECM 0.0.11 REQUIRED NO_MODULE)
+find_package(ECM 0.0.12 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
include(KDEInstallDirs)
@@ -13,7 +13,7 @@
find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED COMPONENTS Widgets Xml)
# Not part of kdelibs
-set(KF5_VERSION "4.97.0")
+set(KF5_VERSION "4.98.0")
find_package(KF5Archive ${KF5_VERSION} REQUIRED)
find_package(KF5Completion ${KF5_VERSION} REQUIRED)
find_package(KF5Config ${KF5_VERSION} REQUIRED)
@@ -46,7 +46,10 @@
add_subdirectory(data)
add_subdirectory(src)
-add_subdirectory(tests)
+if (BUILD_TESTING)
+ add_subdirectory(autotests)
+ add_subdirectory(tests)
+endif()
set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5NewStuff")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knewstuff-4.97.0/autotests/CMakeLists.txt new/knewstuff-4.98.0/autotests/CMakeLists.txt
--- old/knewstuff-4.97.0/autotests/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/knewstuff-4.98.0/autotests/CMakeLists.txt 2014-03-28 19:17:16.000000000 +0100
@@ -0,0 +1,23 @@
+include(ECMMarkAsTest)
+
+find_package(Qt5Test ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED)
+set_package_properties(Qt5Test PROPERTIES
+ TYPE REQUIRED
+ PURPOSE "Required for unit tests")
+
+macro(knewstuff_unit_tests)
+ foreach(_testname ${ARGN})
+ add_executable(${_testname} ${_testname}.cpp)
+ add_test("knewstuff-${_testname}" ${_testname})
+ ecm_mark_as_test(${_testname})
+ target_link_libraries(${_testname} KF5::NewStuff Qt5::Xml Qt5::Test)
+ endforeach()
+endmacro()
+
+# FIXME: port to new API
+#knewstuff_unit_tests(
+# knewstuffauthortest
+# knewstuffentrytest
+# testTranslatable
+#)
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knewstuff-4.97.0/autotests/knewstuffauthortest.cpp new/knewstuff-4.98.0/autotests/knewstuffauthortest.cpp
--- old/knewstuff-4.97.0/autotests/knewstuffauthortest.cpp 1970-01-01 01:00:00.000000000 +0100
+++ new/knewstuff-4.98.0/autotests/knewstuffauthortest.cpp 2014-03-28 19:17:16.000000000 +0100
@@ -0,0 +1,85 @@
+/*
+ This file is part of KNewStuff2.
+ Copyright (c) 2008 Jeremy Whiting <jpwhiting(a)kde.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// unit test for author
+
+#include <QtTest>
+#include <QtCore>
+
+#include <qtest_kde.h>
+
+#include "../knewstuff2/core/author.h"
+
+const QString name = "Name";
+const QString email = "Email(a)nowhere.com";
+const QString jabber = "something(a)kdetalk.net";
+const QString homepage = "http://www.myhomepage.com";
+
+class testAuthor: public QObject
+{
+ Q_OBJECT
+private Q_SLOTS:
+ void testProperties();
+ void testCopy();
+ void testAssignment();
+};
+
+void testAuthor::testProperties()
+{
+ KNS::Author author;
+ author.setName(name);
+ author.setEmail(email);
+ author.setJabber(jabber);
+ author.setHomepage(homepage);
+ QCOMPARE(author.name(), name);
+ QCOMPARE(author.email(), email);
+ QCOMPARE(author.jabber(), jabber);
+ QCOMPARE(author.homepage(), homepage);
+}
+
+void testAuthor::testCopy()
+{
+ KNS::Author author;
+ author.setName(name);
+ author.setEmail(email);
+ author.setJabber(jabber);
+ author.setHomepage(homepage);
+ KNS::Author author2(author);
+ QCOMPARE(author.name(), author2.name());
+ QCOMPARE(author.email(), author2.email());
+ QCOMPARE(author.jabber(), author2.jabber());
+ QCOMPARE(author.homepage(), author2.homepage());
+}
+
+void testAuthor::testAssignment()
+{
+ KNS::Author author;
+ KNS::Author author2;
+ author.setName(name);
+ author.setEmail(email);
+ author.setJabber(jabber);
+ author.setHomepage(homepage);
+ author2 = author;
+ QCOMPARE(author.name(), author2.name());
+ QCOMPARE(author.email(), author2.email());
+ QCOMPARE(author.jabber(), author2.jabber());
+ QCOMPARE(author.homepage(), author2.homepage());
+}
+
+QTEST_KDEMAIN_CORE(testAuthor)
+#include "knewstuffauthortest.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knewstuff-4.97.0/autotests/knewstuffentrytest.cpp new/knewstuff-4.98.0/autotests/knewstuffentrytest.cpp
--- old/knewstuff-4.97.0/autotests/knewstuffentrytest.cpp 1970-01-01 01:00:00.000000000 +0100
+++ new/knewstuff-4.98.0/autotests/knewstuffentrytest.cpp 2014-03-28 19:17:16.000000000 +0100
@@ -0,0 +1,149 @@
+/*
+ This file is part of KNewStuff2.
+ Copyright (c) 2008 Jeremy Whiting <jpwhiting(a)kde.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// unit test for entry
+
+#include <QtTest>
+#include <QtCore>
+
+#include <qtest_kde.h>
+
+#include "../knewstuff2/core/entry.h"
+#include "../knewstuff2/core/ktranslatable.h"
+
+const QString name = "Name";
+const QString category = "Category";
+const QString license = "GPLv2+";
+const QString summary1 = "Summary of contents";
+const QString summary2lang = "de";
+const QString summary2 = "Translated summary of contents";
+const QString version = "v0.1";
+const int release = 1;
+const QDate releasedate = QDate::currentDate();
+const int rating = 80;
+const int downloads = 5000;
+const QString checksum = "BAADF00D";
+const QString signature = "DEADBEEF";
+
+class testEntry: public QObject
+{
+ Q_OBJECT
+private Q_SLOTS:
+ void testProperties();
+ void testCopy();
+ void testAssignment();
+};
+
+void testEntry::testProperties()
+{
+ KNS::Entry entry;
+ entry.setName(KNS::KTranslatable(name));
+ entry.setCategory(category);
+ entry.setLicense(license);
+ KNS::KTranslatable summary(summary1);
+ summary.addString(summary2lang, summary2);
+ entry.setSummary(summary);
+ entry.setVersion(version);
+ entry.setRelease(release);
+ entry.setReleaseDate(releasedate);
+ entry.setRating(rating);
+ entry.setDownloads(downloads);
+ entry.setChecksum(checksum);
+ entry.setSignature(signature);
+
+ QCOMPARE(entry.name().representation(), name);
+ QCOMPARE(entry.category(), category);
+ QCOMPARE(entry.license(), license);
+ QCOMPARE(entry.summary().representation(), summary1);
+ QCOMPARE(entry.summary().translated(summary2lang), summary2);
+ QCOMPARE(entry.version(), version);
+ QCOMPARE(entry.release(), release);
+ QCOMPARE(entry.releaseDate(), releasedate);
+ QCOMPARE(entry.rating(), rating);
+ QCOMPARE(entry.downloads(), downloads);
+ QCOMPARE(entry.checksum(), checksum);
+ QCOMPARE(entry.signature(), signature);
+}
+
+void testEntry::testCopy()
+{
+ KNS::Entry entry;
+ entry.setName(KNS::KTranslatable(name));
+ entry.setCategory(category);
+ entry.setLicense(license);
+ KNS::KTranslatable summary(summary1);
+ summary.addString(summary2lang, summary2);
+ entry.setSummary(summary);
+ entry.setVersion(version);
+ entry.setRelease(release);
+ entry.setReleaseDate(releasedate);
+ entry.setRating(rating);
+ entry.setDownloads(downloads);
+ entry.setChecksum(checksum);
+ entry.setSignature(signature);
+ KNS::Entry entry2(entry);
+
+ QCOMPARE(entry.name().representation(), entry2.name().representation());
+ QCOMPARE(entry.category(), entry2.category());
+ QCOMPARE(entry.license(), entry2.license());
+ QCOMPARE(entry.summary().representation(), entry2.summary().representation());
+ QCOMPARE(entry.summary().translated(summary2lang), entry2.summary().translated(summary2lang));
+ QCOMPARE(entry.version(), entry2.version());
+ QCOMPARE(entry.release(), entry2.release());
+ QCOMPARE(entry.releaseDate(), entry2.releaseDate());
+ QCOMPARE(entry.rating(), entry2.rating());
+ QCOMPARE(entry.downloads(), entry2.downloads());
+ QCOMPARE(entry.checksum(), entry2.checksum());
+ QCOMPARE(entry.signature(), entry2.signature());
+}
+
+void testEntry::testAssignment()
+{
+ KNS::Entry entry;
+ KNS::Entry entry2;;
+ entry.setName(KNS::KTranslatable(name));
+ entry.setCategory(category);
+ entry.setLicense(license);
+ KNS::KTranslatable summary(summary1);
+ summary.addString(summary2lang, summary2);
+ entry.setSummary(summary);
+ entry.setVersion(version);
+ entry.setRelease(release);
+ entry.setReleaseDate(releasedate);
+ entry.setRating(rating);
+ entry.setDownloads(downloads);
+ entry.setChecksum(checksum);
+ entry.setSignature(signature);
+ entry2 = entry;
+
+ QCOMPARE(entry.name().representation(), entry2.name().representation());
+ QCOMPARE(entry.category(), entry2.category());
+ QCOMPARE(entry.license(), entry2.license());
+ QCOMPARE(entry.summary().representation(), entry2.summary().representation());
+ QCOMPARE(entry.summary().translated(summary2lang), entry2.summary().translated(summary2lang));
+ QCOMPARE(entry.version(), entry2.version());
+ QCOMPARE(entry.release(), entry2.release());
+ QCOMPARE(entry.releaseDate(), entry2.releaseDate());
+ QCOMPARE(entry.rating(), entry2.rating());
+ QCOMPARE(entry.downloads(), entry2.downloads());
+ QCOMPARE(entry.checksum(), entry2.checksum());
+ QCOMPARE(entry.signature(), entry2.signature());
+}
+
+QTEST_KDEMAIN_CORE(testEntry)
+#include "knewstuffentrytest.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knewstuff-4.97.0/autotests/testTranslatable.cpp new/knewstuff-4.98.0/autotests/testTranslatable.cpp
--- old/knewstuff-4.97.0/autotests/testTranslatable.cpp 1970-01-01 01:00:00.000000000 +0100
+++ new/knewstuff-4.98.0/autotests/testTranslatable.cpp 2014-03-28 19:17:16.000000000 +0100
@@ -0,0 +1,52 @@
+/*
+ This file is part of KNewStuff2.
+ Copyright (c) 2008 Jeremy Whiting <jpwhiting(a)kde.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// unit test for ktranslatable
+
+#include <QtTest>
+#include <QtCore>
+
+#include <qtest_kde.h>
+
+#include "../knewstuff2/core/ktranslatable.h"
+
+class testTranslatable: public QObject
+{
+ Q_OBJECT
+private Q_SLOTS:
+ void testAddString();
+ void testRepresentation();
+};
+
+void testTranslatable::testRepresentation()
+{
+ KNS::KTranslatable translatable("testRepresentation");
+ QCOMPARE(translatable.representation(), QString("testRepresentation"));
+}
+
+void testTranslatable::testAddString()
+{
+ KNS::KTranslatable translatable;
+ translatable.addString("", "testRepresentation");
+ translatable.addString("1", "1");
+ QCOMPARE(translatable.representation(), QString("testRepresentation"));
+ QCOMPARE(translatable.translated("1"), QString("1"));
+}
+
+QTEST_KDEMAIN_CORE(testTranslatable)
+#include "testTranslatable.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knewstuff-4.97.0/docs/README.kdxs new/knewstuff-4.98.0/docs/README.kdxs
--- old/knewstuff-4.97.0/docs/README.kdxs 2014-03-01 12:51:19.000000000 +0100
+++ new/knewstuff-4.98.0/docs/README.kdxs 1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-KNewStuff2: Desktop Exchange Service implementation (KDXS)
-Josef Spillner <spillner(a)kde.org>
-----------------------------------------------------------------------------
-This is a tech demo which will be folded into the KNewStuff library
-for KDE 4.
-It facilitates the access to the DXS webservice which allows for
-better interaction between the service and its users and contributors.
-DXS is like an interactive interface to a GHNS repository.
-
-To use it, you need Hotstuff installed, which as of now is released with
-the version number 0.9, although updates might be available from KStuff CVS.
-You also need dxs-perl installed from ghns.berlios.de until it gets merged
-into Hotstuff (before 1.0). Also, dxs-perl contains 'dxsclient.pl' to test
-the web service functionality in case KDXS doesn't work.
-A public GHNS repository with DXS currently runs on http://new.kstuff.org.
-
-Some class documentation:
--------------------------
-
-Read src/CLASSES and src/knewstuff2/CLASSES.
-
-Todo:
------
-
-- remove all engine stuff from dialog, make dialog API accessible
-- improved error handling in kdxs
-- implementation of categories() and list() web service methods
-- automatic "upgrade" to cDXS, and "downgrade" to SOAP in soap.cpp
-- automatic recognition of web service capabilities (i.e. ro and rw)
-- automatic user authorisation (how to get user info from kded?)
-- finally, port to KDE 4 and merge into trunk/kdelibs/knewstuff
-
-- [ghns.fd.o] finish WSDL file
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knewstuff-4.97.0/src/Messages.sh new/knewstuff-4.98.0/src/Messages.sh
--- old/knewstuff-4.97.0/src/Messages.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/knewstuff-4.98.0/src/Messages.sh 2014-03-28 19:17:16.000000000 +0100
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Invoke the extractrc script on all .ui, .rc, and .kcfg files in the sources.
+# The results are stored in a pseudo .cpp file to be picked up by xgettext.
+lst=`find . -name \*.rc -o -name \*.ui -o -name \*.kcfg`
+if [ -n "$lst" ] ; then
+ $EXTRACTRC $lst >> rc.cpp
+fi
+
+# If your framework contains tips-of-the-day, call preparetips as well.
+if [ -f "data/tips" ] ; then
+ ( cd data && $PREPARETIPS > ../tips.cpp )
+fi
+
+# Extract strings from all source files.
+# If your framework depends on KI18n, use $XGETTEXT. If it uses Qt translation
+# system, use $EXTRACT_TR_STRINGS.
+$XGETTEXT `find . -name \*.cpp -o -name \*.h -name \*.qml` -o $podir/knewstuff5.pot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knewstuff-4.97.0/src/core/engine.cpp new/knewstuff-4.98.0/src/core/engine.cpp
--- old/knewstuff-4.97.0/src/core/engine.cpp 2014-03-01 12:51:19.000000000 +0100
+++ new/knewstuff-4.98.0/src/core/engine.cpp 2014-03-28 19:17:16.000000000 +0100
@@ -99,10 +99,8 @@
qCritical() << "No knsrc file named '" << configfile << "' was found." << endl;
return false;
}
- // FIXME: accessMode() doesn't return NoAccess for non-existing files
- // - bug in kdecore?
- // - this needs to be looked at again until KConfig backend changes for KDE 4
- // the check below is a workaround
+ // KConfig does not actually tell us whether the config file exists, so
+ // we check ourselves for better error messages.
if (QStandardPaths::locate(QStandardPaths::GenericConfigLocation, configfile).isEmpty()) {
emit signalError(i18n("Configuration file not found: \"%1\"", configfile));
qCritical() << "No knsrc file named '" << configfile << "' was found." << endl;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knewstuff-4.97.0/src/staticxml/staticxmlprovider.cpp new/knewstuff-4.98.0/src/staticxml/staticxmlprovider.cpp
--- old/knewstuff-4.97.0/src/staticxml/staticxmlprovider.cpp 2014-03-01 12:51:19.000000000 +0100
+++ new/knewstuff-4.98.0/src/staticxml/staticxmlprovider.cpp 2014-03-28 19:17:16.000000000 +0100
@@ -72,12 +72,10 @@
mDownloadUrls.insert("downloads", QUrl(url));
}
- // FIXME: what exactly is the following condition supposed to do?
- // FIXME: make sure new QUrl in KDE 4 handles this right
// FIXME: this depends on freedesktop.org icon naming... introduce 'desktopicon'?
QUrl iconurl(xmldata.attribute("icon"));
if (!iconurl.isValid()) {
- iconurl.setPath(xmldata.attribute("icon"));
+ iconurl = QUrl::fromLocalFile(xmldata.attribute("icon"));
}
mIcon = iconurl;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knewstuff-4.97.0/src/uploaddialog.cpp new/knewstuff-4.98.0/src/uploaddialog.cpp
--- old/knewstuff-4.97.0/src/uploaddialog.cpp 2014-03-01 12:51:19.000000000 +0100
+++ new/knewstuff-4.98.0/src/uploaddialog.cpp 2014-03-28 19:17:16.000000000 +0100
@@ -82,10 +82,8 @@
qCritical() << "No knsrc file named '" << configfile << "' was found." << endl;
success = false;
}
- // FIXME: accessMode() doesn't return NoAccess for non-existing files
- // - bug in kdecore?
- // - this needs to be looked at again until KConfig backend changes for KDE 4
- // the check below is a workaround
+ // KConfig does not actually tell us whether the config file exists, so
+ // we check ourselves for better error messages.
if (QStandardPaths::locate(QStandardPaths::GenericConfigLocation, configfile).isEmpty()) {
qCritical() << "No knsrc file named '" << configfile << "' was found." << endl;
success = false;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knewstuff-4.97.0/tests/CMakeLists.txt new/knewstuff-4.98.0/tests/CMakeLists.txt
--- old/knewstuff-4.97.0/tests/CMakeLists.txt 2014-03-01 12:51:19.000000000 +0100
+++ new/knewstuff-4.98.0/tests/CMakeLists.txt 2014-03-28 19:17:16.000000000 +0100
@@ -1,61 +1,27 @@
-project(knewstuff2tests)
-set(CMAKE_AUTOMOC TRUE)
+macro(knewstuff_executable_tests)
+ foreach(_testname ${ARGN})
+ add_executable(${_testname} ${_testname}.cpp)
+ target_link_libraries(${_testname} KF5::NewStuff Qt5::Xml Qt5::Test)
+ target_compile_definitions(${_testname} PRIVATE
+ KNSSRCDIR="\\"${CMAKE_CURRENT_SOURCE_DIR}/\\""
+ KNSBUILDDIR="\\"${CMAKE_CURRENT_BINARY_DIR}\\"")
+ endforeach()
+endmacro()
-include(ECMMarkAsTest)
-
-set(CMAKE_SKIP_RPATH TRUE)
-
-MACRO(KNEWSTUFF_UNIT_TESTS)
- FOREACH(_testname ${ARGN})
- add_executable(${_testname} ${_testname}.cpp)
- add_test("knewstuff2-${_testname}" ${_testname})
- ecm_mark_as_test(${_testname})
- target_link_libraries(${_testname} knewstuff2 Qt5::Xml Qt5::Test)
- set_target_properties(${_testname} PROPERTIES COMPILE_FLAGS -DKNSSRCDIR="\\"${CMAKE_CURRENT_SOURCE_DIR}/\\""\ -DKNSBUILDDIR="\\"${CMAKE_CURRENT_BINARY_DIR}\\"")
- ENDFOREACH(_testname)
-ENDMACRO(KNEWSTUFF_UNIT_TESTS)
-
-MACRO(KNEWSTUFF_EXECUTABLE_TESTS)
- FOREACH(_testname ${ARGN})
- add_executable(${_testname} ${_testname}.cpp)
- ecm_mark_as_test(${_testname})
- target_link_libraries(${_testname} knewstuff2 Qt5::Xml Qt5::Test)
- set_target_properties(${_testname} PROPERTIES COMPILE_FLAGS -DKNSSRCDIR="\\"${CMAKE_CURRENT_SOURCE_DIR}/\\""\ -DKNSBUILDDIR="\\"${CMAKE_CURRENT_BINARY_DIR}\\"")
- ENDFOREACH(_testname)
-ENDMACRO(KNEWSTUFF_EXECUTABLE_TESTS)
-
-##########################
-
-# unit tests
-
-if(NOT KDE_NO_DEPRECATED)
-
-# KNEWSTUFF_UNIT_TESTS(
-# knewstuffauthortest
-# knewstuffentrytest
-# testTranslatable
-# )
-#
-# KNEWSTUFF_EXECUTABLE_TESTS(
+# FIXME: port to new API
+#knewstuff_executable_tests(
# knewstuff2_test
# knewstuff2_download
# knewstuff2_standard
# knewstuff2_cache
-# )
-
-##########################
+#)
#set(kdxspreview_SRCS
# kdxspreview.cpp
# kdxsview.cpp
#)
-
-#add_definitions(-DKNSSRCDIR=\\"${CMAKE_CURRENT_SOURCE_DIR}\\")
-#set(CMAKE_SKIP_RPATH TRUE)
-
-#kde4_add_executable(kdxspreview TEST ${kdxspreview_SRCS})
-
-#target_link_libraries(kdxspreview knewstuff2)
+#add_executable(kdxspreview ${kdxspreview_SRCS})
+#target_link_libraries(kdxspreview KF5::NewStuff)
+# FIXME: test data should not be installed
#install(FILES kdxspreviewrc DESTINATION ${CONFIG_INSTALL_DIR})
-endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knewstuff-4.97.0/tests/README.tests new/knewstuff-4.98.0/tests/README.tests
--- old/knewstuff-4.97.0/tests/README.tests 2014-03-01 12:51:19.000000000 +0100
+++ new/knewstuff-4.98.0/tests/README.tests 2014-03-28 19:17:16.000000000 +0100
@@ -1,8 +1,6 @@
KNewStuff2 test applications
============================
-If you want the test apps, set -DKDE4_BUILD_TESTS=ON for cmake.
-
In order to understand the test structure, remember the engine class
hierarchy of the library:
KNS::CoreEngine - GHNS provider loading/upload/download
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knewstuff-4.97.0/tests/knewstuffauthortest.cpp new/knewstuff-4.98.0/tests/knewstuffauthortest.cpp
--- old/knewstuff-4.97.0/tests/knewstuffauthortest.cpp 2014-03-01 12:51:19.000000000 +0100
+++ new/knewstuff-4.98.0/tests/knewstuffauthortest.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,85 +0,0 @@
-/*
- This file is part of KNewStuff2.
- Copyright (c) 2008 Jeremy Whiting <jpwhiting(a)kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-// unit test for author
-
-#include <QtTest>
-#include <QtCore>
-
-#include <qtest_kde.h>
-
-#include "../knewstuff2/core/author.h"
-
-const QString name = "Name";
-const QString email = "Email(a)nowhere.com";
-const QString jabber = "something(a)kdetalk.net";
-const QString homepage = "http://www.myhomepage.com";
-
-class testAuthor: public QObject
-{
- Q_OBJECT
-private Q_SLOTS:
- void testProperties();
- void testCopy();
- void testAssignment();
-};
-
-void testAuthor::testProperties()
-{
- KNS::Author author;
- author.setName(name);
- author.setEmail(email);
- author.setJabber(jabber);
- author.setHomepage(homepage);
- QCOMPARE(author.name(), name);
- QCOMPARE(author.email(), email);
- QCOMPARE(author.jabber(), jabber);
- QCOMPARE(author.homepage(), homepage);
-}
-
-void testAuthor::testCopy()
-{
- KNS::Author author;
- author.setName(name);
- author.setEmail(email);
- author.setJabber(jabber);
- author.setHomepage(homepage);
- KNS::Author author2(author);
- QCOMPARE(author.name(), author2.name());
- QCOMPARE(author.email(), author2.email());
- QCOMPARE(author.jabber(), author2.jabber());
- QCOMPARE(author.homepage(), author2.homepage());
-}
-
-void testAuthor::testAssignment()
-{
- KNS::Author author;
- KNS::Author author2;
- author.setName(name);
- author.setEmail(email);
- author.setJabber(jabber);
- author.setHomepage(homepage);
- author2 = author;
- QCOMPARE(author.name(), author2.name());
- QCOMPARE(author.email(), author2.email());
- QCOMPARE(author.jabber(), author2.jabber());
- QCOMPARE(author.homepage(), author2.homepage());
-}
-
-QTEST_KDEMAIN_CORE(testAuthor)
-#include "knewstuffauthortest.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knewstuff-4.97.0/tests/knewstuffentrytest.cpp new/knewstuff-4.98.0/tests/knewstuffentrytest.cpp
--- old/knewstuff-4.97.0/tests/knewstuffentrytest.cpp 2014-03-01 12:51:19.000000000 +0100
+++ new/knewstuff-4.98.0/tests/knewstuffentrytest.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,149 +0,0 @@
-/*
- This file is part of KNewStuff2.
- Copyright (c) 2008 Jeremy Whiting <jpwhiting(a)kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-// unit test for entry
-
-#include <QtTest>
-#include <QtCore>
-
-#include <qtest_kde.h>
-
-#include "../knewstuff2/core/entry.h"
-#include "../knewstuff2/core/ktranslatable.h"
-
-const QString name = "Name";
-const QString category = "Category";
-const QString license = "GPLv2+";
-const QString summary1 = "Summary of contents";
-const QString summary2lang = "de";
-const QString summary2 = "Translated summary of contents";
-const QString version = "v0.1";
-const int release = 1;
-const QDate releasedate = QDate::currentDate();
-const int rating = 80;
-const int downloads = 5000;
-const QString checksum = "BAADF00D";
-const QString signature = "DEADBEEF";
-
-class testEntry: public QObject
-{
- Q_OBJECT
-private Q_SLOTS:
- void testProperties();
- void testCopy();
- void testAssignment();
-};
-
-void testEntry::testProperties()
-{
- KNS::Entry entry;
- entry.setName(KNS::KTranslatable(name));
- entry.setCategory(category);
- entry.setLicense(license);
- KNS::KTranslatable summary(summary1);
- summary.addString(summary2lang, summary2);
- entry.setSummary(summary);
- entry.setVersion(version);
- entry.setRelease(release);
- entry.setReleaseDate(releasedate);
- entry.setRating(rating);
- entry.setDownloads(downloads);
- entry.setChecksum(checksum);
- entry.setSignature(signature);
-
- QCOMPARE(entry.name().representation(), name);
- QCOMPARE(entry.category(), category);
- QCOMPARE(entry.license(), license);
- QCOMPARE(entry.summary().representation(), summary1);
- QCOMPARE(entry.summary().translated(summary2lang), summary2);
- QCOMPARE(entry.version(), version);
- QCOMPARE(entry.release(), release);
- QCOMPARE(entry.releaseDate(), releasedate);
- QCOMPARE(entry.rating(), rating);
- QCOMPARE(entry.downloads(), downloads);
- QCOMPARE(entry.checksum(), checksum);
- QCOMPARE(entry.signature(), signature);
-}
-
-void testEntry::testCopy()
-{
- KNS::Entry entry;
- entry.setName(KNS::KTranslatable(name));
- entry.setCategory(category);
- entry.setLicense(license);
- KNS::KTranslatable summary(summary1);
- summary.addString(summary2lang, summary2);
- entry.setSummary(summary);
- entry.setVersion(version);
- entry.setRelease(release);
- entry.setReleaseDate(releasedate);
- entry.setRating(rating);
- entry.setDownloads(downloads);
- entry.setChecksum(checksum);
- entry.setSignature(signature);
- KNS::Entry entry2(entry);
-
- QCOMPARE(entry.name().representation(), entry2.name().representation());
- QCOMPARE(entry.category(), entry2.category());
- QCOMPARE(entry.license(), entry2.license());
- QCOMPARE(entry.summary().representation(), entry2.summary().representation());
- QCOMPARE(entry.summary().translated(summary2lang), entry2.summary().translated(summary2lang));
- QCOMPARE(entry.version(), entry2.version());
- QCOMPARE(entry.release(), entry2.release());
- QCOMPARE(entry.releaseDate(), entry2.releaseDate());
- QCOMPARE(entry.rating(), entry2.rating());
- QCOMPARE(entry.downloads(), entry2.downloads());
- QCOMPARE(entry.checksum(), entry2.checksum());
- QCOMPARE(entry.signature(), entry2.signature());
-}
-
-void testEntry::testAssignment()
-{
- KNS::Entry entry;
- KNS::Entry entry2;;
- entry.setName(KNS::KTranslatable(name));
- entry.setCategory(category);
- entry.setLicense(license);
- KNS::KTranslatable summary(summary1);
- summary.addString(summary2lang, summary2);
- entry.setSummary(summary);
- entry.setVersion(version);
- entry.setRelease(release);
- entry.setReleaseDate(releasedate);
- entry.setRating(rating);
- entry.setDownloads(downloads);
- entry.setChecksum(checksum);
- entry.setSignature(signature);
- entry2 = entry;
-
- QCOMPARE(entry.name().representation(), entry2.name().representation());
- QCOMPARE(entry.category(), entry2.category());
- QCOMPARE(entry.license(), entry2.license());
- QCOMPARE(entry.summary().representation(), entry2.summary().representation());
- QCOMPARE(entry.summary().translated(summary2lang), entry2.summary().translated(summary2lang));
- QCOMPARE(entry.version(), entry2.version());
- QCOMPARE(entry.release(), entry2.release());
- QCOMPARE(entry.releaseDate(), entry2.releaseDate());
- QCOMPARE(entry.rating(), entry2.rating());
- QCOMPARE(entry.downloads(), entry2.downloads());
- QCOMPARE(entry.checksum(), entry2.checksum());
- QCOMPARE(entry.signature(), entry2.signature());
-}
-
-QTEST_KDEMAIN_CORE(testEntry)
-#include "knewstuffentrytest.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knewstuff-4.97.0/tests/testTranslatable.cpp new/knewstuff-4.98.0/tests/testTranslatable.cpp
--- old/knewstuff-4.97.0/tests/testTranslatable.cpp 2014-03-01 12:51:19.000000000 +0100
+++ new/knewstuff-4.98.0/tests/testTranslatable.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,52 +0,0 @@
-/*
- This file is part of KNewStuff2.
- Copyright (c) 2008 Jeremy Whiting <jpwhiting(a)kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-// unit test for ktranslatable
-
-#include <QtTest>
-#include <QtCore>
-
-#include <qtest_kde.h>
-
-#include "../knewstuff2/core/ktranslatable.h"
-
-class testTranslatable: public QObject
-{
- Q_OBJECT
-private Q_SLOTS:
- void testAddString();
- void testRepresentation();
-};
-
-void testTranslatable::testRepresentation()
-{
- KNS::KTranslatable translatable("testRepresentation");
- QCOMPARE(translatable.representation(), QString("testRepresentation"));
-}
-
-void testTranslatable::testAddString()
-{
- KNS::KTranslatable translatable;
- translatable.addString("", "testRepresentation");
- translatable.addString("1", "1");
- QCOMPARE(translatable.representation(), QString("testRepresentation"));
- QCOMPARE(translatable.translated("1"), QString("1"));
-}
-
-QTEST_KDEMAIN_CORE(testTranslatable)
-#include "testTranslatable.moc"
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
[View Less]
1
0
Hello community,
here is the log from the commit of package kmediaplayer for openSUSE:Factory checked in at 2014-04-02 17:22:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kmediaplayer (Old)
and /work/SRC/openSUSE:Factory/.kmediaplayer.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmediaplayer"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kmediaplayer/kmediaplayer.…
[View More]changes 2014-03-10 12:18:10.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kmediaplayer.new/kmediaplayer.changes 2014-04-02 17:22:27.000000000 +0200
@@ -1,0 +2,9 @@
+Sat Mar 29 19:47:46 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 4.98.0
+ * API improvements and cleanups
+ * Buildsystem fixes
+ * For more details please see:
+ http://www.kde.org/announcements/announce-frameworks5-beta1.php
+
+-------------------------------------------------------------------
Old:
----
kmediaplayer-4.97.0.tar.xz
New:
----
kmediaplayer-4.98.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kmediaplayer.spec ++++++
--- /var/tmp/diff_new_pack.u1hPZw/_old 2014-04-02 17:22:28.000000000 +0200
+++ /var/tmp/diff_new_pack.u1hPZw/_new 2014-04-02 17:22:28.000000000 +0200
@@ -18,10 +18,10 @@
%define lname libKF5MediaPlayer5
Name: kmediaplayer
-Version: 4.97.0
+Version: 4.98.0
Release: 0
BuildRequires: cmake >= 2.8.12
-BuildRequires: extra-cmake-modules >= 0.0.11
+BuildRequires: extra-cmake-modules >= 0.0.12
BuildRequires: fdupes
BuildRequires: kbookmarks-devel >= %{_kf5_version}
BuildRequires: kcompletion-devel >= %{_kf5_version}
++++++ kmediaplayer-4.97.0.tar.xz -> kmediaplayer-4.98.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmediaplayer-4.97.0/CMakeLists.txt new/kmediaplayer-4.98.0/CMakeLists.txt
--- old/kmediaplayer-4.97.0/CMakeLists.txt 2014-03-01 12:51:17.000000000 +0100
+++ new/kmediaplayer-4.98.0/CMakeLists.txt 2014-03-28 19:17:15.000000000 +0100
@@ -6,7 +6,7 @@
#
# CMake stuff from ECM
#
-find_package(ECM 0.0.11 REQUIRED NO_MODULE)
+find_package(ECM 0.0.12 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
include(KDEInstallDirs)
@@ -19,7 +19,7 @@
include(ECMGenerateHeaders)
include(ECMPackageConfigHelpers)
-set(KF5_VERSION "4.97.0")
+set(KF5_VERSION "4.98.0")
#
# Version info
@@ -38,9 +38,9 @@
#
# Dependencies
#
-set(QT_REQUIRED_VERSION 5.2.0)
-find_package(Qt5DBus ${QT_REQUIRED_VERSION} REQUIRED NO_MODULE)
-find_package(Qt5Widgets ${QT_REQUIRED_VERSION} REQUIRED NO_MODULE)
+set(REQUIRED_QT_VERSION 5.2.0)
+find_package(Qt5DBus ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
+find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
find_package(KF5Parts ${KF5_VERSION} REQUIRED)
find_package(KF5XmlGui ${KF5_VERSION} REQUIRED)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmediaplayer-4.97.0/autotests/CMakeLists.txt new/kmediaplayer-4.98.0/autotests/CMakeLists.txt
--- old/kmediaplayer-4.97.0/autotests/CMakeLists.txt 2014-03-01 12:51:17.000000000 +0100
+++ new/kmediaplayer-4.98.0/autotests/CMakeLists.txt 2014-03-28 19:17:15.000000000 +0100
@@ -1,4 +1,4 @@
-find_package(Qt5Test ${QT_REQUIRED_VERSION} REQUIRED NO_MODULE)
+find_package(Qt5Test ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
include(ECMMarkAsTest)
macro(KMEDIAPLAYER_EXECUTABLE_TESTS)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
[View Less]
1
0
Hello community,
here is the log from the commit of package kjsembed for openSUSE:Factory checked in at 2014-04-02 17:22:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kjsembed (Old)
and /work/SRC/openSUSE:Factory/.kjsembed.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kjsembed"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kjsembed/kjsembed.changes 2014-03-10 12:17:51.…
[View More]000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kjsembed.new/kjsembed.changes 2014-04-02 17:22:26.000000000 +0200
@@ -1,0 +2,9 @@
+Sat Mar 29 19:47:45 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 4.98.0
+ * API improvements and cleanups
+ * Buildsystem fixes
+ * For more details please see:
+ http://www.kde.org/announcements/announce-frameworks5-beta1.php
+
+-------------------------------------------------------------------
Old:
----
kjsembed-4.97.0.tar.xz
New:
----
kjsembed-4.98.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kjsembed.spec ++++++
--- /var/tmp/diff_new_pack.haEP3O/_old 2014-04-02 17:22:27.000000000 +0200
+++ /var/tmp/diff_new_pack.haEP3O/_new 2014-04-02 17:22:27.000000000 +0200
@@ -18,10 +18,10 @@
%define lname libKF5JsEmbed5
Name: kjsembed
-Version: 4.97.0
+Version: 4.98.0
Release: 0
BuildRequires: cmake >= 2.8.12
-BuildRequires: extra-cmake-modules >= 0.0.11
+BuildRequires: extra-cmake-modules >= 0.0.12
BuildRequires: fdupes
BuildRequires: kdoctools-devel >= %{_kf5_version}
BuildRequires: kf5-filesystem
++++++ kjsembed-4.97.0.tar.xz -> kjsembed-4.98.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-4.97.0/CMakeLists.txt new/kjsembed-4.98.0/CMakeLists.txt
--- old/kjsembed-4.97.0/CMakeLists.txt 2014-03-01 15:43:08.000000000 +0100
+++ new/kjsembed-4.98.0/CMakeLists.txt 2014-03-28 19:17:13.000000000 +0100
@@ -2,11 +2,11 @@
project(KJsEmbed)
-find_package(ECM 0.0.11 REQUIRED NO_MODULE)
+find_package(ECM 0.0.12 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
set(REQUIRED_QT_VERSION "5.2")
-set(KF5_VERSION "4.97.0")
+set(KF5_VERSION "4.98.0")
find_package(Qt5 "${REQUIRED_QT_VERSION}" CONFIG REQUIRED UiTools Widgets Xml Svg)
include(KDEInstallDirs)
include(KDEFrameworkCompilerSettings)
@@ -18,7 +18,7 @@
include(ECMSetupVersion)
include(ECMGenerateHeaders)
-set(KF5_VERSION "4.97.0")
+set(KF5_VERSION "4.98.0")
ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KJSEMBED
#VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kjsembed_version.h"
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5JsEmbedConfigVersion.cmake"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-4.97.0/docs/kjscmd/man-kjscmd5.1.docbook new/kjsembed-4.98.0/docs/kjscmd/man-kjscmd5.1.docbook
--- old/kjsembed-4.97.0/docs/kjscmd/man-kjscmd5.1.docbook 2014-03-01 15:43:08.000000000 +0100
+++ new/kjsembed-4.98.0/docs/kjscmd/man-kjscmd5.1.docbook 2014-03-28 19:17:13.000000000 +0100
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
<!ENTITY % English "INCLUDE"><!-- change language only here -->
]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-4.97.0/kjsembed.yaml new/kjsembed-4.98.0/kjsembed.yaml
--- old/kjsembed-4.97.0/kjsembed.yaml 2014-03-01 15:43:08.000000000 +0100
+++ new/kjsembed-4.98.0/kjsembed.yaml 2014-03-28 19:17:13.000000000 +0100
@@ -1 +1,3 @@
tier: 3
+framework-dependencies:
+ - kdoctools
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjsembed-4.97.0/src/Messages.sh new/kjsembed-4.98.0/src/Messages.sh
--- old/kjsembed-4.97.0/src/Messages.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/kjsembed-4.98.0/src/Messages.sh 2014-03-28 19:17:13.000000000 +0100
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Invoke the extractrc script on all .ui, .rc, and .kcfg files in the sources.
+# The results are stored in a pseudo .cpp file to be picked up by xgettext.
+lst=`find . -name \*.rc -o -name \*.ui -o -name \*.kcfg`
+if [ -n "$lst" ] ; then
+ $EXTRACTRC $lst >> rc.cpp
+fi
+
+# If your framework contains tips-of-the-day, call preparetips as well.
+if [ -f "data/tips" ] ; then
+ ( cd data && $PREPARETIPS > ../tips.cpp )
+fi
+
+# Extract strings from all source files.
+# If your framework depends on KI18n, use $XGETTEXT. If it uses Qt translation
+# system, use $EXTRACT_TR_STRINGS.
+$XGETTEXT `find . -name \*.cpp -o -name \*.h -name \*.qml` -o $podir/kjsembed5.pot
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
[View Less]
1
0
Hello community,
here is the log from the commit of package kjs for openSUSE:Factory checked in at 2014-04-02 17:22:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kjs (Old)
and /work/SRC/openSUSE:Factory/.kjs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kjs"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kjs/kjs.changes 2014-03-10 12:17:31.000000000 +0100
+++ /work/SRC/…
[View More]openSUSE:Factory/.kjs.new/kjs.changes 2014-04-02 17:22:25.000000000 +0200
@@ -1,0 +2,9 @@
+Sat Mar 29 19:47:45 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 4.98.0
+ * API improvements and cleanups
+ * Buildsystem fixes
+ * For more details please see:
+ http://www.kde.org/announcements/announce-frameworks5-beta1.php
+
+-------------------------------------------------------------------
Old:
----
kjs-4.97.0.tar.xz
New:
----
kjs-4.98.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kjs.spec ++++++
--- /var/tmp/diff_new_pack.vdbPyk/_old 2014-04-02 17:22:25.000000000 +0200
+++ /var/tmp/diff_new_pack.vdbPyk/_new 2014-04-02 17:22:25.000000000 +0200
@@ -18,10 +18,10 @@
%define sonum 5
Name: kjs
-Version: 4.97.0
+Version: 4.98.0
Release: 0
BuildRequires: cmake >= 2.8.12
-BuildRequires: extra-cmake-modules >= 0.0.11
+BuildRequires: extra-cmake-modules >= 0.0.12
BuildRequires: fdupes
BuildRequires: kf5-filesystem
BuildRequires: pcre-devel
++++++ kjs-4.97.0.tar.xz -> kjs-4.98.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjs-4.97.0/CMakeLists.txt new/kjs-4.98.0/CMakeLists.txt
--- old/kjs-4.97.0/CMakeLists.txt 2014-03-01 12:51:13.000000000 +0100
+++ new/kjs-4.98.0/CMakeLists.txt 2014-03-28 19:17:11.000000000 +0100
@@ -3,7 +3,7 @@
project(KJS)
# ECM setup
-find_package(ECM 0.0.11 REQUIRED NO_MODULE)
+find_package(ECM 0.0.12 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
include(FeatureSummary)
@@ -12,7 +12,7 @@
include(ECMSetupVersion)
include(ECMMarkNonGuiExecutable)
-set(KF5_VERSION "4.97.0")
+set(KF5_VERSION "4.98.0")
ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KJS
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kjs_version.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjs-4.97.0/src/kjs/CMakeLists.txt new/kjs-4.98.0/src/kjs/CMakeLists.txt
--- old/kjs-4.97.0/src/kjs/CMakeLists.txt 2014-03-01 12:51:13.000000000 +0100
+++ new/kjs-4.98.0/src/kjs/CMakeLists.txt 2014-03-28 19:17:11.000000000 +0100
@@ -203,15 +203,11 @@
set(kjs_SRCS kjs.cpp)
-#required by win32 see kdelibs/cmake/modules/kde4Macros.cmake kde4_add_manifest
-set (kjs_bin_OUTPUT_NAME kjs5)
-
# 'kjs_bin' because cmake doesn't like having a lib and app with the same name
# This is a developer tool, not intended for normal user installs
add_executable(kjs_bin ${kjs_SRCS})
ecm_mark_nongui_executable(kjs_bin)
-
-set_target_properties(kjs_bin PROPERTIES RUNTIME_OUTPUT_NAME ${kjs_bin_OUTPUT_NAME})
+set_target_properties(kjs_bin PROPERTIES RUNTIME_OUTPUT_NAME kjs5)
target_link_libraries(kjs_bin KF5JS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjs-4.97.0/src/kjs/create_hash_table new/kjs-4.98.0/src/kjs/create_hash_table
--- old/kjs-4.97.0/src/kjs/create_hash_table 2014-03-01 12:51:13.000000000 +0100
+++ new/kjs-4.98.0/src/kjs/create_hash_table 2014-03-28 19:17:11.000000000 +0100
@@ -245,7 +245,7 @@
if (defined($entry)) {
my $key = $keys[$entry];
print " \{ \"" . $key . "\"";
- print ", " . $values[$entry];
+ print ", static_cast<int>(" . $values[$entry] . ")";
my $kjsattrs = $attrs[$entry];
if ($kjsattrs ne "0") {
$kjsattrs =~ s/([^|]+)/KJS::$1/g; # DontDelete|Function -> KJS::DontDelete|KJS::Function
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
[View Less]
1
0
Hello community,
here is the log from the commit of package kjobwidgets for openSUSE:Factory checked in at 2014-04-02 17:22:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kjobwidgets (Old)
and /work/SRC/openSUSE:Factory/.kjobwidgets.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kjobwidgets"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kjobwidgets/kjobwidgets.changes …
[View More]2014-03-10 12:17:46.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kjobwidgets.new/kjobwidgets.changes 2014-04-02 17:22:24.000000000 +0200
@@ -1,0 +2,9 @@
+Sat Mar 29 19:47:44 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 4.98.0
+ * API improvements and cleanups
+ * Buildsystem fixes
+ * For more details please see:
+ http://www.kde.org/announcements/announce-frameworks5-beta1.php
+
+-------------------------------------------------------------------
Old:
----
kjobwidgets-4.97.0.tar.xz
New:
----
kjobwidgets-4.98.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kjobwidgets.spec ++++++
--- /var/tmp/diff_new_pack.1Qd408/_old 2014-04-02 17:22:24.000000000 +0200
+++ /var/tmp/diff_new_pack.1Qd408/_new 2014-04-02 17:22:24.000000000 +0200
@@ -18,10 +18,10 @@
%define lname libKF5JobWidgets5
Name: kjobwidgets
-Version: 4.97.0
+Version: 4.98.0
Release: 0
BuildRequires: cmake >= 2.8.12
-BuildRequires: extra-cmake-modules >= 0.0.11
+BuildRequires: extra-cmake-modules >= 0.0.12
BuildRequires: fdupes
BuildRequires: kcoreaddons-devel >= %{_kf5_version}
BuildRequires: kf5-filesystem
++++++ kjobwidgets-4.97.0.tar.xz -> kjobwidgets-4.98.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-4.97.0/CMakeLists.txt new/kjobwidgets-4.98.0/CMakeLists.txt
--- old/kjobwidgets-4.97.0/CMakeLists.txt 2014-03-01 12:51:11.000000000 +0100
+++ new/kjobwidgets-4.98.0/CMakeLists.txt 2014-03-28 19:17:09.000000000 +0100
@@ -2,7 +2,7 @@
project(KJobWidgets)
-find_package(ECM 0.0.11 REQUIRED NO_MODULE)
+find_package(ECM 0.0.12 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
@@ -10,10 +10,10 @@
include(KDEFrameworkCompilerSettings)
include(KDECMakeSettings)
-set(KF5_VERSION "4.97.0")
+set(KF5_VERSION "4.98.0")
-set(QT_REQUIRED_VERSION 5.2.0)
-find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus)
+set(REQUIRED_QT_VERSION 5.2.0)
+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus)
if (NOT APPLE)
find_package(X11)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-4.97.0/KF5JobWidgetsConfig.cmake.in new/kjobwidgets-4.98.0/KF5JobWidgetsConfig.cmake.in
--- old/kjobwidgets-4.97.0/KF5JobWidgetsConfig.cmake.in 2014-03-01 12:51:11.000000000 +0100
+++ new/kjobwidgets-4.98.0/KF5JobWidgetsConfig.cmake.in 2014-03-28 19:17:09.000000000 +0100
@@ -2,7 +2,7 @@
set(KJOBWIDGETS_DBUS_INTERFACES_DIR "${PACKAGE_PREFIX_DIR}/@DBUS_INTERFACES_INSTALL_DIR@")
-find_dependency(Qt5Widgets @QT_REQUIRED_VERSION@)
+find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@)
find_dependency(KF5CoreAddons "@KF5_VERSION@")
find_dependency(KF5WidgetsAddons "@KF5_VERSION@")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-4.97.0/src/Messages.sh new/kjobwidgets-4.98.0/src/Messages.sh
--- old/kjobwidgets-4.97.0/src/Messages.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/kjobwidgets-4.98.0/src/Messages.sh 2014-03-28 19:17:09.000000000 +0100
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Invoke the extractrc script on all .ui, .rc, and .kcfg files in the sources.
+# The results are stored in a pseudo .cpp file to be picked up by xgettext.
+lst=`find . -name \*.rc -o -name \*.ui -o -name \*.kcfg`
+if [ -n "$lst" ] ; then
+ $EXTRACTRC $lst >> rc.cpp
+fi
+
+# If your framework contains tips-of-the-day, call preparetips as well.
+if [ -f "data/tips" ] ; then
+ ( cd data && $PREPARETIPS > ../tips.cpp )
+fi
+
+# Extract strings from all source files.
+# If your framework depends on KI18n, use $XGETTEXT. If it uses Qt translation
+# system, use $EXTRACT_TR_STRINGS.
+$EXTRACT_TR_STRINGS `find . -name \*.cpp -o -name \*.h -name \*.qml` -o $podir/kjobwidgets5.pot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-4.97.0/src/kjobtrackerformatters.cpp new/kjobwidgets-4.98.0/src/kjobtrackerformatters.cpp
--- old/kjobwidgets-4.97.0/src/kjobtrackerformatters.cpp 2014-03-01 12:51:11.000000000 +0100
+++ new/kjobwidgets-4.98.0/src/kjobtrackerformatters.cpp 2014-03-28 19:17:09.000000000 +0100
@@ -26,23 +26,18 @@
#include <QCoreApplication>
-static QString tr(const char *message, const char *disambiguation = 0, int n = -1)
-{
- return QCoreApplication::translate("KJobTrackerFormatters", message, disambiguation, n);
-}
-
QString KJobTrackerFormatters::byteSize(double size)
{
QList<QString> units;
- units << tr("%1 B")
- << tr("%1 KiB")
- << tr("%1 MiB")
- << tr("%1 GiB")
- << tr("%1 TiB")
- << tr("%1 PiB")
- << tr("%1 EiB")
- << tr("%1 ZiB")
- << tr("%1 YiB");
+ units << QCoreApplication::translate("KJobTrackerFormatters", "%1 B")
+ << QCoreApplication::translate("KJobTrackerFormatters", "%1 KiB")
+ << QCoreApplication::translate("KJobTrackerFormatters", "%1 MiB")
+ << QCoreApplication::translate("KJobTrackerFormatters", "%1 GiB")
+ << QCoreApplication::translate("KJobTrackerFormatters", "%1 TiB")
+ << QCoreApplication::translate("KJobTrackerFormatters", "%1 PiB")
+ << QCoreApplication::translate("KJobTrackerFormatters", "%1 EiB")
+ << QCoreApplication::translate("KJobTrackerFormatters", "%1 ZiB")
+ << QCoreApplication::translate("KJobTrackerFormatters", "%1 YiB");
int unit = 0; // Selects what unit to use
const double multiplier = 1024.0;
@@ -62,22 +57,22 @@
QString KJobTrackerFormatters::daysDuration(int n)
{
- return tr("%n day(s)", "@item:intext", n);
+ return QCoreApplication::translate("KJobTrackerFormatters", "%n day(s)", "@item:intext", n);
}
QString KJobTrackerFormatters::hoursDuration(int n)
{
- return tr("%n hour(s)", "@item:intext", n);
+ return QCoreApplication::translate("KJobTrackerFormatters", "%n hour(s)", "@item:intext", n);
}
QString KJobTrackerFormatters::minutesDuration(int n)
{
- return tr("%n minute(s)", "@item:intext", n);
+ return QCoreApplication::translate("KJobTrackerFormatters", "%n minute(s)", "@item:intext", n);
}
QString KJobTrackerFormatters::secondsDuration(int n)
{
- return tr("%n second(s)", "@item:intext", n);
+ return QCoreApplication::translate("KJobTrackerFormatters", "%n second(s)", "@item:intext", n);
}
QString KJobTrackerFormatters::duration(unsigned long mSec)
@@ -98,15 +93,15 @@
}
if (days && hours) {
- return tr("%1 and %2", "@item:intext days and hours.").arg(daysDuration(days)).arg(hoursDuration(hours));
+ return QCoreApplication::translate("KJobTrackerFormatters", "%1 and %2", "@item:intext days and hours.").arg(daysDuration(days)).arg(hoursDuration(hours));
} else if (days) {
return daysDuration(days);
} else if (hours && minutes) {
- return tr("%1 and %2", "@item:intext hours and minutes.").arg(hoursDuration(hours)).arg(minutesDuration(minutes));
+ return QCoreApplication::translate("KJobTrackerFormatters", "%1 and %2", "@item:intext hours and minutes.").arg(hoursDuration(hours)).arg(minutesDuration(minutes));
} else if (hours) {
return hoursDuration(hours);
} else if (minutes && seconds) {
- return tr("%1 and %2", "@item:intext minutes and seconds.").arg(minutesDuration(minutes)).arg(secondsDuration(seconds));
+ return QCoreApplication::translate("KJobTrackerFormatters", "%1 and %2", "@item:intext minutes and seconds.").arg(minutesDuration(minutes)).arg(secondsDuration(seconds));
} else if (minutes) {
return minutesDuration(minutes);
} else {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-4.97.0/src/kstatusbarjobtracker.cpp new/kjobwidgets-4.98.0/src/kstatusbarjobtracker.cpp
--- old/kjobwidgets-4.97.0/src/kstatusbarjobtracker.cpp 2014-03-01 12:51:11.000000000 +0100
+++ new/kjobwidgets-4.98.0/src/kstatusbarjobtracker.cpp 2014-03-28 19:17:09.000000000 +0100
@@ -23,6 +23,7 @@
#include "kstatusbarjobtracker_p.h"
#include "kjobtrackerformatters_p.h"
+#include <QCoreApplication>
#include <QObject>
#include <QWidget>
#include <QPushButton>
@@ -159,7 +160,7 @@
box->addWidget(stack);
if (q->d->showStopButton) {
- button = new QPushButton(tr("Stop"), widget);
+ button = new QPushButton(QCoreApplication::translate("KStatusBarJobTracker", "Stop"), widget);
box->addWidget(button);
connect(button, SIGNAL(clicked(bool)),
this, SLOT(killJob()));
@@ -240,9 +241,9 @@
void KStatusBarJobTracker::Private::ProgressWidget::speed(unsigned long value)
{
if (value == 0) { // speed is measured in bytes-per-second
- label->setText(tr(" Stalled "));
+ label->setText(QCoreApplication::translate("KStatusBarJobTracker", " Stalled "));
} else {
- label->setText(tr(" %1/s ").arg(KJobTrackerFormatters::byteSize(value)));
+ label->setText(QCoreApplication::translate("KStatusBarJobTracker", " %1/s ").arg(KJobTrackerFormatters::byteSize(value)));
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-4.97.0/src/kwidgetjobtracker.cpp new/kjobwidgets-4.98.0/src/kwidgetjobtracker.cpp
--- old/kjobwidgets-4.97.0/src/kwidgetjobtracker.cpp 2014-03-01 12:51:11.000000000 +0100
+++ new/kjobwidgets-4.98.0/src/kwidgetjobtracker.cpp 2014-03-28 19:17:09.000000000 +0100
@@ -24,6 +24,7 @@
#include "kwidgetjobtracker_p.h"
#include "kjobtrackerformatters_p.h"
+#include <QCoreApplication>
#include <QDir>
#include <QProcess>
#include <QTimer>
@@ -265,7 +266,10 @@
{
setWindowTitle(title);
caption = title;
- sourceInvite->setText(tr("%1:", QString("%1 is the label, we add a ':' to it").arg(field1.first).toLatin1().data()).arg(field1.first));
+ sourceInvite->setText(
+ QCoreApplication::translate("KWidgetJobTracker",
+ "%1:", "%1 is the label, we add a ':' to it"
+ ).arg(field1.first));
sourceEdit->setText(field1.second);
if (field2.first.isEmpty()) {
@@ -273,7 +277,10 @@
} else {
setDestVisible(true);
checkDestination(QUrl(field2.second));
- destInvite->setText(tr("%1:", QString("%1 is the label, we add a ':' to it").arg(field2.first).toLatin1().data()).arg(field2.first));
+ destInvite->setText(
+ QCoreApplication::translate("KWidgetJobTracker",
+ "%1:", "%1 is the label, we add a ':' to it"
+ ).arg(field2.first));
destEdit->setText(field2.second);
}
}
@@ -323,7 +330,7 @@
processedSize = amount;
if (totalSizeKnown) {
- tmp = tr("%1 of %2 complete", "", amount)
+ tmp = QCoreApplication::translate("KWidgetJobTracker", "%1 of %2 complete", "", amount)
.arg(KJobTrackerFormatters::byteSize(amount))
.arg(KJobTrackerFormatters::byteSize(totalSize));
} else {
@@ -341,9 +348,9 @@
}
processedDirs = amount;
- tmp = tr("%1 / %n folder(s)", "", totalDirs).arg(processedDirs);
+ tmp = QCoreApplication::translate("KWidgetJobTracker", "%1 / %n folder(s)", "", totalDirs).arg(processedDirs);
tmp += " ";
- tmp += tr("%1 / %n file(s)", "", totalFiles).arg(processedFiles);
+ tmp += QCoreApplication::translate("KWidgetJobTracker", "%1 / %n file(s)", "", totalFiles).arg(processedFiles);
progressLabel->setText(tmp);
break;
@@ -354,10 +361,10 @@
processedFiles = amount;
if (totalDirs > 1) {
- tmp = tr("%1 / %n folder(s)", "", totalDirs).arg(processedDirs);
+ tmp = QCoreApplication::translate("KWidgetJobTracker", "%1 / %n folder(s)", "", totalDirs).arg(processedDirs);
tmp += " ";
}
- tmp += tr("%1 / %n file(s)", "", totalFiles).arg(processedFiles);
+ tmp += QCoreApplication::translate("KWidgetJobTracker", "%1 / %n file(s)", "", totalFiles).arg(processedFiles);
progressLabel->setText(tmp);
}
}
@@ -367,12 +374,12 @@
QString title = caption + " (";
if (totalSizeKnown) {
- title += tr("%1% of %2").arg(percent).arg(
+ title += QCoreApplication::translate("KWidgetJobTracker", "%1% of %2").arg(percent).arg(
KJobTrackerFormatters::byteSize(totalSize));
} else if (totalFiles) {
- title += tr("%1% of %n file(s)", "", totalFiles).arg(percent);
+ title += QCoreApplication::translate("KWidgetJobTracker", "%1% of %n file(s)", "", totalFiles).arg(percent);
} else {
- title += tr("%1%").arg(percent);
+ title += QCoreApplication::translate("KWidgetJobTracker", "%1%").arg(percent);
}
title += ')';
@@ -385,15 +392,15 @@
void KWidgetJobTracker::Private::ProgressWidget::speed(unsigned long value)
{
if (value == 0) {
- speedLabel->setText(tr("Stalled"));
+ speedLabel->setText(QCoreApplication::translate("KWidgetJobTracker", "Stalled"));
} else {
const QString speedStr = KJobTrackerFormatters::byteSize(value);
if (totalSizeKnown) {
const int remaining = 1000 * (totalSize - processedSize) / value;
- speedLabel->setText(tr("%1/s (%2 remaining)", "", remaining).arg(speedStr).arg(
+ speedLabel->setText(QCoreApplication::translate("KWidgetJobTracker", "%1/s (%2 remaining)", "", remaining).arg(speedStr).arg(
KJobTrackerFormatters::duration(remaining)));
} else { // total size is not known (#24228)
- speedLabel->setText(tr("%1/s", "speed in bytes per second").arg(speedStr));
+ speedLabel->setText(QCoreApplication::translate("KWidgetJobTracker", "%1/s", "speed in bytes per second").arg(speedStr));
}
}
}
@@ -401,9 +408,9 @@
void KWidgetJobTracker::Private::ProgressWidget::slotClean()
{
percent(100);
- cancelClose->setText(tr("&Close"));
+ cancelClose->setText(QCoreApplication::translate("KWidgetJobTracker", "&Close"));
cancelClose->setIcon(QIcon::fromTheme("window-close"));
- cancelClose->setToolTip(tr("Close the current window or document"));
+ cancelClose->setToolTip(QCoreApplication::translate("KWidgetJobTracker", "Close the current window or document"));
openFile->setEnabled(true);
if (!totalSizeKnown || totalSize < processedSize) {
totalSize = processedSize;
@@ -416,20 +423,20 @@
if (!s) {
s = 1;
}
- speedLabel->setText(tr("%1/s (done)").arg(
+ speedLabel->setText(QCoreApplication::translate("KWidgetJobTracker", "%1/s (done)").arg(
KJobTrackerFormatters::byteSize(1000 * totalSize / s)));
}
}
void KWidgetJobTracker::Private::ProgressWidget::suspended()
{
- pauseButton->setText(tr("&Resume"));
+ pauseButton->setText(QCoreApplication::translate("KWidgetJobTracker", "&Resume"));
suspendedProperty = true;
}
void KWidgetJobTracker::Private::ProgressWidget::resumed()
{
- pauseButton->setText(tr("&Pause"));
+ pauseButton->setText(QCoreApplication::translate("KWidgetJobTracker", "&Pause"));
suspendedProperty = false;
}
@@ -453,7 +460,7 @@
const int spacingHint = style()->pixelMetric(QStyle::PM_DefaultLayoutSpacing);
grid->addItem(new QSpacerItem(spacingHint, 0), 0, 1);
// filenames or action name
- sourceInvite = new QLabel(tr("Source:", "The source url of a job"), this);
+ sourceInvite = new QLabel(QCoreApplication::translate("KWidgetJobTracker", "Source:", "The source url of a job"), this);
grid->addWidget(sourceInvite, 0, 0);
sourceEdit = new KSqueezedTextLabel(this);
@@ -461,7 +468,7 @@
sourceEdit->installEventFilter(this);
grid->addWidget(sourceEdit, 0, 2);
- destInvite = new QLabel(tr("Destination:", "The destination url of a job"), this);
+ destInvite = new QLabel(QCoreApplication::translate("KWidgetJobTracker", "Destination:", "The destination url of a job"), this);
grid->addWidget(destInvite, 1, 0);
destEdit = new KSqueezedTextLabel(this);
@@ -485,7 +492,7 @@
arrowButton = new QPushButton(this);
arrowButton->setMaximumSize(QSize(32, 25));
arrowButton->setIcon(QIcon::fromTheme("arrow-down"));
- arrowButton->setToolTip(tr("Click this to expand the dialog, to show details"));
+ arrowButton->setToolTip(QCoreApplication::translate("KWidgetJobTracker", "Click this to expand the dialog, to show details"));
arrowState = Qt::DownArrow;
connect(arrowButton, SIGNAL(clicked()), this, SLOT(_k_arrowToggled()));
hBox->addWidget(arrowButton);
@@ -500,7 +507,7 @@
resumeLabel = new QLabel(this);
hBox->addWidget(resumeLabel);
- pauseButton = new QPushButton(tr("&Pause"), this);
+ pauseButton = new QPushButton(QCoreApplication::translate("KWidgetJobTracker", "&Pause"), this);
connect(pauseButton, SIGNAL(clicked()), this, SLOT(_k_pauseResumeClicked()));
hBox->addWidget(pauseButton);
@@ -519,7 +526,7 @@
hBox->addWidget(progressLabel);
progressLabel->hide();
- keepOpenCheck = new QCheckBox(tr("&Keep this window open after transfer is complete"), this);
+ keepOpenCheck = new QCheckBox(QCoreApplication::translate("KWidgetJobTracker", "&Keep this window open after transfer is complete"), this);
connect(keepOpenCheck, SIGNAL(toggled(bool)), this, SLOT(_k_keepOpenToggled(bool)));
topLayout->addWidget(keepOpenCheck);
keepOpenCheck->hide();
@@ -527,13 +534,13 @@
hBox = new QHBoxLayout();
topLayout->addLayout(hBox);
- openFile = new QPushButton(tr("Open &File"), this);
+ openFile = new QPushButton(QCoreApplication::translate("KWidgetJobTracker", "Open &File"), this);
connect(openFile, SIGNAL(clicked()), this, SLOT(_k_openFile()));
hBox->addWidget(openFile);
openFile->setEnabled(false);
openFile->hide();
- openLocation = new QPushButton(tr("Open &Destination"), this);
+ openLocation = new QPushButton(QCoreApplication::translate("KWidgetJobTracker", "Open &Destination"), this);
connect(openLocation, SIGNAL(clicked()), this, SLOT(_k_openLocation()));
hBox->addWidget(openLocation);
openLocation->hide();
@@ -541,7 +548,7 @@
hBox->addStretch(1);
cancelClose = new QPushButton(this);
- cancelClose->setText(tr("&Cancel"));
+ cancelClose->setText(QCoreApplication::translate("KWidgetJobTracker", "&Cancel"));
cancelClose->setIcon(QIcon::fromTheme("dialog-cancel"));
connect(cancelClose, SIGNAL(clicked()), this, SLOT(_k_stop()));
hBox->addWidget(cancelClose);
@@ -549,7 +556,7 @@
resize(sizeHint());
setMaximumHeight(sizeHint().height());
- setWindowTitle(tr("Progress Dialog")); // show something better than kuiserver
+ setWindowTitle(QCoreApplication::translate("KWidgetJobTracker", "Progress Dialog")); // show something better than kuiserver
}
void KWidgetJobTracker::Private::ProgressWidget::showTotals()
@@ -562,9 +569,9 @@
if (totalDirs > 1)
// that we have a singular to translate looks weired but is only logical
{
- tmps = tr("%n folder(s)", "", totalDirs) + " ";
+ tmps = QCoreApplication::translate("KWidgetJobTracker", "%n folder(s)", "", totalDirs) + " ";
}
- tmps += tr("%n file(s)", "", totalFiles);
+ tmps += QCoreApplication::translate("KWidgetJobTracker", "%n file(s)", "", totalFiles);
progressLabel->setText(tmps);
}
}
@@ -650,14 +657,14 @@
progressLabel->show();
speedLabel->show();
arrowButton->setIcon(QIcon::fromTheme("arrow-up"));
- arrowButton->setToolTip(tr("Click this to collapse the dialog, to hide details"));
+ arrowButton->setToolTip(QCoreApplication::translate("KWidgetJobTracker", "Click this to collapse the dialog, to hide details"));
arrowState = Qt::UpArrow;
} else {
//Collapse the dialog
progressLabel->hide();
speedLabel->hide();
arrowButton->setIcon(QIcon::fromTheme("arrow-down"));
- arrowButton->setToolTip(tr("Click this to expand the dialog, to show details"));
+ arrowButton->setToolTip(QCoreApplication::translate("KWidgetJobTracker", "Click this to expand the dialog, to show details"));
arrowState = Qt::DownArrow;
}
setMaximumHeight(sizeHint().height());
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
[View Less]
1
0
Hello community,
here is the log from the commit of package kitemviews for openSUSE:Factory checked in at 2014-04-02 17:22:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kitemviews (Old)
and /work/SRC/openSUSE:Factory/.kitemviews.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kitemviews"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kitemviews/kitemviews.changes 2014-03-…
[View More]10 12:17:20.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kitemviews.new/kitemviews.changes 2014-04-02 17:22:23.000000000 +0200
@@ -1,0 +2,9 @@
+Sat Mar 29 19:47:43 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 4.98.0
+ * API improvements and cleanups
+ * Buildsystem fixes
+ * For more details please see:
+ http://www.kde.org/announcements/announce-frameworks5-beta1.php
+
+-------------------------------------------------------------------
Old:
----
kitemviews-4.97.0.tar.xz
New:
----
kitemviews-4.98.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kitemviews.spec ++++++
--- /var/tmp/diff_new_pack.fAK1uM/_old 2014-04-02 17:22:23.000000000 +0200
+++ /var/tmp/diff_new_pack.fAK1uM/_new 2014-04-02 17:22:23.000000000 +0200
@@ -18,10 +18,10 @@
%define lname libKF5ItemViews5
Name: kitemviews
-Version: 4.97.0
+Version: 4.98.0
Release: 0
BuildRequires: cmake >= 2.8.12
-BuildRequires: extra-cmake-modules >= 0.0.11
+BuildRequires: extra-cmake-modules >= 0.0.12
BuildRequires: fdupes
BuildRequires: kf5-filesystem
BuildRequires: pkgconfig(Qt5Test) >= 5.2.0
++++++ kitemviews-4.97.0.tar.xz -> kitemviews-4.98.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-4.97.0/CMakeLists.txt new/kitemviews-4.98.0/CMakeLists.txt
--- old/kitemviews-4.97.0/CMakeLists.txt 2014-03-01 12:51:08.000000000 +0100
+++ new/kitemviews-4.98.0/CMakeLists.txt 2014-03-28 19:17:07.000000000 +0100
@@ -2,7 +2,7 @@
project(KItemViews)
-find_package(ECM 0.0.11 REQUIRED NO_MODULE)
+find_package(ECM 0.0.12 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
set(REQUIRED_QT_VERSION "5.2.0")
@@ -16,7 +16,7 @@
include(ECMSetupVersion)
include(ECMGenerateHeaders)
-set(KF5_VERSION "4.97.0")
+set(KF5_VERSION "4.98.0")
ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KITEMVIEWS
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kitemviews_version.h"
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5ItemViewsConfigVersion.cmake"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-4.97.0/src/Messages.sh new/kitemviews-4.98.0/src/Messages.sh
--- old/kitemviews-4.97.0/src/Messages.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/kitemviews-4.98.0/src/Messages.sh 2014-03-28 19:17:07.000000000 +0100
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Invoke the extractrc script on all .ui, .rc, and .kcfg files in the sources.
+# The results are stored in a pseudo .cpp file to be picked up by xgettext.
+lst=`find . -name \*.rc -o -name \*.ui -o -name \*.kcfg`
+if [ -n "$lst" ] ; then
+ $EXTRACTRC $lst >> rc.cpp
+fi
+
+# If your framework contains tips-of-the-day, call preparetips as well.
+if [ -f "data/tips" ] ; then
+ ( cd data && $PREPARETIPS > ../tips.cpp )
+fi
+
+# Extract strings from all source files.
+# If your framework depends on KI18n, use $XGETTEXT. If it uses Qt translation
+# system, use $EXTRACT_TR_STRINGS.
+$EXTRACT_TR_STRINGS `find . -name \*.cpp -o -name \*.h -name \*.qml` -o $podir/kitemviews5.pot
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
[View Less]
1
0