[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2020-11-19 Thread Antonio Rojas via arch-commits 
Date: Thursday, November 19, 2020 @ 22:00:00
  Author: arojas
Revision: 757817

Update to 4.9.9

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |   30 +++---
 1 file changed, 11 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-19 21:59:10 UTC (rev 757816)
+++ PKGBUILD2020-11-19 22:00:00 UTC (rev 757817)
@@ -4,8 +4,8 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.9.6
-pkgrel=3
+pkgver=4.9.9
+pkgrel=1
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
 license=('GPL2')
@@ -12,31 +12,23 @@
 arch=('x86_64')
 makedepends=('asciidoc' 'cmake' 'libgit2' 'libusb' 'qt5-tools')
 depends=('googlemaps' 'grantlee' 'hicolor-icon-theme' 'libzip' 'libxml2'
-'libxslt' 'subsurface-libdc' 'qt5-svg' 'qt5-location' 'qt5-connectivity'
-'qt5-webkit' 'sqlite')
+ 'libxslt' 'subsurface-libdc' 'qt5-svg' 'qt5-location' 
'qt5-connectivity'
+ 'qt5-webkit' 'sqlite')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha512sums=('6bef6a17e505aad2ab3d395483b3890ab358cc3c352671fc41f8e0fd946daee27f6aac98da3ed6f75cac7a148047581ad069d757714f40814f7bb0d950215564')
-b2sums=('2df46f721817c363904dd15f39266ea6d9d29686cad7c541996a28fe05c1c22d67563c2c58f7147c458c5b7746c4cba8bfd0e5bcf277d7360fa85efa80a4800f')
+sha512sums=('8e00b61dad580349bef615c0eaf735db1dd5a5ed8b309fe33367598034f5b22fd376a7ee9fcce8c2a2947326eafb010e5cec5bdc4ef0f8dc03d45f8f6bc3e27c')
+b2sums=('e33a00aed92a0751ff4d3d09dd42ce6d0e2eed0dab57f6cca6da4840468b1a43367cf3e14226f64cdac89015a88866b71cee73df0185185feded32d03da73f2c')
 
 # qt5-webkit still used for: printing, manual
 
-prepare() {
-  mv -v "${_pkgname}-${pkgver}" "${pkgname}-${pkgver}"
-}
-
 build() {
-  cd "${pkgname}-${pkgver}"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
--DCMAKE_BUILD_TYPE='None' \
+  cmake -B build -S Subsurface-$pkgver \
+-DCMAKE_INSTALL_PREFIX=/usr \
 -DLIBDIVECOMPUTER_INCLUDE_DIR=/usr/include/libdivecomputer \
--W no-dev \
--B build \
--S .
-  make VERBOSE=1 -C build
+-Wno-dev
+  cmake --build build
 }
 
 package() {
   depends+=('libgit2.so')
-  cd "${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install -C build
+  DESTDIR="${pkgdir}" cmake --install build
 }

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2020-10-15 Thread David Runge via arch-commits 
Date: Thursday, October 15, 2020 @ 16:18:59
  Author: dvzrv
Revision: 724174

upgpkg: subsurface 4.9.6-3: Rebuild against libgit2 1.1.0.

Add all available sodeps in package() and the respective packages in 
makedepends.
Move libusb from depends to makedepends as it is only required during build 
time.
Apply latest cmake packaging guidelines.
Update contributor info.

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |   43 ---
 1 file changed, 24 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-15 16:15:09 UTC (rev 724173)
+++ PKGBUILD2020-10-15 16:18:59 UTC (rev 724174)
@@ -1,37 +1,42 @@
+# Maintainer: Gaetan Bisson 
+# Contributor: David Runge 
 # Contributor: Francois Boulogne 
-# Maintainer: Gaetan Bisson 
 
 pkgname=subsurface
 _pkgname=Subsurface
 pkgver=4.9.6
-pkgrel=2
+pkgrel=3
 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')
+makedepends=('asciidoc' 'cmake' 'libgit2' 'libusb' 'qt5-tools')
+depends=('googlemaps' 'grantlee' 'hicolor-icon-theme' 'libzip' 'libxml2'
+'libxslt' 'subsurface-libdc' 'qt5-svg' 'qt5-location' 'qt5-connectivity'
+'qt5-webkit' 'sqlite')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha256sums=('fed9485958f2b37d0efd8702b63a23eae1abfab0f01e1de1946aad5701c59f34')
+sha512sums=('6bef6a17e505aad2ab3d395483b3890ab358cc3c352671fc41f8e0fd946daee27f6aac98da3ed6f75cac7a148047581ad069d757714f40814f7bb0d950215564')
+b2sums=('2df46f721817c363904dd15f39266ea6d9d29686cad7c541996a28fe05c1c22d67563c2c58f7147c458c5b7746c4cba8bfd0e5bcf277d7360fa85efa80a4800f')
 
 # qt5-webkit still used for: printing, manual
 
+prepare() {
+  mv -v "${_pkgname}-${pkgver}" "${pkgname}-${pkgver}"
+}
+
 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
+  cd "${pkgname}-${pkgver}"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_BUILD_TYPE='None' \
+-DLIBDIVECOMPUTER_INCLUDE_DIR=/usr/include/libdivecomputer \
+-W no-dev \
+-B build \
+-S .
+  make VERBOSE=1 -C build
 }
 
 package() {
-   cd "${srcdir}/${_pkgname}-${pkgver}"
-   cd build
-   make DESTDIR="${pkgdir}" install
+  depends+=('libgit2.so')
+  cd "${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install -C build
 }

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2020-08-30 Thread Evangelos Foutras via arch-commits 
Date: Sunday, August 30, 2020 @ 10:50:43
  Author: foutrelis
Revision: 692655

upgpkg: subsurface 4.9.6-2: rebuild bisson's pkgs

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-08-30 10:50:41 UTC (rev 692654)
+++ PKGBUILD2020-08-30 10:50:43 UTC (rev 692655)
@@ -4,7 +4,7 @@
 pkgname=subsurface
 _pkgname=Subsurface
 pkgver=4.9.6
-pkgrel=1
+pkgrel=2
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
 license=('GPL2')

[arch-commits] Commit in subsurface/trunk (PKGBUILD qpainterpath.patch)

2020-06-21 Thread Gaëtan Bisson via arch-commits 
Date: Sunday, June 21, 2020 @ 08:42:54
  Author: bisson
Revision: 648778

upstream update

Modified:
  subsurface/trunk/PKGBUILD
Deleted:
  subsurface/trunk/qpainterpath.patch

+
 PKGBUILD   |   13 +++--
 qpainterpath.patch |   11 ---
 2 files changed, 3 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-21 08:16:20 UTC (rev 648777)
+++ PKGBUILD2020-06-21 08:42:54 UTC (rev 648778)
@@ -3,7 +3,7 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.9.5
+pkgver=4.9.6
 pkgrel=1
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
@@ -13,18 +13,11 @@
 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')
+source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
+sha256sums=('fed9485958f2b37d0efd8702b63a23eae1abfab0f01e1de1946aad5701c59f34')
 
 # 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

Deleted: qpainterpath.patch
===
--- qpainterpath.patch  2020-06-21 08:16:20 UTC (rev 648777)
+++ qpainterpath.patch  2020-06-21 08:42:54 UTC (rev 648778)
@@ -1,11 +0,0 @@
-diff -Naur old/desktop-widgets/groupedlineedit.cpp 
new/desktop-widgets/groupedlineedit.cpp
 old/desktop-widgets/groupedlineedit.cpp2020-06-12 09:44:56.0 
-1000
-+++ new/desktop-widgets/groupedlineedit.cpp2020-06-12 15:56:58.558388952 
-1000
-@@ -32,6 +32,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include

[arch-commits] Commit in subsurface/trunk (PKGBUILD qpainterpath.patch)

2020-06-13 Thread Gaëtan Bisson via arch-commits 
Date: Saturday, June 13, 2020 @ 06:44:11
  Author: bisson
Revision: 642830

upstream update

Added:
  subsurface/trunk/qpainterpath.patch
Modified:
  subsurface/trunk/PKGBUILD

+
 PKGBUILD   |   13 ++---
 qpainterpath.patch |   11 +++
 2 files changed, 21 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-13 05:48:20 UTC (rev 642829)
+++ PKGBUILD2020-06-13 06:44:11 UTC (rev 642830)
@@ -3,7 +3,7 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.9.4
+pkgver=4.9.5
 pkgrel=1
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
@@ -13,11 +13,18 @@
 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')
+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

Added: qpainterpath.patch
===
--- qpainterpath.patch  (rev 0)
+++ qpainterpath.patch  2020-06-13 06:44:11 UTC (rev 642830)
@@ -0,0 +1,11 @@
+diff -Naur old/desktop-widgets/groupedlineedit.cpp 
new/desktop-widgets/groupedlineedit.cpp
+--- old/desktop-widgets/groupedlineedit.cpp2020-06-12 09:44:56.0 
-1000
 new/desktop-widgets/groupedlineedit.cpp2020-06-12 15:56:58.558388952 
-1000
+@@ -32,6 +32,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2020-05-03 Thread Gaëtan Bisson via arch-commits 
Date: Sunday, May 3, 2020 @ 09:45:13
  Author: bisson
Revision: 624590

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |   16 
 1 file changed, 4 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-03 09:28:28 UTC (rev 624589)
+++ PKGBUILD2020-05-03 09:45:13 UTC (rev 624590)
@@ -3,8 +3,8 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.9.3
-pkgrel=3
+pkgver=4.9.4
+pkgrel=1
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
 license=('GPL2')
@@ -14,18 +14,10 @@
  'subsurface-libdc' 'qt5-svg' 'qt5-location'
  'qt5-connectivity' 'qt5-webkit' 'grantlee' 'googlemaps')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha256sums=('8e35ae13d0ca703da412ebef2e21ddc59cc63a0d7a1da6143654375c20b105b8')
+sha256sums=('3fb3c0c0bfdce94dcca6e5a82478b10dbd716375665c26ee51b10546daf2ee1a')
 
