Date: Monday, September 5, 2022 @ 18:17:28 Author: heftig Revision: 455057
3.28.1-1 Modified: libgnomekbd/trunk/PKGBUILD libgnomekbd/trunk/meson.diff ------------+ PKGBUILD | 6 +-- meson.diff | 94 ++++++++++++----------------------------------------------- 2 files changed, 23 insertions(+), 77 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-09-05 18:13:21 UTC (rev 455056) +++ PKGBUILD 2022-09-05 18:17:28 UTC (rev 455057) @@ -2,7 +2,7 @@ # Contributor: Jan de Groot <[email protected]> pkgname=libgnomekbd -pkgver=3.28.0 +pkgver=3.28.1 pkgrel=1 epoch=1 pkgdesc="Keyboard management library" @@ -13,11 +13,11 @@ makedepends=(gobject-introspection git meson) provides=(libgnomekbd{,ui}.so) options=(debug) -_commit=358fcc6570d5910a5cedae2dbb3be58519ec1876 # tags/3.28.0^0 +_commit=1ca55e9f3644eb20ccee1042a7fa4158465f4aef # tags/3.28.1^0 source=("git+https://gitlab.gnome.org/GNOME/libgnomekbd.git#commit=$_commit"; meson.diff) sha256sums=('SKIP' - '2d78355197d67758dc853d42f165ee03aa1c88d7a1c5a263c24da725836226b4') + 'd41afc90476de55e1281172b538aa764a4697ff487d11660a7b02503c0630430') pkgver() { cd $pkgname Modified: meson.diff =================================================================== --- meson.diff 2022-09-05 18:13:21 UTC (rev 455056) +++ meson.diff 2022-09-05 18:17:28 UTC (rev 455057) @@ -1,12 +1,12 @@ - libgnomekbd/meson.build | 32 +++++++++++++++++++++++++++----- - meson.build | 1 + - 2 files changed, 28 insertions(+), 5 deletions(-) + libgnomekbd/meson.build | 7 +++++++ + meson.build | 1 + + 2 files changed, 8 insertions(+) diff --git c/libgnomekbd/meson.build i/libgnomekbd/meson.build -index 4e8f3fa..c02e942 100644 +index ca65a89..0bffa32 100644 --- c/libgnomekbd/meson.build +++ i/libgnomekbd/meson.build -@@ -37,32 +37,32 @@ libgnomekbd_deps = [ +@@ -39,6 +39,7 @@ libgnomekbd_deps = [ glib_dep, gobject_dep, gio_dep, @@ -14,85 +14,31 @@ 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(), +@@ -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', + ], -+ libraries: libgnomekbd_lib, -+) -+ -+pkgconfig.generate( -+ name: 'libgnomekbdui', -+ description: 'GNOME keyboard shared library', -+ version: meson.project_version(), + ) + + libgnomekbd_dep = declare_dependency( +@@ -137,6 +143,7 @@ pkg.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, -+) + libgnomekbdui_dep = declare_dependency( diff --git c/meson.build i/meson.build -index 4b4a2f9..44e8007 100644 +index cf8a9f5..921591c 100644 --- c/meson.build +++ i/meson.build -@@ -26,6 +26,7 @@ libxklavier_req = '>= 5.2' +@@ -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)
