summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-x.SRCINFO10
-rwxr-xr-xPKGBUILD11
-rw-r--r--unknown_format.patch55
3 files changed, 8 insertions, 68 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 41eca1d0055..c71876ed332 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = boomaga-qt5
pkgdesc = is a virtual printer for viewing a document before printing it out using the physical printer - QT5 version
- pkgver = 1.3.0
- pkgrel = 2
+ pkgver = 3.0.0
+ pkgrel = 1
url = http://www.boomaga.org/
arch = i686
arch = x86_64
@@ -12,10 +12,8 @@ pkgbase = boomaga-qt5
depends = qt5-tools
depends = poppler
conflicts = boomaga
- source = https://github.com/Boomaga/boomaga/archive/v1.3.0.tar.gz
- source = unknown_format.patch
- sha256sums = fd05be1100701cf6e7bbbf41b635ca2ca4d1eaf88bfdcf4a83f9a6ba8de24e35
- sha256sums = 14c118e7aee72b0b375d67e91954c7b772f43aff75c850171b1b244a6e074c7d
+ source = https://github.com/Boomaga/boomaga/archive/v3.0.0.tar.gz
+ sha256sums = 74af10ec5a78008d335011eca0f63ed7ccd4bc2fdac2f4cffa73db7acc05e767
pkgname = boomaga-qt5
diff --git a/PKGBUILD b/PKGBUILD
index a74d0d4667f..89a9e6410d9 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
pkgname=boomaga-qt5
_name=boomaga
-pkgver=1.3.0
-pkgrel=2
+pkgver=3.0.0
+pkgrel=1
pkgdesc="is a virtual printer for viewing a document before printing it out using the physical printer - QT5 version"
arch=('i686' 'x86_64')
url="http://www.boomaga.org/"
@@ -11,12 +11,10 @@ license=('LGPL')
depends=('qt5-tools' 'poppler')
makedepends=('cmake' 'cups' 'snappy')
conflicts=('boomaga')
-source=("https://github.com/Boomaga/boomaga/archive/v$pkgver.tar.gz"
- unknown_format.patch)
+source=("https://github.com/Boomaga/boomaga/archive/v$pkgver.tar.gz")
prepare() {
cd $_name-$pkgver
- patch -Np1 -i ../unknown_format.patch
}
@@ -33,5 +31,4 @@ package() {
make "DESTDIR=$pkgdir" install
install -D -m755 $srcdir/$_name-$pkgver/scripts/installPrinter.sh ${pkgdir}/usr/bin/
}
-sha256sums=('fd05be1100701cf6e7bbbf41b635ca2ca4d1eaf88bfdcf4a83f9a6ba8de24e35'
- '14c118e7aee72b0b375d67e91954c7b772f43aff75c850171b1b244a6e074c7d')
+sha256sums=('74af10ec5a78008d335011eca0f63ed7ccd4bc2fdac2f4cffa73db7acc05e767')
diff --git a/unknown_format.patch b/unknown_format.patch
deleted file mode 100644
index 912f057094c..00000000000
--- a/unknown_format.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 7e1e19cdc808e6918c1956de14c90dc5a198b971 Mon Sep 17 00:00:00 2001
-From: "sokoloff (Alexander)" <sokoloff.a@gmail.com>
-Date: Wed, 16 May 2018 10:55:17 +0300
-Subject: [PATCH] Fixed issue #70 "Unknown format of input file" in Manjaro
-
----
- src/backend/dbus/root/main.cpp | 21 ++++++++++++++-------
- 1 file changed, 14 insertions(+), 7 deletions(-)
-
-diff --git a/src/backend/dbus/root/main.cpp b/src/backend/dbus/root/main.cpp
-index 06d17a9..8ac813f 100644
---- a/src/backend/dbus/root/main.cpp
-+++ b/src/backend/dbus/root/main.cpp
-@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
- return CUPS_BACKEND_FAILED;
- }
-
-- cerr << "DEBUG: [Boomaga root] run boomagabackend as UID:" << pwd->pw_uid << " GID: " << pwd->pw_gid << endl;
-+ cerr << "DEBUG: [Boomaga root] run " NONGUI_DIR"/boomagabackend as UID:" << pwd->pw_uid << " GID: " << pwd->pw_gid << endl;
-
- setenv("HOME", pwd->pw_dir, 1);
-
-@@ -82,6 +82,19 @@ int main(int argc, char *argv[])
- }
-
-
-+ if (argc > 6)
-+ {
-+ // Read PDF from file
-+ stdin = freopen(argv[6], "r", stdin);
-+ if (stdin == nullptr)
-+ {
-+ cerr << "ERROR: [Boomaga root] Can't open input file " << argv[6] << ": ";
-+ perror("");
-+ return CUPS_BACKEND_FAILED;
-+ }
-+ }
-+
-+
- if (setuid(pwd->pw_uid) != 0)
- {
- cerr << "ERROR: [Boomaga root] Can't change UID to " << pwd->pw_uid << ": ";
-@@ -90,12 +103,6 @@ int main(int argc, char *argv[])
- }
-
-
-- if (argc > 6)
-- {
-- // Read PDF from file
-- stdin = freopen(argv[6], "r", stdin);
-- }
--
- execl(NONGUI_DIR "/boomagabackend", NONGUI_DIR "/boomagabackend", jobID, title, count, options, NULL);
- perror("ERROR: [Boomaga root] run boomagabackend error");
- return CUPS_BACKEND_FAILED;