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

[Gaëtan Bisson]

    Date: Sunday, June 21, 2020 @ 08:43:11
  Author: bisson
Revision: 648779

archrelease: copy trunk to community-x86_64

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

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

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-21 08:42:54 UTC (rev 648778)
+++ PKGBUILD	2020-06-21 08:43:11 UTC (rev 648779)
@@ -1,44 +0,0 @@
-# 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/PKGBUILD (from rev 648778, subsurface/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-06-21 08:43:11 UTC (rev 648779)
@@ -0,0 +1,37 @@
+# Contributor: Francois Boulogne <fboulogne at april dot org>
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+
+pkgname=subsurface
+_pkgname=Subsurface
+pkgver=4.9.6
+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=('fed9485958f2b37d0efd8702b63a23eae1abfab0f01e1de1946aad5701c59f34')
+
+# 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
+}

Deleted: qpainterpath.patch
===================================================================
--- qpainterpath.patch	2020-06-21 08:42:54 UTC (rev 648778)
+++ qpainterpath.patch	2020-06-21 08:43:11 UTC (rev 648779)
@@ -1,11 +0,0 @@
-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>