-# qt5-webkit still used for: printing, manual, facebook
+# qt5-webkit still used for: printing, manual
 
-prepare() {
-   cd "${srcdir}/${_pkgname}-${pkgver}"
-   sed \
-   -e 's/GIT_MERGE_TREE_/GIT_MERGE_/g' \
-   -e 's/tree_flags/flags/g' \
-   -i core/git-access.c
-}
-
 build() {
cd "${srcdir}/${_pkgname}-${pkgver}"
install -d build

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2020-04-01 Thread Gaëtan Bisson via arch-commits 
Date: Thursday, April 2, 2020 @ 02:25:39
  Author: bisson
Revision: 609347

rebuild for libgit2-1.0.0

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-02 00:21:33 UTC (rev 609346)
+++ PKGBUILD2020-04-02 02:25:39 UTC (rev 609347)
@@ -4,7 +4,7 @@
 pkgname=subsurface
 _pkgname=Subsurface
 pkgver=4.9.3
-pkgrel=2
+pkgrel=3
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
 license=('GPL2')
@@ -18,6 +18,14 @@
 
 # qt5-webkit still used for: printing, manual, facebook
 
+prepare() {
+   cd "${srcdir}/${_pkgname}-${pkgver}"
+   sed \
+   -e 's/GIT_MERGE_TREE_/GIT_MERGE_/g' \
+   -e 's/tree_flags/flags/g' \
+   -i core/git-access.c
+}
+
 build() {
cd "${srcdir}/${_pkgname}-${pkgver}"
install -d build

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2020-02-19 Thread Gaëtan Bisson via arch-commits 
Date: Wednesday, February 19, 2020 @ 21:02:28
  Author: bisson
Revision: 576873

rebuild for libgit2-0.99

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-02-19 21:02:24 UTC (rev 576872)
+++ PKGBUILD2020-02-19 21:02:28 UTC (rev 576873)
@@ -4,7 +4,7 @@
 pkgname=subsurface
 _pkgname=Subsurface
 pkgver=4.9.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
 license=('GPL2')

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2019-09-11 Thread Gaëtan Bisson via arch-commits 
Date: Wednesday, September 11, 2019 @ 21:23:15
  Author: bisson
Revision: 509327

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-09-11 21:23:00 UTC (rev 509326)
+++ PKGBUILD2019-09-11 21:23:15 UTC (rev 509327)
@@ -3,7 +3,7 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
@@ -14,7 +14,7 @@
  'subsurface-libdc' 'qt5-svg' 'qt5-location'
  'qt5-connectivity' 'qt5-webkit' 'grantlee' 'googlemaps')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha256sums=('557288be1ee21eb17c09a9bfdec7d9f168a83fae7decaeb8928be387d2c704c9')
+sha256sums=('8e35ae13d0ca703da412ebef2e21ddc59cc63a0d7a1da6143654375c20b105b8')
 
 # qt5-webkit still used for: printing, manual, facebook

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2019-08-25 Thread Gaëtan Bisson via arch-commits 
Date: Sunday, August 25, 2019 @ 06:58:20
  Author: bisson
Revision: 501647

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-08-25 06:43:43 UTC (rev 501646)
+++ PKGBUILD2019-08-25 06:58:20 UTC (rev 501647)
@@ -3,7 +3,7 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.9.1
+pkgver=4.9.2
 pkgrel=1
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
@@ -14,7 +14,7 @@
  'subsurface-libdc' 'qt5-svg' 'qt5-location'
  'qt5-connectivity' 'qt5-webkit' 'grantlee' 'googlemaps')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha256sums=('280e1c2ca1e132de63917f21f665169a6950d22471782eaca6100639ac937c3b')
+sha256sums=('557288be1ee21eb17c09a9bfdec7d9f168a83fae7decaeb8928be387d2c704c9')
 
 # qt5-webkit still used for: printing, manual, facebook

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2019-08-01 Thread Gaëtan Bisson via arch-commits 
Date: Thursday, August 1, 2019 @ 22:16:32
  Author: bisson
Revision: 496483

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-08-01 22:16:12 UTC (rev 496482)
+++ PKGBUILD2019-08-01 22:16:32 UTC (rev 496483)
@@ -3,7 +3,7 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.9.0
+pkgver=4.9.1
 pkgrel=1
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
@@ -14,7 +14,7 @@
  'subsurface-libdc' 'qt5-svg' 'qt5-location'
  'qt5-connectivity' 'qt5-webkit' 'grantlee' 'googlemaps')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha256sums=('5550e82fda165a7eefd2f49a9db65b85bbcb69fb11085df679ed86a3d2fc0980')
+sha256sums=('280e1c2ca1e132de63917f21f665169a6950d22471782eaca6100639ac937c3b')
 
 # qt5-webkit still used for: printing, manual, facebook

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2019-07-18 Thread Gaëtan Bisson via arch-commits 
Date: Thursday, July 18, 2019 @ 20:52:30
  Author: bisson
Revision: 491933

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-07-18 20:50:43 UTC (rev 491932)
+++ PKGBUILD2019-07-18 20:52:30 UTC (rev 491933)
@@ -3,8 +3,8 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.8.6
-pkgrel=2
+pkgver=4.9.0
+pkgrel=1
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
 license=('GPL2')
@@ -14,7 +14,7 @@
  'subsurface-libdc' 'qt5-svg' 'qt5-location'
  'qt5-connectivity' 'qt5-webkit' 'grantlee' 'googlemaps')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha256sums=('c8ee45fd3ec2804514babe5e0d7f318ef5bfc4fe760be9ccb6d282ee8b6cf62b')
+sha256sums=('5550e82fda165a7eefd2f49a9db65b85bbcb69fb11085df679ed86a3d2fc0980')
 
 # qt5-webkit still used for: printing, manual, facebook

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2019-06-09 Thread Gaëtan Bisson via arch-commits 
Date: Sunday, June 9, 2019 @ 08:29:10
  Author: bisson
Revision: 478588

rebuild for libgit2-0.28.2

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-09 03:52:04 UTC (rev 478587)
+++ PKGBUILD2019-06-09 08:29:10 UTC (rev 478588)
@@ -4,7 +4,7 @@
 pkgname=subsurface
 _pkgname=Subsurface
 pkgver=4.8.6
-pkgrel=1
+pkgrel=2
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
 license=('GPL2')

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2019-04-11 Thread Gaëtan Bisson via arch-commits 
Date: Friday, April 12, 2019 @ 04:40:01
  Author: bisson
Revision: 451197

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-12 04:22:34 UTC (rev 451196)
+++ PKGBUILD2019-04-12 04:40:01 UTC (rev 451197)
@@ -3,7 +3,7 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.8.5
+pkgver=4.8.6
 pkgrel=1
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
@@ -14,7 +14,7 @@
  'subsurface-libdc' 'qt5-svg' 'qt5-location'
  'qt5-connectivity' 'qt5-webkit' 'grantlee' 'googlemaps')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha256sums=('74702ec4cbbe92c21e125b697c7012520ac4cf370f1c1baf393361e05a41ebb7')
+sha256sums=('c8ee45fd3ec2804514babe5e0d7f318ef5bfc4fe760be9ccb6d282ee8b6cf62b')
 
 # qt5-webkit still used for: printing, manual, facebook

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2019-01-24 Thread Gaëtan Bisson via arch-commits 
Date: Thursday, January 24, 2019 @ 18:13:11
  Author: bisson
Revision: 427562

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-24 17:50:29 UTC (rev 427561)
+++ PKGBUILD2019-01-24 18:13:11 UTC (rev 427562)
@@ -3,7 +3,7 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.8.4
+pkgver=4.8.5
 pkgrel=1
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
@@ -14,7 +14,7 @@
  'subsurface-libdc' 'qt5-svg' 'qt5-location'
  'qt5-connectivity' 'qt5-webkit' 'grantlee' 'googlemaps')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha256sums=('3e806442e602da188666e3905c2b66232e2b99f4bf4ff4bd42002ee1585ef3eb')
+sha256sums=('74702ec4cbbe92c21e125b697c7012520ac4cf370f1c1baf393361e05a41ebb7')
 
 # qt5-webkit still used for: printing, manual, facebook

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2018-11-15 Thread Gaëtan Bisson via arch-commits 
Date: Friday, November 16, 2018 @ 00:21:37
  Author: bisson
Revision: 407793

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-16 00:10:29 UTC (rev 407792)
+++ PKGBUILD2018-11-16 00:21:37 UTC (rev 407793)
@@ -3,7 +3,7 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.8.3
+pkgver=4.8.4
 pkgrel=1
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
@@ -14,7 +14,7 @@
  'subsurface-libdc' 'qt5-svg' 'qt5-location'
  'qt5-connectivity' 'qt5-webkit' 'grantlee' 'googlemaps')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha256sums=('1184881f50506220b84bf5dc2291078ecaf48a06d47648afda7a62b75a09101e')
+sha256sums=('3e806442e602da188666e3905c2b66232e2b99f4bf4ff4bd42002ee1585ef3eb')
 
 # qt5-webkit still used for: printing, manual, facebook

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2018-09-29 Thread Gaëtan Bisson via arch-commits 
Date: Sunday, September 30, 2018 @ 05:32:23
  Author: bisson
Revision: 388137

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-30 05:31:50 UTC (rev 388136)
+++ PKGBUILD2018-09-30 05:32:23 UTC (rev 388137)
@@ -3,7 +3,7 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.8.2
+pkgver=4.8.3
 pkgrel=1
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
@@ -14,7 +14,7 @@
  'subsurface-libdc' 'qt5-svg' 'qt5-location'
  'qt5-connectivity' 'qt5-webkit' 'grantlee' 'googlemaps')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha256sums=('def13086d8611dfe08b68727cf2e6e0914ca462122abcecdd0ff9a85b3c1f9bb')
