[arch-commits] Commit in libmarble4/repos (4 files)

Antonio Rojas arojas at archlinux.org
Wed Jul 29 14:23:55 UTC 2015


    Date: Wednesday, July 29, 2015 @ 16:23:55
  Author: arojas
Revision: 242841

archrelease: copy trunk to kde-unstable-i686, kde-unstable-x86_64

Added:
  libmarble4/repos/kde-unstable-i686/PKGBUILD
    (from rev 242840, libmarble4/trunk/PKGBUILD)
  libmarble4/repos/kde-unstable-x86_64/PKGBUILD
    (from rev 242840, libmarble4/trunk/PKGBUILD)
Deleted:
  libmarble4/repos/kde-unstable-i686/PKGBUILD
  libmarble4/repos/kde-unstable-x86_64/PKGBUILD

------------------------------+
 /PKGBUILD                    |  102 +++++++++++++++++++++++++++++++++++++++++
 kde-unstable-i686/PKGBUILD   |   48 -------------------
 kde-unstable-x86_64/PKGBUILD |   48 -------------------
 3 files changed, 102 insertions(+), 96 deletions(-)

Deleted: kde-unstable-i686/PKGBUILD
===================================================================
--- kde-unstable-i686/PKGBUILD	2015-07-29 14:23:30 UTC (rev 242840)
+++ kde-unstable-i686/PKGBUILD	2015-07-29 14:23:55 UTC (rev 242841)
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 241398 2015-06-29 17:50:28Z arojas $
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-pkgname=libmarble4
-pkgver=15.04.3
-pkgrel=3
-pkgdesc="KDE4 Marble libraries"
-url="http://kde.org/applications/education/marble/"
-arch=(i686 x86_64)
-license=(GPL LGPL FDL)
-depends=(kdebase-runtime libastro)
-makedepends=(cmake automoc4 gpsd libwlocate)
-optdepends=('gpsd: GPS support' 'libwlocate: WLAN based geolocation')
-conflicts=(kdeedu-marble)
-provides=(kdeedu-marble)
-source=("http://download.kde.org/stable/applications/$pkgver/src/marble-$pkgver.tar.xz")
-sha1sums=('9c8c4f307bb633cf7c21fdf5fad82995d2dfa50a')
-
-prepare() {
-  mkdir -p build
-
-# rename include dir
-  sed -e 's|marble/MarbleModel.h|marble4/MarbleModel.h|' -i marble-$pkgver/FindMarble.cmake
-}
-
-build() {
-  cd build
-  cmake ../marble-$pkgver \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DKDE4_BUILD_TESTS=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-
-# remove files provided by libastro and marble
-  rm -r "$pkgdir"/usr/bin
-  rm -r "$pkgdir"/usr/share/applications/kde4/marble-*
-  rm -r "$pkgdir"/usr/include/astro
-  rm -r "$pkgdir"/usr/lib/libastro.*
-  rm -r "$pkgdir"/usr/share/{appdata,config.kcfg,doc,icons}
-# rename include dir to avoid conflicts with marble
-  mv "$pkgdir"/usr/include/marble{,4}
-}
-

Copied: libmarble4/repos/kde-unstable-i686/PKGBUILD (from rev 242840, libmarble4/trunk/PKGBUILD)
===================================================================
--- kde-unstable-i686/PKGBUILD	                        (rev 0)
+++ kde-unstable-i686/PKGBUILD	2015-07-29 14:23:55 UTC (rev 242841)
@@ -0,0 +1,51 @@
+# $Id: PKGBUILD 241398 2015-06-29 17:50:28Z arojas $
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+pkgname=libmarble4
+pkgver=15.04.3
+pkgrel=4
+pkgdesc="KDE4 Marble libraries"
+url="http://kde.org/applications/education/marble/"
+arch=(i686 x86_64)
+license=(GPL LGPL FDL)
+depends=(kdebase-runtime libastro)
+makedepends=(cmake automoc4 gpsd libwlocate)
+optdepends=('gpsd: GPS support' 'libwlocate: WLAN based geolocation')
+conflicts=(kdeedu-marble)
+provides=(kdeedu-marble)
+source=("http://download.kde.org/stable/applications/$pkgver/src/marble-$pkgver.tar.xz")
+sha1sums=('34f6bdedb6ff37f49c1e0f1f3cca219a515accb4')
+
+prepare() {
+  mkdir -p build
+
+# rename include dir
+  sed -e 's|marble/MarbleModel.h|marble4/MarbleModel.h|' -i marble-$pkgver/FindMarble.cmake
+# hack: change soname to make it coinstallable with 15.08 version
+  sed -e 's|GENERIC_LIB_VERSION "0.17.20"|GENERIC_LIB_VERSION "0.17"|' -e 's|GENERIC_LIB_SOVERSION "1"|GENERIC_LIB_SOVERSION "0"|' \
+   -i marble-$pkgver/src/lib/astro/CMakeLists.txt
+}
+
+build() {
+  cd build
+  cmake ../marble-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DKDE4_BUILD_TESTS=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+
+# remove files provided by libastro and marble
+  rm -r "$pkgdir"/usr/bin
+  rm -r "$pkgdir"/usr/share/applications/kde4/marble-*
+  rm -r "$pkgdir"/usr/include/astro
+  rm -r "$pkgdir"/usr/lib/libastro.so
+  rm -r "$pkgdir"/usr/share/{appdata,config.kcfg,doc,icons}
+# rename include dir to avoid conflicts with marble
+  mv "$pkgdir"/usr/include/marble{,4}
+}
+

