subject:"\[arch\-commits\] Commit in subsurface\/repos \(8 files\)"

[arch-commits] Commit in subsurface/repos (8 files)

2016-03-22 Thread Gaetan Bisson

Date: Tuesday, March 22, 2016 @ 22:58:52
  Author: bisson
Revision: 167944

db-move: moved subsurface from [community-staging] to [community-testing] 
(i686, x86_64)

Added:
  subsurface/repos/community-testing-i686/
  subsurface/repos/community-testing-i686/PKGBUILD
(from rev 167943, subsurface/repos/community-staging-i686/PKGBUILD)
  subsurface/repos/community-testing-i686/install
(from rev 167943, subsurface/repos/community-staging-i686/install)
  subsurface/repos/community-testing-x86_64/
  subsurface/repos/community-testing-x86_64/PKGBUILD
(from rev 167943, subsurface/repos/community-staging-x86_64/PKGBUILD)
  subsurface/repos/community-testing-x86_64/install
(from rev 167943, subsurface/repos/community-staging-x86_64/install)
Deleted:
  subsurface/repos/community-staging-i686/
  subsurface/repos/community-staging-x86_64/

---+
 community-testing-i686/PKGBUILD   |   41 
 community-testing-i686/install|   11 +
 community-testing-x86_64/PKGBUILD |   41 
 community-testing-x86_64/install  |   11 +
 4 files changed, 104 insertions(+)

