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

[Gaëtan Bisson]

Date: Sunday, June 25, 2017 @ 20:49:11
  Author: bisson
Revision: 240970

Clean qt5-tools dependency...

Modified:
  subsurface-marble/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2017-06-25 20:30:36 UTC (rev 240969)
+++ PKGBUILD2017-06-25 20:49:11 UTC (rev 240970)
@@ -10,8 +10,8 @@
 url='https://git.subsurface-divelog.org/'
 license=('GPL' 'LGPL' 'FDL')
 arch=('i686' 'x86_64')
-makedepends=('cmake')
-depends=('qt5-'{script,svg,tools,webkit} 'marble-data')
+makedepends=('cmake' 'qt5-tools')
+depends=('qt5-'{script,svg,webkit} 'marble-data')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
 sha256sums=('1b4021d4ad197207bd557416c253f0b2b490438307f0379b266354072cbeb18d')
 

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

[Gaëtan Bisson]

Date: Thursday, April 27, 2017 @ 05:16:57
  Author: bisson
Revision: 225892

upstream update

Modified:
  subsurface-marble/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2017-04-27 05:16:54 UTC (rev 225891)
+++ PKGBUILD2017-04-27 05:16:57 UTC (rev 225892)
@@ -4,7 +4,7 @@
 
 pkgname=subsurface-marble
 _pkgname=marble-subsurface-branch
-pkgver=4.6.3
+pkgver=4.6.4
 pkgrel=1
 pkgdesc='Virtual Globe'
 url='https://git.subsurface-divelog.org/'
@@ -13,7 +13,7 @@
 makedepends=('cmake')
 depends=('qt5-'{script,svg,tools,webkit} 'marble-data')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha256sums=('6a3c5ab94f316d7d609b60640df59b1cf9b35ed852d857216b6a3dc5d729c6e2')
