[arch-commits] Commit in dtkcore/repos/community-testing-x86_64 (3 files)

[Felix Yan]

    Date: Monday, May 14, 2018 @ 18:03:01
  Author: felixonmars
Revision: 322225

archrelease: copy trunk to community-testing-x86_64

Added:
  dtkcore/repos/community-testing-x86_64/PKGBUILD
    (from rev 322224, dtkcore/trunk/PKGBUILD)
  dtkcore/repos/community-testing-x86_64/fix-symbol.patch
    (from rev 322224, dtkcore/trunk/fix-symbol.patch)
Deleted:
  dtkcore/repos/community-testing-x86_64/PKGBUILD

------------------+
 PKGBUILD         |   59 +++++++++++++++++++++++++++--------------------------
 fix-symbol.patch |   30 ++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 28 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-14 18:02:37 UTC (rev 322224)
+++ PKGBUILD	2018-05-14 18:03:01 UTC (rev 322225)
@@ -1,28 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
-# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
-
-pkgname=dtkcore
-pkgver=2.0.8.1
-pkgrel=1
-epoch=1
-pkgdesc='DTK core modules'
-arch=('x86_64')
-url="https://github.com/linuxdeepin/dtkcore"
-license=('GPL3')
-depends=('qt5-base' 'gsettings-qt')
-makedepends=('qt5-tools')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dtkcore/archive/$pkgver.tar.gz")
-sha512sums=('93e0e03ab955825ccf18d931dc372cb592519ed42f947d237705aae01aa1775d7be95c3aeec62eb57c09074af4cd6851f2bf213fbb80b4ce13a78c6740ea49fa')
-
-build() {
-  cd dtkcore-$pkgver
-  qmake-qt5 PREFIX=/usr
-  make
-}
-
-package() {
-  cd dtkcore-$pkgver
-  make INSTALL_ROOT="$pkgdir" install
-}

Copied: dtkcore/repos/community-testing-x86_64/PKGBUILD (from rev 322224, dtkcore/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-05-14 18:03:01 UTC (rev 322225)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+pkgname=dtkcore
+pkgver=2.0.8.1
+pkgrel=2
+epoch=1
+pkgdesc='DTK core modules'
+arch=('x86_64')
+url="https://github.com/linuxdeepin/dtkcore"
+license=('GPL3')
+depends=('qt5-base' 'gsettings-qt')
+makedepends=('qt5-tools')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dtkcore/archive/$pkgver.tar.gz"
+        fix-symbol.patch)
+sha512sums=('93e0e03ab955825ccf18d931dc372cb592519ed42f947d237705aae01aa1775d7be95c3aeec62eb57c09074af4cd6851f2bf213fbb80b4ce13a78c6740ea49fa'
+            '0b3e8e673136b755029e926c7acabb033fea7d89c4b80d85d1c3419faffdcfb6f8ed75214ed9a4226ae2ee7925c797e73e5acbb6f679d6d98879c15965f0b773')
+
+build() {
+  cd dtkcore-$pkgver
+  patch -p1 -i ../fix-symbol.patch
+  qmake-qt5 PREFIX=/usr
+  make
+}
+
+package() {
+  cd dtkcore-$pkgver
+  make INSTALL_ROOT="$pkgdir" install
+}

Copied: dtkcore/repos/community-testing-x86_64/fix-symbol.patch (from rev 322224, dtkcore/trunk/fix-symbol.patch)
===================================================================
--- fix-symbol.patch	                        (rev 0)
+++ fix-symbol.patch	2018-05-14 18:03:01 UTC (rev 322225)
@@ -0,0 +1,30 @@
+diff --git a/src/filesystem/dpathbuf.h b/src/filesystem/dpathbuf.h
+index 3aa7609..85df90d 100644
+--- a/src/filesystem/dpathbuf.h
++++ b/src/filesystem/dpathbuf.h
+@@ -26,7 +26,10 @@ DCORE_BEGIN_NAMESPACE
+ class LIBDTKCORESHARED_EXPORT DPathBuf
+ {
+ public:
+-    DPathBuf(const QString &path);
++    DPathBuf(const QString &path)
++    {
++        m_path = QDir(path).absolutePath();
++    }
+ 
+     DPathBuf operator/(const QString &p) const
+     {
+diff --git a/src/filesystem/filesystem.pri b/src/filesystem/filesystem.pri
+index c8d81a0..e561867 100644
+--- a/src/filesystem/filesystem.pri
++++ b/src/filesystem/filesystem.pri
+@@ -14,8 +14,7 @@ SOURCES += \
+     $$PWD/dbasefilewatcher.cpp \
+     $$PWD/dfilewatcher.cpp \
+     $$PWD/dfilewatchermanager.cpp \
+-    $$PWD/dstandardpaths.cpp \
+-    $$PWD/dpathbuf.cpp
++    $$PWD/dstandardpaths.cpp
+ 
+ linux {
+     SOURCES += \