- Build gnome-session-wayland also on s390x: It was originally

excluded because xwayland did not exist. That has been solved in
  2021 though.

OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=362
This commit is contained in:
Dominique Leuenberger 2024-11-28 08:41:39 +00:00 committed by Git OBS Bridge
commit f69894f945
12 changed files with 4826 additions and 0 deletions

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

19
_service Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0"?>
<services>
<service name="obs_scm" mode="manual">
<param name="scm">git</param>
<param name="url">https://gitlab.gnome.org/GNOME/gnome-session.git</param>
<param name="revision">47.0.1</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">(.*)\+0</param>
<param name="versionrewrite-replacement">\1</param>
<!-- <param name="changesgenerate">enable</param> -->
</service>
<service name="tar" mode="buildtime"/>
<service name="recompress" mode="buildtime">
<param name="file">*.tar</param>
<param name="compression">zst</param>
</service>
<service name="set_version" mode="manual" />
</services>

91
gnome Normal file
View File

@ -0,0 +1,91 @@
#!/bin/bash
#
# This is not the original gnome-session but a start script
# to install some preconfiguration for GNOME
# and some variables to check.
#
# For feedback on this script please use
# https://bugzilla.novell.com/
#
# Define directory that we use to store migration state
if test "x$XDG_CONFIG_HOME" = "x"; then
XDG_CONFIG_HOME="$HOME/.config"
fi
SUSE_DIR="$XDG_CONFIG_HOME/suse"
if test -e /usr/share/applications/YaST2/live-installer.desktop; then
IS_LIVE_IMAGE="yes"
else
IS_LIVE_IMAGE="no"
fi
# Use gnome-applications.menu instead of applications.menu: its
# structure is more appropriate.
export XDG_MENU_PREFIX=gnome-
# Some actions that are specific to the LiveCD
if test "$IS_LIVE_IMAGE" = "yes" ; then
## Make live installer icon more visible. Note that we can't simply put it on
## the desktop, since the desktop is not managed by nautilus anymore (by
## default)
if test -f /etc/xdg/menus/${XDG_MENU_PREFIX}applications.menu -a ! -f "${XDG_CONFIG_HOME}/menus/${XDG_MENU_PREFIX}applications.menu"; then
# Add live installer to the system tools menu (this is nice to have, and also
# required for the favorite app change below)
mkdir -p -m 0700 "${XDG_CONFIG_HOME}"
mkdir -p "${XDG_CONFIG_HOME}/menus"
cat > "${XDG_CONFIG_HOME}/menus/${XDG_MENU_PREFIX}applications.menu" << EOF
<Menu>
<Name>Applications</Name>
<MergeFile type="parent">/etc/xdg/menus/${XDG_MENU_PREFIX}applications.menu</MergeFile>
<Menu>
<Name>System</Name>
<Include>
<Filename>YaST2-live-installer.desktop</Filename>
</Include>
</Menu>
</Menu>
EOF
fi
# Add live installer as favorite application to gnome-shell dash
FAVORITES=`gsettings get org.gnome.shell favorite-apps`
if test $? -eq 0; then
echo ${FAVORITES} | grep -q YaST2-live-installer.desktop
if test $? -ne 0; then
FAVORITES=`echo ${FAVORITES} | sed "s:^\[:\['YaST2-live-installer.desktop', :"`
gsettings set org.gnome.shell favorite-apps "${FAVORITES}"
fi
fi
# Add live installer to the top panel in fallback mode
if test -f /usr/share/gnome-panel/panel-default-layout.layout -a ! -f "${XDG_CONFIG_HOME}/gnome-panel/panel-default-layout.layout"; then
FIRST_TOPLEVEL=`grep --max-count=1 "\[Toplevel" /usr/share/gnome-panel/panel-default-layout.layout | sed "s:\[Toplevel *::g;s: *]::g"`
if test ! -z "${FIRST_TOPLEVEL}"; then
mkdir -p -m 0700 "${XDG_CONFIG_HOME}"
mkdir -p "${XDG_CONFIG_HOME}/gnome-panel"
cp /usr/share/gnome-panel/panel-default-layout.layout "${XDG_CONFIG_HOME}/gnome-panel/panel-default-layout.layout"
cat >> "${XDG_CONFIG_HOME}/gnome-panel/panel-default-layout.layout" << EOF
[Object live-installer-launcher]
object-iid=PanelInternalFactory::Launcher
toplevel-id=top-panel
pack-type=start
pack-index=-1
@instance-config/location="file:///usr/share/applications/YaST2/live-installer.desktop"
EOF
fi
fi
## Other tweaks
# setup session to not have a lock-enabled screensaver
gsettings set org.gnome.desktop.screensaver lock-enabled false
# setup session to not care about updates
gsettings set org.gnome.settings-daemon.plugins.updates active false
fi
# Uncomment after SLED12, remove after SLED14:
#rm -f ~/.skel/gnome2-run ~/.skel/gnome2-run-9.2 ~/.skel/sled10-run
exec /usr/bin/gnome-session ${session} $*

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:765f876bd97faa58275a4443fc9d6c4b05df2ec67bb61dcb01d9c1c0f91a12ad
size 3621388