+sha256sums=('1184881f50506220b84bf5dc2291078ecaf48a06d47648afda7a62b75a09101e')
 
 # qt5-webkit still used for: printing, manual, facebook

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2018-09-17 Thread Gaëtan Bisson via arch-commits 
Date: Tuesday, September 18, 2018 @ 03:37:14
  Author: bisson
Revision: 382878

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-18 03:36:49 UTC (rev 382877)
+++ PKGBUILD2018-09-18 03:37:14 UTC (rev 382878)
@@ -3,7 +3,7 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
@@ -14,7 +14,7 @@
  'subsurface-libdc' 'qt5-svg' 'qt5-location'
  'qt5-connectivity' 'qt5-webkit' 'grantlee' 'googlemaps')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha256sums=('a26d821bd53b5c9dd1a410dc77d5af2b4e0157858061b527d3c8cb5700d7a81c')
+sha256sums=('def13086d8611dfe08b68727cf2e6e0914ca462122abcecdd0ff9a85b3c1f9bb')
 
 # qt5-webkit still used for: printing, manual, facebook

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2018-07-13 Thread Gaëtan Bisson via arch-commits 
Date: Saturday, July 14, 2018 @ 04:44:44
  Author: bisson
Revision: 358884

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-07-14 04:40:16 UTC (rev 358883)
+++ PKGBUILD2018-07-14 04:44:44 UTC (rev 358884)
@@ -4,7 +4,7 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.8.0
+pkgver=4.8.1
 pkgrel=1
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
@@ -15,7 +15,7 @@
  'subsurface-libdc' 'qt5-svg' 'qt5-location'
  'qt5-connectivity' 'qt5-webkit' 'grantlee' 'googlemaps')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha256sums=('98a5eb7541e22f7805849c668e11ff47ad8c0347dc9a93af5cb21919d48e9e52')
+sha256sums=('a26d821bd53b5c9dd1a410dc77d5af2b4e0157858061b527d3c8cb5700d7a81c')
 
 # qt5-webkit still used for: printing, manual, facebook

[arch-commits] Commit in subsurface/trunk (PKGBUILD delete.patch include.patch)

2018-06-29 Thread Gaëtan Bisson via arch-commits 
Date: Friday, June 29, 2018 @ 20:28:07
  Author: bisson
Revision: 34

upstream update

Modified:
  subsurface/trunk/PKGBUILD
Deleted:
  subsurface/trunk/delete.patch
  subsurface/trunk/include.patch

---+
 PKGBUILD  |   18 --
 delete.patch  |   37 -
 include.patch |   35 ---
 3 files changed, 4 insertions(+), 86 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-06-29 20:23:05 UTC (rev 347776)
+++ PKGBUILD2018-06-29 20:28:07 UTC (rev 34)
@@ -4,8 +4,8 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.7.8
-pkgrel=3
+pkgver=4.8.0
+pkgrel=1
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
 license=('GPL2')
@@ -14,21 +14,11 @@
 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;
-'include.patch'
-'delete.patch')
-sha256sums=('da7c09bcc63e0b3bc6e1ce5411a4f1e38a73e6e37bce15055657d840c78b07fa'
-'05d8ed15a42b691043617f9a5e53047db49ab7dc288778300f8c433c644e70b1'
-'59135a6917643be1608eb88db1dc81a740c8b0cff01f9ed62fa80e7d7523ee47')
+source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
+sha256sums=('98a5eb7541e22f7805849c668e11ff47ad8c0347dc9a93af5cb21919d48e9e52')
 
 # qt5-webkit still used for: printing, manual, facebook
 
-prepare() {
-   cd "${srcdir}/${_pkgname}-${pkgver}"
-   patch -p1 -i ../include.patch
-   patch -p1 -i ../delete.patch
-}
-
 build() {
cd "${srcdir}/${_pkgname}-${pkgver}"
install -d build

Deleted: delete.patch
===
--- delete.patch2018-06-29 20:23:05 UTC (rev 347776)
+++ delete.patch2018-06-29 20:28:07 UTC (rev 34)
@@ -1,37 +0,0 @@
-From 479eccd89ae138ecab5bf6513d5ee5051137797e Mon Sep 17 00:00:00 2001
-From: Berthold Stoeger 
-Date: Thu, 24 May 2018 22:57:02 +0200
-Subject: [PATCH] Cleanup: Don't defer deletion of oldModel in
- DiveListView::reload()
-
-There seems to be no point in using deleteLater() of the previous
-model. Set the new model and delete the old one.
-
-Signed-off-by: Berthold Stoeger 

- desktop-widgets/divelistview.cpp | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/desktop-widgets/divelistview.cpp 
b/desktop-widgets/divelistview.cpp
-index 659d8e842..999edd39c 100644
 a/desktop-widgets/divelistview.cpp
-+++ b/desktop-widgets/divelistview.cpp
-@@ -425,13 +425,12 @@ void DiveListView::reload(DiveTripModel::Layout layout, 
bool forceSort)
- 
-   QSortFilterProxyModel *m = qobject_cast(model());
-   QAbstractItemModel *oldModel = m->sourceModel();
--  if (oldModel) {
--  oldModel->deleteLater();
--  }
-   tripModel = new DiveTripModel(this);
-   tripModel->setLayout(layout);
- 
-   m->setSourceModel(tripModel);
-+  if (oldModel)
-+  delete oldModel;
- 
-   if (!forceSort)
-   return;
--- 
-2.14.1
-

Deleted: include.patch
===
--- include.patch   2018-06-29 20:23:05 UTC (rev 347776)
+++ include.patch   2018-06-29 20:28:07 UTC (rev 34)
@@ -1,35 +0,0 @@
-From d3af836467a2c1a4913eb9e444632d834c7a335c Mon Sep 17 00:00:00 2001
-From: Gaetan Bisson 
-Date: Tue, 22 May 2018 21:55:49 -1000
-Subject: [PATCH] Fix includes for building against Qt-5.11.0
-
-Signed-off-by: Gaetan Bisson 

- desktop-widgets/divelistview.cpp | 1 +
- desktop-widgets/templateedit.cpp | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/desktop-widgets/divelistview.cpp 
b/desktop-widgets/divelistview.cpp
-index e45563680..659d8e842 100644
 a/desktop-widgets/divelistview.cpp
-+++ b/desktop-widgets/divelistview.cpp
-@@ -18,6 +18,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include "core/qthelper.h"
- #include "desktop-widgets/undocommands.h"
- #include "desktop-widgets/divelistview.h"
-diff --git a/desktop-widgets/templateedit.cpp 
b/desktop-widgets/templateedit.cpp
-index 4af1666e0..82b02c324 100644
 a/desktop-widgets/templateedit.cpp
-+++ b/desktop-widgets/templateedit.cpp
-@@ -5,6 +5,7 @@
- #include "ui_templateedit.h"
- 
- #include 
-+#include 
- #include 
- 
- TemplateEdit::TemplateEdit(QWidget *parent, struct print_options 
*printOptions, struct template_options *templateOptions) :

[arch-commits] Commit in subsurface/trunk (PKGBUILD delete.patch include.patch)

2018-05-25 Thread Gaëtan Bisson via arch-commits 
Date: Friday, May 25, 2018 @ 07:08:22
  Author: bisson
Revision: 329249

fix build against Qt-5.11, avoid segfault

Added:
  subsurface/trunk/delete.patch
  subsurface/trunk/include.patch
Modified:
  subsurface/trunk/PKGBUILD

---+
 PKGBUILD  |   16 +---
 delete.patch  |   37 +
 include.patch |   35 +++
 3 files changed, 85 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-05-25 07:08:00 UTC (rev 329248)
+++ PKGBUILD2018-05-25 07:08:22 UTC (rev 329249)
@@ -5,7 +5,7 @@
 pkgname=subsurface
 _pkgname=Subsurface
 pkgver=4.7.8
-pkgrel=2
+pkgrel=3
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
 license=('GPL2')
@@ -14,11 +14,21 @@
 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=('da7c09bcc63e0b3bc6e1ce5411a4f1e38a73e6e37bce15055657d840c78b07fa')
+source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;
+'include.patch'
+'delete.patch')
+sha256sums=('da7c09bcc63e0b3bc6e1ce5411a4f1e38a73e6e37bce15055657d840c78b07fa'
+'05d8ed15a42b691043617f9a5e53047db49ab7dc288778300f8c433c644e70b1'
+'59135a6917643be1608eb88db1dc81a740c8b0cff01f9ed62fa80e7d7523ee47')
 
 # qt5-webkit still used for: printing, manual, facebook
 