Copied: subsurface/repos/community-testing-i686/PKGBUILD (from rev 167943, 
subsurface/repos/community-staging-i686/PKGBUILD)
===
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2016-03-22 21:58:52 UTC (rev 167944)
@@ -0,0 +1,41 @@
+# $Id$
+# Contributor: Francois Boulogne 
+# Maintainer: Gaetan Bisson 
+
+pkgname=subsurface
+_pkgname=Subsurface
+pkgver=4.5.4
+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'
+ 'qt5-connectivity' 'grantlee-qt5')
+source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
+sha1sums=('e4ff548171b0a317a1f3f762bde2f62fd2152088')
+
+install=install
+
+prepare() {
+   cd "${srcdir}/${_pkgname}-${pkgver}"
+   sed 's:
+
+pkgname=subsurface
+_pkgname=Subsurface
+pkgver=4.5.4
+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'
+ 'qt5-connectivity' 'grantlee-qt5')
+source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
+sha1sums=('e4ff548171b0a317a1f3f762bde2f62fd2152088')
+
+install=install
+
+prepare() {
+   cd "${srcdir}/${_pkgname}-${pkgver}"
+   sed 's:

[arch-commits] Commit in subsurface/repos (8 files)

2015-12-18 Thread Gaetan Bisson

Date: Friday, December 18, 2015 @ 16:59:15
  Author: bisson
Revision: 153670

db-move: moved subsurface from [community-staging] to [community-testing] 
(i686, x86_64)

Added:
  subsurface/repos/community-testing-i686/
  subsurface/repos/community-testing-i686/PKGBUILD
(from rev 153669, subsurface/repos/community-staging-i686/PKGBUILD)
  subsurface/repos/community-testing-i686/install
(from rev 153669, subsurface/repos/community-staging-i686/install)
  subsurface/repos/community-testing-x86_64/
  subsurface/repos/community-testing-x86_64/PKGBUILD
(from rev 153669, subsurface/repos/community-staging-x86_64/PKGBUILD)
  subsurface/repos/community-testing-x86_64/install
(from rev 153669, subsurface/repos/community-staging-x86_64/install)
Deleted:
  subsurface/repos/community-staging-i686/
  subsurface/repos/community-staging-x86_64/

---+
 community-testing-i686/PKGBUILD   |   41 
 community-testing-i686/install|   11 +
 community-testing-x86_64/PKGBUILD |   41 
 community-testing-x86_64/install  |   11 +
 4 files changed, 104 insertions(+)

Copied: subsurface/repos/community-testing-i686/PKGBUILD (from rev 153669, 
subsurface/repos/community-staging-i686/PKGBUILD)
===
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2015-12-18 15:59:15 UTC (rev 153670)
@@ -0,0 +1,41 @@
+# $Id$
+# Contributor: Francois Boulogne 
+# Maintainer: Gaetan Bisson 
+
+pkgname=subsurface
+_pkgname=Subsurface
+pkgver=4.5.3
+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'
+ 'qt5-connectivity' 'grantlee-qt5')
+source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
+sha1sums=('46981e8ecf4c51094851ee089f4725c3c0f47b62')
+
+install=install
+
+prepare() {
+   cd "${srcdir}/${_pkgname}-${pkgver}"
+   sed 's:
+
+pkgname=subsurface
+_pkgname=Subsurface
+pkgver=4.5.3
+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'
+ 'qt5-connectivity' 'grantlee-qt5')
+source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
+sha1sums=('46981e8ecf4c51094851ee089f4725c3c0f47b62')
+
+install=install
+
+prepare() {
+   cd "${srcdir}/${_pkgname}-${pkgver}"
+   sed 's:

[arch-commits] Commit in subsurface/repos (8 files)

2015-10-27 Thread Gaetan Bisson

Date: Tuesday, October 27, 2015 @ 18:07:23
  Author: bisson
Revision: 145134

archrelease: copy trunk to community-i686, community-x86_64

Added:
  subsurface/repos/community-i686/PKGBUILD
(from rev 145133, subsurface/trunk/PKGBUILD)
  subsurface/repos/community-i686/install
(from rev 145133, subsurface/trunk/install)
  subsurface/repos/community-x86_64/PKGBUILD
(from rev 145133, subsurface/trunk/PKGBUILD)
  subsurface/repos/community-x86_64/install
(from rev 145133, subsurface/trunk/install)
Deleted:
  subsurface/repos/community-i686/PKGBUILD
  subsurface/repos/community-i686/install
  subsurface/repos/community-x86_64/PKGBUILD
  subsurface/repos/community-x86_64/install

---+
 /PKGBUILD |   82 
 /install  |   22 +++
 community-i686/PKGBUILD   |   41 --
 community-i686/install|   11 -
 community-x86_64/PKGBUILD |   41 --
 community-x86_64/install  |   11 -
 6 files changed, 104 insertions(+), 104 deletions(-)

Deleted: community-i686/PKGBUILD
===
--- community-i686/PKGBUILD 2015-10-27 17:06:42 UTC (rev 145133)
+++ community-i686/PKGBUILD 2015-10-27 17:07:23 UTC (rev 145134)
@@ -1,41 +0,0 @@
-# $Id$
-# Contributor: Francois Boulogne 
-# Maintainer: Gaetan Bisson 
-
-pkgname=subsurface
-_pkgname=Subsurface
-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'
- 'qt5-connectivity' 'grantlee-qt5')
-source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha1sums=('1e5e72076d329b8283d4871609af080b787c71f1')
-
-install=install
-
-prepare() {
-   cd "${srcdir}/${_pkgname}-${pkgver}"
-   sed 's:
+
+pkgname=subsurface
+_pkgname=Subsurface
+pkgver=4.5.1
+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'
+ 'qt5-connectivity' 'grantlee-qt5')
+source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
+sha1sums=('a595c479d67fce28c4fbe19b4e85e93c8e11fc12')
+
+install=install
+
+prepare() {
+   cd "${srcdir}/${_pkgname}-${pkgver}"
+   sed 's:/dev/null && gtk-update-icon-cache -q -t 
-f usr/share/icons/hicolor
+}
+
+post_install() {
+   post_upgrade
+}
+
+post_remove() {
+   post_upgrade
+}

