[arch-commits] Commit in libchamplain/trunk (PKGBUILD build.diff)
Date: Sunday, March 3, 2019 @ 20:18:42
Author: heftig
Revision: 347027
0.12.19-1
Modified:
libchamplain/trunk/PKGBUILD
Deleted:
libchamplain/trunk/build.diff
+
PKGBUILD | 11 -
build.diff | 477 ---
2 files changed, 4 insertions(+), 484 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-03-03 16:11:14 UTC (rev 347026)
+++ PKGBUILD2019-03-03 20:18:42 UTC (rev 347027)
@@ -3,7 +3,7 @@
# Contributor: Michael Kanis
pkgname=libchamplain
-pkgver=0.12.17
+pkgver=0.12.19
pkgrel=1
pkgdesc="A map widget"
url="https://wiki.gnome.org/Projects/libchamplain;
@@ -11,11 +11,9 @@
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')
+_commit=37493068c81f28773a910ab3a781fe83fd8fb6f3 # tags/LIBCHAMPLAIN_0_12_19^0
+source=("git+https://gitlab.gnome.org/GNOME/libchamplain.git#commit=$_commit;)
+sha256sums=('SKIP')
pkgver() {
cd $pkgname
@@ -24,7 +22,6 @@
prepare() {
cd $pkgname
- patch -Np1 -i ../build.diff
}
build() {
Deleted: build.diff
===
--- build.diff 2019-03-03 16:11:14 UTC (rev 347026)
+++ build.diff 2019-03-03 20:18:42 UTC (rev 347027)
@@ -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,
- ]
-
- install_headers(
- libchamplain_gtk_public_h,
-- install_dir: join_paths(
--pkgincludedir,
--'champlain-gtk',
-- )
-+ install_dir: libchamplain_gtk_includedir,
- )
-
- libchamplain_gtk_sha = library(
-- package_gtk_string,
-+ libchamplain_gtk_name,
- libchamplain_gtk_sources,
- version: lib_version,
- include_directories: rootdir,
- dependencies: libchamplain_gtk_deps,
- c_args: libchamplain_gtk_c_args,
- link_args: libchamplain_gtk_link_args,
- install: true,
-- install_dir: libdir,
- )
-
- libchamplain_gtk_dep_sources = [
- libchamplain_gtk_enums_h,
- libchamplain_gtk_marshals_h,
- ]
-
- if generate_gir
- libchamplain_gtk_gir_includes = [
- 'GObject-2.0',
- 'Clutter-1.0',
- 'Gtk-3.0',
- libchamplain_gir.get(0),
- ]
-
- libchamplain_gtk_gir = gnome.generate_gir(
- libchamplain_gtk_sha,
- sources: libchamplain_gtk_sources + libchamplain_gtk_public_h,
- nsversion: api_version,
- namespace: 'GtkChamplain',
- symbol_prefix: 'gtk_champlain',
- identifier_prefix: 'GtkChamplain',
- header: 'champlain-gtk/champlain-gtk.h',
--export_packages: [package_gtk_string],
-+export_packages: [libchamplain_gtk_name],
- includes: ['Clutter-1.0', 'Gtk-3.0', libchamplain_gir.get(0)],
- link_with: libchamplain_gtk_sha,
- install: true,
--install_dir_gir: girdir,
--install_dir_typelib:
[arch-commits] Commit in libchamplain/trunk (PKGBUILD build.diff)
Date: Wednesday, February 20, 2019 @ 23:21:57
Author: heftig
Revision: 346604
0.12.17-1
Added:
libchamplain/trunk/build.diff
Modified:
libchamplain/trunk/PKGBUILD
+
PKGBUILD | 30 +--
build.diff | 477 +++
2 files changed, 492 insertions(+), 15 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-02-20 23:12:22 UTC (rev 346603)
+++ PKGBUILD2019-02-20 23:21:57 UTC (rev 346604)
@@ -1,8 +1,9 @@
+# Maintainer: Jan Alexander Steffens (heftig)
# Contributor: Andreas Radke
# Contributor: Michael Kanis
pkgname=libchamplain
-pkgver=0.12.16
+pkgver=0.12.17
pkgrel=1
pkgdesc="A map widget"
url="https://wiki.gnome.org/Projects/libchamplain;
@@ -9,10 +10,12 @@
license=(LGPL)
arch=(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')
+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
@@ -21,21 +24,18 @@
prepare() {
cd $pkgname
- NOCONFIGURE=1 ./autogen.sh
+ patch -Np1 -i ../build.diff
}
build() {
- cd $pkgname
- ./configure --prefix=/usr --disable-static --disable-debug \
---enable-vala --enable-gtk-doc
+ arch-meson $pkgname build -D gtk_doc=true
+ ninja -C build
+}
- # https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
+check() {
+ meson test -C build
}
package() {
- cd $pkgname
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" meson install -C build
}
Added: build.diff
===
--- build.diff (rev 0)
+++ build.diff 2019-02-20 23:21:57 UTC (rev 346604)
@@ -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',
+- )
++ 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,
+ ]
+
+ install_headers(
+ libchamplain_gtk_public_h,
+- install_dir: join_paths(
+-pkgincludedir,
+-'champlain-gtk',
+- )
++ install_dir: libchamplain_gtk_includedir,
+ )
+
+ libchamplain_gtk_sha = library(
+- package_gtk_string,
++ libchamplain_gtk_name,
+ libchamplain_gtk_sources,
+ version: lib_version,
+ include_directories: rootdir,
+ dependencies: libchamplain_gtk_deps,
+ c_args: libchamplain_gtk_c_args,
+ link_args: libchamplain_gtk_link_args,
+ install: true,
+- install_dir: libdir,
+ )
+
+ libchamplain_gtk_dep_sources = [
+ libchamplain_gtk_enums_h,
+ libchamplain_gtk_marshals_h,
+ ]
+
+ if generate_gir
+ libchamplain_gtk_gir_includes = [
+ 'GObject-2.0',
+ 'Clutter-1.0',
+ 'Gtk-3.0',
+