+prepare() {
+   cd "${srcdir}/${_pkgname}-${pkgver}"
+   patch -p1 -i ../include.patch
+   patch -p1 -i ../delete.patch
+}
+
 build() {
cd "${srcdir}/${_pkgname}-${pkgver}"
install -d build

Added: delete.patch
===
--- delete.patch(rev 0)
+++ delete.patch2018-05-25 07:08:22 UTC (rev 329249)
@@ -0,0 +1,37 @@
+From 479eccd89ae138ecab5bf6513d5ee5051137797e Mon Sep 17 00:00:00 2001
+From: Berthold Stoeger 
+Date: Thu, 24 May 2018 22:57:02 +0200
+Subject: [PATCH] Cleanup: Don't defer deletion of oldModel in
+ DiveListView::reload()
+
+There seems to be no point in using deleteLater() of the previous
+model. Set the new model and delete the old one.
+
+Signed-off-by: Berthold Stoeger 
+---
+ desktop-widgets/divelistview.cpp | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/desktop-widgets/divelistview.cpp 
b/desktop-widgets/divelistview.cpp
+index 659d8e842..999edd39c 100644
+--- a/desktop-widgets/divelistview.cpp
 b/desktop-widgets/divelistview.cpp
+@@ -425,13 +425,12 @@ void DiveListView::reload(DiveTripModel::Layout layout, 
bool forceSort)
+ 
+   QSortFilterProxyModel *m = qobject_cast(model());
+   QAbstractItemModel *oldModel = m->sourceModel();
+-  if (oldModel) {
+-  oldModel->deleteLater();
+-  }
+   tripModel = new DiveTripModel(this);
+   tripModel->setLayout(layout);
+ 
+   m->setSourceModel(tripModel);
++  if (oldModel)
++  delete oldModel;
+ 
+   if (!forceSort)
+   return;
+-- 
+2.14.1
+

Added: include.patch
===
--- include.patch   (rev 0)
+++ include.patch   2018-05-25 07:08:22 UTC (rev 329249)
@@ -0,0 +1,35 @@
+From d3af836467a2c1a4913eb9e444632d834c7a335c Mon Sep 17 00:00:00 2001
+From: Gaetan Bisson 
+Date: Tue, 22 May 2018 21:55:49 -1000
+Subject: [PATCH] Fix includes for building against Qt-5.11.0
+
+Signed-off-by: Gaetan Bisson 
+---
+ desktop-widgets/divelistview.cpp | 1 +
+ desktop-widgets/templateedit.cpp | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/desktop-widgets/divelistview.cpp 
b/desktop-widgets/divelistview.cpp
+index e45563680..659d8e842 100644
+--- a/desktop-widgets/divelistview.cpp
 b/desktop-widgets/divelistview.cpp
+@@ -18,6 +18,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include "core/qthelper.h"
+ #include "desktop-widgets/undocommands.h"
+ #include "desktop-widgets/divelistview.h"
+diff --git a/desktop-widgets/templateedit.cpp 
b/desktop-widgets/templateedit.cpp
+index 4af1666e0..82b02c324 100644
+--- a/desktop-widgets/templateedit.cpp
 b/desktop-widgets/templateedit.cpp
+@@ -5,6 +5,7 @@
+ #include "ui_templateedit.h"
+ 
+ #include 
++#include 
+ #include 
+ 
+ TemplateEdit::TemplateEdit(QWidget *parent, struct print_options 
*printOptions, struct template_options *templateOptions) :

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2018-04-15 Thread Gaëtan Bisson via arch-commits 
Date: Monday, April 16, 2018 @ 02:50:32
  Author: bisson
Revision: 316461

free rebuild

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-16 02:44:28 UTC (rev 316460)
+++ PKGBUILD2018-04-16 02:50:32 UTC (rev 316461)
@@ -5,7 +5,7 @@
 pkgname=subsurface
 _pkgname=Subsurface
 pkgver=4.7.8
-pkgrel=1
+pkgrel=2
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
 license=('GPL2')

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2018-04-05 Thread Gaëtan Bisson via arch-commits 
Date: Friday, April 6, 2018 @ 00:18:47
  Author: bisson
Revision: 314537

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-06 00:16:00 UTC (rev 314536)
+++ PKGBUILD2018-04-06 00:18:47 UTC (rev 314537)
@@ -4,8 +4,8 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.7.7
-pkgrel=2
+pkgver=4.7.8
+pkgrel=1
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
 license=('GPL2')
@@ -15,7 +15,7 @@
  'subsurface-libdc' 'qt5-svg' 'qt5-location'
  'qt5-connectivity' 'qt5-webkit' 'grantlee' 'googlemaps')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha256sums=('7c59223a21a187ce7294c35f6b69a9ab418ea53fe95ec4a9f047c7ee8964077d')
+sha256sums=('da7c09bcc63e0b3bc6e1ce5411a4f1e38a73e6e37bce15055657d840c78b07fa')
 
 # qt5-webkit still used for: printing, manual, facebook

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2018-04-04 Thread Gaëtan Bisson via arch-commits 
Date: Wednesday, April 4, 2018 @ 19:33:00
  Author: bisson
Revision: 314248

rebuild for libgit2-0.27.0

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-04 19:32:15 UTC (rev 314247)
+++ PKGBUILD2018-04-04 19:33:00 UTC (rev 314248)
@@ -5,7 +5,7 @@
 pkgname=subsurface
 _pkgname=Subsurface
 pkgver=4.7.7
-pkgrel=1
+pkgrel=2
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
 license=('GPL2')

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2018-02-10 Thread Gaëtan Bisson via arch-commits 
Date: Sunday, February 11, 2018 @ 05:44:27
  Author: bisson
Revision: 291792

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-02-11 05:44:18 UTC (rev 291791)
+++ PKGBUILD2018-02-11 05:44:27 UTC (rev 291792)
@@ -4,7 +4,7 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.7.6
+pkgver=4.7.7
 pkgrel=1
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
@@ -15,7 +15,7 @@
  'subsurface-libdc' 'qt5-svg' 'qt5-location'
  'qt5-connectivity' 'qt5-webkit' 'grantlee' 'googlemaps')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha256sums=('cf9b14a3b4b6e3fc2a74c2c6b9c850640fd4d9ea1df720e04ce00dd6bfc3884b')
+sha256sums=('7c59223a21a187ce7294c35f6b69a9ab418ea53fe95ec4a9f047c7ee8964077d')
 
 # qt5-webkit still used for: printing, manual, facebook

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2017-12-30 Thread Gaëtan Bisson via arch-commits 
Date: Saturday, December 30, 2017 @ 14:23:24
  Author: bisson
Revision: 277164

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-30 14:16:48 UTC (rev 277163)
+++ PKGBUILD2017-12-30 14:23:24 UTC (rev 277164)
@@ -4,7 +4,7 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.7.5
+pkgver=4.7.6
 pkgrel=1
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
@@ -15,7 +15,7 @@
  'subsurface-libdc' 'qt5-svg' 'qt5-location'
  'qt5-connectivity' 'qt5-webkit' 'grantlee' 'googlemaps')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha256sums=('02ad73ec10eb6dec8de5c81049a4595da4db96467b622b5826992a216bb61563')
+sha256sums=('cf9b14a3b4b6e3fc2a74c2c6b9c850640fd4d9ea1df720e04ce00dd6bfc3884b')
 
 # qt5-webkit still used for: printing, manual, facebook

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2017-12-07 Thread Gaëtan Bisson via arch-commits 
Date: Friday, December 8, 2017 @ 04:57:40
  Author: bisson
Revision: 273224

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-08 04:52:42 UTC (rev 273223)
+++ PKGBUILD2017-12-08 04:57:40 UTC (rev 273224)
@@ -4,7 +4,7 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.7.4
+pkgver=4.7.5
 pkgrel=1
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
@@ -15,7 +15,7 @@
  'subsurface-libdc' 'qt5-svg' 'qt5-location'
  'qt5-connectivity' 'qt5-webkit' 'grantlee' 'googlemaps')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha256sums=('0f22c371ae00c8319ad037c63cda5af5d83508cc0762c6f6593329eba96cfc54')
+sha256sums=('02ad73ec10eb6dec8de5c81049a4595da4db96467b622b5826992a216bb61563')
 
 # qt5-webkit still used for: printing, manual, facebook

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2017-11-12 Thread Gaëtan Bisson 
Date: Monday, November 13, 2017 @ 06:50:04
  Author: bisson
Revision: 266708

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-11-13 06:44:35 UTC (rev 266707)
+++ PKGBUILD2017-11-13 06:50:04 UTC (rev 266708)
@@ -4,7 +4,7 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.7.2
+pkgver=4.7.4
 pkgrel=1
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
@@ -15,7 +15,7 @@
  'subsurface-libdc' 'qt5-svg' 'qt5-location'
  'qt5-connectivity' 'qt5-webkit' 'grantlee' 'googlemaps')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha256sums=('57ae81ad993126ee46e43a50a6f6b4344f671065300ae7b0c082d9d07b09c219')
+sha256sums=('0f22c371ae00c8319ad037c63cda5af5d83508cc0762c6f6593329eba96cfc54')
 
 # qt5-webkit still used for: printing, manual, facebook

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2017-11-01 Thread Gaëtan Bisson 
Date: Wednesday, November 1, 2017 @ 06:14:14
  Author: bisson
Revision: 264960

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-11-01 05:58:23 UTC (rev 264959)
+++ PKGBUILD2017-11-01 06:14:14 UTC (rev 264960)
@@ -4,7 +4,7 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.7.1
+pkgver=4.7.2
 pkgrel=1
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
@@ -15,7 +15,7 @@
  'subsurface-libdc' 'qt5-svg' 'qt5-location'
  'qt5-connectivity' 'qt5-webkit' 'grantlee' 'googlemaps')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha256sums=('37cdd01000c93ac6b5de29b14550079c40180a069690c4f92aae48e04d7e4c35')
+sha256sums=('57ae81ad993126ee46e43a50a6f6b4344f671065300ae7b0c082d9d07b09c219')
 
 # qt5-webkit still used for: printing, manual, facebook

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2017-10-22 Thread Gaëtan Bisson 
Date: Sunday, October 22, 2017 @ 21:59:29
  Author: bisson
Revision: 264003

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |   24 +---
 1 file changed, 9 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-10-22 21:57:42 UTC (rev 264002)
+++ PKGBUILD2017-10-22 21:59:29 UTC (rev 264003)
@@ -4,23 +4,20 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.6.4
-pkgrel=2
+pkgver=4.7.1
+pkgrel=1
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
 license=('GPL2')
 arch=('i686' 'x86_64')
-makedepends=('cmake' 'asciidoc')
+makedepends=('cmake' 'asciidoc' 'qt5-tools')
 depends=('libzip' 'libxml2' 'libxslt' 'sqlite' 'libusb' 'libgit2'
- 'subsurface-libdc' 'subsurface-marble'
- 'qt5-connectivity' 'grantlee')
+ 'subsurface-libdc' 'qt5-svg' 'qt5-location'
+ 'qt5-connectivity' 'qt5-webkit' 'grantlee' 'googlemaps')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha256sums=('b9620931a7683e69a04c58ad5f5291722f51800d428dd6c6f945fb258ce49376')
+sha256sums=('37cdd01000c93ac6b5de29b14550079c40180a069690c4f92aae48e04d7e4c35')
 
