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

Gaetan Bisson bisson at archlinux.org
Sat Feb 21 08:19:13 UTC 2015


    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 <bisson at 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 <bisson at 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 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-i686/install (from rev 128061, subsurface/trunk/install)
===================================================================
--- community-i686/install	                        (rev 0)
+++ community-i686/install	2015-02-21 08:19:13 UTC (rev 128062)
@@ -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
+}

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2015-02-21 08:18:42 UTC (rev 128061)
+++ community-x86_64/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 <bisson at 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-x86_64/PKGBUILD (from rev 128061, subsurface/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/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 <bisson at 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-x86_64/install
===================================================================
--- community-x86_64/install	2015-02-21 08:18:42 UTC (rev 128061)
+++ community-x86_64/install	2015-02-21 08:19:13 UTC (rev 128062)
@@ -1,11 +0,0 @@
-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-x86_64/install (from rev 128061, subsurface/trunk/install)
===================================================================
--- community-x86_64/install	                        (rev 0)
+++ community-x86_64/install	2015-02-21 08:19:13 UTC (rev 128062)
@@ -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
+}



More information about the arch-commits mailing list