[arch-commits] Commit in subsurface/repos/community-x86_64 (3 files)

[Gaëtan Bisson]

    Date: Saturday, June 13, 2020 @ 06:44:55
  Author: bisson
Revision: 642831

archrelease: copy trunk to community-x86_64

Added:
  subsurface/repos/community-x86_64/PKGBUILD
    (from rev 642830, subsurface/trunk/PKGBUILD)
  subsurface/repos/community-x86_64/qpainterpath.patch
    (from rev 642830, subsurface/trunk/qpainterpath.patch)
Deleted:
  subsurface/repos/community-x86_64/PKGBUILD

--------------------+
 PKGBUILD           |   81 +++++++++++++++++++++++++++------------------------
 qpainterpath.patch |   11 ++++++
 2 files changed, 55 insertions(+), 37 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-13 06:44:11 UTC (rev 642830)
+++ PKGBUILD	2020-06-13 06:44:55 UTC (rev 642831)
@@ -1,37 +0,0 @@
-# Contributor: Francois Boulogne <fboulogne at april dot org>
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-
-pkgname=subsurface
-_pkgname=Subsurface
-pkgver=4.9.4
-pkgrel=1
-pkgdesc='Divelog program'
-url='https://subsurface-divelog.org/'
-license=('GPL2')
-arch=('x86_64')
-makedepends=('cmake' 'asciidoc' 'qt5-tools')
-depends=('libzip' 'libxml2' 'libxslt' 'sqlite' 'libusb' 'libgit2'
-         'subsurface-libdc' 'qt5-svg' 'qt5-location'
-         'qt5-connectivity' 'qt5-webkit' 'grantlee' 'googlemaps')
-source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz")
-sha256sums=('3fb3c0c0bfdce94dcca6e5a82478b10dbd716375665c26ee51b10546daf2ee1a')
-
-# qt5-webkit still used for: printing, manual
-
-build() {
-	cd "${srcdir}/${_pkgname}-${pkgver}"
-	install -d build
-	cd build
-	cmake \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DLIBDIVECOMPUTER_INCLUDE_DIR=/usr/include/libdivecomputer \
-		..
-	make
-}
-
-package() {
-	cd "${srcdir}/${_pkgname}-${pkgver}"
-	cd build
-	make DESTDIR="${pkgdir}" install
-}

Copied: subsurface/repos/community-x86_64/PKGBUILD (from rev 642830, subsurface/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-06-13 06:44:55 UTC (rev 642831)
@@ -0,0 +1,44 @@
+# Contributor: Francois Boulogne <fboulogne at april dot org>
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+
+pkgname=subsurface
+_pkgname=Subsurface
+pkgver=4.9.5
+pkgrel=1
+pkgdesc='Divelog program'
+url='https://subsurface-divelog.org/'
+license=('GPL2')
+arch=('x86_64')
+makedepends=('cmake' 'asciidoc' 'qt5-tools')
+depends=('libzip' 'libxml2' 'libxslt' 'sqlite' 'libusb' 'libgit2'
+         'subsurface-libdc' 'qt5-svg' 'qt5-location'
+         'qt5-connectivity' 'qt5-webkit' 'grantlee' 'googlemaps')
+source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz"
+        'qpainterpath.patch')
+sha256sums=('266e8a2ca7ccb583366b87641187e38611cd60e6db33d9adcc35a0b89075bc6f'
+            '0e73e29383c6dfa4a70eea75b67f4ac32a27052d83671032e7bb6bdcd4694598')
+
+# qt5-webkit still used for: printing, manual
+
+prepare() {
+	cd "${srcdir}/${_pkgname}-${pkgver}"
+	patch -p1 -i ../qpainterpath.patch
+}
+
+build() {
+	cd "${srcdir}/${_pkgname}-${pkgver}"
+	install -d build
+	cd build
+	cmake \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DLIBDIVECOMPUTER_INCLUDE_DIR=/usr/include/libdivecomputer \
+		..
+	make
+}
+
+package() {
+	cd "${srcdir}/${_pkgname}-${pkgver}"
+	cd build
+	make DESTDIR="${pkgdir}" install
+}

Copied: subsurface/repos/community-x86_64/qpainterpath.patch (from rev 642830, subsurface/trunk/qpainterpath.patch)
===================================================================
--- qpainterpath.patch	                        (rev 0)
+++ qpainterpath.patch	2020-06-13 06:44:55 UTC (rev 642831)
@@ -0,0 +1,11 @@
+diff -Naur old/desktop-widgets/groupedlineedit.cpp new/desktop-widgets/groupedlineedit.cpp
+--- old/desktop-widgets/groupedlineedit.cpp	2020-06-12 09:44:56.000000000 -1000
++++ new/desktop-widgets/groupedlineedit.cpp	2020-06-12 15:56:58.558388952 -1000
+@@ -32,6 +32,7 @@
+ #include <QScrollBar>
+ #include <QTextBlock>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QApplication>
+ #include <QStyle>
+ #include <QStyleOptionFocusRect>