sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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

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 (aed7c713a57b19b7d6a9392a3d8a640999ea61bc)
Date: Tue, 28 Nov 2017 17:37:38 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

kde-frameworks/kio/DETAILS | 1
kde-frameworks/kio/HISTORY | 4 +++
kde-frameworks/kio/PRE_BUILD | 3 ++
kde-frameworks/kio/patches/qurl.patch | 35
++++++++++++++++++++++++++++++++++
libs/upower/DETAILS | 4 +--
libs/upower/HISTORY | 3 ++
6 files changed, 48 insertions(+), 2 deletions(-)

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

kio - upstream patch

commit 02d377286381649c05ec2ff94ffe6df7b047f56e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

upower: => 0.99.7

diff --git a/kde-frameworks/kio/DETAILS b/kde-frameworks/kio/DETAILS
index 232bca7..61a872b 100755
--- a/kde-frameworks/kio/DETAILS
+++ b/kde-frameworks/kio/DETAILS
@@ -1,5 +1,6 @@
SPELL=kio
VERSION=5.40.0
+ PATCHLEVEL=1
VX=${VERSION%.?}
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL=https://download.kde.org/stable/frameworks/$VX/$SOURCE
diff --git a/kde-frameworks/kio/HISTORY b/kde-frameworks/kio/HISTORY
index 062ec15..1b84aed 100644
--- a/kde-frameworks/kio/HISTORY
+++ b/kde-frameworks/kio/HISTORY
@@ -1,3 +1,7 @@
+2017-11-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD qurl.patch: upstream patch added
+
2017-11-11 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.40.0

diff --git a/kde-frameworks/kio/PRE_BUILD b/kde-frameworks/kio/PRE_BUILD
new file mode 100755
index 0000000..4604ffc
--- /dev/null
+++ b/kde-frameworks/kio/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches
diff --git a/kde-frameworks/kio/patches/qurl.patch
b/kde-frameworks/kio/patches/qurl.patch
new file mode 100644
index 0000000..0a3d45a
--- /dev/null
+++ b/kde-frameworks/kio/patches/qurl.patch
@@ -0,0 +1,35 @@
+diff --git a/src/core/mkpathjob.cpp b/src/core/mkpathjob.cpp
+index bff46ca..a177805 100644
+--- a/src/core/mkpathjob.cpp
++++ b/src/core/mkpathjob.cpp
+@@ -43,8 +43,13 @@ public:
+ m_url.setPath(QStringLiteral("/"));
+ int i = 0;
+ for (; i < basePathComponents.count() && i <
m_pathComponents.count(); ++i) {
+- if (m_pathComponents.at(i) == basePathComponents.at(i)) {
+- m_url.setPath(m_url.path() + '/' + m_pathComponents.at(i));
++ const QString pathComponent = m_pathComponents.at(i);
++ if (pathComponent == basePathComponents.at(i)) {
++ if (m_url.path() == QLatin1Char('/')) {
++ m_url.setPath(m_url.path() + pathComponent);
++ } else {
++ m_url.setPath(m_url.path() + '/' + pathComponent);
++ }
+ } else {
+ break;
+ }
+@@ -57,7 +62,13 @@ public:
+ if (m_url.isLocalFile()) {
+ i = 0;
+ for (; i < m_pathComponents.count(); ++i) {
+- QString testDir = m_url.toLocalFile() + '/' +
m_pathComponents.at(i);
++ const QString localFile = m_url.toLocalFile();
++ QString testDir;
++ if (localFile == QLatin1Char('/')) {
++ testDir = localFile + m_pathComponents.at(i);
++ } else {
++ testDir = localFile + '/' + m_pathComponents.at(i);
++ }
+ if (QFileInfo(testDir).isDir()) {
+ m_url.setPath(testDir);
+ } else {
diff --git a/libs/upower/DETAILS b/libs/upower/DETAILS
index 24a0bbc..6f93d46 100755
--- a/libs/upower/DETAILS
+++ b/libs/upower/DETAILS
@@ -1,6 +1,6 @@
SPELL=upower
- VERSION=0.99.6
-
SOURCE_HASH=sha512:7e7256491ecb5d3f04abf41f05a761b79761c8868a1aedadfc5085c3b9cf15f6099c1494596e6a24b0951511bc7cac074e93ebb2b84abb9fb7a4374483052d3f
+ VERSION=0.99.7
+
SOURCE_HASH=sha512:a1ad200e715284eae815580bba3faad480f7f13401f6ff1a2e7446172796a2413990ce2b553de713ddc530849b2dff1f0ddc12fbd2fd9b55510bbb644d2340a4
SOURCE=$SPELL-$VERSION.tar.xz
# SOURCE_GPG=gurus.gpg:$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/upower/HISTORY b/libs/upower/HISTORY
index de134b7..d3e026f 100644
--- a/libs/upower/HISTORY
+++ b/libs/upower/HISTORY
@@ -1,3 +1,6 @@
+2017-11-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.99.7
+
2017-09-22 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.99.6

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (aed7c713a57b19b7d6a9392a3d8a640999ea61bc), Treeve Jelbert, 11/28/2017