-prepare() {
-   cd "${srcdir}/${_pkgname}-${pkgver}"
-   sed 's:

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2017-09-05 Thread Gaëtan Bisson 
Date: Tuesday, September 5, 2017 @ 17:43:48
  Author: bisson
Revision: 255859

fix FS#55511

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-05 17:34:44 UTC (rev 255858)
+++ PKGBUILD2017-09-05 17:43:48 UTC (rev 255859)
@@ -32,7 +32,9 @@
-DMARBLE_LIBRARIES=/usr/lib/libssrfmarblewidget.so \
-DMARBLE_INCLUDE_DIR=/usr/include/subsurface/marble \
..
-   make
+
+   # running multiple jobs mitigates the "ui_mainwindow.h" race condition
+   make -j4
 }
 
 package() {

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2017-07-08 Thread Gaëtan Bisson 
Date: Sunday, July 9, 2017 @ 03:59:19
  Author: bisson
Revision: 243375

rebuild for libgit-0.26.0

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-09 01:27:15 UTC (rev 243374)
+++ PKGBUILD2017-07-09 03:59:19 UTC (rev 243375)
@@ -5,7 +5,7 @@
 pkgname=subsurface
 _pkgname=Subsurface
 pkgver=4.6.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
 license=('GPL2')

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2017-04-27 Thread Gaëtan Bisson 
Date: Thursday, April 27, 2017 @ 06:34:56
  Author: bisson
Revision: 225918

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-04-27 06:29:40 UTC (rev 225917)
+++ PKGBUILD2017-04-27 06:34:56 UTC (rev 225918)
@@ -4,8 +4,8 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.6.3
-pkgrel=6
+pkgver=4.6.4
+pkgrel=1
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
 license=('GPL2')
@@ -15,12 +15,10 @@
  'subsurface-libdc' 'subsurface-marble'
  'qt5-connectivity' 'grantlee')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha256sums=('44c64397d5225522be0734b126c479566b4adfed6de1b1f95b978a02e4a3958d')
+sha256sums=('b9620931a7683e69a04c58ad5f5291722f51800d428dd6c6f945fb258ce49376')
 
 prepare() {
cd "${srcdir}/${_pkgname}-${pkgver}"
-   sed 's:tree_flags:flags:g' -i core/git-access.c
-   sed 's:GIT_MERGE_TREE_FIND_RENAMES:GIT_MERGE_FIND_RENAMES:g' -i 
core/git-access.c
sed 's:

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2017-03-16 Thread Gaëtan Bisson 
Date: Friday, March 17, 2017 @ 01:34:36
  Author: bisson
Revision: 216854

rebuild for openssl-1.1

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-17 01:22:44 UTC (rev 216853)
+++ PKGBUILD2017-03-17 01:34:36 UTC (rev 216854)
@@ -5,7 +5,7 @@
 pkgname=subsurface
 _pkgname=Subsurface
 pkgver=4.6.3
-pkgrel=5
+pkgrel=6
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
 license=('GPL2')

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2017-03-16 Thread Gaëtan Bisson 
Date: Friday, March 17, 2017 @ 01:22:03
  Author: bisson
Revision: 216849

fix libxslt linkage

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-16 23:02:59 UTC (rev 216848)
+++ PKGBUILD2017-03-17 01:22:03 UTC (rev 216849)
@@ -5,7 +5,7 @@
 pkgname=subsurface
 _pkgname=Subsurface
 pkgver=4.6.3
-pkgrel=4
+pkgrel=5
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
 license=('GPL2')

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2017-03-13 Thread Gaëtan Bisson 
Date: Monday, March 13, 2017 @ 06:34:29
  Author: bisson
Revision: 216018

rebuild for libgit2

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-13 06:34:08 UTC (rev 216017)
+++ PKGBUILD2017-03-13 06:34:29 UTC (rev 216018)
@@ -5,7 +5,7 @@
 pkgname=subsurface
 _pkgname=Subsurface
 pkgver=4.6.3
-pkgrel=3
+pkgrel=4
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
 license=('GPL2')

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2017-03-13 Thread Gaëtan Bisson 
Date: Monday, March 13, 2017 @ 06:14:49
  Author: bisson
Revision: 216010

rebuild for libzip-1.2.0

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-13 05:37:30 UTC (rev 216009)
+++ PKGBUILD2017-03-13 06:14:49 UTC (rev 216010)
@@ -5,7 +5,7 @@
 pkgname=subsurface
 _pkgname=Subsurface
 pkgver=4.6.3
-pkgrel=2
+pkgrel=3
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
 license=('GPL2')

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2017-03-04 Thread Jan de Groot 
Date: Saturday, March 4, 2017 @ 22:02:04
  Author: jgc
Revision: 214933

upgpkg: subsurface 4.6.3-2

libgit2 rebuild

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-04 21:38:47 UTC (rev 214932)
+++ PKGBUILD2017-03-04 22:02:04 UTC (rev 214933)
@@ -5,7 +5,7 @@
 pkgname=subsurface
 _pkgname=Subsurface
 pkgver=4.6.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
 license=('GPL2')

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2017-03-03 Thread Gaëtan Bisson 
Date: Friday, March 3, 2017 @ 08:03:11
  Author: bisson
Revision: 214639

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-03 08:03:09 UTC (rev 214638)
+++ PKGBUILD2017-03-03 08:03:11 UTC (rev 214639)
@@ -4,7 +4,7 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.6.2
+pkgver=4.6.3
 pkgrel=1
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
@@ -15,7 +15,7 @@
  'subsurface-libdc' 'subsurface-marble'
  'qt5-connectivity' 'grantlee')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha256sums=('c14ea6e1f8735365911c96cb921e161d5ee144143ea912e8deb19b32698ffe03')
+sha256sums=('44c64397d5225522be0734b126c479566b4adfed6de1b1f95b978a02e4a3958d')
 
 prepare() {
cd "${srcdir}/${_pkgname}-${pkgver}"

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2017-03-01 Thread Gaëtan Bisson 
Date: Thursday, March 2, 2017 @ 01:00:34
  Author: bisson
Revision: 214410

switch to sha256sum

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-02 01:00:30 UTC (rev 214409)
+++ PKGBUILD2017-03-02 01:00:34 UTC (rev 214410)
@@ -15,7 +15,7 @@
  'subsurface-libdc' 'subsurface-marble'
  'qt5-connectivity' 'grantlee')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha1sums=('ecfc4f2867e71c2af3651219d9cb16110ecbf7b4')
+sha256sums=('c14ea6e1f8735365911c96cb921e161d5ee144143ea912e8deb19b32698ffe03')
 
 prepare() {
cd "${srcdir}/${_pkgname}-${pkgver}"

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2017-02-20 Thread Gaëtan Bisson 
Date: Monday, February 20, 2017 @ 08:50:04
  Author: bisson
Revision: 213166

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-20 08:39:13 UTC (rev 213165)
+++ PKGBUILD2017-02-20 08:50:04 UTC (rev 213166)
@@ -4,7 +4,7 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.6.1
+pkgver=4.6.2
 pkgrel=1
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
@@ -15,7 +15,7 @@
  'subsurface-libdc' 'subsurface-marble'
  'qt5-connectivity' 'grantlee')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha1sums=('c36cabe72bc33cb848406dbe229916e1bc4ea774')
+sha1sums=('ecfc4f2867e71c2af3651219d9cb16110ecbf7b4')
 
 prepare() {
cd "${srcdir}/${_pkgname}-${pkgver}"

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2017-02-13 Thread Gaëtan Bisson 
Date: Monday, February 13, 2017 @ 11:11:47
  Author: bisson
Revision: 212105

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-13 10:59:41 UTC (rev 212104)
+++ PKGBUILD2017-02-13 11:11:47 UTC (rev 212105)
@@ -4,8 +4,8 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.6.0
-pkgrel=2
+pkgver=4.6.1
+pkgrel=1
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
 license=('GPL2')
@@ -15,7 +15,7 @@
  'subsurface-libdc' 'subsurface-marble'
  'qt5-connectivity' 'grantlee')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha1sums=('af2faabd36a8f1d4760476c995e6e9c5836b6153')
+sha1sums=('c36cabe72bc33cb848406dbe229916e1bc4ea774')
 
 prepare() {
cd "${srcdir}/${_pkgname}-${pkgver}"

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2017-01-16 Thread Gaëtan Bisson 
Date: Monday, January 16, 2017 @ 09:31:35
  Author: bisson
Revision: 207593

fix marble detection

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-16 09:29:19 UTC (rev 207592)
+++ PKGBUILD2017-01-16 09:31:35 UTC (rev 207593)
@@ -5,7 +5,7 @@
 pkgname=subsurface
 _pkgname=Subsurface
 pkgver=4.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
 license=('GPL2')
@@ -29,10 +29,10 @@
install -d build
cd build
cmake \
-   -DUSE_LIBGIT23_API=1 \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DMARBLE_LIBRARIES=/usr/lib/libssrfmarblewidget.so \
+   -DMARBLE_INCLUDE_DIR=/usr/include/subsurface/marble \
..
make
 }

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2017-01-16 Thread Gaëtan Bisson 
Date: Monday, January 16, 2017 @ 09:10:43
  Author: bisson
Revision: 207583

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |   17 ++---
 1 file changed, 10 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-16 09:09:07 UTC (rev 207582)
+++ PKGBUILD2017-01-16 09:10:43 UTC (rev 207583)
@@ -4,8 +4,8 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.5.6
-pkgrel=3
+pkgver=4.6.0
+pkgrel=1
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
 license=('GPL2')
@@ -15,27 +15,30 @@
  'subsurface-libdc' 'subsurface-marble'
  'qt5-connectivity' 'grantlee')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha1sums=('db74614fe66da19f8a07a375551e1ef032291b4a')