Deleted: community-x86_64/PKGBUILD
===
--- community-x86_64/PKGBUILD   2015-10-27 17:06:42 UTC (rev 145133)
+++ community-x86_64/PKGBUILD   2015-10-27 17:07:23 UTC (rev 145134)
@@ -1,41 +0,0 @@
-# $Id$
-# Contributor: Francois Boulogne 
-# Maintainer: Gaetan Bisson 
-
-pkgname=subsurface
-_pkgname=Subsurface
-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'
- 'qt5-connectivity' 'grantlee-qt5')
-source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
-sha1sums=('1e5e72076d329b8283d4871609af080b787c71f1')
-
-install=install
-
-prepare() {
-   cd "${srcdir}/${_pkgname}-${pkgver}"
-   sed 's:
+
+pkgname=subsurface
+_pkgname=Subsurface
+pkgver=4.5.1
+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'
+ 'qt5-connectivity' 'grantlee-qt5')
+source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
+sha1sums=('a595c479d67fce28c4fbe19b4e85e93c8e11fc12')
+
+install=install
+
+prepare() {
+   cd "${srcdir}/${_pkgname}-${pkgver}"
+

[arch-commits] Commit in subsurface/repos (8 files)

2015-08-28 Thread Gaetan Bisson

Date: Saturday, August 29, 2015 @ 03:53:45
  Author: bisson
Revision: 138908

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  subsurface/repos/staging-i686/
  subsurface/repos/staging-i686/PKGBUILD
(from rev 138907, subsurface/trunk/PKGBUILD)
  subsurface/repos/staging-i686/install
(from rev 138907, subsurface/trunk/install)
  subsurface/repos/staging-i686/libgit2.patch
(from rev 138907, subsurface/trunk/libgit2.patch)
  subsurface/repos/staging-x86_64/
  subsurface/repos/staging-x86_64/PKGBUILD
(from rev 138907, subsurface/trunk/PKGBUILD)
  subsurface/repos/staging-x86_64/install
(from rev 138907, subsurface/trunk/install)
  subsurface/repos/staging-x86_64/libgit2.patch
(from rev 138907, subsurface/trunk/libgit2.patch)

--+
 staging-i686/PKGBUILD|   40 
 staging-i686/install |   11 +++
 staging-i686/libgit2.patch   |   19 +++
 staging-x86_64/PKGBUILD  |   40 
 staging-x86_64/install   |   11 +++
 staging-x86_64/libgit2.patch |   19 +++
 6 files changed, 140 insertions(+)

Copied: subsurface/repos/staging-i686/PKGBUILD (from rev 138907, 
subsurface/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2015-08-29 01:53:45 UTC (rev 138908)
@@ -0,0 +1,40 @@
+# $Id$
+# Contributor: Francois Boulogne fboulogne at april dot org
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+
+pkgname=subsurface
+_pkgname=Subsurface
+pkgver=4.4.2
+pkgrel=2
+pkgdesc='Divelog program'
+url='http://subsurface-divelog.org/'
+license=('GPL2')
+arch=('i686' 'x86_64')
+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')
+
+install=install
+
+prepare() {
+   cd ${srcdir}/${_pkgname}-${pkgver}
+   patch -p1 -i ../libgit2.patch
+}
+
+build() {
+   cd ${srcdir}/${_pkgname}-${pkgver}
+   qmake-qt5 \
+   -config release \
+   SPECIAL_MARBLE_PREFIX=1 \
+   INCLUDEPATH+='/usr/include/subsurface' \
+
+   make
+}
+
+package() {
+   cd ${srcdir}/${_pkgname}-${pkgver}
+   make INSTALL_ROOT=${pkgdir} install
+}

Copied: subsurface/repos/staging-i686/install (from rev 138907, 
subsurface/trunk/install)
===
--- staging-i686/install(rev 0)
+++ staging-i686/install2015-08-29 01:53:45 UTC (rev 138908)
@@ -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
+}

Copied: subsurface/repos/staging-i686/libgit2.patch (from rev 138907, 
subsurface/trunk/libgit2.patch)
===
--- staging-i686/libgit2.patch  (rev 0)
+++ staging-i686/libgit2.patch  2015-08-29 01:53:45 UTC (rev 138908)
@@ -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)
+ 

