[arch-commits] Commit in libchamplain/repos/extra-x86_64 (3 files)

2019-03-03 Thread Jan Steffens via arch-commits
Date: Sunday, March 3, 2019 @ 20:26:16
  Author: heftig
Revision: 347029

archrelease: copy trunk to extra-x86_64

Added:
  libchamplain/repos/extra-x86_64/PKGBUILD
(from rev 347028, libchamplain/trunk/PKGBUILD)
Deleted:
  libchamplain/repos/extra-x86_64/PKGBUILD
  libchamplain/repos/extra-x86_64/build.diff

+
 PKGBUILD   |   79 -
 build.diff |  477 ---
 2 files changed, 38 insertions(+), 518 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2019-03-03 20:25:53 UTC (rev 347028)
+++ PKGBUILD2019-03-03 20:26:16 UTC (rev 347029)
@@ -1,41 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) 
-# Contributor: Andreas Radke 
-# Contributor: Michael Kanis 
-
-pkgname=libchamplain
-pkgver=0.12.17
-pkgrel=1
-pkgdesc="A map widget"
-url="https://wiki.gnome.org/Projects/libchamplain";
-license=(LGPL)
-arch=(x86_64)
-depends=(clutter-gtk libsoup cairo sqlite)
-makedepends=(gobject-introspection gtk-doc vala meson git)
-_commit=5d2f7f938471d9455aa08bd6bb1f0a244984713c  # tags/LIBCHAMPLAIN_0_12_17^0
-source=("git+https://gitlab.gnome.org/GNOME/libchamplain.git#commit=$_commit";
-build.diff)
-sha256sums=('SKIP'
-'1146f8cc78e5ab7986a9f047ff6b7a5e4ba60552907498a6097bb78bdacfec4d')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/^LIBCHAMPLAIN_//;s/_/./g;s/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-  patch -Np1 -i ../build.diff
-}
-
-build() {
-  arch-meson $pkgname build -D gtk_doc=true
-  ninja -C build
-}
-
-check() {
-  meson test -C build
-}
-
-package() {
-  DESTDIR="$pkgdir" meson install -C build
-}

