Date: Wednesday, August 17, 2022 @ 19:18:23 Author: heftig Revision: 453057
3.28.0-1 Added: libgnomekbd/trunk/meson.diff Modified: libgnomekbd/trunk/PKGBUILD ------------+ PKGBUILD | 32 ++++++++++-------- meson.diff | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+), 14 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-08-17 19:16:42 UTC (rev 453056) +++ PKGBUILD 2022-08-17 19:18:23 UTC (rev 453057) @@ -2,7 +2,7 @@ # Contributor: Jan de Groot <[email protected]> pkgname=libgnomekbd -pkgver=3.26.1+r5+g54da436 +pkgver=3.28.0 pkgrel=1 epoch=1 pkgdesc="Keyboard management library" @@ -10,12 +10,14 @@ arch=(x86_64) license=(LGPL) depends=(libxklavier gtk3 dconf) -makedepends=(gobject-introspection git) +makedepends=(gobject-introspection git meson) provides=(libgnomekbd{,ui}.so) options=(debug) -_commit=54da436258d79b683f57dfadf787bdf56ca58576 # master -source=("git+https://gitlab.gnome.org/GNOME/libgnomekbd.git#commit=$_commit";) -sha256sums=('SKIP') +_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 @@ -24,20 +26,22 @@ prepare() { cd $pkgname - NOCONFIGURE=1 ./autogen.sh + + # Fixes for meson build + git apply -3 ../meson.diff } build() { - cd "$pkgname" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-schemas-compile --disable-static - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make + arch-meson $pkgname build + meson compile -C build } +check() { + meson test -C build --print-errorlogs +} + package() { - cd "$pkgname" - make DESTDIR="$pkgdir" install + meson install -C build --destdir "$pkgdir" } -# vim:set sw=2 et: +# vim:set sw=2 sts=-1 et: Added: meson.diff =================================================================== --- meson.diff (rev 0) +++ meson.diff 2022-08-17 19:18:23 UTC (rev 453057) @@ -0,0 +1,102 @@ + 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')
