[arch-commits] Commit in deepin-printer/trunk (PKGBUILD build-fix.patch)

[Felix Yan]

    Date: Saturday, April 24, 2021 @ 14:54:20
  Author: felixonmars
Revision: 923685

upgpkg: deepin-printer 0.8.5-1

Modified:
  deepin-printer/trunk/PKGBUILD
Deleted:
  deepin-printer/trunk/build-fix.patch

-----------------+
 PKGBUILD        |   19 ++++++++-----------
 build-fix.patch |   37 -------------------------------------
 2 files changed, 8 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-24 14:44:36 UTC (rev 923684)
+++ PKGBUILD	2021-04-24 14:54:20 UTC (rev 923685)
@@ -1,27 +1,24 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=deepin-printer
-pkgver=0.7.6
+pkgver=0.8.5
 pkgrel=1
 pkgdesc='Printer configuration project for DDE'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/dde-printer"
 license=('GPL3')
-depends=('crypto++' 'cups' 'deepin-qt5integration' 'libcups' 'smbclient')
-makedepends=('qt5-tools')
+depends=('cups' 'deepin-qt5integration' 'smbclient')
+makedepends=('gtest' 'qt5-tools')
 groups=('deepin-extra')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-printer/archive/$pkgver.tar.gz"
-        build-fix.patch)
-sha512sums=('ea11d4eb93c9a20b245616e50e4b07125fe2b424c667d280546524a7d5822048f4178a8f0905dfa5fb5364b0b97d56fb39913e67641d9eb1fc11e81b940f2ecb'
-            '1312037fd47a1e50385d9011269a331cd745d89313ea94a827c743938214d9cd447d74038b96b9082a0100a62314919487fe6ee65e4341e4d3f2880417896555')
+source=("https://github.com/linuxdeepin/dde-printer/archive/$pkgver/$pkgname-$pkgver.tar.gz")
+sha512sums=('251f7ec33968f31004fef0880b2e01d9172475363891d116b317efb91a435199360e5f861e7b006ea53e4caf44aea0666d68f1a943baca8a92e0c5833bf9963c')
 
 prepare() {
   cd dde-printer-$pkgver
-  patch -p1 -i ../build-fix.patch
-  sed -i '/include <QEventLoop>/a #include <QCloseEvent>' src/Printer/ui/dprintersshowwindow.h
-  sed -i '/include <QList>/a #include <QFile>' src/Printer/vendor/zdrivermanager.h
-  sed -i 's/-lcrypto++/-lcryptopp/' src/Printer/Printer.pro
   sed -i '$aOnlyShowIn=Deepin' src/Printer/platform/linux/dde-printer.desktop
+
+  # https://github.com/linuxdeepin/dde-printer/issues/4
+  sed -i '/#include <strings.h>/a #include <stdexcept>' src/cppcups/cupssnmp.cpp
 }
 
 build() {

Deleted: build-fix.patch
===================================================================
--- build-fix.patch	2021-04-24 14:44:36 UTC (rev 923684)
+++ build-fix.patch	2021-04-24 14:54:20 UTC (rev 923685)
@@ -1,37 +0,0 @@
-commit e35db46f50ab1740ee7bcb6a512a95b1f9389a4f
-Author: Zhang, DingYuan <justforlxz at gmail.com>
-Date:   Fri Sep 4 23:14:44 2020 +0800
-
-    fix: failure in 0.6.8
-    
-    编译失败
-    
-    Log: 0.6.8编译失败
-    Issue: Fixes #4
-    Change-Id: I181102ff5900b92ffaa391b32c46f572419ee838
-
-diff --git a/src/Printer/vendor/zdrivermanager.cpp b/src/Printer/vendor/zdrivermanager.cpp
-index 7411ab1..316caef 100644
---- a/src/Printer/vendor/zdrivermanager.cpp
-+++ b/src/Printer/vendor/zdrivermanager.cpp
-@@ -44,6 +44,7 @@
- #include <QJsonArray>
- #include <QEventLoop>
- #include <QTimer>
-+#include <QFile>
- 
- static QMutex g_mutex;
- static QMap<QString, QMap<QString, QString>> g_ppds; //所以ppd文件的字典，以device_id(没有device_id则以make_and_model)作为key
-diff --git a/src/cppcups/cupssnmp.cpp b/src/cppcups/cupssnmp.cpp
-index c6ef69e..0219446 100644
---- a/src/cppcups/cupssnmp.cpp
-+++ b/src/cppcups/cupssnmp.cpp
-@@ -230,7 +230,7 @@ bool cupssnmp::SNMPSupport()
-         {
-             bRet = false;
-         }
--    } catch (const std::runtime_error &e) {
-+    } catch (...) {
-         bRet = false;
-     }
-