Compare commits
3 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| c6f1f6d3b6 | |||
| 97d5fe24b1 | |||
| ab36e7dcfc |
32
U_meson-fix-generation-of-shadow-man-pages.patch
Normal file
32
U_meson-fix-generation-of-shadow-man-pages.patch
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
From fb63768b72437e647fe85b4cfa2f211e986cc564 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Date: Sun, 9 Feb 2025 10:31:27 -0800
|
||||||
|
Subject: [PATCH] meson: fix generation of shadow man pages
|
||||||
|
|
||||||
|
Since the shadow man pages have 'man__libmansuffix__/Xau.__libmansuffix__'
|
||||||
|
the /g modifier needs to be applied to the sed substitution to make it
|
||||||
|
apply to all instances in the line, not just the first.
|
||||||
|
|
||||||
|
Fixes: 68e74d3 ("add Meson build system")
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Part-of: <https://gitlab.freedesktop.org/xorg/lib/libxau/-/merge_requests/20>
|
||||||
|
---
|
||||||
|
man/meson.build | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/man/meson.build b/man/meson.build
|
||||||
|
index 4732cbc..64babf5 100644
|
||||||
|
--- a/man/meson.build
|
||||||
|
+++ b/man/meson.build
|
||||||
|
@@ -13,7 +13,7 @@ foreach man : ['Xau', 'XauDisposeAuth', 'XauFileName', 'XauGetAuthByAddr',
|
||||||
|
command : [
|
||||||
|
prog_sed,
|
||||||
|
'-e', 's/__xorgversion__/"libXau @0@" "X Version 11"/'.format(meson.project_version()),
|
||||||
|
- '-e', 's/__libmansuffix__/3/',
|
||||||
|
+ '-e', 's/__libmansuffix__/3/g',
|
||||||
|
'@INPUT@',
|
||||||
|
],
|
||||||
|
capture : true,
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
|
|
||||||
@@ -1,3 +1,16 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Mar 28 12:26:06 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||||
|
|
||||||
|
- replaced fix-sed-for-manpages.patch with upstream patch
|
||||||
|
U_meson-fix-generation-of-shadow-man-pages.patch
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Mar 26 12:57:19 UTC 2025 - Thorsten Kukuk <kukuk@suse.com>
|
||||||
|
|
||||||
|
- fix-sed-for-manpages.patch: sed need to replace all occurences
|
||||||
|
of the string, not only the first one. Else e.g. .so references
|
||||||
|
are broken (.so man3/Xau.__libmansuffix__)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sat Dec 14 03:47:36 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
|
Sat Dec 14 03:47:36 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package libXau
|
# spec file for package libXau
|
||||||
#
|
#
|
||||||
# Copyright (c) 2024 SUSE LLC
|
# Copyright (c) 2025 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@@ -28,6 +28,7 @@ URL: https://xorg.freedesktop.org/
|
|||||||
#Git-Web: http://cgit.freedesktop.org/xorg/lib/libXau/
|
#Git-Web: http://cgit.freedesktop.org/xorg/lib/libXau/
|
||||||
Source: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.xz
|
Source: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.xz
|
||||||
Source1: baselibs.conf
|
Source1: baselibs.conf
|
||||||
|
Patch: U_meson-fix-generation-of-shadow-man-pages.patch
|
||||||
#git#BuildRequires: autoconf >= 2.60, automake
|
#git#BuildRequires: autoconf >= 2.60, automake
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
@@ -76,7 +77,7 @@ This package contains the development headers for the library found
|
|||||||
in %{lname}.
|
in %{lname}.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%autosetup -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%meson
|
%meson
|
||||||
|
|||||||
Reference in New Issue
Block a user