+sha1sums=('af2faabd36a8f1d4760476c995e6e9c5836b6153')
 
 prepare() {
cd "${srcdir}/${_pkgname}-${pkgver}"
-   sed 's:tree_flags:flags:g' -i git-access.c
-   sed 's:GIT_MERGE_TREE_FIND_RENAMES:GIT_MERGE_FIND_RENAMES:g' -i 
git-access.c
-   sed 's:

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2016-11-01 Thread Gaëtan Bisson 
Date: Tuesday, November 1, 2016 @ 22:10:03
  Author: bisson
Revision: 194300

add https

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-01 22:09:58 UTC (rev 194299)
+++ PKGBUILD2016-11-01 22:10:03 UTC (rev 194300)
@@ -7,7 +7,7 @@
 pkgver=4.5.6
 pkgrel=3
 pkgdesc='Divelog program'
-url='http://subsurface-divelog.org/'
+url='https://subsurface-divelog.org/'
 license=('GPL2')
 arch=('i686' 'x86_64')
 makedepends=('cmake' 'asciidoc')
@@ -14,7 +14,7 @@
 depends=('libzip' 'libxml2' 'libxslt' 'sqlite' 'libusb' 'libgit2'
  'subsurface-libdc' 'subsurface-marble'
  'qt5-connectivity' 'grantlee')
-source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
+source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
 sha1sums=('db74614fe66da19f8a07a375551e1ef032291b4a')
 
 prepare() {

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2016-08-30 Thread Antonio Rojas 
Date: Tuesday, August 30, 2016 @ 20:37:00
  Author: arojas
Revision: 188076

grantlee-qt5 -> grantlee

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-30 20:36:37 UTC (rev 188075)
+++ PKGBUILD2016-08-30 20:37:00 UTC (rev 188076)
@@ -13,7 +13,7 @@
 makedepends=('cmake' 'asciidoc')
 depends=('libzip' 'libxml2' 'libxslt' 'sqlite' 'libusb' 'libgit2'
  'subsurface-libdc' 'subsurface-marble'
- 'qt5-connectivity' 'grantlee-qt5')
+ 'qt5-connectivity' 'grantlee')
 source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
 sha1sums=('db74614fe66da19f8a07a375551e1ef032291b4a')

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2016-08-11 Thread Gaëtan Bisson 
Date: Friday, August 12, 2016 @ 00:25:42
  Author: bisson
Revision: 186448

fix build against libgit2-0.24

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-11 20:52:05 UTC (rev 186447)
+++ PKGBUILD2016-08-12 00:25:42 UTC (rev 186448)
@@ -5,7 +5,7 @@
 pkgname=subsurface
 _pkgname=Subsurface
 pkgver=4.5.6
-pkgrel=2
+pkgrel=3
 pkgdesc='Divelog program'
 url='http://subsurface-divelog.org/'
 license=('GPL2')
@@ -19,13 +19,15 @@
 
 prepare() {
cd "${srcdir}/${_pkgname}-${pkgver}"
+   sed 's:tree_flags:flags:g' -i git-access.c
+   sed 's:GIT_MERGE_TREE_FIND_RENAMES:GIT_MERGE_FIND_RENAMES:g' -i 
git-access.c
sed 's:

[arch-commits] Commit in subsurface/trunk (PKGBUILD install)

2016-05-03 Thread Gaetan Bisson 
Date: Tuesday, May 3, 2016 @ 23:41:57
  Author: bisson
Revision: 173609

remove deprecated install file

Modified:
  subsurface/trunk/PKGBUILD
Deleted:
  subsurface/trunk/install

--+
 PKGBUILD |4 +---
 install  |   11 ---
 2 files changed, 1 insertion(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-03 21:34:57 UTC (rev 173608)
+++ PKGBUILD2016-05-03 21:41:57 UTC (rev 173609)
@@ -5,7 +5,7 @@
 pkgname=subsurface
 _pkgname=Subsurface
 pkgver=4.5.6
-pkgrel=1
+pkgrel=2
 pkgdesc='Divelog program'
 url='http://subsurface-divelog.org/'
 license=('GPL2')
@@ -17,8 +17,6 @@
 source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
 sha1sums=('db74614fe66da19f8a07a375551e1ef032291b4a')
 
-install=install
-
 prepare() {
cd "${srcdir}/${_pkgname}-${pkgver}"
sed 's:

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2016-04-11 Thread Gaetan Bisson 
Date: Monday, April 11, 2016 @ 21:57:57
  Author: bisson
Revision: 170539

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-11 18:54:21 UTC (rev 170538)
+++ PKGBUILD2016-04-11 19:57:57 UTC (rev 170539)
@@ -4,7 +4,7 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.5.4
+pkgver=4.5.5
 pkgrel=1
 pkgdesc='Divelog program'
 url='http://subsurface-divelog.org/'
@@ -15,7 +15,7 @@
  'subsurface-libdc' 'subsurface-marble'
  'qt5-connectivity' 'grantlee-qt5')
 source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha1sums=('e4ff548171b0a317a1f3f762bde2f62fd2152088')
+sha1sums=('f108d9d6048a34a4f61e37fab855081ce7c1ec67')
 
 install=install
 
@@ -22,6 +22,7 @@
 prepare() {
cd "${srcdir}/${_pkgname}-${pkgver}"
sed 's:

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2016-03-22 Thread Gaetan Bisson 
Date: Tuesday, March 22, 2016 @ 22:55:23
  Author: bisson
Revision: 167942

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-22 20:35:20 UTC (rev 167941)
+++ PKGBUILD2016-03-22 21:55:23 UTC (rev 167942)
@@ -4,7 +4,7 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.5.3
+pkgver=4.5.4
 pkgrel=1
 pkgdesc='Divelog program'
 url='http://subsurface-divelog.org/'
@@ -15,7 +15,7 @@
  'subsurface-libdc' 'subsurface-marble'
  'qt5-connectivity' 'grantlee-qt5')
 source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha1sums=('46981e8ecf4c51094851ee089f4725c3c0f47b62')
+sha1sums=('e4ff548171b0a317a1f3f762bde2f62fd2152088')
 
 install=install

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2015-12-18 Thread Gaetan Bisson 
Date: Friday, December 18, 2015 @ 16:54:23
  Author: bisson
Revision: 153668

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-18 15:42:06 UTC (rev 153667)
+++ PKGBUILD2015-12-18 15:54:23 UTC (rev 153668)
@@ -4,8 +4,8 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.5.2
-pkgrel=2
+pkgver=4.5.3
+pkgrel=1
 pkgdesc='Divelog program'
 url='http://subsurface-divelog.org/'
 license=('GPL2')
@@ -15,7 +15,7 @@
  'subsurface-libdc' 'subsurface-marble'
  'qt5-connectivity' 'grantlee-qt5')
 source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha1sums=('6f06a34133465da14a9e37372ff200bec31746ca')
+sha1sums=('46981e8ecf4c51094851ee089f4725c3c0f47b62')
 
 install=install

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2015-12-08 Thread Antonio Rojas 
Date: Tuesday, December 8, 2015 @ 16:08:51
  Author: arojas
Revision: 150337

C++11 ABI rebuild

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-08 15:00:13 UTC (rev 150336)
+++ PKGBUILD2015-12-08 15:08:51 UTC (rev 150337)
@@ -5,7 +5,7 @@
 pkgname=subsurface
 _pkgname=Subsurface
 pkgver=4.5.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Divelog program'
 url='http://subsurface-divelog.org/'
 license=('GPL2')

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2015-11-07 Thread Gaetan Bisson 
Date: Sunday, November 8, 2015 @ 07:48:35
  Author: bisson
Revision: 146390

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-11-08 05:57:13 UTC (rev 146389)
+++ PKGBUILD2015-11-08 06:48:35 UTC (rev 146390)
@@ -4,7 +4,7 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.5.1
+pkgver=4.5.2
 pkgrel=1
 pkgdesc='Divelog program'
 url='http://subsurface-divelog.org/'
@@ -15,7 +15,7 @@
  'subsurface-libdc' 'subsurface-marble'
  'qt5-connectivity' 'grantlee-qt5')
 source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha1sums=('a595c479d67fce28c4fbe19b4e85e93c8e11fc12')
+sha1sums=('6f06a34133465da14a9e37372ff200bec31746ca')
 
 install=install

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2015-10-27 Thread Gaetan Bisson 
Date: Tuesday, October 27, 2015 @ 18:06:42
  Author: bisson
Revision: 145133

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-27 16:59:32 UTC (rev 145132)
+++ PKGBUILD2015-10-27 17:06:42 UTC (rev 145133)
@@ -4,7 +4,7 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.5.0
+pkgver=4.5.1
 pkgrel=1
 pkgdesc='Divelog program'
 url='http://subsurface-divelog.org/'
@@ -15,7 +15,7 @@
  'subsurface-libdc' 'subsurface-marble'
  'qt5-connectivity' 'grantlee-qt5')
 source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha1sums=('1e5e72076d329b8283d4871609af080b787c71f1')
+sha1sums=('a595c479d67fce28c4fbe19b4e85e93c8e11fc12')
 
 install=install

[arch-commits] Commit in subsurface/trunk (PKGBUILD libgit2.patch)

2015-10-14 Thread Gaetan Bisson 
Date: Wednesday, October 14, 2015 @ 22:04:43
  Author: bisson
Revision: 144006

upstream update

Modified:
  subsurface/trunk/PKGBUILD
Deleted:
  subsurface/trunk/libgit2.patch

---+
 PKGBUILD  |   29 +++--
 libgit2.patch |   19 ---
 2 files changed, 15 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-14 19:41:55 UTC (rev 144005)
+++ PKGBUILD2015-10-14 20:04:43 UTC (rev 144006)
@@ -4,37 +4,38 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.4.2
-pkgrel=2
+pkgver=4.5.0
+pkgrel=1
 pkgdesc='Divelog program'
 url='http://subsurface-divelog.org/'
 license=('GPL2')
 arch=('i686' 'x86_64')
