Compare commits
No commits in common. "c8s" and "c9-beta" have entirely different histories.
.gitignore.xorg-x11-xinit.metadata0001-startx-Pass-keeptty-when-telling-the-server-to-start.patch0002-startx-Fix-startx-picking-an-already-used-display-nu.patch
SOURCES
0003-startx-Make-startx-auto-display-select-work-with-per.patchXclientsXmodmapXresourcesXsessionlocaluser.shxinit-1.0.2-client-session.patchxinit-1.3.4-set-XORG_RUN_AS_USER_OK.patchxinit-compatxinit-compat.desktopxinitrcxinitrc-common
SPECS
gating.yamlsources
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
/xinit-1.3.4.tar.bz2
|
SOURCES/xinit-1.4.0.tar.bz2
|
||||||
|
1
.xorg-x11-xinit.metadata
Normal file
1
.xorg-x11-xinit.metadata
Normal file
@ -0,0 +1 @@
|
|||||||
|
fcdca692b09a45f546016fff78718d1cf7e7852f SOURCES/xinit-1.4.0.tar.bz2
|
@ -1,34 +0,0 @@
|
|||||||
From c70ab1d87b4aec8f171615aa8dee4a1fc1104b4b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Hans de Goede <hdegoede@redhat.com>
|
|
||||||
Date: Tue, 20 Jan 2015 16:18:34 +0100
|
|
||||||
Subject: [PATCH xinit] startx: Pass -keeptty when telling the server to start
|
|
||||||
on the current tty
|
|
||||||
|
|
||||||
Detaching from the tty causes systemd-logind to refuse service to the xserver,
|
|
||||||
the xserver already tries to detect that it is being asked to run on the
|
|
||||||
current tty and then automatically enables -keeptty, but this code fails if
|
|
||||||
all of stdin, stdout and stderr are redirected to a file. So explicitly tell
|
|
||||||
the xserver to not detach when we're telling it to run on the current tty.
|
|
||||||
|
|
||||||
BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1177513
|
|
||||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
||||||
---
|
|
||||||
startx.cpp | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/startx.cpp b/startx.cpp
|
|
||||||
index 1c6fce0..45d7bd9 100644
|
|
||||||
--- a/startx.cpp
|
|
||||||
+++ b/startx.cpp
|
|
||||||
@@ -195,7 +195,7 @@ if [ x"$server" = x ]; then
|
|
||||||
tty=$(tty)
|
|
||||||
if expr match "$tty" '^/dev/tty[0-9]\+$' > /dev/null; then
|
|
||||||
tty_num=$(echo "$tty" | grep -oE '[0-9]+$')
|
|
||||||
- vtarg="vt$tty_num"
|
|
||||||
+ vtarg="vt$tty_num -keeptty"
|
|
||||||
fi
|
|
||||||
#endif
|
|
||||||
|
|
||||||
--
|
|
||||||
2.1.0
|
|
||||||
|
|
@ -1,36 +0,0 @@
|
|||||||
From 848dc9b7f3a95f14efd4ea34188cba51965c9f53 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Hans de Goede <hdegoede@redhat.com>
|
|
||||||
Date: Fri, 20 Mar 2015 14:25:44 +0100
|
|
||||||
Subject: [PATCH xinit 2/3] startx: Fix startx picking an already used display
|
|
||||||
number when -nolock is used
|
|
||||||
|
|
||||||
Currently startx relies on /tmp/.X?-lock being present for automatically
|
|
||||||
picking a free display number. This does not work if -nolock is used when
|
|
||||||
starting the server, or if the server is started with -displayfd as -displayfd
|
|
||||||
implies -nolock.
|
|
||||||
|
|
||||||
This is becoming a problem now that -displayfd is getting used by
|
|
||||||
display-managers (e.g. gdm), this fixes this by also checking for
|
|
||||||
/tmp/.X11-unix/X?
|
|
||||||
|
|
||||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
||||||
---
|
|
||||||
startx.cpp | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/startx.cpp b/startx.cpp
|
|
||||||
index 8520399..fe49996 100644
|
|
||||||
--- a/startx.cpp
|
|
||||||
+++ b/startx.cpp
|
|
||||||
@@ -120,7 +120,7 @@ enable_xauth=1
|
|
||||||
XCOMM Automatically determine an unused $DISPLAY
|
|
||||||
d=0
|
|
||||||
while true ; do
|
|
||||||
- [ -e /tmp/.X$d-lock ] || break
|
|
||||||
+ [ -e "/tmp/.X$d-lock" -o -S "/tmp/.X11-unix/X$d" ] || break
|
|
||||||
d=$(($d + 1))
|
|
||||||
done
|
|
||||||
defaultdisplay=":$d"
|
|
||||||
--
|
|
||||||
2.3.3
|
|
||||||
|
|
@ -2,12 +2,12 @@
|
|||||||
|
|
||||||
Summary: X.Org X11 X Window System xinit startup scripts
|
Summary: X.Org X11 X Window System xinit startup scripts
|
||||||
Name: xorg-x11-%{pkgname}
|
Name: xorg-x11-%{pkgname}
|
||||||
Version: 1.3.4
|
Version: 1.4.0
|
||||||
Release: 18%{?dist}
|
Release: 11%{?dist}
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: http://www.x.org
|
URL: https://www.x.org
|
||||||
|
|
||||||
Source0: http://xorg.freedesktop.org/archive/individual/app/%{pkgname}-%{version}.tar.bz2
|
Source0: https://xorg.freedesktop.org/archive/individual/app/%{pkgname}-%{version}.tar.bz2
|
||||||
Source10: xinitrc-common
|
Source10: xinitrc-common
|
||||||
Source11: xinitrc
|
Source11: xinitrc
|
||||||
Source12: Xclients
|
Source12: Xclients
|
||||||
@ -22,14 +22,23 @@ Source19: xinit-compat
|
|||||||
|
|
||||||
# Fedora specific patches
|
# Fedora specific patches
|
||||||
Patch1: xinit-1.0.2-client-session.patch
|
Patch1: xinit-1.0.2-client-session.patch
|
||||||
# A few fixes submitted upstream, rhbz#1177513, rhbz#1203780
|
|
||||||
Patch3: 0001-startx-Pass-keeptty-when-telling-the-server-to-start.patch
|
|
||||||
Patch4: 0002-startx-Fix-startx-picking-an-already-used-display-nu.patch
|
|
||||||
Patch5: 0003-startx-Make-startx-auto-display-select-work-with-per.patch
|
Patch5: 0003-startx-Make-startx-auto-display-select-work-with-per.patch
|
||||||
# Fedora specific patch to match the similar patch in the xserver
|
# Fedora specific patch to match the similar patch in the xserver
|
||||||
Patch6: xinit-1.3.4-set-XORG_RUN_AS_USER_OK.patch
|
Patch6: xinit-1.3.4-set-XORG_RUN_AS_USER_OK.patch
|
||||||
|
|
||||||
BuildRequires: automake gcc
|
# The build process uses cpp (the C preprocessor) to do some text
|
||||||
|
# processing on several files that are not C or C++. However, these
|
||||||
|
# files have '.cpp' extensions, which causes cpp to preprocess them
|
||||||
|
# using cc1plus, which is part of gcc-c++. We could patch the build
|
||||||
|
# to pass '-xc' or '-xassembler-with-cpp' to cpp to avoid this, but
|
||||||
|
# doing so actually causes the processing to be done differently
|
||||||
|
# somehow, and a bunch of empty lines to show up at the top of
|
||||||
|
# startx (which is one of the files so processed). So it seems better
|
||||||
|
# to just BuildRequire gcc-c++ for now, so the processing is done as
|
||||||
|
# it was before. See https://bugs.freedesktop.org/show_bug.cgi?id=107368
|
||||||
|
# for more on this.
|
||||||
|
BuildRequires: make
|
||||||
|
BuildRequires: automake gcc gcc-c++
|
||||||
BuildRequires: pkgconfig(x11)
|
BuildRequires: pkgconfig(x11)
|
||||||
BuildRequires: dbus-devel
|
BuildRequires: dbus-devel
|
||||||
|
|
||||||
@ -55,8 +64,6 @@ managers.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n %{pkgname}-%{version}
|
%setup -q -n %{pkgname}-%{version}
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch3 -p1
|
|
||||||
%patch4 -p1
|
|
||||||
%patch5 -p1
|
%patch5 -p1
|
||||||
%patch6 -p1
|
%patch6 -p1
|
||||||
|
|
||||||
@ -112,6 +119,40 @@ install -p -m644 -D %{SOURCE18} $RPM_BUILD_ROOT%{_datadir}/xsessions/xinit-compa
|
|||||||
%{_datadir}/xsessions/xinit-compat.desktop
|
%{_datadir}/xsessions/xinit-compat.desktop
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.4.0-11
|
||||||
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||||
|
Related: rhbz#1991688
|
||||||
|
|
||||||
|
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.4.0-10
|
||||||
|
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||||
|
|
||||||
|
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-9
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Nov 5 11:00:56 AEST 2020 Peter Hutterer <peter.hutterer@redhat.com> - 1.4.0-8
|
||||||
|
- Add BuildRequires for make
|
||||||
|
|
||||||
|
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-7
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jul 24 2018 Adam Williamson <awilliam@redhat.com> - 1.4.0-3
|
||||||
|
- Rebuild with gcc-c++ (build without it succeeded but was broken)
|
||||||
|
|
||||||
|
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Mar 12 2018 Adam Jackson <ajax@redhat.com> - 1.4.0-1
|
||||||
|
- xinit 1.4.0
|
||||||
|
|
||||||
* Mon Feb 19 2018 Peter Hutterer <peter.hutterer@redhat.com> 1.3.4-18
|
* Mon Feb 19 2018 Peter Hutterer <peter.hutterer@redhat.com> 1.3.4-18
|
||||||
- Add BR for automake and gcc
|
- Add BR for automake and gcc
|
||||||
|
|
@ -1,6 +0,0 @@
|
|||||||
--- !Policy
|
|
||||||
product_versions:
|
|
||||||
- rhel-8
|
|
||||||
decision_context: osci_compose_gate
|
|
||||||
rules:
|
|
||||||
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
|
Loading…
Reference in New Issue
Block a user