BIN
gnome-session-47.0.1.obscpio (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,13 @@
Index: gnome-session-42.0/tools/gnome-session-check-accelerated.c
===================================================================
--- gnome-session-42.0.orig/tools/gnome-session-check-accelerated.c
+++ gnome-session-42.0/tools/gnome-session-check-accelerated.c
@@ -147,7 +147,7 @@ main (int argc, char **argv)
* Also make sure that we don't read cached information about the first GPU
* when requesting information about the second.
*/
- if (is_discrete_gpu_check () || g_strcmp0 (g_getenv ("XDG_SESSION_TYPE"), "x11") != 0) {
+ if (is_discrete_gpu_check () || g_strcmp0 (g_getenv ("XDG_SESSION_TYPE"), "wayland") == 0) {
g_autofree char *discrete_renderer_string = get_gtk_gles_renderer (&gtk_gles_error);
if (discrete_renderer_string) {
g_print ("%s", discrete_renderer_string);

View File

@ -0,0 +1,12 @@
Index: gnome-session-40.1.1/data/meson.build
===================================================================
--- gnome-session-40.1.1.orig/data/meson.build
+++ gnome-session-40.1.1/data/meson.build
@@ -25,7 +25,6 @@ required_components = {
'org.gnome.SettingsDaemon.Smartcard',
'org.gnome.SettingsDaemon.Sound',
'org.gnome.SettingsDaemon.UsbProtection',
- 'org.gnome.SettingsDaemon.Wacom',
'org.gnome.SettingsDaemon.XSettings',
],
}

4374
gnome-session.changes Normal file

File diff suppressed because it is too large Load Diff

4
gnome-session.obsinfo Normal file
View File

@ -0,0 +1,4 @@
name: gnome-session
version: 47.0.1
mtime: 1726749415
commit: 51f1872f8e2a60a52126c082531307b9aae05add

217
gnome-session.spec Normal file
View File

@ -0,0 +1,217 @@
#
# spec file for package gnome-session
#
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define basever 47
Name: gnome-session
Version: 47.0.1
Release: 0
Summary: Session Tools for the GNOME Desktop
License: GPL-2.0-or-later
Group: System/GUI/GNOME
URL: https://www.gnome.org
#Source0: https://download.gnome.org/sources/gnome-session/44/%%{name}-%%{version}.tar.xz
Source0: %{name}-%{version}.tar.zst
Source1: gnome
Source2: gnome.desktop
# PATCH-FIX-UPSTREAM gnome-session-better-handle-empty-xdg_session_type.patch bsc#1084756 bgo#794256 yfjiang@suse.com -- solution provided by msrb@suse.com using a more reasonable way to handle gpu acceleration check
Patch0: gnome-session-better-handle-empty-xdg_session_type.patch
# PATCH-FIX-OPENSUSE gnome-session-s390-not-require-g-s-d_wacom.patch bsc#1129412 yfjiang@suse.com -- Remove the runtime requirement of g-s-d Wacom plugin
Patch2: gnome-session-s390-not-require-g-s-d_wacom.patch
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes
BuildRequires: meson
BuildRequires: pkgconfig
BuildRequires: xsltproc
BuildRequires: pkgconfig(egl)
BuildRequires: pkgconfig(epoxy)
BuildRequires: pkgconfig(gio-2.0) >= 2.46.0
BuildRequires: pkgconfig(gio-unix-2.0) >= 2.46.0
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glesv2)
BuildRequires: pkgconfig(glib-2.0) >= 2.46.0
BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.24.2
BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.0
BuildRequires: pkgconfig(ice)
BuildRequires: pkgconfig(json-glib-1.0) >= 0.10
BuildRequires: pkgconfig(libsystemd) >= 209
BuildRequires: pkgconfig(sm)
BuildRequires: pkgconfig(systemd) >= 242
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xcomposite)
BuildRequires: pkgconfig(xtrans)
Requires: %{name}-core = %{version}
# gnome-session-default-session merged into gnome-session; the alternative - fallback-session - disappeared
# with GNOME 3.8
Provides: %{name}-default-session = %{version}
Obsoletes: %{name}-default-session <= %{version}
%description
This package provides the basic session tools, like session management
functionality, for the GNOME Desktop.
%package wayland
Summary: Wayland support for the GNOME Session Manager
Group: System/GUI/GNOME
Requires: %{name} = %{version}
Requires: gnome-settings-daemon
Requires: xorg-x11-server-wayland
%description wayland
This package contains the definition of the default GNOME session on Wayland.
%package core
Summary: Minimal version of the GNOME Session Manager
Group: System/GUI/GNOME
Requires: /usr/bin/dbus-launch
Requires: gsettings-desktop-schemas >= 0.1.7
Requires: hicolor-icon-theme
%description core
This package contains a minimal version of gnome-session, that can be
used for specific cases. The gnome-session package is needed for a fully
functional GNOME desktop.
%package xsession
Summary: Desktop file for X11 GNOME Session
Provides: gnome-session:%{_datadir}/xsessions/gnome.desktop
Requires: %{name} = %{version}
Requires: gnome-shell
Requires: xorg-x11-server
%description xsession
Desktop file to add GNOME (X11) to display manager session menu.
%lang_package
%prep
%setup -q
%patch -P 0 -p1
%ifarch s390 s390x
%patch -P 2 -p1
%endif
%build
%meson \
-D docbook=false \
-D systemduserunitdir=%{_userunitdir} \
%{nil}
%meson_build
%install
%meson_install
# install startup script and xsession file
install -d -m755 %{buildroot}%{_bindir}
install -m755 %{SOURCE1} %{buildroot}%{_bindir}/gnome
install -d -m755 %{buildroot}%{_datadir}/xsessions
install -m644 %{SOURCE2} %{buildroot}%{_datadir}/xsessions/gnome.desktop
%find_lang %{name}-%{basever} %{?no_lang_C}
%fdupes %{buildroot}/%{_prefix}
# Prepare for 'default.desktop' being update-alternative handled, boo#1039756
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop
ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop
touch %{buildroot}%{_sysconfdir}/alternatives/default-waylandsession.desktop
ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_datadir}/wayland-sessions/default.desktop
%post xsession
%{_sbindir}/update-alternatives --install %{_datadir}/xsessions/default.desktop \
default-xsession.desktop %{_datadir}/xsessions/gnome.desktop 25
%postun xsession
[ -f %{_datadir}/xsessions/gnome.desktop ] || %{_sbindir}/update-alternatives \
--remove default-xsession.desktop %{_datadir}/xsessions/gnome.desktop
%files
%{_bindir}/gnome
%{_datadir}/gnome-session/sessions/gnome.session
%{_datadir}/gnome-session/sessions/gnome-dummy.session
%files xsession
%{_datadir}/xsessions/default.desktop
%{_datadir}/xsessions/gnome.desktop
%{_datadir}/xsessions/gnome-xorg.desktop
%ghost %{_sysconfdir}/alternatives/default-xsession.desktop
%post wayland
%{_sbindir}/update-alternatives --install %{_datadir}/wayland-sessions/default.desktop \
default-waylandsession.desktop %{_datadir}/wayland-sessions/gnome.desktop 25
%postun wayland
[ -f %{_datadir}/wayland-sessions/gnome.desktop ] || %{_sbindir}/update-alternatives \
--remove default-waylandsession.desktop %{_datadir}/wayland-sessions/gnome.desktop
%files wayland
%dir %{_datadir}/wayland-sessions
%{_datadir}/wayland-sessions/default.desktop
%{_datadir}/wayland-sessions/gnome.desktop
%{_datadir}/wayland-sessions/gnome-wayland.desktop
%ghost %{_sysconfdir}/alternatives/default-waylandsession.desktop
# Disabled as wayland is now the default session again.
#{_datadir}/wayland-sessions/gnome-wayland.desktop
%files core
%license COPYING
%doc AUTHORS ChangeLog NEWS README
%{_bindir}/gnome-session
%{_bindir}/gnome-session-inhibit
%{_bindir}/gnome-session-quit
%{_datadir}/glib-2.0/schemas/org.gnome.SessionManager.gschema.xml
%dir %{_datadir}/gnome-session
%dir %{_datadir}/gnome-session/sessions
%dir %{_datadir}/xdg-desktop-portal
%{_datadir}/xdg-desktop-portal/gnome-portals.conf
%{_mandir}/man1/gnome-session.1%{?ext_man}
%{_mandir}/man1/gnome-session-inhibit.1%{?ext_man}
%{_mandir}/man1/gnome-session-quit.1%{?ext_man}
%{_libexecdir}/gnome-session-binary
# Helper for the session definitions, to know if hardware is accelerated
%{_libexecdir}/gnome-session-check-accelerated
%{_libexecdir}/gnome-session-check-accelerated-gl-helper
%{_libexecdir}/gnome-session-check-accelerated-gles-helper
%{_libexecdir}/gnome-session-ctl
%{_libexecdir}/gnome-session-failed
%{_datadir}/gnome-session/hardware-compatibility
%dir %{_userunitdir}/gnome-launched-.scope.d
%{_userunitdir}/gnome-launched-.scope.d/override.conf
%{_userunitdir}/gnome-session-failed.service
%{_userunitdir}/gnome-session-failed.target
%{_userunitdir}/gnome-session-initialized.target
%{_userunitdir}/gnome-session-manager.target
%{_userunitdir}/gnome-session-manager@.service
%{_userunitdir}/gnome-session-monitor.service
%{_userunitdir}/gnome-session-pre.target
%{_userunitdir}/gnome-session-restart-dbus.service
%{_userunitdir}/gnome-session-shutdown.target
%{_userunitdir}/gnome-session-signal-init.service
%{_userunitdir}/gnome-session-wayland.target
%{_userunitdir}/gnome-session-wayland@.target
%{_userunitdir}/gnome-session-x11-services-ready.target
%{_userunitdir}/gnome-session-x11-services.target
%{_userunitdir}/gnome-session-x11.target
%{_userunitdir}/gnome-session-x11@.target
%{_userunitdir}/gnome-session.target
%{_userunitdir}/gnome-session@.target
%dir %{_userunitdir}/gnome-session@gnome.target.d
%{_userunitdir}/gnome-session@gnome.target.d/gnome.session.conf
%files lang -f %{name}-%{basever}.lang
%changelog