+makedepends=('cmake' 'asciidoc')
 depends=('libzip' 'libxml2' 'libxslt' 'sqlite' 'libusb' 'libgit2'
- 'subsurface-libdc' 'subsurface-marble')
-source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;
-'libgit2.patch')
-sha1sums=('40dd3e3693170219d58dd9c1484274f724bedbea'
-  'd36e5d3182254a0a5d1940308a7878febdcfdef8')
+ 'subsurface-libdc' 'subsurface-marble'
+ 'qt5-connectivity' 'grantlee-qt5')
+source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
+sha1sums=('1e5e72076d329b8283d4871609af080b787c71f1')
 
 install=install
 
 prepare() {
cd "${srcdir}/${_pkgname}-${pkgver}"
-   patch -p1 -i ../libgit2.patch
+   sed 's:

[arch-commits] Commit in subsurface/trunk (PKGBUILD libgit2.patch)

2015-08-28 Thread Gaetan Bisson 
Date: Saturday, August 29, 2015 @ 03:53:00
  Author: bisson
Revision: 138907

rebuild for libgit2-1:0.23.1

Added:
  subsurface/trunk/libgit2.patch
Modified:
  subsurface/trunk/PKGBUILD

---+
 PKGBUILD  |   13 ++---
 libgit2.patch |   19 +++
 2 files changed, 29 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-08-28 23:42:37 UTC (rev 138906)
+++ PKGBUILD2015-08-29 01:53:00 UTC (rev 138907)
@@ -5,7 +5,7 @@
 pkgname=subsurface
 _pkgname=Subsurface
 pkgver=4.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Divelog program'
 url='http://subsurface-divelog.org/'
 license=('GPL2')
@@ -12,11 +12,18 @@
 arch=('i686' 'x86_64')
 depends=('libzip' 'libxml2' 'libxslt' 'sqlite' 'libusb' 'libgit2'
  'subsurface-libdc' 'subsurface-marble')
-source=(http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha1sums=('40dd3e3693170219d58dd9c1484274f724bedbea')
+source=(http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;
+'libgit2.patch')
+sha1sums=('40dd3e3693170219d58dd9c1484274f724bedbea'
+  'd36e5d3182254a0a5d1940308a7878febdcfdef8')
 
 install=install
 
+prepare() {
+   cd ${srcdir}/${_pkgname}-${pkgver}
+   patch -p1 -i ../libgit2.patch
+}
+
 build() {
cd ${srcdir}/${_pkgname}-${pkgver}
qmake-qt5 \

Added: libgit2.patch
===
--- libgit2.patch   (rev 0)
+++ libgit2.patch   2015-08-29 01:53:00 UTC (rev 138907)
@@ -0,0 +1,19 @@
+diff -Naur old/save-git.c new/save-git.c
+--- old/save-git.c 2015-05-04 07:59:10.0 -1000
 new/save-git.c 2015-08-28 15:33:01.298869918 -1000
+@@ -34,6 +34,15 @@
+ #else
+   #define git_treebuilder_write(id, repo, bld)   git_treebuilder_write(id, 
bld)
+ #endif
++/*
++ * api break introduced in libgit2 master after 0.22 - let's guess this is 
the v0.23 API
++ */
++#if USE_LIBGIT23_API || (!LIBGIT2_VER_MAJOR  LIBGIT2_VER_MINOR = 23)
++  #define git_branch_create(out, repo, branch_name, target, force, signature, 
log_message) \
++   git_branch_create(out, repo, branch_name, target, force)
++  #define git_reference_set_target(out, ref, id, author, log_message) \
++   git_reference_set_target(out, ref, id, log_message)
++#endif
+ 
+ #define VA_BUF(b, fmt) do { va_list args; va_start(args, fmt); put_vformat(b, 
fmt, args); va_end(args); } while (0)
+

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2015-05-09 Thread Gaetan Bisson 
Date: Saturday, May 9, 2015 @ 12:46:36
  Author: bisson
Revision: 133036

rebuild for libzip-1.0.1

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-09 10:46:15 UTC (rev 133035)
+++ PKGBUILD2015-05-09 10:46:36 UTC (rev 133036)
@@ -5,7 +5,7 @@
 pkgname=subsurface
 _pkgname=Subsurface
 pkgver=4.4.1
-pkgrel=3
+pkgrel=4
 pkgdesc='Divelog program'
 url='http://subsurface-divelog.org/'
 license=('GPL2')

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2015-03-03 Thread Gaetan Bisson 
Date: Tuesday, March 3, 2015 @ 17:44:30
  Author: bisson
Revision: 128642

revert bikeshedding

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-03 15:43:03 UTC (rev 128641)
+++ PKGBUILD2015-03-03 16:44:30 UTC (rev 128642)
@@ -10,21 +10,21 @@
 url='http://subsurface-divelog.org/'
 license=('GPL2')
 arch=('i686' 'x86_64')
-install=install
 depends=('libzip' 'libxml2' 'libxslt' 'sqlite' 'libusb' 'libgit2'
  'subsurface-libdc' 'subsurface-marble')
 source=(http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;
-revert-detect.patch
-qt-5.4.1.patch)
+'revert-detect.patch'
+'qt-5.4.1.patch')
 sha1sums=('7c33c734c59ced134f10c242c5f51b6d48cb3a0d'
   '06bee56a7d1c9b93628147f27febbd07e5745e46'
   '0f8ee15029561ff3cca86b937e43e6384df99218')
 