Deleted: kde-unstable-x86_64/PKGBUILD
===================================================================
--- kde-unstable-x86_64/PKGBUILD	2015-07-29 14:23:30 UTC (rev 242840)
+++ kde-unstable-x86_64/PKGBUILD	2015-07-29 14:23:55 UTC (rev 242841)
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 241398 2015-06-29 17:50:28Z arojas $
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-pkgname=libmarble4
-pkgver=15.04.3
-pkgrel=3
-pkgdesc="KDE4 Marble libraries"
-url="http://kde.org/applications/education/marble/"
-arch=(i686 x86_64)
-license=(GPL LGPL FDL)
-depends=(kdebase-runtime libastro)
-makedepends=(cmake automoc4 gpsd libwlocate)
-optdepends=('gpsd: GPS support' 'libwlocate: WLAN based geolocation')
-conflicts=(kdeedu-marble)
-provides=(kdeedu-marble)
-source=("http://download.kde.org/stable/applications/$pkgver/src/marble-$pkgver.tar.xz")
-sha1sums=('9c8c4f307bb633cf7c21fdf5fad82995d2dfa50a')
-
-prepare() {
-  mkdir -p build
-
-# rename include dir
-  sed -e 's|marble/MarbleModel.h|marble4/MarbleModel.h|' -i marble-$pkgver/FindMarble.cmake
-}
-
-build() {
-  cd build
-  cmake ../marble-$pkgver \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DKDE4_BUILD_TESTS=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-
-# remove files provided by libastro and marble
-  rm -r "$pkgdir"/usr/bin
-  rm -r "$pkgdir"/usr/share/applications/kde4/marble-*
-  rm -r "$pkgdir"/usr/include/astro
-  rm -r "$pkgdir"/usr/lib/libastro.*
-  rm -r "$pkgdir"/usr/share/{appdata,config.kcfg,doc,icons}
-# rename include dir to avoid conflicts with marble
-  mv "$pkgdir"/usr/include/marble{,4}
-}
-

Copied: libmarble4/repos/kde-unstable-x86_64/PKGBUILD (from rev 242840, libmarble4/trunk/PKGBUILD)
===================================================================
--- kde-unstable-x86_64/PKGBUILD	                        (rev 0)
+++ kde-unstable-x86_64/PKGBUILD	2015-07-29 14:23:55 UTC (rev 242841)
@@ -0,0 +1,51 @@
+# $Id: PKGBUILD 241398 2015-06-29 17:50:28Z arojas $
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+pkgname=libmarble4
+pkgver=15.04.3
+pkgrel=4
+pkgdesc="KDE4 Marble libraries"
+url="http://kde.org/applications/education/marble/"
+arch=(i686 x86_64)
+license=(GPL LGPL FDL)
+depends=(kdebase-runtime libastro)
+makedepends=(cmake automoc4 gpsd libwlocate)
+optdepends=('gpsd: GPS support' 'libwlocate: WLAN based geolocation')
+conflicts=(kdeedu-marble)
+provides=(kdeedu-marble)
+source=("http://download.kde.org/stable/applications/$pkgver/src/marble-$pkgver.tar.xz")
+sha1sums=('34f6bdedb6ff37f49c1e0f1f3cca219a515accb4')
+
+prepare() {
+  mkdir -p build
+
+# rename include dir
+  sed -e 's|marble/MarbleModel.h|marble4/MarbleModel.h|' -i marble-$pkgver/FindMarble.cmake
+# hack: change soname to make it coinstallable with 15.08 version
+  sed -e 's|GENERIC_LIB_VERSION "0.17.20"|GENERIC_LIB_VERSION "0.17"|' -e 's|GENERIC_LIB_SOVERSION "1"|GENERIC_LIB_SOVERSION "0"|' \
+   -i marble-$pkgver/src/lib/astro/CMakeLists.txt
+}
+
+build() {
+  cd build
+  cmake ../marble-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DKDE4_BUILD_TESTS=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+
+# remove files provided by libastro and marble
+  rm -r "$pkgdir"/usr/bin
+  rm -r "$pkgdir"/usr/share/applications/kde4/marble-*
+  rm -r "$pkgdir"/usr/include/astro
+  rm -r "$pkgdir"/usr/lib/libastro.so
+  rm -r "$pkgdir"/usr/share/{appdata,config.kcfg,doc,icons}
+# rename include dir to avoid conflicts with marble
+  mv "$pkgdir"/usr/include/marble{,4}
+}
+



More information about the arch-commits mailing list