Date: Friday, September 4, 2020 @ 23:31:35 Author: felixonmars Revision: 698731
upgpkg: deepin-printer 0.6.8-1 Added: deepin-printer/trunk/build-fix.patch Modified: deepin-printer/trunk/PKGBUILD -----------------+ PKGBUILD | 11 +++++++---- build-fix.patch | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-09-04 23:31:23 UTC (rev 698730) +++ PKGBUILD 2020-09-04 23:31:35 UTC (rev 698731) @@ -1,8 +1,8 @@ # Maintainer: Felix Yan <[email protected]> pkgname=deepin-printer -pkgver=0.6.3 -pkgrel=2 +pkgver=0.6.8 +pkgrel=1 pkgdesc='Printer configuration project for DDE' arch=('x86_64') url="https://github.com/linuxdeepin/dde-printer"; @@ -10,11 +10,14 @@ depends=('crypto++' 'cups' 'deepin-qt5integration' 'libcups' 'smbclient') makedepends=('qt5-tools') groups=('deepin-extra') -source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-printer/archive/$pkgver.tar.gz";) -sha512sums=('b782df54a508784011ebe505a45cf7ef3d8f6251055af500ec7e65ede922060b3b5152567127cbd10e3d3993530c6afb9236533ef534f9c159bab1004defb4f6') +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-printer/archive/$pkgver.tar.gz"; + build-fix.patch) +sha512sums=('634608b63f83762b701dd49e318003d6af2f8c4706f0638a6ef3800f21b3f2fab8641341ac6131671f06c611f856da704acbd292fbe95c27fafd6f45d6cca13b' + '1312037fd47a1e50385d9011269a331cd745d89313ea94a827c743938214d9cd447d74038b96b9082a0100a62314919487fe6ee65e4341e4d3f2880417896555') 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 Added: build-fix.patch =================================================================== --- build-fix.patch (rev 0) +++ build-fix.patch 2020-09-04 23:31:35 UTC (rev 698731) @@ -0,0 +1,37 @@ +commit e35db46f50ab1740ee7bcb6a512a95b1f9389a4f +Author: Zhang, DingYuan <[email protected]> +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; + } +