+install=install
 
 prepare() {
-  cd $_pkgname-$pkgver
-  patch -Np1 -R -i ../revert-detect.patch
-  patch -Np1 -i ../qt-5.4.1.patch
+   cd ${srcdir}/${_pkgname}-${pkgver}
+   patch -p1 -R -i ../revert-detect.patch
+   patch -p1 -i ../qt-5.4.1.patch
 }
   
 build() {

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2015-02-21 Thread Gaetan Bisson 
Date: Saturday, February 21, 2015 @ 09:18:42
  Author: bisson
Revision: 128061

rebuild against subsurface-{libdc,marble}

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |   42 +-
 1 file changed, 5 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-02-21 06:32:47 UTC (rev 128060)
+++ PKGBUILD2015-02-21 08:18:42 UTC (rev 128061)
@@ -5,61 +5,29 @@
 pkgname=subsurface
 _pkgname=Subsurface
 pkgver=4.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Divelog program'
 url='http://subsurface-divelog.org/'
 license=('GPL2')
 arch=('i686' 'x86_64')
-makedepends=('git' 'cmake' 'asciidoc')
 depends=('libzip' 'libxml2' 'libxslt' 'sqlite' 'libusbx' 'libgit2'
- 'libdivecomputer' 'qt5-'{script,svg,tools,webkit})
-source=(http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;
-
'git://git.subsurface-divelog.org/marble#commit=aa18d0af6951debf3a3a90916f3f772784dbf326')
-sha1sums=('7c33c734c59ced134f10c242c5f51b6d48cb3a0d'
-  'SKIP')
+ 'subsurface-libdc' 'subsurface-marble')
+source=(http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
+sha1sums=('7c33c734c59ced134f10c242c5f51b6d48cb3a0d')
 
 install=install
 
 build() {
-   # subsurface is Qt5-only so we need to build marble against it;
-   # while we're at it we use Subsurface's custom marble branch.
-
-   cd ${srcdir}/marble
-   cmake \
-   -DCMAKE_INSTALL_PREFIX=/usr \
-   -DCMAKE_BUILD_TYPE=Release \
-   -DQT5BUILD=ON \
-   -DQTONLY=ON \
-   -DBUILD_MARBLE_APPS=OFF \
-   -DBUILD_MARBLE_EXAMPLES=OFF \
-   -DBUILD_MARBLE_TESTS=OFF \
-   -DBUILD_MARBLE_TOOLS=OFF \
-   -DBUILD_TESTING=OFF \
-   -DWITH_DESIGNER_PLUGIN=OFF \
-   -DBUILD_WITH_DBUS=OFF \
-   .
-   make
-   install -d pkg
-   make DESTDIR=`pwd`/pkg install
-
cd ${srcdir}/${_pkgname}-${pkgver}
qmake-qt5 \
-config release \
SPECIAL_MARBLE_PREFIX=1 \
-   LIBMARBLEDEVEL=../marble/pkg \
-   LIBS+=-L`pwd`/../marble/pkg/usr/lib \
-   INCLUDEPATH+=`pwd`/../marble/pkg/usr/include \
+   INCLUDEPATH+='/usr/include/subsurface' \
 
make
 }
 
 package() {
-   cd ${srcdir}/marble
-   make DESTDIR=${pkgdir} install
-
-   # remove conflicts with kdeedu-marble
-   rm -fr ${pkgdir}/usr/{include,share/{appdata,icons}}
-
cd ${srcdir}/${_pkgname}-${pkgver}
make INSTALL_ROOT=${pkgdir} install
 }

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2015-02-20 Thread Gaetan Bisson 
Date: Friday, February 20, 2015 @ 09:55:25
  Author: bisson
Revision: 128023

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-02-20 08:45:45 UTC (rev 128022)
+++ PKGBUILD2015-02-20 08:55:25 UTC (rev 128023)
@@ -4,7 +4,7 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.4.0
+pkgver=4.4.1
 pkgrel=1
 pkgdesc='Divelog program'
 url='http://subsurface-divelog.org/'
@@ -15,7 +15,7 @@
  'libdivecomputer' 'qt5-'{script,svg,tools,webkit})
 source=(http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;
 
'git://git.subsurface-divelog.org/marble#commit=aa18d0af6951debf3a3a90916f3f772784dbf326')
-sha1sums=('6598c1f894bd0334d8fa3dfec13adfadc041d56c'
+sha1sums=('7c33c734c59ced134f10c242c5f51b6d48cb3a0d'
   'SKIP')
 
 install=install

[arch-commits] Commit in subsurface/trunk (PKGBUILD install)

2015-02-04 Thread Gaetan Bisson 
Date: Thursday, February 5, 2015 @ 04:19:32
  Author: bisson
Revision: 127139

upstream update, qt5 build, custom marble

Added:
  subsurface/trunk/install
Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |   54 ++
 install  |   11 +++
 2 files changed, 57 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-02-05 02:44:06 UTC (rev 127138)
+++ PKGBUILD2015-02-05 03:19:32 UTC (rev 127139)
@@ -4,24 +4,62 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.3
-pkgrel=2
+pkgver=4.4.0
+pkgrel=1
 pkgdesc='Divelog program'
-url='http://subsurface.hohndel.org/'
+url='http://subsurface-divelog.org/'
 license=('GPL2')
 arch=('i686' 'x86_64')
-depends=('qt4' 'kdeedu-marble' 'libzip' 'libxml2' 'libxslt' 'sqlite' 'libusbx'
- 'libgit2' 'libdivecomputer')
-source=(http://subsurface.hohndel.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha1sums=('29f27537ef2ee91234244b0d984ddb30253fc69a')
+makedepends=('git' 'cmake' 'asciidoc')
+depends=('libzip' 'libxml2' 'libxslt' 'sqlite' 'libusbx' 'libgit2'
+ 'libdivecomputer' 'qt5-'{script,svg,tools,webkit})
+source=(http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;
+
'git://git.subsurface-divelog.org/marble#commit=aa18d0af6951debf3a3a90916f3f772784dbf326')
+sha1sums=('6598c1f894bd0334d8fa3dfec13adfadc041d56c'
+  'SKIP')
 
+install=install
+
 build() {
+   # subsurface is Qt5-only so we need to build marble against it;
+   # while we're at it we use Subsurface's custom marble branch.
+
+   cd ${srcdir}/marble
+   cmake \
+   -DCMAKE_INSTALL_PREFIX=/usr \
+   -DCMAKE_BUILD_TYPE=Release \
+   -DQT5BUILD=ON \
+   -DQTONLY=ON \
+   -DBUILD_MARBLE_APPS=OFF \
+   -DBUILD_MARBLE_EXAMPLES=OFF \
+   -DBUILD_MARBLE_TESTS=OFF \
+   -DBUILD_MARBLE_TOOLS=OFF \
+   -DBUILD_TESTING=OFF \
+   -DWITH_DESIGNER_PLUGIN=OFF \
+   -DBUILD_WITH_DBUS=OFF \
+   .
+   make
+   install -d pkg
+   make DESTDIR=`pwd`/pkg install
+
cd ${srcdir}/${_pkgname}-${pkgver}
-   qmake-qt4 -config release
+   qmake-qt5 \
+   -config release \
+   SPECIAL_MARBLE_PREFIX=1 \
+   LIBMARBLEDEVEL=../marble/pkg \
+   LIBS+=-L`pwd`/../marble/pkg/usr/lib \
+   INCLUDEPATH+=`pwd`/../marble/pkg/usr/include \
+
make
 }
 
 package() {
+   cd ${srcdir}/marble
+   make DESTDIR=${pkgdir} install
+
+   # remove conflicts with kdeedu-marble
+   rm -fr ${pkgdir}/usr/{include,share/{appdata,icons}}
+
cd ${srcdir}/${_pkgname}-${pkgver}
make INSTALL_ROOT=${pkgdir} install
 }

Added: install
===
--- install (rev 0)
+++ install 2015-02-05 03:19:32 UTC (rev 127139)
@@ -0,0 +1,11 @@
+post_upgrade() {
+   type gtk-update-icon-cache /dev/null  gtk-update-icon-cache -q -t 
-f usr/share/icons/hicolor
+}
+
+post_install() {
+   post_upgrade
+}
+
+post_remove() {
+   post_upgrade
+}

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2015-01-16 Thread Felix Yan 
Date: Friday, January 16, 2015 @ 09:50:14
  Author: fyan
Revision: 125983

upgpkg: subsurface 4.3-2

rebuild for kdeedu-marble

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-16 05:57:37 UTC (rev 125982)
+++ PKGBUILD2015-01-16 08:50:14 UTC (rev 125983)
@@ -5,7 +5,7 @@
 pkgname=subsurface
 _pkgname=Subsurface
 pkgver=4.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Divelog program'
 url='http://subsurface.hohndel.org/'
 license=('GPL2')

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2014-12-18 Thread Gaetan Bisson 
Date: Thursday, December 18, 2014 @ 12:39:34
  Author: bisson
Revision: 124078

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-12-18 11:18:40 UTC (rev 124077)
+++ PKGBUILD2014-12-18 11:39:34 UTC (rev 124078)
@@ -4,8 +4,8 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.2
-pkgrel=2
+pkgver=4.3
+pkgrel=1
 pkgdesc='Divelog program'
 url='http://subsurface.hohndel.org/'
 license=('GPL2')
@@ -13,7 +13,7 @@
 depends=('qt4' 'kdeedu-marble' 'libzip' 'libxml2' 'libxslt' 'sqlite' 'libusbx'
  'libgit2' 'libdivecomputer')
 source=(http://subsurface.hohndel.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha1sums=('c1ffe749c806eb760582341950800281a8b3dd9c')
+sha1sums=('29f27537ef2ee91234244b0d984ddb30253fc69a')
 
 build() {
cd ${srcdir}/${_pkgname}-${pkgver}

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2014-08-26 Thread Gaetan Bisson 
Date: Wednesday, August 27, 2014 @ 05:14:44
  Author: bisson
Revision: 117939

fix FS#41702

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-27 03:12:26 UTC (rev 117938)
+++ PKGBUILD2014-08-27 03:14:44 UTC (rev 117939)
@@ -5,7 +5,7 @@
 pkgname=subsurface
 _pkgname=Subsurface
 pkgver=4.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Divelog program'
 url='http://subsurface.hohndel.org/'
 license=('GPL2')

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2014-08-08 Thread Gaetan Bisson 
Date: Saturday, August 9, 2014 @ 01:19:18
  Author: bisson
Revision: 117049

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-08 21:12:47 UTC (rev 117048)
+++ PKGBUILD2014-08-08 23:19:18 UTC (rev 117049)
@@ -4,16 +4,16 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.1
-pkgrel=2
+pkgver=4.2
+pkgrel=1
 pkgdesc='Divelog program'
 url='http://subsurface.hohndel.org/'
 license=('GPL2')
 arch=('i686' 'x86_64')
-depends=('qt4' 'kdeedu-marble' 'libzip' 'libxml2' 'libxslt' 'sqlite' 'libusbx' 
'libgit2'
- 'libdivecomputer')
+depends=('qt4' 'kdeedu-marble' 'libzip' 'libxml2' 'libxslt' 'sqlite' 'libusbx'
+ 'libgit2' 'libdivecomputer')
 source=(http://subsurface.hohndel.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha1sums=('906e4279546ae3c6bed937623c77d44af0c9d00b')
+sha1sums=('c1ffe749c806eb760582341950800281a8b3dd9c')
 
 build() {
cd ${srcdir}/${_pkgname}-${pkgver}
@@ -24,4 +24,4 @@
 package() {
cd ${srcdir}/${_pkgname}-${pkgver}
make INSTALL_ROOT=${pkgdir} install
-} 
+}

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2014-06-27 Thread Daniel Micay 
Date: Saturday, June 28, 2014 @ 00:46:31
  Author: thestinger
Revision: 113687

upgpkg: subsurface 4.1-2

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-27 21:37:56 UTC (rev 113686)
+++ PKGBUILD2014-06-27 22:46:31 UTC (rev 113687)
@@ -5,7 +5,7 @@
 pkgname=subsurface
 _pkgname=Subsurface
 pkgver=4.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Divelog program'
 url='http://subsurface.hohndel.org/'
 license=('GPL2')

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2014-05-08 Thread Gaetan Bisson 
Date: Friday, May 9, 2014 @ 00:29:17
  Author: bisson
Revision: 110866

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-08 20:20:17 UTC (rev 110865)
+++ PKGBUILD2014-05-08 22:29:17 UTC (rev 110866)
@@ -4,15 +4,16 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.0.3
-pkgrel=2
+pkgver=4.1
+pkgrel=1
 pkgdesc='Divelog program'
 url='http://subsurface.hohndel.org/'
 license=('GPL2')
 arch=('i686' 'x86_64')
-depends=('qt4' 'kdeedu-marble' 'libzip' 'libxml2' 'libxslt' 'sqlite' 
'libdivecomputer' 'libusbx')
+depends=('qt4' 'kdeedu-marble' 'libzip' 'libxml2' 'libxslt' 'sqlite' 'libusbx' 
'libgit2'
+ 'libdivecomputer')
 source=(http://subsurface.hohndel.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha1sums=('f813196bbef98130b1fcb778baf6b504ec01a1eb')
+sha1sums=('906e4279546ae3c6bed937623c77d44af0c9d00b')
 
 build() {
cd ${srcdir}/${_pkgname}-${pkgver}

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2014-04-29 Thread Gaetan Bisson 
Date: Tuesday, April 29, 2014 @ 22:45:57
  Author: bisson
Revision: 110439

rebuild for libmarblewidget.so

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-04-29 19:43:08 UTC (rev 110438)
+++ PKGBUILD2014-04-29 20:45:57 UTC (rev 110439)
@@ -5,7 +5,7 @@
 pkgname=subsurface
 _pkgname=Subsurface
 pkgver=4.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Divelog program'
 url='http://subsurface.hohndel.org/'
 license=('GPL2')

[arch-commits] Commit in subsurface/trunk (PKGBUILD)

2014-03-23 Thread Gaetan Bisson 
Date: Monday, March 24, 2014 @ 01:56:41
  Author: bisson
Revision: 108146

upstream update

Modified:
  subsurface/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-23 21:02:34 UTC (rev 108145)
+++ PKGBUILD2014-03-24 00:56:41 UTC (rev 108146)
@@ -4,7 +4,7 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.0.2
+pkgver=4.0.3
 pkgrel=1
 pkgdesc='Divelog program'
 url='http://subsurface.hohndel.org/'
@@ -12,7 +12,7 @@
 arch=('i686' 'x86_64')
 depends=('qt4' 'kdeedu-marble' 'libzip' 'libxml2' 'libxslt' 'sqlite' 
'libdivecomputer' 'libusbx')
 source=(http://subsurface.hohndel.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha1sums=('14370c2e91f82a6df32d44e2a0a4b20908c74465')
+sha1sums=('f813196bbef98130b1fcb778baf6b504ec01a1eb')
 
 build() {
cd ${srcdir}/${_pkgname}-${pkgver}