Date: Monday, September 5, 2022 @ 18:46:53
Author: heftig
Revision: 455073
archrelease: copy trunk to extra-x86_64
Added:
libgnomekbd/repos/extra-x86_64/PKGBUILD
(from rev 455069, libgnomekbd/trunk/PKGBUILD)
libgnomekbd/repos/extra-x86_64/meson.diff
(from rev 455069, libgnomekbd/trunk/meson.diff)
Deleted:
libgnomekbd/repos/extra-x86_64/PKGBUILD
libgnomekbd/repos/extra-x86_64/meson.diff
------------+
PKGBUILD | 94 ++++++++++++++++++------------------
meson.diff | 150 ++++++++++++++++++-----------------------------------------
2 files changed, 95 insertions(+), 149 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-09-05 18:46:53 UTC (rev 455072)
+++ PKGBUILD 2022-09-05 18:46:53 UTC (rev 455073)
@@ -1,47 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org>
-# Contributor: Jan de Groot <j...@archlinux.org>
-
-pkgname=libgnomekbd
-pkgver=3.28.0
-pkgrel=1
-epoch=1
-pkgdesc="Keyboard management library"
-url="https://gitlab.gnome.org/GNOME/libgnomekbd";
-arch=(x86_64)
-license=(LGPL)
-depends=(libxklavier gtk3 dconf)
-makedepends=(gobject-introspection git meson)
-provides=(libgnomekbd{,ui}.so)
-options=(debug)
-_commit=358fcc6570d5910a5cedae2dbb3be58519ec1876 # tags/3.28.0^0
-source=("git+https://gitlab.gnome.org/GNOME/libgnomekbd.git#commit=$_commit";
- meson.diff)
-sha256sums=('SKIP'
- '2d78355197d67758dc853d42f165ee03aa1c88d7a1c5a263c24da725836226b4')
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
-}
-
-prepare() {
- cd $pkgname
-
- # Fixes for meson build
- git apply -3 ../meson.diff
-}
-
-build() {
- arch-meson $pkgname build
- meson compile -C build
-}
-
-check() {
- meson test -C build --print-errorlogs
-}
-
-package() {
- meson install -C build --destdir "$pkgdir"
-}
-
-# vim:set sw=2 sts=-1 et:
Copied: libgnomekbd/repos/extra-x86_64/PKGBUILD (from rev 455069,
libgnomekbd/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-09-05 18:46:53 UTC (rev 455073)
@@ -0,0 +1,47 @@
+# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org>
+# Contributor: Jan de Groot <j...@archlinux.org>
+
+pkgname=libgnomekbd
+pkgver=3.28.1
+pkgrel=1
+epoch=1
+pkgdesc="Keyboard management library"
+url="https://gitlab.gnome.org/GNOME/libgnomekbd";
+arch=(x86_64)
+license=(LGPL)
+depends=(libxklavier gtk3 dconf)
+makedepends=(gobject-introspection git meson)
+provides=(libgnomekbd{,ui}.so)
+options=(debug)
+_commit=1ca55e9f3644eb20ccee1042a7fa4158465f4aef # tags/3.28.1^0
+source=("git+https://gitlab.gnome.org/GNOME/libgnomekbd.git#commit=$_commit";
+ meson.diff)
+sha256sums=('SKIP'
+ 'd41afc90476de55e1281172b538aa764a4697ff487d11660a7b02503c0630430')
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+ cd $pkgname
+
+ # Fixes for meson build
+ git apply -3 ../meson.diff
+}
+
+build() {
+ arch-meson $pkgname build
+ meson compile -C build
+}
+
+check() {
+ meson test -C build --print-errorlogs
+}
+
+package() {
+ meson install -C build --destdir "$pkgdir"
+}
+
+# vim:set sw=2 sts=-1 et:
Deleted: meson.diff
===================================================================
--- meson.diff 2022-09-05 18:46:53 UTC (rev 455072)
+++ meson.diff 2022-09-05 18:46:53 UTC (rev 455073)
@@ -1,102 +0,0 @@
- libgnomekbd/meson.build | 32 +++++++++++++++++++++++++++-----
- meson.build | 1 +
- 2 files changed, 28 insertions(+), 5 deletions(-)
-
-diff --git c/libgnomekbd/meson.build i/libgnomekbd/meson.build
-index 4e8f3fa..c02e942 100644
---- c/libgnomekbd/meson.build
-+++ i/libgnomekbd/meson.build
-@@ -37,32 +37,32 @@ libgnomekbd_deps = [
- glib_dep,
- gobject_dep,
- gio_dep,
-+ gmodule_export_dep,
- gdk_dep,
- gtk_dep,
- x11_dep,
- libxklavier_dep,
- ]
-
- libgnomekbd_sources = files(
- 'gkbd-desktop-config.c',
- 'gkbd-keyboard-config.c',
- 'gkbd-util.c',
- )
-
- libgnomekbd_headers = files(
- 'gkbd-desktop-config.h',
- 'gkbd-keyboard-config.h',
- 'gkbd-util.h',
- )
-
- libgnomekbd_lib = library(
- 'gnomekbd',
- libgnomekbd_sources,
- config_h,
- dependencies: libgnomekbd_deps,
- include_directories: root_include,
-- version: meson.project_version(),
-- soversion: library_version,
-+ version: library_version,
- install: true,
- )
-
-@@ -115,8 +115,7 @@ libgnomekbdui_lib = library(
- gkbd_keyboard_drawing_marshal,
- dependencies: libgnomekbdui_deps,
- include_directories: root_include,
-- version: meson.project_version(),
-- soversion: library_version,
-+ version: library_version,
- c_args: [
- '-DUIDIR="@0@"'.format(ui_dir),
- '-DDATADIR="@0@"'.format(pkg_data_dir),
-@@ -149,6 +148,28 @@ install_headers(
- subdir: 'libgnomekbd',
- )
-
-+pkgconfig = import('pkgconfig')
-+
-+pkgconfig.generate(
-+ name: 'libgnomekbd',
-+ description: 'GNOME keyboard shared library',
-+ version: meson.project_version(),
-+ requires: [
-+ 'gmodule-export-2.0',
-+ 'gdk-3.0',
-+ 'libxklavier',
-+ ],
-+ libraries: libgnomekbd_lib,
-+)
-+
-+pkgconfig.generate(
-+ name: 'libgnomekbdui',
-+ description: 'GNOME keyboard shared library',
-+ version: meson.project_version(),
-+ requires: ['libgnomekbd'],
-+ libraries: libgnomekbdui_lib,
-+)
-+
- gkbd_keyboard_display_cfg = configuration_data()
- gkbd_keyboard_display_cfg.set('VERSION', meson.project_version())
-
-@@ -187,4 +208,5 @@ gnome.generate_gir(
- namespace: 'Gkbd',
- nsversion: '3.0',
- includes: ['GObject-2.0', 'Gtk-3.0', 'xlib-2.0', 'Xkl-1.0'],
--)
-\ No newline at end of file
-+ install: true,
-+)
-diff --git c/meson.build i/meson.build
-index 4b4a2f9..44e8007 100644
---- c/meson.build
-+++ i/meson.build
-@@ -26,6 +26,7 @@ libxklavier_req = '>= 5.2'
- glib_dep = dependency('glib-2.0', version: glib_req)
- gobject_dep = dependency('gobject-2.0', version: glib_req)
- gio_dep = dependency('gio-2.0', version: glib_req)
-+gmodule_export_dep = dependency('gmodule-export-2.0', version: glib_req)
- gdk_dep = dependency('gdk-3.0', version: gdk_req)
- gtk_dep = dependency('gtk+-3.0', version: gtk_req)
- x11_dep = dependency('x11')
Copied: libgnomekbd/repos/extra-x86_64/meson.diff (from rev 455069,
libgnomekbd/trunk/meson.diff)
===================================================================
--- meson.diff (rev 0)
+++ meson.diff 2022-09-05 18:46:53 UTC (rev 455073)
@@ -0,0 +1,48 @@
+ libgnomekbd/meson.build | 7 +++++++
+ meson.build | 1 +
+ 2 files changed, 8 insertions(+)
+
+diff --git c/libgnomekbd/meson.build i/libgnomekbd/meson.build
+index ca65a89..0bffa32 100644
+--- c/libgnomekbd/meson.build
++++ i/libgnomekbd/meson.build
+@@ -39,6 +39,7 @@ libgnomekbd_deps = [
+ glib_dep,
+ gobject_dep,
+ gio_dep,
++ gmodule_export_dep,
+ gdk_dep,
+ gtk_dep,
+ x11_dep,
+@@ -72,6 +73,11 @@ pkg.generate(
+ name: 'libgnomekbd',
+ description: 'GNOME keyboard shared library',
+ version: meson.project_version(),
++ requires: [
++ 'gmodule-export-2.0',
++ 'gdk-3.0',
++ 'libxklavier',
++ ],
+ )
+
+ libgnomekbd_dep = declare_dependency(
+@@ -137,6 +143,7 @@ pkg.generate(
+ name: 'libgnomekbdui',
+ description: 'GNOME keyboard shared library',
+ version: meson.project_version(),
++ requires: ['libgnomekbd'],
+ )
+
+ libgnomekbdui_dep = declare_dependency(
+diff --git c/meson.build i/meson.build
+index cf8a9f5..921591c 100644
+--- c/meson.build
++++ i/meson.build
+@@ -28,6 +28,7 @@ libxklavier_req = '>= 5.2'
+ glib_dep = dependency('glib-2.0', version: glib_req)
+ gobject_dep = dependency('gobject-2.0', version: glib_req)
+ gio_dep = dependency('gio-2.0', version: glib_req)
++gmodule_export_dep = dependency('gmodule-export-2.0', version: glib_req)
+ gdk_dep = dependency('gdk-3.0', version: gdk_req)
+ gtk_dep = dependency('gtk+-3.0', version: gtk_req)
+ x11_dep = dependency('x11')