Copied: libchamplain/repos/extra-x86_64/PKGBUILD (from rev 347028, 
libchamplain/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2019-03-03 20:26:16 UTC (rev 347029)
@@ -0,0 +1,38 @@
+# Maintainer: Jan Alexander Steffens (heftig) 
+# Contributor: Andreas Radke 
+# Contributor: Michael Kanis 
+
+pkgname=libchamplain
+pkgver=0.12.19
+pkgrel=1
+pkgdesc="A map widget"
+url="https://wiki.gnome.org/Projects/libchamplain";
+license=(LGPL)
+arch=(x86_64)
+depends=(clutter-gtk libsoup cairo sqlite)
+makedepends=(gobject-introspection gtk-doc vala meson git)
+_commit=37493068c81f28773a910ab3a781fe83fd8fb6f3  # tags/LIBCHAMPLAIN_0_12_19^0
+source=("git+https://gitlab.gnome.org/GNOME/libchamplain.git#commit=$_commit";)
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/^LIBCHAMPLAIN_//;s/_/./g;s/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+}
+
+build() {
+  arch-meson $pkgname build -D gtk_doc=true
+  ninja -C build
+}
+
+check() {
+  meson test -C build
+}
+
+package() {
+  DESTDIR="$pkgdir" meson install -C build
+}

Deleted: build.diff
===
--- build.diff  2019-03-03 20:25:53 UTC (rev 347028)
+++ build.diff  2019-03-03 20:26:16 UTC (rev 347029)
@@ -1,477 +0,0 @@
-diff --git i/champlain-gtk/meson.build w/champlain-gtk/meson.build
-index 8137bc7..241f592 100644
 i/champlain-gtk/meson.build
-+++ w/champlain-gtk/meson.build
-@@ -1,148 +1,149 @@
-+libchamplain_gtk_name = package_gtk_string.strip('lib')
-+
- libchamplain_gtk_public_h = [
-   'champlain-gtk.h',
-   'gtk-champlain-embed.h',
- ]
- 
- libchamplain_gtk_sources = [
-   'gtk-champlain-embed.c',
- ]
- 
-+libchamplain_gtk_requires = [
-+  gtk_dep,
-+  clutter_gtk_dep,
-+  libchamplain_sha,
-+]
-+
- libchamplain_gtk_deps = [
-   glib_dep,
-   gobject_dep,
-   gtk_dep,
-   clutter_gtk_dep,
-   libchamplain_dep,
- ]
- 
- libchamplain_gtk_srcdir = include_directories('.')
- 
- libchamplain_gtk_c_args = [
-   '-DHAVE_CONFIG_H',
-   '-DCHAMPLAIN_GTK_COMPILATION',
--  '-DG_LOG_DOMAIN="@0@"'.format(package_gtk_name),
-+  '-DG_LOG_DOMAIN="libchamplain-gtk"',
- ]
- 
- libchamplain_gtk_link_args = [
- ]
- 
-+libchamplain_gtk_includedir = join_paths(
-+  includedir,
-+  package_gtk_string,
-+  'champlain-gtk',
-+)
-+
- libchamplain_gtk_marshals = gnome.genmarshal(
-   'champlain-gtk-marshal',
-   sources: 'champlain-gtk-marshal.list',
-   prefix: '_champlain_gtk_marshal',
-   install_header: true,
--  install_dir: join_paths(
--pkgincludedir,
--'champlain-gtk',
--  )
-+  install_dir: libchamplain_gtk_includedir,
- )
- 
- libchamplain_gtk_enums = gnome.mkenums(
-   'champlain-gtk-enum-types',
-   sources: libchamplain_gtk_public_h,
-   h_template: 'champlain-gtk-enum-types.h.in',
-   c_template: 'champlain-gtk-enum-types.c.in',
-   install_header: true,
--  install_dir: join_paths(
--pkgincludedir,
--'champlain-gtk',
--  )
-+  install_dir: libchamplain_gtk_includedir,
- )
- 
- libchamplain_gtk_marshals_h = libchamplain_gtk_marshals.get(1)
- libchamplain_gtk_enums_h = libchamplain_gtk_enums.get(1)
- 
- libchamplain_gtk_sources += [
-   libchamplain_gtk_marshals,
-   libchamplain_gtk_enums,
- ]
- 
- inst

[arch-commits] Commit in libchamplain/repos/extra-x86_64 (3 files)

2019-02-20 Thread Jan Steffens via arch-commits
Date: Wednesday, February 20, 2019 @ 23:22:07
  Author: heftig
Revision: 346605

archrelease: copy trunk to extra-x86_64

Added:
  libchamplain/repos/extra-x86_64/PKGBUILD
(from rev 346604, libchamplain/trunk/PKGBUILD)
  libchamplain/repos/extra-x86_64/build.diff
(from rev 346604, libchamplain/trunk/build.diff)
Deleted:
  libchamplain/repos/extra-x86_64/PKGBUILD

+
 PKGBUILD   |   83 +-
 build.diff |  477 +++
 2 files changed, 518 insertions(+), 42 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2019-02-20 23:21:57 UTC (rev 346604)
+++ PKGBUILD2019-02-20 23:22:07 UTC (rev 346605)
@@ -1,42 +0,0 @@
-# $Id$
-# Contributor: Andreas Radke 
-# Contributor: Michael Kanis 
-
-pkgname=libchamplain
-pkgver=0.12.16
-pkgrel=1
-pkgdesc="A map widget"
-url="https://wiki.gnome.org/Projects/libchamplain";
-license=(LGPL)
-arch=(i686 x86_64)
-depends=(clutter-gtk libsoup cairo sqlite)
-makedepends=(gobject-introspection gtk-doc vala gnome-common git)
-_commit=daea081ce4a67d0c221de5f389130355fe37e73e  # tags/LIBCHAMPLAIN_0_12_16^0
-source=("git+https://git.gnome.org/browse/libchamplain#commit=$_commit";)
-sha256sums=('SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/^LIBCHAMPLAIN_//;s/_/./g;s/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  cd $pkgname
-  ./configure --prefix=/usr --disable-static --disable-debug \
---enable-vala --enable-gtk-doc
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
-}
-
-package() {
-  cd $pkgname
-  make DESTDIR="$pkgdir" install
-}

Copied: libchamplain/repos/extra-x86_64/PKGBUILD (from rev 346604, 
libchamplain/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2019-02-20 23:22:07 UTC (rev 346605)
@@ -0,0 +1,41 @@
+# Maintainer: Jan Alexander Steffens (heftig) 
+# Contributor: Andreas Radke 
+# Contributor: Michael Kanis 
+
+pkgname=libchamplain
+pkgver=0.12.17
+pkgrel=1
+pkgdesc="A map widget"
+url="https://wiki.gnome.org/Projects/libchamplain";
+license=(LGPL)
+arch=(x86_64)
+depends=(clutter-gtk libsoup cairo sqlite)
+makedepends=(gobject-introspection gtk-doc vala meson git)
+_commit=5d2f7f938471d9455aa08bd6bb1f0a244984713c  # tags/LIBCHAMPLAIN_0_12_17^0
+source=("git+https://gitlab.gnome.org/GNOME/libchamplain.git#commit=$_commit";
+build.diff)
+sha256sums=('SKIP'
+'1146f8cc78e5ab7986a9f047ff6b7a5e4ba60552907498a6097bb78bdacfec4d')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/^LIBCHAMPLAIN_//;s/_/./g;s/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+  patch -Np1 -i ../build.diff
+}
+
+build() {
+  arch-meson $pkgname build -D gtk_doc=true
+  ninja -C build
+}
+
+check() {
+  meson test -C build
+}
+
+package() {
+  DESTDIR="$pkgdir" meson install -C build
+}

Copied: libchamplain/repos/extra-x86_64/build.diff (from rev 346604, 
libchamplain/trunk/build.diff)
===
--- build.diff  (rev 0)
+++ build.diff  2019-02-20 23:22:07 UTC (rev 346605)
@@ -0,0 +1,477 @@
+diff --git i/champlain-gtk/meson.build w/champlain-gtk/meson.build
+index 8137bc7..241f592 100644
+--- i/champlain-gtk/meson.build
 w/champlain-gtk/meson.build
+@@ -1,148 +1,149 @@
++libchamplain_gtk_name = package_gtk_string.strip('lib')
++
+ libchamplain_gtk_public_h = [
+   'champlain-gtk.h',
+   'gtk-champlain-embed.h',
+ ]
+ 
+ libchamplain_gtk_sources = [
+   'gtk-champlain-embed.c',
+ ]
+ 
++libchamplain_gtk_requires = [
++  gtk_dep,
++  clutter_gtk_dep,
++  libchamplain_sha,
++]
++
+ libchamplain_gtk_deps = [
+   glib_dep,
+   gobject_dep,
+   gtk_dep,
+   clutter_gtk_dep,
+   libchamplain_dep,
+ ]
+ 
+ libchamplain_gtk_srcdir = include_directories('.')
+ 
+ libchamplain_gtk_c_args = [
+   '-DHAVE_CONFIG_H',
+   '-DCHAMPLAIN_GTK_COMPILATION',
+-  '-DG_LOG_DOMAIN="@0@"'.format(package_gtk_name),
++  '-DG_LOG_DOMAIN="libchamplain-gtk"',
+ ]
+ 
+ libchamplain_gtk_link_args = [
+ ]
+ 
++libchamplain_gtk_includedir = join_paths(
++  includedir,
++  package_gtk_string,
++  'champlain-gtk',
++)
++
+ libchamplain_gtk_marshals = gnome.genmarshal(
+   'champlain-gtk-marshal',
+   sources: 'champlain-gtk-marshal.list',
+   prefix: '_champlain_gtk_marshal',
+   install_header: true,
+-  install_dir: join_paths(
+-pkgincludedir,
+-'champlain-gtk',
+-  )
++  install_dir: libchamplain_gtk_includedir,
+ )
+ 
+ libchamplain_gtk_enums = gnome.mkenums(
+   'champlain-gtk-enum-types',
+   sources: libchamplain_gtk_public_h,
+   h_template: 'champlain-gtk-enum-types.h.in',
+   c_template: 'champlain-gtk-enum-types.c.in',
+   install_header: true,
+-  install_dir: join_paths(
+-pkgincludedir,
+-'champlain-gtk',
+-  )
++  in