Copied: subsurface/repos/staging-x86_64/PKGBUILD (from rev 138907, 
subsurface/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2015-08-29 01:53:45 UTC (rev 138908)
@@ -0,0 +1,40 @@
+# $Id$
+# Contributor: Francois Boulogne fboulogne at april dot org
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+
+pkgname=subsurface
+_pkgname=Subsurface
+pkgver=4.4.2
+pkgrel=2
+pkgdesc='Divelog program'
+url='http://subsurface-divelog.org/'
+license=('GPL2')
+arch=('i686' 'x86_64')
+depends=('libzip' 'libxml2' 'libxslt' 'sqlite' 'libusb' 'libgit2'

[arch-commits] Commit in subsurface/repos (8 files)

2015-08-28 Thread Gaetan Bisson

Date: Saturday, August 29, 2015 @ 04:02:14
  Author: bisson
Revision: 138909

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  subsurface/repos/community-staging-i686/
  subsurface/repos/community-staging-i686/PKGBUILD
(from rev 138908, subsurface/trunk/PKGBUILD)
  subsurface/repos/community-staging-i686/install
(from rev 138908, subsurface/trunk/install)
  subsurface/repos/community-staging-i686/libgit2.patch
(from rev 138908, subsurface/trunk/libgit2.patch)
  subsurface/repos/community-staging-x86_64/
  subsurface/repos/community-staging-x86_64/PKGBUILD
(from rev 138908, subsurface/trunk/PKGBUILD)
  subsurface/repos/community-staging-x86_64/install
(from rev 138908, subsurface/trunk/install)
  subsurface/repos/community-staging-x86_64/libgit2.patch
(from rev 138908, subsurface/trunk/libgit2.patch)

+
 community-staging-i686/PKGBUILD|   40 +++
 community-staging-i686/install |   11 
 community-staging-i686/libgit2.patch   |   19 ++
 community-staging-x86_64/PKGBUILD  |   40 +++
 community-staging-x86_64/install   |   11 
 community-staging-x86_64/libgit2.patch |   19 ++
 6 files changed, 140 insertions(+)

Copied: subsurface/repos/community-staging-i686/PKGBUILD (from rev 138908, 
subsurface/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-08-29 02:02:14 UTC (rev 138909)
@@ -0,0 +1,40 @@
+# $Id$
+# Contributor: Francois Boulogne fboulogne at april dot org
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+
+pkgname=subsurface
+_pkgname=Subsurface
+pkgver=4.4.2
+pkgrel=2
+pkgdesc='Divelog program'
+url='http://subsurface-divelog.org/'
+license=('GPL2')
+arch=('i686' 'x86_64')
+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')
+
+install=install
+
+prepare() {
+   cd ${srcdir}/${_pkgname}-${pkgver}
+   patch -p1 -i ../libgit2.patch
+}
+
+build() {
+   cd ${srcdir}/${_pkgname}-${pkgver}
+   qmake-qt5 \
+   -config release \
+   SPECIAL_MARBLE_PREFIX=1 \
+   INCLUDEPATH+='/usr/include/subsurface' \
+
+   make
+}
+
+package() {
+   cd ${srcdir}/${_pkgname}-${pkgver}
+   make INSTALL_ROOT=${pkgdir} install
+}

Copied: subsurface/repos/community-staging-i686/install (from rev 138908, 
subsurface/trunk/install)
===
--- community-staging-i686/install  (rev 0)
+++ community-staging-i686/install  2015-08-29 02:02:14 UTC (rev 138909)
@@ -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
+}

Copied: subsurface/repos/community-staging-i686/libgit2.patch (from rev 138908, 
subsurface/trunk/libgit2.patch)
===
--- community-staging-i686/libgit2.patch(rev 0)
+++ community-staging-i686/libgit2.patch2015-08-29 02:02:14 UTC (rev 
138909)
@@ -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)
+ 

Copied: subsurface/repos/community-staging-x86_64/PKGBUILD (from rev 138908, 
subsurface/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2015-08-29 02:02:14 UTC (rev 138909)
@@ -0,0 +1,40 @@
+# $Id$
+# Contributor: Francois Boulogne fboulogne at april dot org
+# Maintainer: Gaetan Bisson

[arch-commits] Commit in subsurface/repos (8 files)

2015-02-21 Thread Gaetan Bisson

Date: Saturday, February 21, 2015 @ 09:19:13
  Author: bisson
Revision: 128062

archrelease: copy trunk to community-i686, community-x86_64

Added:
  subsurface/repos/community-i686/PKGBUILD
(from rev 128061, subsurface/trunk/PKGBUILD)
  subsurface/repos/community-i686/install
(from rev 128061, subsurface/trunk/install)
  subsurface/repos/community-x86_64/PKGBUILD
(from rev 128061, subsurface/trunk/PKGBUILD)
  subsurface/repos/community-x86_64/install
(from rev 128061, subsurface/trunk/install)
Deleted:
  subsurface/repos/community-i686/PKGBUILD
  subsurface/repos/community-i686/install
  subsurface/repos/community-x86_64/PKGBUILD
  subsurface/repos/community-x86_64/install

---+
 /PKGBUILD |   66 
 /install  |   22 ++
 community-i686/PKGBUILD   |   65 ---
 community-i686/install|   11 ---
 community-x86_64/PKGBUILD |   65 ---
 community-x86_64/install  |   11 ---
 6 files changed, 88 insertions(+), 152 deletions(-)

Deleted: community-i686/PKGBUILD
===
--- community-i686/PKGBUILD 2015-02-21 08:18:42 UTC (rev 128061)
+++ community-i686/PKGBUILD 2015-02-21 08:19:13 UTC (rev 128062)
@@ -1,65 +0,0 @@
-# $Id$
-# Contributor: Francois Boulogne fboulogne at april dot org
-# Maintainer: Gaetan Bisson bis...@archlinux.org
-
-pkgname=subsurface
-_pkgname=Subsurface
-pkgver=4.4.1
-pkgrel=1
-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')
-
-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 \
-
-   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
-}

Copied: subsurface/repos/community-i686/PKGBUILD (from rev 128061, 
subsurface/trunk/PKGBUILD)
===
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-02-21 08:19:13 UTC (rev 128062)
@@ -0,0 +1,33 @@
+# $Id$
+# Contributor: Francois Boulogne fboulogne at april dot org
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+
+pkgname=subsurface
+_pkgname=Subsurface
+pkgver=4.4.1
+pkgrel=2
+pkgdesc='Divelog program'
+url='http://subsurface-divelog.org/'
+license=('GPL2')
+arch=('i686' 'x86_64')
+depends=('libzip' 'libxml2' 'libxslt' 'sqlite' 'libusbx' 'libgit2'
+ 'subsurface-libdc' 'subsurface-marble')
+source=(http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz;)
+sha1sums=('7c33c734c59ced134f10c242c5f51b6d48cb3a0d')
+
+install=install
+
+build() {
+   cd ${srcdir}/${_pkgname}-${pkgver}
+   qmake-qt5 \
+   -config release \
+   SPECIAL_MARBLE_PREFIX=1 \
+   INCLUDEPATH+='/usr/include/subsurface' \
+
+   make
+}
+
+package() {
+   cd ${srcdir}/${_pkgname}-${pkgver}
+   make INSTALL_ROOT=${pkgdir} install
+}

Deleted: community-i686/install
===
--- community-i686/install  2015-02-21 08:18:42 UTC (rev 128061)
+++ community-i686/install  2015-02-21 08:19:13 UTC (rev 128062)
@@ -1,11 +0,0 @@
-post_upgrade() {
-   type

[arch-commits] Commit in subsurface/repos (8 files)

2015-02-20 Thread Gaetan Bisson

Date: Friday, February 20, 2015 @ 09:55:53
  Author: bisson
Revision: 128024

archrelease: copy trunk to community-i686, community-x86_64

Added:
  subsurface/repos/community-i686/PKGBUILD
(from rev 128023, subsurface/trunk/PKGBUILD)
  subsurface/repos/community-i686/install
(from rev 128023, subsurface/trunk/install)
  subsurface/repos/community-x86_64/PKGBUILD
(from rev 128023, subsurface/trunk/PKGBUILD)
  subsurface/repos/community-x86_64/install
(from rev 128023, subsurface/trunk/install)
Deleted:
  subsurface/repos/community-i686/PKGBUILD
  subsurface/repos/community-i686/install
  subsurface/repos/community-x86_64/PKGBUILD
  subsurface/repos/community-x86_64/install

---+
 /PKGBUILD |  130 
 /install  |   22 +++
 community-i686/PKGBUILD   |   65 --
 community-i686/install|   11 ---
 community-x86_64/PKGBUILD |   65 --
 community-x86_64/install  |   11 ---
 6 files changed, 152 insertions(+), 152 deletions(-)

Deleted: community-i686/PKGBUILD
===
--- community-i686/PKGBUILD 2015-02-20 08:55:25 UTC (rev 128023)
+++ community-i686/PKGBUILD 2015-02-20 08:55:53 UTC (rev 128024)
@@ -1,65 +0,0 @@
-# $Id$
-# Contributor: Francois Boulogne fboulogne at april dot org
-# Maintainer: Gaetan Bisson bis...@archlinux.org
-
-pkgname=subsurface
-_pkgname=Subsurface
-pkgver=4.4.0
-pkgrel=1
-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=('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-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
-}

Copied: subsurface/repos/community-i686/PKGBUILD (from rev 128023, 
subsurface/trunk/PKGBUILD)
===
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-02-20 08:55:53 UTC (rev 128024)
@@ -0,0 +1,65 @@
+# $Id$
+# Contributor: Francois Boulogne fboulogne at april dot org
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+
+pkgname=subsurface
+_pkgname=Subsurface
+pkgver=4.4.1
+pkgrel=1
+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')
+
+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 \
+

[arch-commits] Commit in subsurface/repos (8 files)

[arch-commits] Commit in subsurface/repos (8 files)

[arch-commits] Commit in subsurface/repos (8 files)

[arch-commits] Commit in subsurface/repos (8 files)

[arch-commits] Commit in subsurface/repos (8 files)

[arch-commits] Commit in subsurface/repos (8 files)

[arch-commits] Commit in subsurface/repos (8 files)

7 matches

Site Navigation

Mail list logo

Footer information