mirror of
https://gitlab.com/CinnamonSlackBuilds/csb.git
synced 2024-12-24 21:59:18 +01:00
libgnomekbd: Upgraded to 3.28.1.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackware-id.org>
This commit is contained in:
parent
7d70ca3cd9
commit
278c517fc0
2 changed files with 4 additions and 107 deletions
|
@ -2,7 +2,7 @@
|
|||
|
||||
# Slackware build script for libgnomekbd
|
||||
|
||||
# Copyright 2014-2022 Willy Sudiarto Raharjo <willysr@slackware-id.org>
|
||||
# Copyright 2014-2024 Willy Sudiarto Raharjo <willysr@slackware-id.org>
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use of this script, with or without modification, is
|
||||
|
@ -23,8 +23,8 @@
|
|||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
PRGNAM=libgnomekbd
|
||||
VERSION=${VERSION:-3.28.0}
|
||||
BUILD=${BUILD:-2}
|
||||
VERSION=${VERSION:-3.28.1}
|
||||
BUILD=${BUILD:-1}
|
||||
TAG=${TAG:-_csb}
|
||||
|
||||
if [ -z "$ARCH" ]; then
|
||||
|
@ -35,7 +35,7 @@ if [ -z "$ARCH" ]; then
|
|||
esac
|
||||
fi
|
||||
|
||||
wget -c http://ftp.acc.umu.se/pub/gnome/sources/libgnomekbd/3.28/$PRGNAM-$VERSION.tar.xz
|
||||
wget -c https://download.gnome.org/sources/libgnomekbd/3.28/$PRGNAM-$VERSION.tar.xz
|
||||
|
||||
CWD=$(pwd)
|
||||
TMP=${TMP:-/tmp/csb}
|
||||
|
@ -74,7 +74,6 @@ find -L . \
|
|||
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
|
||||
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
|
||||
|
||||
patch -p1 < $CWD/pkgconfig.patch
|
||||
mkdir build
|
||||
cd build
|
||||
CFLAGS="$SLKCFLAGS" \
|
||||
|
|
|
@ -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')
|
Loading…
Reference in a new issue