[arch-commits] Commit in deepin-draw/trunk (3 files)

[Felix Yan]

    Date: Tuesday, August 16, 2022 @ 08:52:59
  Author: felixonmars
Revision: 1266556

upgpkg: deepin-draw 5.10.6-1

Modified:
  deepin-draw/trunk/PKGBUILD
Deleted:
  deepin-draw/trunk/deepin-draw-missing-includes.patch
  deepin-draw/trunk/fix-build.patch

------------------------------------+
 PKGBUILD                           |   26 +++++++-----------
 deepin-draw-missing-includes.patch |   49 -----------------------------------
 fix-build.patch                    |   13 ---------
 3 files changed, 10 insertions(+), 78 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-16 08:43:35 UTC (rev 1266555)
+++ PKGBUILD	2022-08-16 08:52:59 UTC (rev 1266556)
@@ -1,38 +1,32 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=deepin-draw
-pkgver=5.8.0.22
-pkgrel=4
+pkgver=5.10.6
+pkgrel=1
 pkgdesc="A lightweight drawing tool for Linux Deepin"
 arch=('x86_64')
 url="https://github.com/linuxdeepin/deepin-draw"
 license=('GPL3')
-depends=('deepin-picker' 'deepin-qt5integration' 'freeimage' 'libexif' 'qt5-imageformats')
-makedepends=('qt5-tools')
+depends=('deepin-picker' 'deepin-qt5integration')
+makedepends=('cmake' 'qt5-tools')
 groups=('deepin-extra')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-draw/archive/$pkgver.tar.gz"
-         deepin-draw-missing-includes.patch
-         fix-build.patch)
-sha512sums=('a63007d344edd8f094e73693d1d10618116139783eed3a2aaf0e43ddc32e26616b95bdcc0c6c59213e9c750289a739f67b34c8acdacf2cfa4d759fbaf795097a'
-            '82016ef6a077d6887d52ff8e3f6fb6d3d2b10880cbeef76a54efa62551a62a7cbd38fb4a1a14fa5808039ab3ae1ad7c82275469386289fa42b5048c4d4eaeec7'
-            'adc318a87cf0ce5aa597a7ad7680cadd6b6a9178b39eed7d3fb2ca9d0ddbfc68635bb252a0f9f8848d2b8e0e08e8ce102bb23df7015c051a20e0b210fc9d7f59')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-draw/archive/$pkgver.tar.gz")
+sha512sums=('ca5730dfa38e9e61d41601689595bdd84d3a92aa9948378b6a217a94ee2a0ce217edb72f9f10eb87be993b7e0328b9a5eb8ec26aac7c7e7fd0f7bc88de081b55')
 
 prepare() {
   cd deepin-draw-$pkgver
-  patch -p1 -i ../deepin-draw-missing-includes.patch # Fix missing includes
-  sed -i '/include <DGraphicsView>/i #include <QFileDevice>' frame/cgraphicsview.h
-  sed -i '/include <QPainter>/a #include <QMouseEvent>' widgets/ciconbutton.cpp
-  patch -p1 -i ../fix-build.patch
+  sed -e '/set(CMAKE_CXX_FLAGS/d' -e '/set(CMAKE_C_FLAGS/d' -e '/SET(CMAKE_EXE_LINKER_FLAGS/d' \
+      -i src/CMakeLists.txt
 }
 
 build() {
   cd deepin-draw-$pkgver
 
-  qmake-qt5
+  cmake -DCMAKE_INSTALL_PREFIX=/usr .
   make
 }
 
 package() {
   cd deepin-draw-$pkgver
-  make INSTALL_ROOT="$pkgdir" install -j1
+  make DESTDIR="$pkgdir" install
 }

Deleted: deepin-draw-missing-includes.patch
===================================================================
--- deepin-draw-missing-includes.patch	2022-08-16 08:43:35 UTC (rev 1266555)
+++ deepin-draw-missing-includes.patch	2022-08-16 08:52:59 UTC (rev 1266556)
@@ -1,49 +0,0 @@
-diff --git a/widgets/ccheckbutton.h b/widgets/ccheckbutton.h
-index c219285..0273c59 100644
---- a/widgets/ccheckbutton.h
-+++ b/widgets/ccheckbutton.h
-@@ -21,6 +21,7 @@
- 
- #include <QMap>
- #include <DToolButton>
-+#include <DWidget>
- 
- DWIDGET_USE_NAMESPACE
- 
-diff --git a/widgets/cclickbutton.h b/widgets/cclickbutton.h
-index 7da95b4..d1f0eed 100644
---- a/widgets/cclickbutton.h
-+++ b/widgets/cclickbutton.h
-@@ -20,6 +20,7 @@
- #define CCLICKBUTTON_H
- 
- #include <DToolButton>
-+#include <DWidget>
- 
- DWIDGET_USE_NAMESPACE
- 
-diff --git a/frame/linewidget.h b/frame/linewidget.h
-index a8e28091..c9897e5b 100644
---- a/frame/linewidget.h
-+++ b/frame/linewidget.h
-@@ -21,7 +21,7 @@
- 
- #include <DWidget>
- #include <DLabel>
--
-+#include <DComboBox>
- #include "drawshape/globaldefine.h"
- 
- class CSideWidthWidget;
-diff --git a/widgets/csidewidthwidget.h b/widgets/csidewidthwidget.h
-index f3027762..71cc94f1 100644
---- a/widgets/csidewidthwidget.h
-+++ b/widgets/csidewidthwidget.h
-@@ -25,6 +25,7 @@
- #include <DFrame>
- #include <QHBoxLayout>
- #include <DWidget>
-+#include <DComboBox>
- 
- DWIDGET_USE_NAMESPACE
- 

Deleted: fix-build.patch
===================================================================
--- fix-build.patch	2022-08-16 08:43:35 UTC (rev 1266555)
+++ fix-build.patch	2022-08-16 08:52:59 UTC (rev 1266556)
@@ -1,13 +0,0 @@
-diff --git a/frame/textwidget.cpp b/frame/textwidget.cpp
-index 02ada9f8..932a3b04 100644
---- a/frame/textwidget.cpp
-+++ b/frame/textwidget.cpp
-@@ -63,7 +63,7 @@ void TextWidget::initUI()
-     m_fontFamilyLabel->setFont(ft);
-     m_fontComBox = new CFontComboBox(this);
-     m_fontComBox->setFont(ft);
--    m_fontComBox->setFontFilters(DFontComboBox::AllFonts);
-+    m_fontComBox->setFontFilters(QFontComboBox::AllFonts);
- 
-     m_fontComBox->setFixedSize(QSize(240, 36));
-     m_fontComBox->setCurrentIndex(0);