66
gnome.desktop Normal file
View File

@ -0,0 +1,66 @@
[Desktop Entry]
Encoding=UTF-8
Type=XSession
Exec=gnome
TryExec=gnome
Name=GNOME
DesktopNames=GNOME
Name[ar]=جينوم
Name[bn]=
Name[cs]=GNOME
Name[eo]=Gnomikuo
Name[hi]=
Name[mn]=ГНОМЕ
Name[sv]=Gnome
Name[ta]=
Name[xx]=xxGNOMExx
Comment=The GNU Network Object Model Environment. A complete, free and easy-to-use desktop environment
Comment[ar]=بيئة نموذج الكائن الشبكي من GNU، بيئة سطح مكتبي حرّة وسهلة الاستخدام
Comment[bn]=ি ি ি ,
Comment[bs]=GNU Network Object Model Environment. Kompletna, slobodna i jednostavna za upotrebu desktop okolina
Comment[ca]=El GNU Network Object Model Environment. Un complet, lliure i fàcil d'usar entorn d'escriptori
Comment[cs]=GNU Network Object Model Environment. Úplné, svobodné a snadno použitelné pracovní prostředí
Comment[cy]=Yr Amgylchedd Model Gwrthrych Rhwydwaith GNU (GNU Network Object Model Environment). Amgylchedd penbwrdd cyflawn, rhydd, a hawdd ei ddefnyddio.
Comment[da]=GNU Network Object Model Environment. Et fuldstænding, frit og nemt at bruge desktopmiljø
Comment[de]=Das GNU Network Object Model Environment. Eine komplette, freie und leicht benutzbare Arbeitsumgebung
Comment[el]=Το GNU Network Object Model Environment. Ένα πλήρης, ελεύθερο και εύκολο στη χρήση περιβάλλον επιφάνειας εργασίας
Comment[eo]=Plena labortabla ĉirkaŭaĵo
Comment[es]=El GNU Network Object Model Environment, un entorno de escritorio completo, libre y fácil de usar
Comment[et]=GNU Network Object Model Environment on täielik, vaba ja väga hõlpsasti kasutatav töölaua keskkond
Comment[eu]=GNU Network Object Model Environment. mahaigain-ingurune oso, libre eta erabilterreza
Comment[fi]=GNU Network Object Model Environment. Valmis, vapaa ja helppokäyttöinen työpöytäympäristö
Comment[fr]=The GNU Network Object Model Environment. Un environnement de bureau complet, gratuit et facile à utiliser
Comment[fy]=De GNU Network Object Model Environment, In komplete, frije en ienfâldige te brûken buroblêd omwrâld
Comment[gl]=O GNU Network Object Model Environment. Un entorno de escritorio completo, ceibe e de uso doado
Comment[he]=The GNU Network Object Model Environment. סביבת עבודה מלאה, חופשית וקלה לשימוש
Comment[hi]= . ,
Comment[hu]=GNU Network Object Model Environment (GNOME), egy teljes, ingyenes, könnyen kezelhető grafikus környezet
Comment[is]=GNU Network Object Model Environment er fullkomið og fjrálst skjáborðsumhverfi sem er auðvelt að nota
Comment[it]=Il GNU Network Object Model Environment. Un ambiente desktop completo, libero e facile da usare
Comment[ja]=GNU,使
Comment[lt]=GNU tinklo objektų modeliavimo aplinka. Savarankiška, laisva ir lengvai naudojama darbastalio aplinka
Comment[mk]=GNU Network Object Model Environment. Работна околина која е комплетна, слободна и едноставна за користење
Comment[mn]=GNU Network Object Model Environment. Бүрэн, үнэгүй хэрэглэхэд хялбар дэлгэцийн системийн орчин
Comment[mt]=GNU Network Object Model Environment. Ambjent grafiku komplet, ħieles u faċli tużah.
Comment[nb]=GNU Network Object Model Environment. Et skrivebordsmiljø som er komplett, fritt og lett å bruke.
Comment[nds]=De GNU Network Object Model Environment. En kumplette Schriefdisch-Ümgeven, ümsunst un eenfach to bruken
Comment[nl]=De GNU Network Object Model Environment, een complete, vrije en eenvoudig te gebruiken desktop environment.
Comment[nn]=GNU Network Object Model Environment. Eit skrivebordsmiljø som er komplett, fritt og lett å bruka.
Comment[pa]=GNU Network Object Model Environment , ਿ ਿ ਿ
Comment[pl]=GNU Network Object Model Environment (GNOME). Pełne, wolne i łatwe w użyciu środowisko pulpitu
Comment[pt]=O GNU Network Object Model Environment. Um ambiente de trabalho completo, livre e fácil de usar
Comment[pt_BR]=Acrônimo para GNU Network Object Model Environment ou Ambiente de Modelo de Objetos de Rede GNU; um ambiente de trabalho completo, livre e fácil de usar
Comment[ro]=GNU Network Object Model Environment. Un mediu grafic complet, gratuit şi uşor de utilizat
Comment[ru]=GNU Network Object Model Environment - полная, свободная и легкая в использовании графическая среда
Comment[sk]=The GNU Network Object Model Environment. Úplné, voľne šíriteľné a ľahko používateľné pracovné prostredie
Comment[sl]=GNU Network Object Model Environment. Popolno, prosto in preposto namizno okolje
Comment[sr]=GNU Network Object Model Environment(Gnome, Гном). Потпуно, бесплатно и лако за коришћење радно окружење
Comment[sr@Latn]=GNU Network Object Model Environment(Gnome, Gnom). Potpuno, besplatno i lako za korišćenje radno okruženje
Comment[sv]=GNU Network Object Model Environment. En fullständig, fri och lättanvänd skrivbordsmiljö
Comment[ta]=GNU ிி . , ி
Comment[tr]=GNU Network Object Model Environment (GNOME)
Comment[uk]=The GNU Network Object Model Environment. Повнофункціональне, вільне та зручне графічне середовище
Comment[uz]=GNOME (GNU Network Object Model Environment) - мукаммал, бепул ва фойдаланиш учун жуда қулай иш столи муҳити
Comment[vi]=Môi trưng kiu đi tưng ca GNU: Mt môi trưng desktop đy đ, min phí và d s dng
Comment[xx]=xxThe GNU Network Object Model Environment. A complete, free and easy-to-use desktop environmentxx
Comment[zh_CN]=GNU