[arch-commits] Commit in deepin-clone/trunk (PKGBUILD dtk5.patch)

[Felix Yan]

    Date: Friday, May 1, 2020 @ 17:17:38
  Author: felixonmars
Revision: 624095

upgpkg: deepin-clone 5.0.3-1

Added:
  deepin-clone/trunk/dtk5.patch
Modified:
  deepin-clone/trunk/PKGBUILD

------------+
 PKGBUILD   |    9 ++++--
 dtk5.patch |   86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 92 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-01 17:14:50 UTC (rev 624094)
+++ PKGBUILD	2020-05-01 17:17:38 UTC (rev 624095)
@@ -1,7 +1,7 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=deepin-clone
-pkgver=5.0.1
+pkgver=5.0.3
 pkgrel=1
 pkgdesc='Disk and partition backup/restore tool'
 arch=('x86_64')
@@ -10,11 +10,14 @@
 depends=('deepin-qt5integration' 'partclone' 'e2fsprogs' 'jfsutils' 'xfsprogs')
 makedepends=('qt5-tools' 'deepin-gettext-tools')
 groups=('deepin-extra')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-clone/archive/$pkgver.tar.gz")
-sha512sums=('c4e5dad01a0a185f8154c1f5427cdab0559f9a4808435c8bedba6296bac711f4e1427c0a1c6d60e4ba271b1d3db632e1a75f0292008183d6f78dc4cf1dcd234a')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-clone/archive/$pkgver.tar.gz"
+        dtk5.patch)
+sha512sums=('fda6f351c4723ed4eda88c25baae0a3809cb5a2ec6389c325f2ed7567a5656c0db5baa787cdedc69b0c1c4ea7c5e3c8df621b474bd56532ba3398ed59238d49b'
+            'eec931bf07057aa68a7ec5721254c54772647f7ed9b20cfde12b8732c7bf09a2abd14d6e55d5b7a18b39e3917f479261ca374078a95b3ffc8c3856cae2a15aea')
 
 prepare() {
   cd deepin-clone-$pkgver
+  patch -p1 -i ../dtk5.patch
   sed -i 's|/usr/sbin|/usr/bin|' app/{deepin-clone-app.pro,deepin-clone-ionice,deepin-clone-pkexec,com.deepin.pkexec.deepin-clone.policy.tmp}
 }
 

Added: dtk5.patch
===================================================================
--- dtk5.patch	                        (rev 0)
+++ dtk5.patch	2020-05-01 17:17:38 UTC (rev 624095)
@@ -0,0 +1,86 @@
+diff --git a/.gitignore b/.gitignore
+index e4955720e5a00e9868aad96ce3068112394a60c7..ff56adac0f6d353f87c79eccbe6a2f0c82589c37 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -39,3 +39,6 @@ CMakeLists.txt.user*
+ 
+ *.qm
+ com.deepin.pkexec.deepin-clone.policy
++
++build/
++
+diff --git a/app/src/main.cpp b/app/src/main.cpp
+index 5e6afa7c9906a066a28da0eaa1e9d8d0dd618fd6..dbb0fc35e6f3b1d6d78fae1f43199cc352f421c2 100644
+--- a/app/src/main.cpp
++++ b/app/src/main.cpp
+@@ -233,7 +233,7 @@ int main(int argc, char *argv[])
+         MainWindow *window = new MainWindow;
+ 
+         window->setFixedSize(860, 660);
+-        window->setStyleSheet(DThemeManager::instance()->getQssForWidget("main", window));
++        window->setStyleSheet(DThemeManager::instance()->getQssForWidget("main"));
+         window->setWindowIcon(QIcon::fromTheme("deepin-clone"));
+         window->setWindowFlags(Qt::WindowCloseButtonHint | Qt::WindowMinimizeButtonHint | Qt::WindowSystemMenuHint);
+         window->titlebar()->setIcon(window->windowIcon());
+diff --git a/app/src/widgets/selectfilepage.cpp b/app/src/widgets/selectfilepage.cpp
+index 1efe0babc3c23d5e99ed6b40ab555daff8e8b131..5f8c4649db90ab184cdc25617c057168eafa2167 100644
+--- a/app/src/widgets/selectfilepage.cpp
++++ b/app/src/widgets/selectfilepage.cpp
+@@ -28,7 +28,7 @@
+ #include "iconlabel.h"
+ #include "helper.h"
+ 
+-#include <dlinkbutton.h>
++#include <DCommandLinkButton>
+ 
+ #include <QVBoxLayout>
+ #include <QFileDialog>
+@@ -77,7 +77,7 @@ private:
+     QString m_defaultFileName;
+     QLabel *m_dragDropLabel = 0;
+     IconLabel *m_label;
+-    DLinkButton *m_button;
++    DCommandLinkButton *m_button;
+ 
+     friend class SelectFilePage;
+ };
+@@ -98,7 +98,7 @@ SelectFileWidget::SelectFileWidget(Mode mode, QWidget *parent)
+         setAcceptDrops(true);
+     }
+ 
+-    m_button = new DLinkButton(mode == GetSaveName ? tr("Select storage location") : tr("Select image file"), this);
++    m_button = new DCommandLinkButton(mode == GetSaveName ? tr("Select storage location") : tr("Select image file"), this);
+ 
+     layout->addStretch();
+     layout->addWidget(m_label, 0, Qt::AlignHCenter);
+@@ -121,7 +121,7 @@ SelectFileWidget::SelectFileWidget(Mode mode, QWidget *parent)
+     layout->addWidget(m_button, 0, Qt::AlignHCenter);
+     layout->addStretch();
+ 
+-    connect(m_button, &DLinkButton::clicked, this, &SelectFileWidget::openFileDialog);
++    connect(m_button, &DCommandLinkButton::clicked, this, &SelectFileWidget::openFileDialog);
+ 
+     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+ }
+diff --git a/app/src/widgets/utilitylistitem.cpp b/app/src/widgets/utilitylistitem.cpp
+index eb898bd49c6ee0c205d2c9f1d6da7216775477e2..aadb466ca53572348c54927f44fb79fecff13c49 100644
+--- a/app/src/widgets/utilitylistitem.cpp
++++ b/app/src/widgets/utilitylistitem.cpp
+@@ -21,7 +21,7 @@
+ 
+ #include "utilitylistitem.h"
+ 
+-#include <dseparatorhorizontal.h>
++#include <DHorizontalLine>
+ 
+ #include <QHBoxLayout>
+ #include <QLabel>
+@@ -107,7 +107,7 @@ UtilityListItem::UtilityListItem(QWidget *parent)
+     m_layout->addWidget(m_label, 0, Qt::AlignVCenter);
+ 
+     m_spaceSeparator = new QWidget(this);
+-    m_bottomSeparator = new DSeparatorHorizontal(this);
++    m_bottomSeparator = new DHorizontalLine(this);
+ 
+     m_spaceSeparator->setFixedHeight(2);
+