+sha256sums=('1b4021d4ad197207bd557416c253f0b2b490438307f0379b266354072cbeb18d')
 
 prepare() {
cd "${srcdir}/${_pkgname}-${pkgver}"

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

[Gaëtan Bisson]

Date: Friday, March 3, 2017 @ 07:53:43
  Author: bisson
Revision: 214625

upstream update

Modified:
  subsurface-marble/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2017-03-03 07:51:31 UTC (rev 214624)
+++ PKGBUILD2017-03-03 07:53:43 UTC (rev 214625)
@@ -4,7 +4,7 @@
 
 pkgname=subsurface-marble
 _pkgname=marble-subsurface-branch
-pkgver=4.6.2
+pkgver=4.6.3
 pkgrel=1
 pkgdesc='Virtual Globe'
 url='https://git.subsurface-divelog.org/'
@@ -13,7 +13,7 @@
 makedepends=('cmake')
 depends=('qt5-'{script,svg,tools,webkit} 'marble-data')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha256sums=('e3c2df82c9616c3b01baffe4710970371b01744b60761cdaf5b8259506455f5b')
+sha256sums=('6a3c5ab94f316d7d609b60640df59b1cf9b35ed852d857216b6a3dc5d729c6e2')
 
 prepare() {
cd "${srcdir}/${_pkgname}-${pkgver}"

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

[Gaëtan Bisson]

Date: Thursday, March 2, 2017 @ 01:00:30
  Author: bisson
Revision: 214409

switch to sha256sum

Modified:
  subsurface-marble/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2017-03-02 01:00:26 UTC (rev 214408)
+++ PKGBUILD2017-03-02 01:00:30 UTC (rev 214409)
@@ -13,7 +13,7 @@
 makedepends=('cmake')
 depends=('qt5-'{script,svg,tools,webkit} 'marble-data')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha1sums=('b58bcbb8598c80d0c524684a4543a2afc4ca0cfd')
+sha256sums=('e3c2df82c9616c3b01baffe4710970371b01744b60761cdaf5b8259506455f5b')
 
 prepare() {
cd "${srcdir}/${_pkgname}-${pkgver}"

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

[Gaëtan Bisson]

Date: Monday, February 20, 2017 @ 08:33:41
  Author: bisson
Revision: 213160

upstream update

Modified:
  subsurface-marble/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2017-02-20 08:24:41 UTC (rev 213159)
+++ PKGBUILD2017-02-20 08:33:41 UTC (rev 213160)
@@ -4,7 +4,7 @@
 
 pkgname=subsurface-marble
 _pkgname=marble-subsurface-branch
-pkgver=4.6.1
+pkgver=4.6.2
 pkgrel=1
 pkgdesc='Virtual Globe'
 url='https://git.subsurface-divelog.org/'
@@ -13,7 +13,7 @@
 makedepends=('cmake')
 depends=('qt5-'{script,svg,tools,webkit} 'marble-data')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha1sums=('a21caaac617f602cb71cf0f62842c912e4ca1cc8')
+sha1sums=('b58bcbb8598c80d0c524684a4543a2afc4ca0cfd')
 
 prepare() {
cd "${srcdir}/${_pkgname}-${pkgver}"

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

[Gaëtan Bisson]

Date: Monday, February 13, 2017 @ 10:59:04
  Author: bisson
Revision: 212103

upstream update

Modified:
  subsurface-marble/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2017-02-13 10:57:37 UTC (rev 212102)
+++ PKGBUILD2017-02-13 10:59:04 UTC (rev 212103)
@@ -4,7 +4,7 @@
 
 pkgname=subsurface-marble
 _pkgname=marble-subsurface-branch
-pkgver=4.6.0
+pkgver=4.6.1
 pkgrel=1
 pkgdesc='Virtual Globe'
 url='https://git.subsurface-divelog.org/'
@@ -13,8 +13,13 @@
 makedepends=('cmake')
 depends=('qt5-'{script,svg,tools,webkit} 'marble-data')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha1sums=('52c107eef0b8e7686c96df9557c36849d5ff8871')
+sha1sums=('a21caaac617f602cb71cf0f62842c912e4ca1cc8')
 
+prepare() {
+   cd "${srcdir}/${_pkgname}-${pkgver}"
+   sed '/

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

[Gaëtan Bisson]

Date: Monday, January 16, 2017 @ 09:08:37
  Author: bisson
Revision: 207581

upstream update

Modified:
  subsurface-marble/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2017-01-16 09:08:09 UTC (rev 207580)
+++ PKGBUILD2017-01-16 09:08:37 UTC (rev 207581)
@@ -4,7 +4,7 @@
 
 pkgname=subsurface-marble
 _pkgname=marble-subsurface-branch
-pkgver=4.5.6
+pkgver=4.6.0
 pkgrel=1
 pkgdesc='Virtual Globe'
 url='https://git.subsurface-divelog.org/'
@@ -13,7 +13,7 @@
 makedepends=('cmake')
 depends=('qt5-'{script,svg,tools,webkit} 'marble-data')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha1sums=('2112aeaf4562dc29bb942f18faea894544a3a6d8')
+sha1sums=('52c107eef0b8e7686c96df9557c36849d5ff8871')
 
 build() {
cd "${srcdir}/${_pkgname}-${pkgver}"

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

[Gaëtan Bisson]

Date: Tuesday, November 1, 2016 @ 22:10:11
  Author: bisson
Revision: 194302

add https

Modified:
  subsurface-marble/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2016-11-01 22:10:07 UTC (rev 194301)
+++ PKGBUILD2016-11-01 22:10:11 UTC (rev 194302)
@@ -7,12 +7,12 @@
 pkgver=4.5.6
 pkgrel=1
 pkgdesc='Virtual Globe'
-url='http://git.subsurface-divelog.org/'
+url='https://git.subsurface-divelog.org/'
 license=('GPL' 'LGPL' 'FDL')
 arch=('i686' 'x86_64')
 makedepends=('cmake')
 depends=('qt5-'{script,svg,tools,webkit} 'marble-data')
-source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
+source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
 sha1sums=('2112aeaf4562dc29bb942f18faea894544a3a6d8')
 
 build() {

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

[Gaetan Bisson]

Date: Tuesday, April 26, 2016 @ 19:38:45
  Author: bisson
Revision: 171918

upstream update

Modified:
  subsurface-marble/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2016-04-26 17:26:11 UTC (rev 171917)
+++ PKGBUILD2016-04-26 17:38:45 UTC (rev 171918)
@@ -4,7 +4,7 @@
 
 pkgname=subsurface-marble
 _pkgname=marble-subsurface-branch
-pkgver=4.5.5
+pkgver=4.5.6
 pkgrel=1
 pkgdesc='Virtual Globe'
 url='http://git.subsurface-divelog.org/'
@@ -13,7 +13,7 @@
 makedepends=('cmake')
 depends=('qt5-'{script,svg,tools,webkit} 'marble-data')
 source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha1sums=('6f166303218066ac19bf74afa5905fd8c61ad619')
+sha1sums=('2112aeaf4562dc29bb942f18faea894544a3a6d8')
 
 build() {
cd "${srcdir}/${_pkgname}-${pkgver}"

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

[Gaetan Bisson]

Date: Monday, April 11, 2016 @ 20:53:25
  Author: bisson
Revision: 170537

upstream update

Modified:
  subsurface-marble/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2016-04-11 18:41:46 UTC (rev 170536)
+++ PKGBUILD2016-04-11 18:53:25 UTC (rev 170537)
@@ -4,7 +4,7 @@
 
 pkgname=subsurface-marble
 _pkgname=marble-subsurface-branch
-pkgver=4.5.4
+pkgver=4.5.5
 pkgrel=1
 pkgdesc='Virtual Globe'
 url='http://git.subsurface-divelog.org/'
@@ -13,7 +13,7 @@
 makedepends=('cmake')
 depends=('qt5-'{script,svg,tools,webkit} 'marble-data')
 source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha1sums=('a244fd261c087bd96d6d96d474fcf824f13323eb')
+sha1sums=('6f166303218066ac19bf74afa5905fd8c61ad619')
 
 build() {
cd "${srcdir}/${_pkgname}-${pkgver}"

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

[Gaetan Bisson]

Date: Tuesday, March 22, 2016 @ 18:29:19
  Author: bisson
Revision: 167922

upstream update

Modified:
  subsurface-marble/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2016-03-22 16:27:24 UTC (rev 167921)
+++ PKGBUILD2016-03-22 17:29:19 UTC (rev 167922)
@@ -4,7 +4,7 @@
 
 pkgname=subsurface-marble
 _pkgname=marble-subsurface-branch
-pkgver=4.5.3
+pkgver=4.5.4
 pkgrel=1
 pkgdesc='Virtual Globe'
 url='http://git.subsurface-divelog.org/'
@@ -13,7 +13,7 @@
 makedepends=('cmake')
 depends=('qt5-'{script,svg,tools,webkit} 'marble-data')
 source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha1sums=('77e562c5f7b28e4fef5bba788183c616c8f505fe')
+sha1sums=('a244fd261c087bd96d6d96d474fcf824f13323eb')
 
 build() {
cd "${srcdir}/${_pkgname}-${pkgver}"

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

[Gaetan Bisson]

Date: Friday, December 18, 2015 @ 16:40:15
  Author: bisson
Revision: 153664

upstream update

Modified:
  subsurface-marble/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2015-12-18 15:39:55 UTC (rev 153663)
+++ PKGBUILD2015-12-18 15:40:15 UTC (rev 153664)
@@ -4,8 +4,8 @@
 
 pkgname=subsurface-marble
 _pkgname=marble-subsurface-branch
-pkgver=4.5.2
-pkgrel=2
+pkgver=4.5.3
+pkgrel=1
 pkgdesc='Virtual Globe'
 url='http://git.subsurface-divelog.org/'
 license=('GPL' 'LGPL' 'FDL')
@@ -13,7 +13,7 @@
 makedepends=('cmake')
 depends=('qt5-'{script,svg,tools,webkit} 'marble-data')
 source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha1sums=('949a4b312f95b474171d08fc4e41df04766d1199')
+sha1sums=('77e562c5f7b28e4fef5bba788183c616c8f505fe')
 
 build() {
cd "${srcdir}/${_pkgname}-${pkgver}"

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

[Bartłomiej Piotrowski]

Date: Tuesday, December 8, 2015 @ 15:28:37
  Author: bpiotrowski
Revision: 150329

C++11 ABI rebuild

Modified:
  subsurface-marble/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2015-12-08 14:23:13 UTC (rev 150328)
+++ PKGBUILD2015-12-08 14:28:37 UTC (rev 150329)
@@ -5,7 +5,7 @@
 pkgname=subsurface-marble
 _pkgname=marble-subsurface-branch
 pkgver=4.5.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Virtual Globe'
 url='http://git.subsurface-divelog.org/'
 license=('GPL' 'LGPL' 'FDL')

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

[Gaetan Bisson]

Date: Sunday, November 8, 2015 @ 06:56:48
  Author: bisson
Revision: 146388

upstream update

Modified:
  subsurface-marble/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2015-11-08 05:31:49 UTC (rev 146387)
+++ PKGBUILD2015-11-08 05:56:48 UTC (rev 146388)
@@ -4,8 +4,8 @@
 
 pkgname=subsurface-marble
 _pkgname=marble-subsurface-branch
-pkgver=4.5.0
-pkgrel=2
+pkgver=4.5.2
+pkgrel=1
 pkgdesc='Virtual Globe'
 url='http://git.subsurface-divelog.org/'
 license=('GPL' 'LGPL' 'FDL')
@@ -13,7 +13,7 @@
 makedepends=('cmake')
 depends=('qt5-'{script,svg,tools,webkit} 'marble-data')
 source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha1sums=('492a2a9b3afacc6e36be15721cfaa103710fd4e3')
+sha1sums=('949a4b312f95b474171d08fc4e41df04766d1199')
 
 build() {
cd "${srcdir}/${_pkgname}-${pkgver}"

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

[Gaetan Bisson]

Date: Thursday, October 15, 2015 @ 18:44:53
  Author: bisson
Revision: 144181

fix FS#46728

Modified:
  subsurface-marble/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2015-10-15 16:34:20 UTC (rev 144180)
+++ PKGBUILD2015-10-15 16:44:53 UTC (rev 144181)
@@ -5,7 +5,7 @@
 pkgname=subsurface-marble
 _pkgname=marble-subsurface-branch
 pkgver=4.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Virtual Globe'
 url='http://git.subsurface-divelog.org/'
 license=('GPL' 'LGPL' 'FDL')
@@ -45,4 +45,7 @@
# Provided by marble-data, avoids conflicts.
rm share/marble/cmake/FindMarble.cmake
rm -fr share/marble/data
+
+   # Conflicts with libastro
+   rm lib/libastro.so{,.1,.0.17.20}
 }

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

[Gaetan Bisson]

Date: Wednesday, October 14, 2015 @ 21:38:11
  Author: bisson
Revision: 144001

upstream update

Modified:
  subsurface-marble/trunk/PKGBUILD

--+
 PKGBUILD |   22 --
 1 file changed, 8 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-14 19:20:05 UTC (rev 144000)
+++ PKGBUILD2015-10-14 19:38:11 UTC (rev 144001)
@@ -3,26 +3,20 @@
 # Maintainer: Gaetan Bisson 
 
 pkgname=subsurface-marble
-pkgver=4.4.1
-pkgrel=3
+_pkgname=marble-subsurface-branch
+pkgver=4.5.0
+pkgrel=1
 pkgdesc='Virtual Globe'
 url='http://git.subsurface-divelog.org/'
 license=('GPL' 'LGPL' 'FDL')
 arch=('i686' 'x86_64')
-makedepends=('cmake')
+makedepends=('cmake' 'git')
 depends=('qt5-'{script,svg,tools,webkit} 'marble-data')
-source=("http://subsurface-divelog.org/downloads/${pkgname}-${pkgver}.tgz;
-'qt55.patch')
-sha1sums=('4867a8219cd2dcf478414ad91ff4479ad2afc1a3'
-  'ae862f9a740b4ccffb7a20f7c3711798e90cec14')
+source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
+sha1sums=('492a2a9b3afacc6e36be15721cfaa103710fd4e3')
 
-prepare() {
-   cd "${srcdir}/${pkgname}"
-   patch -p1 -i ../qt55.patch
-}
-
 build() {
-   cd "${srcdir}/${pkgname}"
+   cd "${srcdir}/${_pkgname}-${pkgver}"
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
@@ -39,7 +33,7 @@
 }
 
 package() {
-   cd "${srcdir}/${pkgname}"
+   cd "${srcdir}/${_pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
 
cd "${pkgdir}/usr"

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

[Gaetan Bisson]

Date: Thursday, October 15, 2015 @ 04:41:44
  Author: bisson
Revision: 144017

remove unneeded dependency

Modified:
  subsurface-marble/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2015-10-15 02:38:45 UTC (rev 144016)
+++ PKGBUILD2015-10-15 02:41:44 UTC (rev 144017)
@@ -10,7 +10,7 @@
 url='http://git.subsurface-divelog.org/'
 license=('GPL' 'LGPL' 'FDL')
 arch=('i686' 'x86_64')
-makedepends=('cmake' 'git')
+makedepends=('cmake')
 depends=('qt5-'{script,svg,tools,webkit} 'marble-data')
 source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
 sha1sums=('492a2a9b3afacc6e36be15721cfaa103710fd4e3')

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

[Gaetan Bisson]

Date: Tuesday, August 25, 2015 @ 04:24:30
  Author: bisson
Revision: 138740

fix cmake file conflict with marble

Modified:
  subsurface-marble/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2015-08-25 02:23:53 UTC (rev 138739)
+++ PKGBUILD2015-08-25 02:24:30 UTC (rev 138740)
@@ -4,7 +4,7 @@
 
 pkgname=subsurface-marble
 pkgver=4.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Virtual Globe'
 url='http://git.subsurface-divelog.org/'
 license=('GPL' 'LGPL' 'FDL')
@@ -49,5 +49,6 @@
 rm -fr share/{appdata,icons}
 
# Provided by marble-data, avoids conflicts.
+   rm share/marble/cmake/FindMarble.cmake
rm -fr share/marble/data
 }

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

[Gaetan Bisson]

Date: Tuesday, August 25, 2015 @ 03:37:28
  Author: bisson
Revision: 138737

fix build with qt-5.5, fix FS#46098

Added:
  subsurface-marble/trunk/qt55.patch
Modified:
  subsurface-marble/trunk/PKGBUILD

+
 PKGBUILD   |   18 ++-
 qt55.patch |  298 +++
 2 files changed, 312 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-08-24 22:56:17 UTC (rev 138736)
+++ PKGBUILD2015-08-25 01:37:28 UTC (rev 138737)
@@ -4,16 +4,23 @@
 
 pkgname=subsurface-marble
 pkgver=4.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Virtual Globe'
 url='http://git.subsurface-divelog.org/'
 license=('GPL' 'LGPL' 'FDL')
 arch=('i686' 'x86_64')
 makedepends=('cmake')
-depends=('qt5-'{script,svg,tools,webkit})
-source=(http://subsurface-divelog.org/downloads/${pkgname}-${pkgver}.tgz;)
-sha1sums=('4867a8219cd2dcf478414ad91ff4479ad2afc1a3')
+depends=('qt5-'{script,svg,tools,webkit} 'marble-data')
+source=(http://subsurface-divelog.org/downloads/${pkgname}-${pkgver}.tgz;
+'qt55.patch')
+sha1sums=('4867a8219cd2dcf478414ad91ff4479ad2afc1a3'
+  'ae862f9a740b4ccffb7a20f7c3711798e90cec14')
 
+prepare() {
+   cd ${srcdir}/${pkgname}
+   patch -p1 -i ../qt55.patch
+}
+
 build() {
cd ${srcdir}/${pkgname}
cmake \
@@ -40,4 +47,7 @@
install -d include
mv subsurface include
 rm -fr share/{appdata,icons}
+
+   # Provided by marble-data, avoids conflicts.
+   rm -fr share/marble/data
 }

Added: qt55.patch
===
--- qt55.patch  (rev 0)
+++ qt55.patch  2015-08-25 01:37:28 UTC (rev 138737)
@@ -0,0 +1,298 @@
+From: Anke Boersma d...@kaosx.us
+Date: Sun, 28 Jun 2015 15:46:06 + (+0200)
+Subject: Fix compilation with Qt 5.5
+X-Git-Url: 
http://git.subsurface-divelog.org/?p=marble.git;a=commitdiff_plain;h=11c7e96e96c11ae24a485ce34f95925365acc4f4
+
+Fix compilation with Qt 5.5
+
+(cherry picked from commit 92748d6ad115879b38fc3034a0c244b594ca3ba9)
+---
+
+diff --git a/src/lib/marble/DiscCache.cpp b/src/lib/marble/DiscCache.cpp
+index d6199e6..c7bcc0d 100644
+--- a/src/lib/marble/DiscCache.cpp
 b/src/lib/marble/DiscCache.cpp
+@@ -16,6 +16,7 @@
+ #include QtGlobal
+ #include QFile
+ #include QDirIterator
++#include QDataStream
+ 
+ using namespace Marble;
+ 
+diff --git a/src/lib/marble/geodata/data/GeoDataCoordinates.cpp 
b/src/lib/marble/geodata/data/GeoDataCoordinates.cpp
+index 94cda07..d1616fe 100644
+--- a/src/lib/marble/geodata/data/GeoDataCoordinates.cpp
 b/src/lib/marble/geodata/data/GeoDataCoordinates.cpp
+@@ -23,6 +23,7 @@
+ #include QStringList
+ #include QCoreApplication
+ #include QAtomicInt
++#include QDataStream
+ 
+ #include MarbleGlobal.h
+ #include MarbleDebug.h
+diff --git a/src/lib/marble/geodata/data/GeoDataGeometry.cpp 
b/src/lib/marble/geodata/data/GeoDataGeometry.cpp
+index d0206ee..527ba4f 100644
+--- a/src/lib/marble/geodata/data/GeoDataGeometry.cpp
 b/src/lib/marble/geodata/data/GeoDataGeometry.cpp
+@@ -21,6 +21,8 @@
+ 
+ #include MarbleDebug.h
+ 
++#include QDataStream
++
+ 
+ namespace Marble
+ {
+diff --git a/src/lib/marble/geodata/data/GeoDataLabelStyle.cpp 
b/src/lib/marble/geodata/data/GeoDataLabelStyle.cpp
+index 1ec0c78..eb96091 100644
+--- a/src/lib/marble/geodata/data/GeoDataLabelStyle.cpp
 b/src/lib/marble/geodata/data/GeoDataLabelStyle.cpp
+@@ -12,6 +12,7 @@
+ #include GeoDataLabelStyle.h
+ 
+ #include QFont
++#include QDataStream
+ 
+ #include GeoDataTypes.h
+ 
+diff --git a/src/lib/marble/geodata/data/GeoDataLatLonAltBox.cpp 
b/src/lib/marble/geodata/data/GeoDataLatLonAltBox.cpp
+index f0bbe6b..54a25bc 100644
+--- a/src/lib/marble/geodata/data/GeoDataLatLonAltBox.cpp
 b/src/lib/marble/geodata/data/GeoDataLatLonAltBox.cpp
+@@ -18,6 +18,8 @@
+ 
+ #include GeoDataTypes.h
+ 
++#include QDataStream
++
+ namespace Marble
+ {
+ 
+diff --git a/src/lib/marble/geodata/data/GeoDataLatLonBox.cpp 
b/src/lib/marble/geodata/data/GeoDataLatLonBox.cpp
+index 5dd7834..ac2c635 100644
+--- a/src/lib/marble/geodata/data/GeoDataLatLonBox.cpp
 b/src/lib/marble/geodata/data/GeoDataLatLonBox.cpp
+@@ -18,6 +18,8 @@
+ 
+ #include GeoDataTypes.h
+ 
++#include QDataStream
++
+ namespace Marble
+ {
+ 
+diff --git a/src/lib/marble/geodata/data/GeoDataLineString.cpp 
b/src/lib/marble/geodata/data/GeoDataLineString.cpp
+index 8864518..e210f60 100644
+--- a/src/lib/marble/geodata/data/GeoDataLineString.cpp
 b/src/lib/marble/geodata/data/GeoDataLineString.cpp
+@@ -18,6 +18,8 @@
+ #include Quaternion.h
+ #include MarbleDebug.h
+ 
++#include QDataStream
++
+ 
+ namespace Marble
+ {
+diff --git a/src/lib/marble/geodata/data/GeoDataLineStyle.cpp 
b/src/lib/marble/geodata/data/GeoDataLineStyle.cpp
+index 2e54493..e2817d2 100644
+--- a/src/lib/marble/geodata/data/GeoDataLineStyle.cpp
 

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

[Gaetan Bisson]

Date: Sunday, February 22, 2015 @ 06:30:16
  Author: bisson
Revision: 128099

update upstream source

Modified:
  subsurface-marble/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2015-02-22 05:24:34 UTC (rev 128098)
+++ PKGBUILD2015-02-22 05:30:16 UTC (rev 128099)
@@ -3,7 +3,6 @@
 # Maintainer: Gaetan Bisson bis...@archlinux.org
 
 pkgname=subsurface-marble
-_pkgname=marble
 pkgver=4.4.1
 pkgrel=1
 pkgdesc='Virtual Globe'
@@ -12,11 +11,11 @@
 arch=('i686' 'x86_64')
 makedepends=('git' 'cmake')
 depends=('qt5-'{script,svg,tools,webkit})
-source=('git://git.subsurface-divelog.org/marble#commit=aa18d0af6951debf3a3a90916f3f772784dbf326')
-sha1sums=('SKIP')
+source=(http://subsurface-divelog.org/downloads/${pkgname}-${pkgver}.tgz;)
+sha1sums=('4867a8219cd2dcf478414ad91ff4479ad2afc1a3')
 
 build() {
-   cd ${srcdir}/${_pkgname}
+   cd ${srcdir}/${pkgname}
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
@@ -33,7 +32,7 @@
 }
 
 package() {
-   cd ${srcdir}/${_pkgname}
+   cd ${srcdir}/${pkgname}
make DESTDIR=${pkgdir} install
 
cd ${pkgdir}/usr

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

[Gaetan Bisson]

Date: Sunday, February 22, 2015 @ 06:32:19
  Author: bisson
Revision: 128100

remove git makedep

Modified:
  subsurface-marble/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2015-02-22 05:30:16 UTC (rev 128099)
+++ PKGBUILD2015-02-22 05:32:19 UTC (rev 128100)
@@ -9,7 +9,7 @@
 url='http://git.subsurface-divelog.org/'
 license=('GPL' 'LGPL' 'FDL')
 arch=('i686' 'x86_64')
-makedepends=('git' 'cmake')
+makedepends=('cmake')
 depends=('qt5-'{script,svg,tools,webkit})
 source=(http://subsurface-divelog.org/downloads/${pkgname}-${pkgver}.tgz;)
 sha1sums=('4867a8219cd2dcf478414ad91ff4479ad2afc1a3')

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

[Gaetan Bisson]

Date: Saturday, February 21, 2015 @ 07:21:37
  Author: bisson
Revision: 128057

first release

Modified:
  subsurface-marble/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2015-02-21 06:21:22 UTC (rev 128056)
+++ PKGBUILD2015-02-21 06:21:37 UTC (rev 128057)
@@ -36,6 +36,9 @@
cd ${srcdir}/${_pkgname}
make DESTDIR=${pkgdir} install
 
-   # remove conflicts with kdeedu-marble
-rm -fr ${pkgdir}/usr/{include,share/{appdata,icons}}
+   cd ${pkgdir}/usr
+   mv include subsurface
+   install -d include
+   mv subsurface include
+rm -fr share/{appdata,icons}
 }