From e354b8ac563cb6f3fcb5d61db9650ed3a8a25ca2 Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Fri, 28 Jul 2023 21:41:32 +0200 Subject: [PATCH] Update installers and rpm packages --- README.md | 33 ++++++++++++++++++++-- create_linux_gnome_installers.sh | 10 +++++-- create_linux_kde_installers.sh | 4 +++ create_linux_minimal_installers.sh | 4 +++ create_linux_staging_gnome_installers.sh | 6 ++++ create_linux_staging_kde_installers.sh | 4 +++ create_linux_staging_minimal_installers.sh | 4 +++ dist/rpm/gnome/systray-x-gnome.spec | 31 ++------------------ dist/rpm/kde/systray-x.spec | 31 ++------------------ dist/rpm/minimal/systray-x-minimal.spec | 31 ++------------------ 10 files changed, 70 insertions(+), 88 deletions(-) diff --git a/README.md b/README.md index 922ea33..1c05fd6 100644 --- a/README.md +++ b/README.md @@ -229,7 +229,7 @@ Installing the repository: ```bash wget -q https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/Debian_Testing/Release.key -sudo apt-key add Release.key +sudo cp -f Release.key /etc/apt/trusted.d.gpg.d/SysTray-X.asc sudo bash -c 'echo "deb https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/Debian_Testing ./" > /etc/apt/sources.list.d/systray-x.list' sudo apt update ``` @@ -238,11 +238,20 @@ sudo apt update ```bash wget -q https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/Debian_Unstable/Release.key -sudo apt-key add Release.key +sudo cp -f Release.key /etc/apt/trusted.d.gpg.d/SysTray-X.asc sudo bash -c 'echo "deb https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/Debian_Unstable ./" > /etc/apt/sources.list.d/systray-x.list' sudo apt update ``` +###### 12 + +```bash +wget -q https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/Debian_12/Release.key +sudo cp -f Release.key /etc/apt/trusted.d.gpg.d/SysTray-X.asc +sudo bash -c 'echo "deb https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/Debian_12 ./" > /etc/apt/sources.list.d/systray-x.list' +sudo apt update +``` + ###### 11 ```bash @@ -277,6 +286,26 @@ sudo apt install systray-x sudo apt install systray-x-gnome ``` +Disabling wayland: + +```bash +sudo nano /etc/gdm3/daemon.conf + +``` + +and change (and remove the leading '#' when needed) + +``` +WaylandEnable=true +``` + +into + +``` +WaylandEnable=false +``` + + ###### XFCE / Others (non-KDE, non-GNOME) ```bash diff --git a/create_linux_gnome_installers.sh b/create_linux_gnome_installers.sh index cde15e6..d16ec81 100755 --- a/create_linux_gnome_installers.sh +++ b/create_linux_gnome_installers.sh @@ -69,12 +69,18 @@ OBS_DEB_GNOME_EXT+="v34 " OBS_DEB_ARCHS+="Debian_11/amd64 " OBS_DEB_PKS+="deb11 " OBS_DEB_GNOME_EXT+="v34 " +OBS_DEB_ARCHS+="Debian_12/i386 " +OBS_DEB_PKS+="deb12 " +OBS_DEB_GNOME_EXT+="v46 " +OBS_DEB_ARCHS+="Debian_12/amd64 " +OBS_DEB_PKS+="deb12 " +OBS_DEB_GNOME_EXT+="v46 " OBS_DEB_ARCHS+="Debian_Unstable/amd64 " OBS_DEB_PKS+="debunstable " -OBS_DEB_GNOME_EXT+="v34 " +OBS_DEB_GNOME_EXT+="v46 " OBS_DEB_ARCHS+="Debian_Testing/amd64 " OBS_DEB_PKS+="debtest " -OBS_DEB_GNOME_EXT+="v34 " +OBS_DEB_GNOME_EXT+="v46 " OBS_DEB_ARCHS+="xUbuntu_16.04/i386 " OBS_DEB_PKS+="xenial1604 " OBS_DEB_GNOME_EXT+="v26 " diff --git a/create_linux_kde_installers.sh b/create_linux_kde_installers.sh index eff01f1..48a8232 100755 --- a/create_linux_kde_installers.sh +++ b/create_linux_kde_installers.sh @@ -49,6 +49,10 @@ OBS_DEB_ARCHS+="Debian_11/i386 " OBS_DEB_PKS+="deb11 " OBS_DEB_ARCHS+="Debian_11/amd64 " OBS_DEB_PKS+="deb11 " +OBS_DEB_ARCHS+="Debian_12/i386 " +OBS_DEB_PKS+="deb12 " +OBS_DEB_ARCHS+="Debian_12/amd64 " +OBS_DEB_PKS+="deb12 " OBS_DEB_ARCHS+="Debian_Unstable/amd64 " OBS_DEB_PKS+="debunstable " OBS_DEB_ARCHS+="Debian_Testing/amd64 " diff --git a/create_linux_minimal_installers.sh b/create_linux_minimal_installers.sh index c3feb1a..7dc161b 100755 --- a/create_linux_minimal_installers.sh +++ b/create_linux_minimal_installers.sh @@ -49,6 +49,10 @@ OBS_DEB_ARCHS+="Debian_11/i386 " OBS_DEB_PKS+="deb11 " OBS_DEB_ARCHS+="Debian_11/amd64 " OBS_DEB_PKS+="deb11 " +OBS_DEB_ARCHS+="Debian_12/i386 " +OBS_DEB_PKS+="deb12 " +OBS_DEB_ARCHS+="Debian_12/amd64 " +OBS_DEB_PKS+="deb12 " OBS_DEB_ARCHS+="Debian_Unstable/amd64 " OBS_DEB_PKS+="debunstable " OBS_DEB_ARCHS+="Debian_Testing/amd64 " diff --git a/create_linux_staging_gnome_installers.sh b/create_linux_staging_gnome_installers.sh index 927d1b1..b240624 100755 --- a/create_linux_staging_gnome_installers.sh +++ b/create_linux_staging_gnome_installers.sh @@ -69,6 +69,12 @@ OBS_DEB_GNOME_EXT+="v34 " OBS_DEB_ARCHS+="Debian_11/amd64 " OBS_DEB_PKS+="deb11 " OBS_DEB_GNOME_EXT+="v34 " +OBS_DEB_ARCHS+="Debian_12/i386 " +OBS_DEB_PKS+="deb12 " +OBS_DEB_GNOME_EXT+="0 " +OBS_DEB_ARCHS+="Debian_12/amd64 " +OBS_DEB_PKS+="deb12 " +OBS_DEB_GNOME_EXT+="0 " OBS_DEB_ARCHS+="Debian_Unstable/amd64 " OBS_DEB_PKS+="debunstable " OBS_DEB_GNOME_EXT+="v34 " diff --git a/create_linux_staging_kde_installers.sh b/create_linux_staging_kde_installers.sh index ce527ed..142e5dd 100755 --- a/create_linux_staging_kde_installers.sh +++ b/create_linux_staging_kde_installers.sh @@ -49,6 +49,10 @@ OBS_DEB_ARCHS+="Debian_11/i386 " OBS_DEB_PKS+="deb11 " OBS_DEB_ARCHS+="Debian_11/amd64 " OBS_DEB_PKS+="deb11 " +OBS_DEB_ARCHS+="Debian_12/i386 " +OBS_DEB_PKS+="deb12 " +OBS_DEB_ARCHS+="Debian_12/amd64 " +OBS_DEB_PKS+="deb12 " OBS_DEB_ARCHS+="Debian_Unstable/amd64 " OBS_DEB_PKS+="debunstable " OBS_DEB_ARCHS+="Debian_Testing/amd64 " diff --git a/create_linux_staging_minimal_installers.sh b/create_linux_staging_minimal_installers.sh index 737ee8a..d5f98fb 100755 --- a/create_linux_staging_minimal_installers.sh +++ b/create_linux_staging_minimal_installers.sh @@ -49,6 +49,10 @@ OBS_DEB_ARCHS+="Debian_11/i386 " OBS_DEB_PKS+="deb11 " OBS_DEB_ARCHS+="Debian_11/amd64 " OBS_DEB_PKS+="deb11 " +OBS_DEB_ARCHS+="Debian_12/i386 " +OBS_DEB_PKS+="deb12 " +OBS_DEB_ARCHS+="Debian_12/amd64 " +OBS_DEB_PKS+="deb12 " OBS_DEB_ARCHS+="Debian_Unstable/amd64 " OBS_DEB_PKS+="debunstable " OBS_DEB_ARCHS+="Debian_Testing/amd64 " diff --git a/dist/rpm/gnome/systray-x-gnome.spec b/dist/rpm/gnome/systray-x-gnome.spec index 0ae9176..cbba62e 100644 --- a/dist/rpm/gnome/systray-x-gnome.spec +++ b/dist/rpm/gnome/systray-x-gnome.spec @@ -75,22 +75,12 @@ sed < app/config/linux/SysTray_X.json.template -e 's|SYSTRAY_X_PATH|%{_bindir}/S %install install -Dm0755 SysTray-X %{buildroot}/%{_bindir}/SysTray-X install -Dm0644 SysTray_X.json %{buildroot}%{_libdir}/mozilla/native-messaging-hosts/SysTray_X.json -%if 0%{?fedora_version} || 0%{?centos_version} -# Option 1 (enigmail way) does not work -#_systx_dir=%{buildroot}%{_datadir}/mozilla/extensions/\{3550f703-e582-4d05-9a08-453d09bdfdc6\}/systray-x@Ximi1970 +#_systx_dir=%{buildroot}%{_libdir}/mozilla/extensions/\{3550f703-e582-4d05-9a08-453d09bdfdc6\}/systray-x@Ximi1970 #mkdir -pv $_systx_dir #unzip -d $_systx_dir systray-x@Ximi1970.xpi - -# Option 2 (Ubuntu way) does not work -#install -Dm0644 systray-x@Ximi1970.xpi %{buildroot}/usr/lib/thunderbird-addons/extensions/systray-x@Ximi1970.xpi - -# Force into thunderbird dir, system addons not working / not allowed / unknown extensions search path -install -Dm0644 systray-x@Ximi1970.xpi %{buildroot}%{_libdir}/thunderbird/distribution/extensions/systray-x@Ximi1970.xpi -%else -_systx_dir=%{buildroot}%{_libdir}/mozilla/extensions/\{3550f703-e582-4d05-9a08-453d09bdfdc6\}/systray-x@Ximi1970 +_systx_dir=%{buildroot}%{_libdir}/mozilla/extensions/\{3550f703-e582-4d05-9a08-453d09bdfdc6\} mkdir -pv $_systx_dir -unzip -d $_systx_dir systray-x@Ximi1970.xpi -%endif +install -m 644 systray-x@Ximi1970.xpi %{buildroot}/$_systx_dir %post PROF_DIR="/etc/dconf/profile" @@ -153,20 +143,5 @@ fi %doc README.md systray-x@Ximi1970.xpi %{_bindir}/SysTray-X %{_libdir}/mozilla -%if 0%{?fedora_version} || 0%{?centos_version} -# Option 1 -#%dir /usr/lib/thunderbird-addons -#%dir /usr/lib/thunderbird-addons/extensions -#/usr/lib/thunderbird-addons/extensions/systray-x@Ximi1970.xpi -# Option 2 -#%dir %{_datadir}/mozilla/ -#%dir %{_datadir}/mozilla/extensions -#%dir %{_datadir}/mozilla/extensions/\{3550f703-e582-4d05-9a08-453d09bdfdc6\} -#%{_datadir}/mozilla/extensions/\{3550f703-e582-4d05-9a08-453d09bdfdc6\}/systray-x@Ximi1970 -%dir %{_libdir}/thunderbird -%dir %{_libdir}/thunderbird/distribution -%dir %{_libdir}/thunderbird/distribution/extensions -%{_libdir}/thunderbird/distribution/extensions/systray-x@Ximi1970.xpi -%endif %changelog diff --git a/dist/rpm/kde/systray-x.spec b/dist/rpm/kde/systray-x.spec index ac41712..688efba 100644 --- a/dist/rpm/kde/systray-x.spec +++ b/dist/rpm/kde/systray-x.spec @@ -78,42 +78,17 @@ sed < app/config/linux/SysTray_X.json.template -e 's|SYSTRAY_X_PATH|%{_bindir}/S %install install -Dm0755 SysTray-X %{buildroot}/%{_bindir}/SysTray-X install -Dm0644 SysTray_X.json %{buildroot}%{_libdir}/mozilla/native-messaging-hosts/SysTray_X.json -%if 0%{?fedora_version} || 0%{?centos_version} -# Option 1 (enigmail way) does not work -#_systx_dir=%{buildroot}%{_datadir}/mozilla/extensions/\{3550f703-e582-4d05-9a08-453d09bdfdc6\}/systray-x@Ximi1970 +#_systx_dir=%{buildroot}%{_libdir}/mozilla/extensions/\{3550f703-e582-4d05-9a08-453d09bdfdc6\}/systray-x@Ximi1970 #mkdir -pv $_systx_dir #unzip -d $_systx_dir systray-x@Ximi1970.xpi - -# Option 2 (Ubuntu way) does not work -#install -Dm0644 systray-x@Ximi1970.xpi %{buildroot}/usr/lib/thunderbird-addons/extensions/systray-x@Ximi1970.xpi - -# Force into thunderbird dir, system addons not working / not allowed / unknown extensions search path -install -Dm0644 systray-x@Ximi1970.xpi %{buildroot}%{_libdir}/thunderbird/distribution/extensions/systray-x@Ximi1970.xpi -%else -_systx_dir=%{buildroot}%{_libdir}/mozilla/extensions/\{3550f703-e582-4d05-9a08-453d09bdfdc6\}/systray-x@Ximi1970 +_systx_dir=%{buildroot}%{_libdir}/mozilla/extensions/\{3550f703-e582-4d05-9a08-453d09bdfdc6\} mkdir -pv $_systx_dir -unzip -d $_systx_dir systray-x@Ximi1970.xpi -%endif +install -m 644 systray-x@Ximi1970.xpi %{buildroot}/$_systx_dir %files %license LICENSE %doc README.md systray-x@Ximi1970.xpi %{_bindir}/SysTray-X %{_libdir}/mozilla -%if 0%{?fedora_version} || 0%{?centos_version} -# Option 1 -#%dir /usr/lib/thunderbird-addons -#%dir /usr/lib/thunderbird-addons/extensions -#/usr/lib/thunderbird-addons/extensions/systray-x@Ximi1970.xpi -# Option 2 -#%dir %{_datadir}/mozilla/ -#%dir %{_datadir}/mozilla/extensions -#%dir %{_datadir}/mozilla/extensions/\{3550f703-e582-4d05-9a08-453d09bdfdc6\} -#%{_datadir}/mozilla/extensions/\{3550f703-e582-4d05-9a08-453d09bdfdc6\}/systray-x@Ximi1970 -%dir %{_libdir}/thunderbird -%dir %{_libdir}/thunderbird/distribution -%dir %{_libdir}/thunderbird/distribution/extensions -%{_libdir}/thunderbird/distribution/extensions/systray-x@Ximi1970.xpi -%endif %changelog diff --git a/dist/rpm/minimal/systray-x-minimal.spec b/dist/rpm/minimal/systray-x-minimal.spec index 9696fed..92005f8 100644 --- a/dist/rpm/minimal/systray-x-minimal.spec +++ b/dist/rpm/minimal/systray-x-minimal.spec @@ -74,42 +74,17 @@ sed < app/config/linux/SysTray_X.json.template -e 's|SYSTRAY_X_PATH|%{_bindir}/S %install install -Dm0755 SysTray-X %{buildroot}/%{_bindir}/SysTray-X install -Dm0644 SysTray_X.json %{buildroot}%{_libdir}/mozilla/native-messaging-hosts/SysTray_X.json -%if 0%{?fedora_version} || 0%{?centos_version} -# Option 1 (enigmail way) does not work -#_systx_dir=%{buildroot}%{_datadir}/mozilla/extensions/\{3550f703-e582-4d05-9a08-453d09bdfdc6\}/systray-x@Ximi1970 +#_systx_dir=%{buildroot}%{_libdir}/mozilla/extensions/\{3550f703-e582-4d05-9a08-453d09bdfdc6\}/systray-x@Ximi1970 #mkdir -pv $_systx_dir #unzip -d $_systx_dir systray-x@Ximi1970.xpi - -# Option 2 (Ubuntu way) does not work -#install -Dm0644 systray-x@Ximi1970.xpi %{buildroot}/usr/lib/thunderbird-addons/extensions/systray-x@Ximi1970.xpi - -# Force into thunderbird dir, system addons not working / not allowed / unknown extensions search path -install -Dm0644 systray-x@Ximi1970.xpi %{buildroot}%{_libdir}/thunderbird/distribution/extensions/systray-x@Ximi1970.xpi -%else -_systx_dir=%{buildroot}%{_libdir}/mozilla/extensions/\{3550f703-e582-4d05-9a08-453d09bdfdc6\}/systray-x@Ximi1970 +_systx_dir=%{buildroot}%{_libdir}/mozilla/extensions/\{3550f703-e582-4d05-9a08-453d09bdfdc6\} mkdir -pv $_systx_dir -unzip -d $_systx_dir systray-x@Ximi1970.xpi -%endif +install -m 644 systray-x@Ximi1970.xpi %{buildroot}/$_systx_dir %files %license LICENSE %doc README.md systray-x@Ximi1970.xpi %{_bindir}/SysTray-X %{_libdir}/mozilla -%if 0%{?fedora_version} || 0%{?centos_version} -# Option 1 -#%dir /usr/lib/thunderbird-addons -#%dir /usr/lib/thunderbird-addons/extensions -#/usr/lib/thunderbird-addons/extensions/systray-x@Ximi1970.xpi -# Option 2 -#%dir %{_datadir}/mozilla/ -#%dir %{_datadir}/mozilla/extensions -#%dir %{_datadir}/mozilla/extensions/\{3550f703-e582-4d05-9a08-453d09bdfdc6\} -#%{_datadir}/mozilla/extensions/\{3550f703-e582-4d05-9a08-453d09bdfdc6\}/systray-x@Ximi1970 -%dir %{_libdir}/thunderbird -%dir %{_libdir}/thunderbird/distribution -%dir %{_libdir}/thunderbird/distribution/extensions -%{_libdir}/thunderbird/distribution/extensions/systray-x@Ximi1970.xpi -%endif %changelog