Date: Friday, January 22, 2021 @ 18:41:39 Author: spupykin Revision: 824813
scantailor -> scantailor-advanced Added: scantailor-advanced/ scantailor-advanced/trunk/package.patch Modified: scantailor-advanced/trunk/PKGBUILD (contents, properties) Deleted: scantailor-advanced/trunk/build-fix.patch scantailor-advanced/trunk/scantailor.desktop scantailor/ -----------------------------------------+ scantailor-advanced/trunk/package.patch | 67 ++++++++++++++++++++++++++++++ trunk/PKGBUILD | 60 +++++++++++--------------- trunk/build-fix.patch | 11 ---- trunk/scantailor.desktop | 11 ---- 4 files changed, 93 insertions(+), 56 deletions(-) Modified: scantailor-advanced/trunk/PKGBUILD =================================================================== --- scantailor/trunk/PKGBUILD 2021-01-22 18:41:22 UTC (rev 824812) +++ scantailor-advanced/trunk/PKGBUILD 2021-01-22 18:41:39 UTC (rev 824813) @@ -1,44 +1,36 @@ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Contributor: Denis Terskov aka neurosurgeon <terskov....@gmail.com> +# $Id$ +# Maintainer: Sergej Pupykin <arch+...@sergej.pp.ru> +# Previous maintainer: Martin HasoĊ <martin.ha...@gmail.com> -pkgname=scantailor -pkgver=0.9.12.2 -pkgrel=4 -#_realver=EXPERIMENTAL_2016_02_22 -# use experimental branch -_commit=ce74e53f89883b35bb12ec7ed4fd654c016e71e4 -pkgdesc="Interactive post-processing tool for scanned pages" -arch=(x86_64) -url="https://scantailor.org/" -license=("GPL") -depends=('qt5-base' 'libtiff' 'hicolor-icon-theme' 'desktop-file-utils') -makedepends=('cmake' 'qt5-tools' 'eigen' 'boost' 'git') -#source=($pkgname-$_realver.tar.gz::https://github.com/Tulon/$pkgname/archive/$_realver.tar.gz -source=(git://github.com/Tulon/scantailor.git#commit=${_commit} - scantailor.desktop - build-fix.patch) -sha256sums=('SKIP' - '3c191c0380f991709bd38a0ace6adbf351fca441a2c5fd432e56a0da6b68a728' - 'e21ec75ed1302fadffd53989f4f262f05ef2236261861fd88db9b3c8867b2671') +pkgname=scantailor-advanced +pkgver=1.0.16 +pkgrel=2 +pkgdesc="An interactive post-processing tool for scanned pages." +arch=("x86_64") +url="https://github.com/4lex4/scantailor-advanced" +license=("GPL3") +depends=("qt5-base" "hicolor-icon-theme" "boost-libs>=1.0.0" "libpng>=1.0.0" "zlib>=1.0.0" "libtiff>=4.0.0") +makedepends=("cmake>=3.9.0" "qt5-tools" "boost>=1.0.0") +conflicts=("scantailor") +replaces=("scantailor") +source=("$pkgname-$pkgver::https://github.com/4lex4/$pkgname/archive/v$pkgver.tar.gz" "package.patch") +sha256sums=('84629d2edba4c36c62bdb75eedb145262b894d950bcb95cec0dab43e21bdb909' + '15680699fd419af8ac624fa01d70dabe52b37dc1b0a94d80b91082c61f0d6634') prepare() { -# cd "$srcdir"/$pkgname-${_realver} - cd "$srcdir"/$pkgname - patch -p1 -i "$srcdir"/build-fix.patch + cd "$pkgname-$pkgver" + patch --forward --strip=1 --input="${srcdir}/package.patch" } build() { - cd "$srcdir"/$pkgname - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - . - make + cd "$pkgname-$pkgver" + cmake -G "Unix Makefiles" + make -j`nproc` } package() { - cd "$srcdir"/$pkgname - make DESTDIR="$pkgdir" install - install -Dm0644 "resources/appicon.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/scantailor.svg" - install -Dm0644 "$srcdir/scantailor.desktop" "$pkgdir/usr/share/applications/scantailor.desktop" + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install + install -Dm0644 "resources/appicon.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/scantailor-advanced.svg" + install -Dm0644 "resources/unix/scantailor.desktop" "$pkgdir/usr/share/applications/scantailor.desktop" } Property changes on: scantailor-advanced/trunk/PKGBUILD ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Deleted: scantailor-advanced/trunk/build-fix.patch =================================================================== --- scantailor/trunk/build-fix.patch 2021-01-22 18:41:22 UTC (rev 824812) +++ scantailor-advanced/trunk/build-fix.patch 2021-01-22 18:41:39 UTC (rev 824813) @@ -1,11 +0,0 @@ -diff -wbBur scantailor/filters/page_split/OptionsWidget.cpp scantailor.my/filters/page_split/OptionsWidget.cpp ---- scantailor/filters/page_split/OptionsWidget.cpp 2018-11-16 15:30:37.616233595 +0300 -+++ scantailor.my/filters/page_split/OptionsWidget.cpp 2018-11-16 15:22:32.029572581 +0300 -@@ -29,6 +29,7 @@ - #include <QPixmap> - #include <boost/foreach.hpp> - #include <assert.h> -+#include <QButtonGroup> - - namespace page_split - { Added: scantailor-advanced/trunk/package.patch =================================================================== --- scantailor-advanced/trunk/package.patch (rev 0) +++ scantailor-advanced/trunk/package.patch 2021-01-22 18:41:39 UTC (rev 824813) @@ -0,0 +1,67 @@ +diff --unified --recursive --text scantailor-advanced-1.0.16/filters/output/OutputGenerator.cpp scantailor-advanced-1.0.16/filters/output/OutputGenerator.cpp +--- scantailor-advanced-1.0.16/filters/output/OutputGenerator.cpp 2018-07-17 04:04:23.000000000 +0200 ++++ scantailor-advanced-1.0.16/filters/output/OutputGenerator.cpp 2021-01-02 16:18:50.911568918 +0100 +@@ -25,6 +25,7 @@ + #include <imageproc/ImageCombination.h> + #include <QDebug> + #include <QPainter> ++#include <QPainterPath> + #include <QtCore/QSettings> + #include <boost/bind.hpp> + #include "DebugImages.h" +diff --unified --recursive --text src/scantailor-advanced-1.0.16/filters/page_layout/ImageView.cpp scantailor-advanced-1.0.16/filters/page_layout/ImageView.cpp +--- scantailor-advanced-1.0.16/filters/page_layout/ImageView.cpp 2018-07-17 04:04:23.000000000 +0200 ++++ scantailor-advanced-1.0.16/filters/page_layout/ImageView.cpp 2021-01-02 16:19:10.674838837 +0100 +@@ -27,6 +27,7 @@ + #include <imageproc/Transform.h> + #include <QMouseEvent> + #include <QPainter> ++#include <QPainterPath> + #include <boost/bind.hpp> + #include <boost/lambda/lambda.hpp> + #include "ImagePresentation.h" +diff --unified --recursive --text scantailor-advanced-1.0.16/filters/select_content/ContentBoxFinder.cpp scantailor-advanced-1.0.16/filters/select_content/ContentBoxFinder.cpp +--- scantailor-advanced-1.0.16/filters/select_content/ContentBoxFinder.cpp 2018-07-17 04:04:23.000000000 +0200 ++++ scantailor-advanced-1.0.16/filters/select_content/ContentBoxFinder.cpp 2021-01-02 16:19:30.304741496 +0100 +@@ -19,6 +19,7 @@ + #include "ContentBoxFinder.h" + #include <QDebug> + #include <QPainter> ++#include <QPainterPath> + #include <cmath> + #include <queue> + #include "DebugImages.h" +diff --unified --recursive --text scantailor-advanced-1.0.16/ImageViewBase.cpp scantailor-advanced-1.0.16/ImageViewBase.cpp +--- scantailor-advanced-1.0.16/ImageViewBase.cpp 2018-07-17 04:04:23.000000000 +0200 ++++ scantailor-advanced-1.0.16/ImageViewBase.cpp 2021-01-02 16:17:56.541540662 +0100 +@@ -21,6 +21,8 @@ + #include <QGLWidget> + #include <QMouseEvent> + #include <QPaintEngine> ++#include <QPainter> ++#include <QPainterPath> + #include <QPointer> + #include <QScrollBar> + #include <QSettings> +diff --unified --recursive --text scantailor-advanced-1.0.16/zones/ZoneContextMenuInteraction.cpp scantailor-advanced-1.0.16/zones/ZoneContextMenuInteraction.cpp +--- scantailor-advanced-1.0.16/zones/ZoneContextMenuInteraction.cpp 2018-07-17 04:04:23.000000000 +0200 ++++ scantailor-advanced-1.0.16/zones/ZoneContextMenuInteraction.cpp 2021-01-02 16:20:00.591196620 +0100 +@@ -21,6 +21,7 @@ + #include <QMenu> + #include <QMessageBox> + #include <QPainter> ++#include <QPainterPath> + #include <QSignalMapper> + #include <boost/bind.hpp> + #include "ImageViewBase.h" +diff --unified --recursive --text scantailor-advanced-1.0.16/zones/ZoneDefaultInteraction.cpp scantailor-advanced-1.0.16/zones/ZoneDefaultInteraction.cpp +--- scantailor-advanced-1.0.16/zones/ZoneDefaultInteraction.cpp 2018-07-17 04:04:23.000000000 +0200 ++++ scantailor-advanced-1.0.16/zones/ZoneDefaultInteraction.cpp 2021-01-02 16:38:15.740296794 +0100 +@@ -19,6 +19,7 @@ + #include "ZoneDefaultInteraction.h" + #include <QMouseEvent> + #include <QPainter> ++#include <QPainterPath> + #include "ImageViewBase.h" + #include "SerializableSpline.h" + #include "ZoneInteractionContext.h" Deleted: scantailor-advanced/trunk/scantailor.desktop =================================================================== --- scantailor/trunk/scantailor.desktop 2021-01-22 18:41:22 UTC (rev 824812) +++ scantailor-advanced/trunk/scantailor.desktop 2021-01-22 18:41:39 UTC (rev 824813) @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=Scan Tailor -Comment=An interactive post-processing tool for scanned pages. -Icon=/usr/share/icons/hicolor/scalable/apps/scantailor.svg -Exec=scantailor %u -TryExec=scantailor -Terminal=false -Type=Application -StartupNotify=true -Categories=Graphics; -MimeType=image/png;image/tif;image/jpeg