From 49d5b06c54663d3c55a63822ae50bd790133d078c96bdeb34ed39be7ba0241bd Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 30 Jul 2025 11:55:59 +0000 Subject: [PATCH 1/3] - For the transition period let's limit scope to executing opensuse-welcome. For the time being make opensuse-welcome recommended as we replace it in pattern-base. - Use Hidden=True for .config/autostart Introduce org.opensuse.opensuse_welcome_launcher-hidden.desktop - Remove legacy org.opensuse.opensuse_welcome.desktop from .config/autostart now when it was dropped from opensuse-welcome - Add svg files from opensuse-welcome for icon reference in .desktop files. Also adds Buildrequires on hicolor icons - Related to code-o-o#leap/features/208 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/opensuse-welcome-launcher?expand=0&rev=2 --- opensuse-welcome-launcher.changes | 20 ++++++++++++ opensuse-welcome-launcher.sh | 23 ++++++++------ opensuse-welcome-launcher.spec | 29 ++++++++++++++--- ...e.opensuse_welcome_launcher-hidden.desktop | 10 ++++++ ...use.opensuse_welcome_launcher-symbolic.svg | 3 ++ ...opensuse.opensuse_welcome_launcher.desktop | 31 +++---------------- org.opensuse.opensuse_welcome_launcher.svg | 17 ++++++++++ 7 files changed, 94 insertions(+), 39 deletions(-) create mode 100644 org.opensuse.opensuse_welcome_launcher-hidden.desktop create mode 100644 org.opensuse.opensuse_welcome_launcher-symbolic.svg create mode 100644 org.opensuse.opensuse_welcome_launcher.svg diff --git a/opensuse-welcome-launcher.changes b/opensuse-welcome-launcher.changes index 7f4c1ec..ad1557b 100644 --- a/opensuse-welcome-launcher.changes +++ b/opensuse-welcome-launcher.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Jul 29 21:22:16 UTC 2025 - Lubos Kocman + +- For the transition period let's limit scope to executing + opensuse-welcome. For the time being make + opensuse-welcome recommended as we replace it in pattern-base. + +- Use Hidden=True for .config/autostart + Introduce org.opensuse.opensuse_welcome_launcher-hidden.desktop + +- Remove legacy org.opensuse.opensuse_welcome.desktop + from .config/autostart now when it was dropped from + opensuse-welcome + +- Add svg files from opensuse-welcome for icon reference in + .desktop files. Also adds Buildrequires on hicolor icons + +- Related to code-o-o#leap/features/208 + + ------------------------------------------------------------------- Fri Jun 13 12:18:41 UTC 2025 - Lubos Kocman diff --git a/opensuse-welcome-launcher.sh b/opensuse-welcome-launcher.sh index 38c5f9a..00b9f3b 100644 --- a/opensuse-welcome-launcher.sh +++ b/opensuse-welcome-launcher.sh @@ -3,15 +3,18 @@ # Mimic behavior of old openSUSE-welcome with "Show on next boot" unchecked LAUNCHER_XDG_FILE=org.opensuse.opensuse_welcome_launcher.desktop -ORIG_XDG_FILE=/org.opensuse.opensuse_welcome.desktop +LEGACY_XDG_FILE=org.opensuse.opensuse_welcome.desktop +HIDDEN_LAUNCHER_XDG_FILE="/usr/share/opensuse-welcome-launcher/org.opensuse.opensuse_welcome_launcher-hidden.desktop" -# Override also the original's openSUSE-welcome startup -if [[ -e "/etc/xdg/autostart/${LAUNCHER_XDG_FILE}" && \ - ! -e "$HOME/.config/autostart/${LAUNCHER_XDG_FILE}" ]]; then - cp /etc/xdg/autostart/${LAUNCHER_XDG_FILE} ${HOME}/.config/autostart/${LAUNCHER_XDG_FILE} - cp /etc/xdg/autostart/${LAUNCHER_XDG_FILE} ${HOME}/.config/autostart/${ORIG_XDG_FILE} +# The legacy autostart was dropped let's remove it from homedir +if [[ -e "$HOME/.config/autostart/${LEGACY_XDG_FILE}" && \ + ! -e "/etc/xdg/autostart/${LEGACY_XDG_FILE}" ]]; then + rm -f "$HOME/.config/autostart/${LEGACY_XDG_FILE}" fi +# Show only once +cp ${HIDDEN_LAUNCHER_XDG_FILE} ${HOME}/.config/autostart/${LAUNCHER_XDG_FILE} + detect_de() { if [ -n "$XDG_CURRENT_DESKTOP" ]; then @@ -38,9 +41,11 @@ if [ -z "$welcome_binary" ]; then welcome_binary=$(command -v opensuse-welcome) fi +# XXX: hack for the initial integration +# keep legacy behavior and only trigger opensuse-welcome +# rest would be the next step +welcome_binary=$(command -v opensuse-welcome) + if [ ! -z "$welcome_binary" ]; then $welcome_binary -else - echo "No matching welcome tool is available; however, we can't leave it like this!" - echo "So let me at least say: Welcome, and have a lot of fun!" fi diff --git a/opensuse-welcome-launcher.spec b/opensuse-welcome-launcher.spec index c1d8a06..d1dd53c 100644 --- a/opensuse-welcome-launcher.spec +++ b/opensuse-welcome-launcher.spec @@ -16,7 +16,6 @@ # - Name: opensuse-welcome-launcher Version: 1.0 Release: 0 @@ -27,7 +26,12 @@ URL: https://github.com/openSUSE/openSUSE-welcome Source0: opensuse-welcome-launcher.sh # Original filename was org.opensuse.opensuse_welcome.desktop Source1: org.opensuse.opensuse_welcome_launcher.desktop -Suggests: opensuse-welcome +Source2: org.opensuse.opensuse_welcome_launcher-hidden.desktop +Source3: org.opensuse.opensuse_welcome_launcher.svg +Source4: org.opensuse.opensuse_welcome_launcher-symbolic.svg +Recommends: opensuse-welcome >= 0.1.10 +BuildRequires: hicolor-icon-theme +BuildRequires: hicolor-icon-theme-branding-openSUSE %description A simple wrapper to spawn relevant welcome tool on given desktop @@ -35,15 +39,32 @@ A simple wrapper to spawn relevant welcome tool on given desktop %prep %install +# Create necessary directories mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart +mkdir -p %{buildroot}%{_datadir}/applications +mkdir -p %{buildroot}%{_datadir}/opensuse-welcome-launcher +mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps +mkdir -p %{buildroot}%{_datadir}/icons/hicolor/symbolic/apps +# Install launcher script install -m 0755 %{SOURCE0} %{buildroot}%{_bindir}/opensuse-welcome-launcher + +# Install desktop entries install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/xdg/autostart/org.opensuse.opensuse_welcome_launcher.desktop +install -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/applications/org.opensuse.opensuse_welcome_launcher.desktop +install -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/opensuse-welcome-launcher/org.opensuse.opensuse_welcome_launcher-hidden.desktop + +# Install icons +install -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/org.opensuse.opensuse_welcome_launcher.svg +install -m 0644 %{SOURCE4} %{buildroot}%{_datadir}/icons/hicolor/symbolic/apps/org.opensuse.opensuse_welcome_launcher-symbolic.svg %files %{_bindir}/opensuse-welcome-launcher %{_sysconfdir}/xdg/autostart/org.opensuse.opensuse_welcome_launcher.desktop - - +%{_datadir}/applications/org.opensuse.opensuse_welcome_launcher.desktop +%dir %{_datadir}/opensuse-welcome-launcher +%{_datadir}/opensuse-welcome-launcher/org.opensuse.opensuse_welcome_launcher-hidden.desktop +%{_datadir}/icons/hicolor/scalable/apps/org.opensuse.opensuse_welcome_launcher.svg +%{_datadir}/icons/hicolor/symbolic/apps/org.opensuse.opensuse_welcome_launcher-symbolic.svg %changelog diff --git a/org.opensuse.opensuse_welcome_launcher-hidden.desktop b/org.opensuse.opensuse_welcome_launcher-hidden.desktop new file mode 100644 index 0000000..d3cbd7c --- /dev/null +++ b/org.opensuse.opensuse_welcome_launcher-hidden.desktop @@ -0,0 +1,10 @@ +# Copy me to /etc/xdg/autostart and /usr/share/applications +[Desktop Entry] +Type=Application +Name=Welcome launcher +Exec=/usr/bin/opensuse-welcome-launcher +Hidden=true +Icon=org.opensuse.opensuse_welcome_launcher +Comment=The openSUSE Welcome launcher utility. +Categories=Qt;System;Documentation +GenericName=Welcome launcher Utility diff --git a/org.opensuse.opensuse_welcome_launcher-symbolic.svg b/org.opensuse.opensuse_welcome_launcher-symbolic.svg new file mode 100644 index 0000000..7611db4 --- /dev/null +++ b/org.opensuse.opensuse_welcome_launcher-symbolic.svg @@ -0,0 +1,3 @@ + + + diff --git a/org.opensuse.opensuse_welcome_launcher.desktop b/org.opensuse.opensuse_welcome_launcher.desktop index e27d764..a0ed216 100644 --- a/org.opensuse.opensuse_welcome_launcher.desktop +++ b/org.opensuse.opensuse_welcome_launcher.desktop @@ -1,30 +1,9 @@ # Copy me to /etc/xdg/autostart and /usr/share/applications [Desktop Entry] Type=Application -Name=Welcome -Exec=/usr/bin/opensuse-welcome -Icon=org.opensuse.opensuse_welcome -Comment=The openSUSE Welcome utility. +Name=Welcome launcher +Exec=/usr/bin/opensuse-welcome-launcher +Icon=org.opensuse.opensuse_welcome_launcher +Comment=The openSUSE Welcome launcher utility. Categories=Qt;System;Documentation -GenericName=Welcome Utility -# Danish translation -Name[da]=Velkomst -Comment[da]=Redskabet openSUSE Velkomst. -GenericName[da]=Velkomst-redskab -# Spanish translation -Name[es]=Bienvenida -Comment[es]=La utilidad de bienvenida de openSUSE. -GenericName[es]=Utilidad de bienvenida -# French translation -Name[fr]=Bienvenue -Comment[fr]=Utilitaire de bienvenue -GenericName[fr]=L'utilitaire de bienvenue d'openSUSE. -# Polish translation -Name[pl]=Witaj -Comment[pl]=Program do powitania -GenericName[pl]=Program do powitania w openSUSE. -# Simplified Chinese translation -Name[zh_CN]=欢迎 -Comment[zh_CN]=openSUSE 欢迎程序。 -GenericName[zh_CN]=欢迎程序 -NotShowIn=GNOME; +GenericName=Welcome launcher Utility diff --git a/org.opensuse.opensuse_welcome_launcher.svg b/org.opensuse.opensuse_welcome_launcher.svg new file mode 100644 index 0000000..c52a7fb --- /dev/null +++ b/org.opensuse.opensuse_welcome_launcher.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + -- 2.51.1 From 7ba229346fbb2645f1c550043db83286bcb836ac1f64497f78fb2688c0766d18 Mon Sep 17 00:00:00 2001 From: Lubos Kocman Date: Tue, 19 Aug 2025 07:55:05 +0000 Subject: [PATCH 2/3] Alternative SR - change the way we decide to auto-start OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/opensuse-welcome-launcher?expand=0&rev=3 --- opensuse-welcome-launcher.changes | 16 ++++++++++++++++ opensuse-welcome-launcher.sh | 13 ++++++++++--- opensuse-welcome-launcher.spec | 12 ++++++------ ...suse.opensuse_welcome_launcher-hidden.desktop | 10 ---------- 4 files changed, 32 insertions(+), 19 deletions(-) delete mode 100644 org.opensuse.opensuse_welcome_launcher-hidden.desktop diff --git a/opensuse-welcome-launcher.changes b/opensuse-welcome-launcher.changes index ad1557b..abbdb9b 100644 --- a/opensuse-welcome-launcher.changes +++ b/opensuse-welcome-launcher.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Aug 19 07:46:04 UTC 2025 - Dominique Leuenberger + +- Change autostart to always launch, but internally decide if we + already showed the greeter. This allows us to bump the version + for next Leap versions and have the welcome screen show at least + once every while. + +------------------------------------------------------------------- +Mon Aug 18 15:30:12 UTC 2025 - Dominique Leuenberger + +- Ensure ${HOME}/.config/autostart exists before copying to it + (boo#1248197). +- Install autostart to /usr/etc/xdg/autosttart +- Build as noarch: this package only consists of a shell script. + ------------------------------------------------------------------- Tue Jul 29 21:22:16 UTC 2025 - Lubos Kocman diff --git a/opensuse-welcome-launcher.sh b/opensuse-welcome-launcher.sh index 00b9f3b..af3cca2 100644 --- a/opensuse-welcome-launcher.sh +++ b/opensuse-welcome-launcher.sh @@ -4,7 +4,7 @@ LAUNCHER_XDG_FILE=org.opensuse.opensuse_welcome_launcher.desktop LEGACY_XDG_FILE=org.opensuse.opensuse_welcome.desktop -HIDDEN_LAUNCHER_XDG_FILE="/usr/share/opensuse-welcome-launcher/org.opensuse.opensuse_welcome_launcher-hidden.desktop" +OSWL_VERSION_TAG=1 # The legacy autostart was dropped let's remove it from homedir if [[ -e "$HOME/.config/autostart/${LEGACY_XDG_FILE}" && \ @@ -12,9 +12,16 @@ if [[ -e "$HOME/.config/autostart/${LEGACY_XDG_FILE}" && \ rm -f "$HOME/.config/autostart/${LEGACY_XDG_FILE}" fi -# Show only once -cp ${HIDDEN_LAUNCHER_XDG_FILE} ${HOME}/.config/autostart/${LAUNCHER_XDG_FILE} +# Show only once per version +if [ -f ${HOME}/.local/share/opensuse-welcome/launched ]; then + if "$(cat ${HOME}/.local/share/opensuse-welcome/launched)" = "${OSWL_VERSION_TAG}"; then + # We have already shown the laucher at this version - skipping + exit 0 + fi +fi +test -d ${HOME}/.local/share/opensuse-welcome || mkdir -p ${HOME}/.local/share/opensuse-welcome +echo "${OSWL_VERSION_TAG}" > ${HOME}/.local/share/opensuse-welcome/launched detect_de() { if [ -n "$XDG_CURRENT_DESKTOP" ]; then diff --git a/opensuse-welcome-launcher.spec b/opensuse-welcome-launcher.spec index d1dd53c..2a274ca 100644 --- a/opensuse-welcome-launcher.spec +++ b/opensuse-welcome-launcher.spec @@ -26,22 +26,24 @@ URL: https://github.com/openSUSE/openSUSE-welcome Source0: opensuse-welcome-launcher.sh # Original filename was org.opensuse.opensuse_welcome.desktop Source1: org.opensuse.opensuse_welcome_launcher.desktop -Source2: org.opensuse.opensuse_welcome_launcher-hidden.desktop Source3: org.opensuse.opensuse_welcome_launcher.svg Source4: org.opensuse.opensuse_welcome_launcher-symbolic.svg Recommends: opensuse-welcome >= 0.1.10 BuildRequires: hicolor-icon-theme BuildRequires: hicolor-icon-theme-branding-openSUSE +BuildArch: noarch %description A simple wrapper to spawn relevant welcome tool on given desktop %prep +%build + %install # Create necessary directories mkdir -p %{buildroot}%{_bindir} -mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart +mkdir -p %{buildroot}%{_distconfdir}/xdg/autostart mkdir -p %{buildroot}%{_datadir}/applications mkdir -p %{buildroot}%{_datadir}/opensuse-welcome-launcher mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps @@ -51,9 +53,8 @@ mkdir -p %{buildroot}%{_datadir}/icons/hicolor/symbolic/apps install -m 0755 %{SOURCE0} %{buildroot}%{_bindir}/opensuse-welcome-launcher # Install desktop entries -install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/xdg/autostart/org.opensuse.opensuse_welcome_launcher.desktop +install -m 0644 %{SOURCE1} %{buildroot}%{_distconfdir}/xdg/autostart/org.opensuse.opensuse_welcome_launcher.desktop install -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/applications/org.opensuse.opensuse_welcome_launcher.desktop -install -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/opensuse-welcome-launcher/org.opensuse.opensuse_welcome_launcher-hidden.desktop # Install icons install -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/org.opensuse.opensuse_welcome_launcher.svg @@ -61,10 +62,9 @@ install -m 0644 %{SOURCE4} %{buildroot}%{_datadir}/icons/hicolor/symbolic/apps/o %files %{_bindir}/opensuse-welcome-launcher -%{_sysconfdir}/xdg/autostart/org.opensuse.opensuse_welcome_launcher.desktop +%{_distconfdir}/xdg/autostart/org.opensuse.opensuse_welcome_launcher.desktop %{_datadir}/applications/org.opensuse.opensuse_welcome_launcher.desktop %dir %{_datadir}/opensuse-welcome-launcher -%{_datadir}/opensuse-welcome-launcher/org.opensuse.opensuse_welcome_launcher-hidden.desktop %{_datadir}/icons/hicolor/scalable/apps/org.opensuse.opensuse_welcome_launcher.svg %{_datadir}/icons/hicolor/symbolic/apps/org.opensuse.opensuse_welcome_launcher-symbolic.svg %changelog diff --git a/org.opensuse.opensuse_welcome_launcher-hidden.desktop b/org.opensuse.opensuse_welcome_launcher-hidden.desktop deleted file mode 100644 index d3cbd7c..0000000 --- a/org.opensuse.opensuse_welcome_launcher-hidden.desktop +++ /dev/null @@ -1,10 +0,0 @@ -# Copy me to /etc/xdg/autostart and /usr/share/applications -[Desktop Entry] -Type=Application -Name=Welcome launcher -Exec=/usr/bin/opensuse-welcome-launcher -Hidden=true -Icon=org.opensuse.opensuse_welcome_launcher -Comment=The openSUSE Welcome launcher utility. -Categories=Qt;System;Documentation -GenericName=Welcome launcher Utility -- 2.51.1 From fe0f6ddb966c224409fe5682cca226634abd64952c05ac9e0f78048fc2e02226 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 19 Aug 2025 08:23:08 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/opensuse-welcome-launcher?expand=0&rev=4 --- opensuse-welcome-launcher.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opensuse-welcome-launcher.sh b/opensuse-welcome-launcher.sh index af3cca2..c682e98 100644 --- a/opensuse-welcome-launcher.sh +++ b/opensuse-welcome-launcher.sh @@ -14,7 +14,7 @@ fi # Show only once per version if [ -f ${HOME}/.local/share/opensuse-welcome/launched ]; then - if "$(cat ${HOME}/.local/share/opensuse-welcome/launched)" = "${OSWL_VERSION_TAG}"; then + if [ "$(cat ${HOME}/.local/share/opensuse-welcome/launched)" = "${OSWL_VERSION_TAG}" ]; then # We have already shown the laucher at this version - skipping exit 0 fi -- 2.51.1