Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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 (c462962adaf9ce1335e3170df459cdae82b83f5c)
  • Date: Thu, 12 Jan 2017 16:58:22 +0000

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

kde5-pim/kdepim-runtime/HISTORY | 2 ++
kde5-pim/kdepim-runtime/PRE_BUILD | 1 -
kde5-pim/kdepim-runtime/dataloss.diff | 33
---------------------------------
3 files changed, 2 insertions(+), 34 deletions(-)

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

kdepim-runtime - remove patch

diff --git a/kde5-pim/kdepim-runtime/HISTORY b/kde5-pim/kdepim-runtime/HISTORY
index 6d923b8..891bfa5 100644
--- a/kde5-pim/kdepim-runtime/HISTORY
+++ b/kde5-pim/kdepim-runtime/HISTORY
@@ -1,5 +1,7 @@
2017-01-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 16.12.1
+ * dataloss.diff: deleted
+ * PRE_BUILD: adjust

2017-01-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
diff --git a/kde5-pim/kdepim-runtime/PRE_BUILD
b/kde5-pim/kdepim-runtime/PRE_BUILD
index d53ccb7..f78bfd4 100755
--- a/kde5-pim/kdepim-runtime/PRE_BUILD
+++ b/kde5-pim/kdepim-runtime/PRE_BUILD
@@ -3,4 +3,3 @@ 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
deleted file mode 100644
index 182b8f2..0000000
--- a/kde5-pim/kdepim-runtime/dataloss.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-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



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

Archive powered by MHonArc 2.6.24.

Top of Page