[arch-commits] Commit in deepin-printer/repos/community-x86_64 (4 files)
Felix Yan
felixonmars at archlinux.org
Tue Dec 29 12:17:14 UTC 2020
Date: Tuesday, December 29, 2020 @ 12:17:14
Author: felixonmars
Revision: 796977
archrelease: copy trunk to community-x86_64
Added:
deepin-printer/repos/community-x86_64/PKGBUILD
(from rev 796976, deepin-printer/trunk/PKGBUILD)
deepin-printer/repos/community-x86_64/build-fix.patch
(from rev 796976, deepin-printer/trunk/build-fix.patch)
Deleted:
deepin-printer/repos/community-x86_64/PKGBUILD
deepin-printer/repos/community-x86_64/build-fix.patch
-----------------+
PKGBUILD | 72 ++++++++++++++++++++++++++--------------------------
build-fix.patch | 74 +++++++++++++++++++++++++++---------------------------
2 files changed, 73 insertions(+), 73 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-12-29 12:17:01 UTC (rev 796976)
+++ PKGBUILD 2020-12-29 12:17:14 UTC (rev 796977)
@@ -1,36 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=deepin-printer
-pkgver=0.7.3
-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')
-groups=('deepin-extra')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-printer/archive/$pkgver.tar.gz"
- build-fix.patch)
-sha512sums=('1011b3b270c6cfdb61cfc4b1e0a08aec76d3fb7921127ce6616b2251a7547db1f585b9f6213dd1f5bfa97751846ac86a5417e47d8ef9994fefecdb39adc83251'
- '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
- sed -i '$aOnlyShowIn=Deepin' src/Printer/platform/linux/dde-printer.desktop
-}
-
-build() {
- cd dde-printer-$pkgver
- qmake-qt5 PREFIX=/usr
- make
-}
-
-package() {
- cd dde-printer-$pkgver
- make INSTALL_ROOT="$pkgdir" install
-}
Copied: deepin-printer/repos/community-x86_64/PKGBUILD (from rev 796976, deepin-printer/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-12-29 12:17:14 UTC (rev 796977)
@@ -0,0 +1,36 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=deepin-printer
+pkgver=0.7.4
+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')
+groups=('deepin-extra')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-printer/archive/$pkgver.tar.gz"
+ build-fix.patch)
+sha512sums=('6d075237f5520a4b4db1af28ed63bb0530123ebc9b0b6dc4a6259d76856a5eeb1b42efc2a8846c199080bf837c8c6970ac203a020ca59fbfeec0095f8ea30ced'
+ '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
+ sed -i '$aOnlyShowIn=Deepin' src/Printer/platform/linux/dde-printer.desktop
+}
+
+build() {
+ cd dde-printer-$pkgver
+ qmake-qt5 PREFIX=/usr
+ make
+}
+
+package() {
+ cd dde-printer-$pkgver
+ make INSTALL_ROOT="$pkgdir" install
+}
Deleted: build-fix.patch
===================================================================
--- build-fix.patch 2020-12-29 12:17:01 UTC (rev 796976)
+++ build-fix.patch 2020-12-29 12:17:14 UTC (rev 796977)
@@ -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;
- }
-
Copied: deepin-printer/repos/community-x86_64/build-fix.patch (from rev 796976, deepin-printer/trunk/build-fix.patch)
===================================================================
--- build-fix.patch (rev 0)
+++ build-fix.patch 2020-12-29 12:17:14 UTC (rev 796977)
@@ -0,0 +1,37 @@
+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;
+ }
+
More information about the arch-commits
mailing list