Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (6052b538fbbbfbfc250311efcef3123baf778be0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (6052b538fbbbfbfc250311efcef3123baf778be0)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (6052b538fbbbfbfc250311efcef3123baf778be0)
  • Date: Sun, 1 Jan 2017 10:00:42 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

kde5-extra/kpmcore/DETAILS |
2
kde5-extra/kpmcore/HISTORY |
3
kde5-pim/kdepim-runtime/DETAILS |
1
kde5-pim/kdepim-runtime/HISTORY |
5
kde5-pim/kdepim-runtime/PRE_BUILD |
1
kde5-pim/kdepim-runtime/dataloss.diff |
33 ++++
plasma/kwin/CONFLICTS |
1
plasma/kwin/HISTORY |
3
plasma/plasma-integration/87b27476cc8a3865994da066ce06a3e836462719.diff |
71 ++++++++++
plasma/plasma-integration/DETAILS |
1
plasma/plasma-integration/HISTORY |
4
plasma/plasma-integration/PRE_BUILD |
3
12 files changed, 126 insertions(+), 2 deletions(-)

New commits:
commit 6052b538fbbbfbfc250311efcef3123baf778be0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kwin - CONFLICTS nolonger needed

commit 27b70745de81a46c30621c4550d156617d28b928
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kdepim-runtime - upstream patch

commit 75f13f27ef1a5b0e9f76aad694530b0e846bfda5
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

plasma-integration - upstream patch

commit 3ef7c79c1f5ebce0e14eb4bcbe8c201a3af8e559
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kpmcore: => 3.0.1

diff --git a/kde5-extra/kpmcore/DETAILS b/kde5-extra/kpmcore/DETAILS
index e757d98..3b6d54a 100755
--- a/kde5-extra/kpmcore/DETAILS
+++ b/kde5-extra/kpmcore/DETAILS
@@ -1,5 +1,5 @@
SPELL=kpmcore
- VERSION=3.0.0
+ VERSION=3.0.1
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL=http://download.kde.org/stable/$SPELL/${VERSION}/src/$SOURCE
SOURCE2=$SOURCE.sig
diff --git a/kde5-extra/kpmcore/HISTORY b/kde5-extra/kpmcore/HISTORY
index 9c283a3..f020da7 100644
--- a/kde5-extra/kpmcore/HISTORY
+++ b/kde5-extra/kpmcore/HISTORY
@@ -1,3 +1,6 @@
+2017-01-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.0.1
+
2016-12-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.0.0

diff --git a/kde5-pim/kdepim-runtime/DETAILS b/kde5-pim/kdepim-runtime/DETAILS
index 0ff38c3..7cd955c 100644
--- a/kde5-pim/kdepim-runtime/DETAILS
+++ b/kde5-pim/kdepim-runtime/DETAILS
@@ -1,5 +1,6 @@
SPELL=kdepim-runtime
VERSION=16.12.0
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.xz

SOURCE_URL=http://download.kde.org/stable/applications/${VERSION}/src/$SOURCE
SOURCE2=$SOURCE.sig
diff --git a/kde5-pim/kdepim-runtime/HISTORY b/kde5-pim/kdepim-runtime/HISTORY
index 522252a..f2c7bd0 100644
--- a/kde5-pim/kdepim-runtime/HISTORY
+++ b/kde5-pim/kdepim-runtime/HISTORY
@@ -1,3 +1,8 @@
+2017-01-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * dataloss.diff: added
+ * PRE_BUILD: apply patch
+
2016-12-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 16.12.0

diff --git a/kde5-pim/kdepim-runtime/PRE_BUILD
b/kde5-pim/kdepim-runtime/PRE_BUILD
index f78bfd4..d53ccb7 100755
--- a/kde5-pim/kdepim-runtime/PRE_BUILD
+++ b/kde5-pim/kdepim-runtime/PRE_BUILD
@@ -3,3 +3,4 @@ cd $SOURCE_DIRECTORY &&
sed -i '/update_xdg_mimetypes/D;/Declarative/d' CMakeLists.txt
# temporary fix
sed -i '/dav/D' resources/CMakeLists.txt
+patch -p1 -i $SPELL_DIRECTORY/dataloss.diff
diff --git a/kde5-pim/kdepim-runtime/dataloss.diff
b/kde5-pim/kdepim-runtime/dataloss.diff
new file mode 100644
index 0000000..182b8f2
--- /dev/null
+++ b/kde5-pim/kdepim-runtime/dataloss.diff
@@ -0,0 +1,33 @@
+commit 8ae09b6f4afa8ceb2770da67b6dc79c78b86af47
+Author: David Faure <faure AT kde.org>
+Date: Mon Dec 19 13:29:30 2016 +0100
+
+ Fix DATA LOSS bug in ical resource which failed to create std.ics if it
didn't exist.
+
+ The default setup sets the Path to be a local path, not a URL.
+ => Use QUrl::fromUserInput so that it can deal with both cases, paths
and URLs.
+
+ CCMAIL: smartins AT kde.org, release-team AT kde.org
+
+diff --git a/resources/shared/singlefileresource/singlefileresource.h
b/resources/shared/singlefileresource/singlefileresource.h
+index f3c19aaf5..3f4149903 100644
+--- a/resources/shared/singlefileresource/singlefileresource.h
++++ b/resources/shared/singlefileresource/singlefileresource.h
+@@ -55,7 +55,7 @@ public:
+ , mSettings(new Settings(config()))
+ {
+ // The resource needs network when the path refers to a non local
file.
+- setNeedsNetwork(!QUrl(mSettings->path()).isLocalFile());
++
setNeedsNetwork(!QUrl::fromUserInput(mSettings->path()).isLocalFile());
+ }
+ ~SingleFileResource()
+ {
+@@ -82,7 +82,7 @@ public:
+ return;
+ }
+
+- mCurrentUrl = QUrl(mSettings->path()); // path already has scheme
++ mCurrentUrl = QUrl::fromUserInput(mSettings->path()); // the string
contains the scheme if remote, doesn't if local path
+ if (mCurrentHash.isEmpty())
+ {
+ // First call to readFile() lets see if there is a hash stored
in a
diff --git a/plasma/kwin/CONFLICTS b/plasma/kwin/CONFLICTS
deleted file mode 100755
index cc1cece..0000000
--- a/plasma/kwin/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts kwin y
diff --git a/plasma/kwin/HISTORY b/plasma/kwin/HISTORY
index a2242a8..8792d3c 100644
--- a/plasma/kwin/HISTORY
+++ b/plasma/kwin/HISTORY
@@ -1,3 +1,6 @@
+2017-01-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFLICTS: deleted
+
2016-12-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.8.5

diff --git
a/plasma/plasma-integration/87b27476cc8a3865994da066ce06a3e836462719.diff
b/plasma/plasma-integration/87b27476cc8a3865994da066ce06a3e836462719.diff
new file mode 100644
index 0000000..148825d
--- /dev/null
+++ b/plasma/plasma-integration/87b27476cc8a3865994da066ce06a3e836462719.diff
@@ -0,0 +1,71 @@
+commit 87b27476cc8a3865994da066ce06a3e836462719
+Author: Albert Astals Cid <aacid AT kde.org>
+Date: Sat Dec 31 11:55:43 2016 +0100
+
+ Fix regression in which the Save dialog appears as an Open dialog
+
+ 7bbbd93cd3fc0abdffd3fa7f144cb50a33fafad9 makes the save dialog appear as
Open dialog.
+
+ Simplify the code in that commit so it does not regress anymore.
+
+ Comes with a unit test
+
+ New test fails without the patch, works with it. Kate Save As dialog no
longer shows as Open dialog.
+
+ REVIEW: 129732
+
+diff --git a/autotests/kfiledialog_unittest.cpp
b/autotests/kfiledialog_unittest.cpp
+index 47a5543..d53c7e3 100644
+--- a/autotests/kfiledialog_unittest.cpp
++++ b/autotests/kfiledialog_unittest.cpp
+@@ -95,6 +95,29 @@ private Q_SLOTS:
+ QCOMPARE(dialog.directoryUrl(), directoryUrl);
+ }
+
++ void testGetSaveFileUrl()
++ {
++ QObject lambdaGuard;
++ QTemporaryFile tempFile(QDir::tempPath()+"/kfiledialogtest_XXXXXX");
++ tempFile.open();
++ const QString tempName = tempFile.fileName();
++ const QUrl url = QUrl::fromLocalFile(tempName);
++
++ // Need to use a lambda and not just QTest::qWaitForWindowExposed();
++ // because with the static getSaveFileUrl we do not have access
++ // to the QFileDialog object, so instead we hook to a signal
++ KFileWidget::OperationMode saveFileOperationMode =
KFileWidget::Other;
++ connect(qApp, &QGuiApplication::focusWindowChanged, &lambdaGuard,
[&saveFileOperationMode] {
++ KFileWidget *fileWidget = findFileWidget();
++ saveFileOperationMode = fileWidget->operationMode();
++ qApp->activeWindow()->close();
++ });
++
++ QFileDialog::getSaveFileUrl(0, QString(), url);
++
++ QCOMPARE(saveFileOperationMode, KFileWidget::Saving);
++ }
++
+ void testViewMode()
+ {
+ // Open a file dialog, and change view mode to tree
+diff --git a/src/platformtheme/kdeplatformfiledialoghelper.cpp
b/src/platformtheme/kdeplatformfiledialoghelper.cpp
+index 990b983..05cfe35 100644
+--- a/src/platformtheme/kdeplatformfiledialoghelper.cpp
++++ b/src/platformtheme/kdeplatformfiledialoghelper.cpp
+@@ -365,15 +365,7 @@ void KDEPlatformFileDialogHelper::selectFile(const QUrl
&filename)
+ // Qt 5 at least <= 5.8.0 does not derive the directory from the passed
url
+ // and set the initialDirectory option accordingly, also not for known
schemes
+ // like file://, so we have to do it ourselves
+-
+- // Syntax-wise we have to use a copy ctor until Qt 5.7.x and clone()
since Qt 5.8.
+-#if QT_VERSION < QT_VERSION_CHECK(5, 8, 0)
+- QSharedPointer<QFileDialogOptions> opt(new
QFileDialogOptions(*options()));
+-#else
+- auto opt = options()->clone();
+-#endif
+- opt->setInitialDirectory(m_dialog->directory());
+- setOptions(opt);
++ options()->setInitialDirectory(m_dialog->directory());
+ }
+
+ void KDEPlatformFileDialogHelper::setDirectory(const QUrl &directory)
diff --git a/plasma/plasma-integration/DETAILS
b/plasma/plasma-integration/DETAILS
index 8b8fef9..9645355 100755
--- a/plasma/plasma-integration/DETAILS
+++ b/plasma/plasma-integration/DETAILS
@@ -1,5 +1,6 @@
SPELL=plasma-integration
VERSION=5.8.5
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL=http://download.kde.org/stable/plasma/${VERSION}/$SOURCE
SOURCE2=$SOURCE.sig
diff --git a/plasma/plasma-integration/HISTORY
b/plasma/plasma-integration/HISTORY
index 9350dde..9967530 100644
--- a/plasma/plasma-integration/HISTORY
+++ b/plasma/plasma-integration/HISTORY
@@ -1,3 +1,7 @@
+2017-01-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD 87b27476cc8a3865994da066ce06a3e836462719.diff: added,
upstream patch
+
2016-12-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.8.5

diff --git a/plasma/plasma-integration/PRE_BUILD
b/plasma/plasma-integration/PRE_BUILD
new file mode 100755
index 0000000..8fbac72
--- /dev/null
+++ b/plasma/plasma-integration/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/87b27476cc8a3865994da066ce06a3e836462719.diff


  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (6052b538fbbbfbfc250311efcef3123baf778be0), Treeve Jelbert, 01/01/2017

Archive powered by MHonArc 2.6.24.

Top of Page