From: ahesford <ahesford@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] libxkbcommon: update to 1.0.1.
Date: Wed, 30 Sep 2020 03:24:05 +0200 [thread overview]
Message-ID: <20200930012405.cU1pqd_CIQOb1E50wmh6-R7zm2cCqRmKTt3LerKRuyg@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25134@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1012 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/dashezup/void-packages libxkbcommon-1.0.1
https://github.com/void-linux/void-packages/pull/25134
libxkbcommon: update to 1.0.1.
btw I saw this and added libxkbregistry.so.0 to shlibs
`=> WARNING: libxkbcommon-1.0.1_1: libxkbregistry.so.0 not found in common/shlibs!`
Questions:
1. ~~Are those shlibs usually added when there are new ones are found like this, or add only when it's actually needed?~~
`libxkbregistry.so.0` is located at `/usr/lib/libxkbregistry.so.0`, I've added it to common/shlibs
2. ~~Should I add `shlib_provides="libxkbcommon.so.0 libxkbregistry.so.0"` and `shlib_provides="libxkbcommon-x11.so.0"` to package template? I also added it for now, ask me to remove them if it's not supposed to be added~~
I will keep it as before, `shlib_provides` is not added in this commit.
A patch file from https://github.com/void-linux/void-packages/pull/25134.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libxkbcommon-1.0.1-25134.patch --]
[-- Type: text/x-diff, Size: 5986 bytes --]
From 0a684c7393f8d7e9a5a5bcd50802f21a6213f55a Mon Sep 17 00:00:00 2001
From: Dash Eclipse <dash@ezup.dev>
Date: Tue, 29 Sep 2020 20:58:43 +0000
Subject: [PATCH 1/2] libxkbcommon: update to 1.0.1.
---
common/shlibs | 1 +
srcpkgs/libxkbcommon/patches/remove-fuzzing.patch | 10 +++++-----
srcpkgs/libxkbcommon/template | 6 +++---
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index ded49667426..19f95a83819 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1221,6 +1221,7 @@ libwayland-cursor.so.0 wayland-1.6.0_1
libtomcrypt.so.1 libtomcrypt-1.18.0_1
libHX.so.28 libHX-3.14_1
libxkbcommon.so.0 libxkbcommon-0.2.0_1
+libxkbregistry.so.0 libxkbcommon-1.0.1_1
libxkbcommon-x11.so.0 libxkbcommon-x11-0.4.2_1
libgee-0.8.so.2 libgee08-0.8.2_1
libnettle.so.8 nettle-3.6_1
diff --git a/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch b/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch
index eddc5ce2b5b..46acb48878e 100644
--- a/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch
+++ b/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch
@@ -4,8 +4,8 @@ Reason: removes creation of fuzzing infrastructure which isn't included in the d
--- meson.build
+++ meson.build
-@@ -382,12 +382,6 @@ if get_option('enable-x11')
- executable('test-x11comp', 'test/x11comp.c', dependencies: x11_test_dep)
+@@ -670,12 +670,6 @@
+ message('valgrind not found, disabling valgrind test setup')
endif
-
@@ -14,6 +14,6 @@ Reason: removes creation of fuzzing infrastructure which isn't included in the d
-executable('fuzz-compose', 'fuzz/compose/target.c', dependencies: test_dep)
-
-
- # Demo programs.
- executable('rmlvo-to-kccgst', 'test/rmlvo-to-kccgst.c', dependencies: test_dep)
- executable('print-compiled-keymap', 'test/print-compiled-keymap.c', dependencies: test_dep)
+ # Benchmarks.
+ libxkbcommon_bench_internal = static_library(
+ 'xkbcommon-bench-internal',
diff --git a/srcpkgs/libxkbcommon/template b/srcpkgs/libxkbcommon/template
index 708056d67f7..3e2fdfcf92d 100644
--- a/srcpkgs/libxkbcommon/template
+++ b/srcpkgs/libxkbcommon/template
@@ -1,19 +1,19 @@
# Template file for 'libxkbcommon'
pkgname=libxkbcommon
-version=0.10.0
+version=1.0.1
revision=1
wrksrc="${pkgname}-${pkgname#lib}-${version}"
build_style=meson
configure_args="-Denable-wayland=true -Denable-docs=false -Denable-x11=true"
hostmakedepends="pkg-config bison wayland-protocols wayland-devel"
-makedepends="xkeyboard-config libxcb-devel wayland-devel wayland-protocols"
+makedepends="xkeyboard-config libxcb-devel libxml2-devel wayland-protocols wayland-devel"
depends="xkeyboard-config"
short_desc="Library to handle keyboard descriptions"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://xkbcommon.org/"
distfiles="https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-${version}.tar.gz"
-checksum=9b4635cf5d9fc0fb9611ceec1780aafc0944299e9a29ab09c18ec2633923b9c3
+checksum=270e2ad4ce5699f633e49042114cb68a5697fa1ed45b65c1d96a833cfac20954
pkg_install() {
vlicense LICENSE
From 301a9bf9bc53afa752ae0755de19e5f241a94303 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 29 Sep 2020 21:18:42 -0400
Subject: [PATCH 2/2] libxkbcommon: split tools into libxkbcommon-tools
subpackage
---
common/shlibs | 1 -
srcpkgs/libxkbcommon-tools | 1 +
srcpkgs/libxkbcommon/template | 19 +++++++++++++++----
3 files changed, 16 insertions(+), 5 deletions(-)
create mode 120000 srcpkgs/libxkbcommon-tools
diff --git a/common/shlibs b/common/shlibs
index 19f95a83819..ded49667426 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1221,7 +1221,6 @@ libwayland-cursor.so.0 wayland-1.6.0_1
libtomcrypt.so.1 libtomcrypt-1.18.0_1
libHX.so.28 libHX-3.14_1
libxkbcommon.so.0 libxkbcommon-0.2.0_1
-libxkbregistry.so.0 libxkbcommon-1.0.1_1
libxkbcommon-x11.so.0 libxkbcommon-x11-0.4.2_1
libgee-0.8.so.2 libgee08-0.8.2_1
libnettle.so.8 nettle-3.6_1
diff --git a/srcpkgs/libxkbcommon-tools b/srcpkgs/libxkbcommon-tools
new file mode 120000
index 00000000000..51911d5197a
--- /dev/null
+++ b/srcpkgs/libxkbcommon-tools
@@ -0,0 +1 @@
+libxkbcommon
\ No newline at end of file
diff --git a/srcpkgs/libxkbcommon/template b/srcpkgs/libxkbcommon/template
index 3e2fdfcf92d..808140b5524 100644
--- a/srcpkgs/libxkbcommon/template
+++ b/srcpkgs/libxkbcommon/template
@@ -4,9 +4,10 @@ version=1.0.1
revision=1
wrksrc="${pkgname}-${pkgname#lib}-${version}"
build_style=meson
-configure_args="-Denable-wayland=true -Denable-docs=false -Denable-x11=true"
+configure_args="-Denable-x11=true -Denable-docs=false
+ -Denable-wayland=true -Denable-xkbregistry=false"
hostmakedepends="pkg-config bison wayland-protocols wayland-devel"
-makedepends="xkeyboard-config libxcb-devel libxml2-devel wayland-protocols wayland-devel"
+makedepends="xkeyboard-config libxcb-devel wayland-devel wayland-protocols"
depends="xkeyboard-config"
short_desc="Library to handle keyboard descriptions"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,7 +16,7 @@ homepage="https://xkbcommon.org/"
distfiles="https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-${version}.tar.gz"
checksum=270e2ad4ce5699f633e49042114cb68a5697fa1ed45b65c1d96a833cfac20954
-pkg_install() {
+post_install() {
vlicense LICENSE
}
@@ -27,7 +28,8 @@ libxkbcommon-x11_package() {
}
libxkbcommon-devel_package() {
- depends="libxcb-devel ${sourcepkg}-x11>=${version}_${revision} ${sourcepkg}>=${version}_${revision}"
+ depends="${sourcepkg}-x11>=${version}_${revision}
+ ${sourcepkg}>=${version}_${revision} libxcb-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -35,3 +37,12 @@ libxkbcommon-devel_package() {
vmove "usr/lib/*.so"
}
}
+
+libxkbcommon-tools_package() {
+ short_desc+=" - utilities"
+ pkg_install() {
+ vmove usr/bin
+ vmove usr/libexec
+ vmove usr/share/man
+ }
+}
next prev parent reply other threads:[~2020-09-30 1:24 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-27 17:12 [PR PATCH] " dashezup
2020-09-27 18:19 ` [PR PATCH] [Updated] " dashezup
2020-09-29 14:08 ` ahesford
2020-09-29 20:59 ` [PR PATCH] [Updated] " dashezup
2020-09-29 21:26 ` dashezup
2020-09-29 21:55 ` dashezup
2020-09-29 21:55 ` dashezup
2020-09-29 21:56 ` [PR PATCH] [Updated] " dashezup
2020-09-29 22:12 ` dashezup
2020-09-29 22:12 ` dashezup
2020-09-29 22:42 ` dashezup
2020-09-30 1:24 ` ahesford [this message]
2020-09-30 1:29 ` ahesford
2020-09-30 9:48 ` dashezup
2020-09-30 12:39 ` [PR PATCH] [Closed]: " ahesford
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200930012405.cU1pqd_CIQOb1E50wmh6-R7zm2cCqRmKTt3LerKRuyg@z \
--to=ahesford@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).