Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] xkeyboard-config: use intltool again.
@ 2022-02-11 22:46 tibequadorian
  2022-02-11 22:51 ` [PR PATCH] [Merged]: " leahneukirchen
  0 siblings, 1 reply; 2+ messages in thread
From: tibequadorian @ 2022-02-11 22:46 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1402 bytes --]

There is a new pull request by tibequadorian against master on the void-packages repository

https://github.com/tibequadorian/void-packages xkeyboard-config-revert
https://github.com/void-linux/void-packages/pull/35545

xkeyboard-config: use intltool again.
<!-- Uncomment relevant sections and delete options which are not applicable -->

Sorry, I didn't see the locales part @leahneukirchen
I added intltool again, though it was part of the autotools build system so I removed it... :/

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/35545.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xkeyboard-config-revert-35545.patch --]
[-- Type: text/x-diff, Size: 934 bytes --]

From 259f55d9790b2aeb8fa7f72337c615b7a182799c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 11 Feb 2022 23:44:11 +0100
Subject: [PATCH] xkeyboard-config: use intltool again.

---
 srcpkgs/xkeyboard-config/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xkeyboard-config/template b/srcpkgs/xkeyboard-config/template
index e4de462d7776..238d45a9ea55 100644
--- a/srcpkgs/xkeyboard-config/template
+++ b/srcpkgs/xkeyboard-config/template
@@ -1,10 +1,10 @@
 # Template file for 'xkeyboard-config'
 pkgname=xkeyboard-config
 version=2.35.1
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dxorg-rules-symlinks=true -Dcompat-rules=true"
-hostmakedepends="pkg-config libxslt python3 perl"
+hostmakedepends="pkg-config libxslt python3 intltool perl"
 makedepends="libX11-devel xkbcomp"
 depends="xkbcomp"
 short_desc="X Keyboard Configuration Database"

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: xkeyboard-config: use intltool again.
  2022-02-11 22:46 [PR PATCH] xkeyboard-config: use intltool again tibequadorian
@ 2022-02-11 22:51 ` leahneukirchen
  0 siblings, 0 replies; 2+ messages in thread
From: leahneukirchen @ 2022-02-11 22:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1222 bytes --]

There's a merged pull request on the void-packages repository

xkeyboard-config: use intltool again.
https://github.com/void-linux/void-packages/pull/35545

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

Sorry, I missed the locales part @leahneukirchen
I added intltool again. I thought it was part of the autotools build system so I removed it... :/

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-02-11 22:51 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-11 22:46 [PR PATCH] xkeyboard-config: use intltool again tibequadorian
2022-02-11 22:51 ` [PR PATCH] [Merged]: " leahneukirchen

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).