From c0872ff61ca0a8ec95c0cc669f678b22f5403d9f Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Sat, 14 Oct 2023 15:20:52 +0200 Subject: [PATCH 1/3] Update installers --- create_linux_gnome_installers.sh | 12 +++++++++--- create_linux_kde_installers.sh | 8 ++++++-- create_linux_minimal_installers.sh | 8 ++++++-- create_linux_staging_gnome_installers.sh | 12 +++++++++--- create_linux_staging_kde_installers.sh | 8 ++++++-- create_linux_staging_minimal_installers.sh | 8 ++++++-- dist/deb/gnome/debian.changelog | 1 + dist/deb/kde/debian.changelog | 1 + dist/deb/minimal/debian.changelog | 1 + dist/rpm/gnome/systray-x-gnome.changes | 3 ++- dist/rpm/kde/systray-x.changes | 3 ++- dist/rpm/minimal/systray-x-minimal.changes | 3 ++- 12 files changed, 51 insertions(+), 17 deletions(-) diff --git a/create_linux_gnome_installers.sh b/create_linux_gnome_installers.sh index d366294..035f6db 100755 --- a/create_linux_gnome_installers.sh +++ b/create_linux_gnome_installers.sh @@ -40,9 +40,12 @@ OBS_RPM_GNOME_EXT+="master " OBS_RPM_ARCHS+="Fedora_38/x86_64 " OBS_RPM_PKS+="fed38 " OBS_RPM_GNOME_EXT+="master " -#OBS_RPM_ARCHS+="Fedora_Rawhide/x86_64 " -#OBS_RPM_PKS+="fedraw " -#OBS_RPM_GNOME_EXT+="master " +OBS_RPM_ARCHS+="Fedora_39/x86_64 " +OBS_RPM_PKS+="fed39 " +OBS_RPM_GNOME_EXT+="master " +OBS_RPM_ARCHS+="Fedora_Rawhide/x86_64 " +OBS_RPM_PKS+="fedraw " +OBS_RPM_GNOME_EXT+="master " OBS_RPM_ARCHS+="CentOS_7/x86_64 " OBS_RPM_PKS+="el7 " OBS_RPM_GNOME_EXT+="v26 " @@ -96,6 +99,9 @@ OBS_DEB_GNOME_EXT+="0 " OBS_DEB_ARCHS+="xUbuntu_23.04/amd64 " OBS_DEB_PKS+="lunar2023 " OBS_DEB_GNOME_EXT+="0 " +OBS_DEB_ARCHS+="xUbuntu_23.10/amd64 " +OBS_DEB_PKS+="mantic2023 " +OBS_DEB_GNOME_EXT+="0 " OBS_PAC_ARCHS="" diff --git a/create_linux_kde_installers.sh b/create_linux_kde_installers.sh index cb22da6..21e2d99 100755 --- a/create_linux_kde_installers.sh +++ b/create_linux_kde_installers.sh @@ -29,8 +29,10 @@ OBS_RPM_ARCHS+="Fedora_37/x86_64 " OBS_RPM_PKS+="fed37 " OBS_RPM_ARCHS+="Fedora_38/x86_64 " OBS_RPM_PKS+="fed38 " -#OBS_RPM_ARCHS+="Fedora_Rawhide/x86_64 " -#OBS_RPM_PKS+="fedraw " +OBS_RPM_ARCHS+="Fedora_39/x86_64 " +OBS_RPM_PKS+="fed39 " +OBS_RPM_ARCHS+="Fedora_Rawhide/x86_64 " +OBS_RPM_PKS+="fedraw " OBS_RPM_ARCHS+="CentOS_7/x86_64 " OBS_RPM_PKS+="el7 " OBS_RPM_ARCHS+="CentOS_8/x86_64 " @@ -67,6 +69,8 @@ OBS_DEB_ARCHS+="xUbuntu_22.04/amd64 " OBS_DEB_PKS+="jammy2022 " OBS_DEB_ARCHS+="xUbuntu_23.04/amd64 " OBS_DEB_PKS+="lunar2023 " +OBS_DEB_ARCHS+="xUbuntu_23.10/amd64 " +OBS_DEB_PKS+="mantic2023 " OBS_PAC_ARCHS="" diff --git a/create_linux_minimal_installers.sh b/create_linux_minimal_installers.sh index 0f10682..5c43bc8 100755 --- a/create_linux_minimal_installers.sh +++ b/create_linux_minimal_installers.sh @@ -29,8 +29,10 @@ OBS_RPM_ARCHS+="Fedora_37/x86_64 " OBS_RPM_PKS+="fed37 " OBS_RPM_ARCHS+="Fedora_38/x86_64 " OBS_RPM_PKS+="fed38 " -#OBS_RPM_ARCHS+="Fedora_Rawhide/x86_64 " -#OBS_RPM_PKS+="fedraw " +OBS_RPM_ARCHS+="Fedora_39/x86_64 " +OBS_RPM_PKS+="fed39 " +OBS_RPM_ARCHS+="Fedora_Rawhide/x86_64 " +OBS_RPM_PKS+="fedraw " OBS_RPM_ARCHS+="CentOS_7/x86_64 " OBS_RPM_PKS+="el7 " OBS_RPM_ARCHS+="CentOS_8/x86_64 " @@ -67,6 +69,8 @@ OBS_DEB_ARCHS+="xUbuntu_22.04/amd64 " OBS_DEB_PKS+="jammy2022 " OBS_DEB_ARCHS+="xUbuntu_23.04/amd64 " OBS_DEB_PKS+="lunar2023 " +OBS_DEB_ARCHS+="xUbuntu_23.10/amd64 " +OBS_DEB_PKS+="mantic2023 " OBS_PAC_ARCHS="" diff --git a/create_linux_staging_gnome_installers.sh b/create_linux_staging_gnome_installers.sh index 17e2e59..7fe8984 100755 --- a/create_linux_staging_gnome_installers.sh +++ b/create_linux_staging_gnome_installers.sh @@ -40,9 +40,12 @@ OBS_RPM_GNOME_EXT+="master " OBS_RPM_ARCHS+="Fedora_38/x86_64 " OBS_RPM_PKS+="fed38 " OBS_RPM_GNOME_EXT+="master " -#OBS_RPM_ARCHS+="Fedora_Rawhide/x86_64 " -#OBS_RPM_PKS+="fedraw " -#OBS_RPM_GNOME_EXT+="master " +OBS_RPM_ARCHS+="Fedora_39/x86_64 " +OBS_RPM_PKS+="fed39 " +OBS_RPM_GNOME_EXT+="master " +OBS_RPM_ARCHS+="Fedora_Rawhide/x86_64 " +OBS_RPM_PKS+="fedraw " +OBS_RPM_GNOME_EXT+="master " OBS_RPM_ARCHS+="CentOS_7/x86_64 " OBS_RPM_PKS+="el7 " OBS_RPM_GNOME_EXT+="v26 " @@ -96,6 +99,9 @@ OBS_DEB_GNOME_EXT+="0 " OBS_DEB_ARCHS+="xUbuntu_23.04/amd64 " OBS_DEB_PKS+="lunar2023 " OBS_DEB_GNOME_EXT+="0 " +OBS_DEB_ARCHS+="xUbuntu_23.10/amd64 " +OBS_DEB_PKS+="mantic2023 " +OBS_DEB_GNOME_EXT+="0 " OBS_PAC_ARCHS="" diff --git a/create_linux_staging_kde_installers.sh b/create_linux_staging_kde_installers.sh index 3a8a2db..e3047c3 100755 --- a/create_linux_staging_kde_installers.sh +++ b/create_linux_staging_kde_installers.sh @@ -29,8 +29,10 @@ OBS_RPM_ARCHS+="Fedora_37/x86_64 " OBS_RPM_PKS+="fed37 " OBS_RPM_ARCHS+="Fedora_38/x86_64 " OBS_RPM_PKS+="fed38 " -#OBS_RPM_ARCHS+="Fedora_Rawhide/x86_64 " -#OBS_RPM_PKS+="fedraw " +OBS_RPM_ARCHS+="Fedora_39/x86_64 " +OBS_RPM_PKS+="fed39 " +OBS_RPM_ARCHS+="Fedora_Rawhide/x86_64 " +OBS_RPM_PKS+="fedraw " OBS_RPM_ARCHS+="CentOS_7/x86_64 " OBS_RPM_PKS+="el7 " OBS_RPM_ARCHS+="CentOS_8/x86_64 " @@ -67,6 +69,8 @@ OBS_DEB_ARCHS+="xUbuntu_22.04/amd64 " OBS_DEB_PKS+="jammy2022 " OBS_DEB_ARCHS+="xUbuntu_23.04/amd64 " OBS_DEB_PKS+="lunar2023 " +OBS_DEB_ARCHS+="xUbuntu_23.10/amd64 " +OBS_DEB_PKS+="mantic2023 " OBS_PAC_ARCHS="" diff --git a/create_linux_staging_minimal_installers.sh b/create_linux_staging_minimal_installers.sh index e17f094..2ea2ef1 100755 --- a/create_linux_staging_minimal_installers.sh +++ b/create_linux_staging_minimal_installers.sh @@ -29,8 +29,10 @@ OBS_RPM_ARCHS+="Fedora_37/x86_64 " OBS_RPM_PKS+="fed37 " OBS_RPM_ARCHS+="Fedora_38/x86_64 " OBS_RPM_PKS+="fed38 " -#OBS_RPM_ARCHS+="Fedora_Rawhide/x86_64 " -#OBS_RPM_PKS+="fedraw " +OBS_RPM_ARCHS+="Fedora_39/x86_64 " +OBS_RPM_PKS+="fed39 " +OBS_RPM_ARCHS+="Fedora_Rawhide/x86_64 " +OBS_RPM_PKS+="fedraw " OBS_RPM_ARCHS+="CentOS_7/x86_64 " OBS_RPM_PKS+="el7 " OBS_RPM_ARCHS+="CentOS_8/x86_64 " @@ -67,6 +69,8 @@ OBS_DEB_ARCHS+="xUbuntu_22.04/amd64 " OBS_DEB_PKS+="jammy2022 " OBS_DEB_ARCHS+="xUbuntu_23.04/amd64 " OBS_DEB_PKS+="lunar2023 " +OBS_DEB_ARCHS+="xUbuntu_23.10/amd64 " +OBS_DEB_PKS+="mantic2023 " OBS_PAC_ARCHS="" diff --git a/dist/deb/gnome/debian.changelog b/dist/deb/gnome/debian.changelog index 05b3c3b..bf966aa 100644 --- a/dist/deb/gnome/debian.changelog +++ b/dist/deb/gnome/debian.changelog @@ -5,6 +5,7 @@ systray-x-gnome (0.9.6-0) unstable; urgency=low - Added option to show a new mail indicator or icon shading - Added option to launch an app on start and close - Refactored windows state handling + - Refactored mail counting - Bugfixes systray-x-gnome (0.9.5-0) unstable; urgency=low diff --git a/dist/deb/kde/debian.changelog b/dist/deb/kde/debian.changelog index f501bb3..6f8c9cc 100644 --- a/dist/deb/kde/debian.changelog +++ b/dist/deb/kde/debian.changelog @@ -5,6 +5,7 @@ systray-x (0.9.6-0) unstable; urgency=low - Added option to show a new mail indicator or icon shading - Added option to launch an app on start and close - Refactored windows state handling + - Refactored mail counting - Bugfixes systray-x (0.9.5-0) unstable; urgency=low diff --git a/dist/deb/minimal/debian.changelog b/dist/deb/minimal/debian.changelog index bb09c4c..9b8a153 100644 --- a/dist/deb/minimal/debian.changelog +++ b/dist/deb/minimal/debian.changelog @@ -5,6 +5,7 @@ systray-x-minimal (0.9.6-0) unstable; urgency=low - Added option to show a new mail indicator or icon shading - Added option to launch an app on start and close - Refactored windows state handling + - Refactored mail counting - Bugfixes systray-x-minimal (0.9.5-0) unstable; urgency=low diff --git a/dist/rpm/gnome/systray-x-gnome.changes b/dist/rpm/gnome/systray-x-gnome.changes index 6c95eba..5d3ee7e 100644 --- a/dist/rpm/gnome/systray-x-gnome.changes +++ b/dist/rpm/gnome/systray-x-gnome.changes @@ -1,11 +1,12 @@ ------------------------------------------------------------------- -Sun Aug 27 21:40:00 UTC 2023 - Maxime Rijnders +Sun Oct 15 21:40:00 UTC 2023 - Maxime Rijnders * Update to 0.9.6 - Added option to show a new mail indicator or icon shading - Added option to launch an app on start and close - Refactored windows state handling + - Refactored mail counting - Bugfixes ------------------------------------------------------------------- diff --git a/dist/rpm/kde/systray-x.changes b/dist/rpm/kde/systray-x.changes index 6c95eba..5d3ee7e 100644 --- a/dist/rpm/kde/systray-x.changes +++ b/dist/rpm/kde/systray-x.changes @@ -1,11 +1,12 @@ ------------------------------------------------------------------- -Sun Aug 27 21:40:00 UTC 2023 - Maxime Rijnders +Sun Oct 15 21:40:00 UTC 2023 - Maxime Rijnders * Update to 0.9.6 - Added option to show a new mail indicator or icon shading - Added option to launch an app on start and close - Refactored windows state handling + - Refactored mail counting - Bugfixes ------------------------------------------------------------------- diff --git a/dist/rpm/minimal/systray-x-minimal.changes b/dist/rpm/minimal/systray-x-minimal.changes index 6c95eba..5d3ee7e 100644 --- a/dist/rpm/minimal/systray-x-minimal.changes +++ b/dist/rpm/minimal/systray-x-minimal.changes @@ -1,11 +1,12 @@ ------------------------------------------------------------------- -Sun Aug 27 21:40:00 UTC 2023 - Maxime Rijnders +Sun Oct 15 21:40:00 UTC 2023 - Maxime Rijnders * Update to 0.9.6 - Added option to show a new mail indicator or icon shading - Added option to launch an app on start and close - Refactored windows state handling + - Refactored mail counting - Bugfixes ------------------------------------------------------------------- From f2e2eb95eaa840f566823347b565e37f0f0b79c3 Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Sat, 14 Oct 2023 15:42:25 +0200 Subject: [PATCH 2/3] Update README --- README.md | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 31168b9..0fbc368 100644 --- a/README.md +++ b/README.md @@ -123,6 +123,15 @@ sudo zypper in systray-x-minimal Installing the repository: +###### 23.10 + +```bash +wget -q https://download.opensuse.org/repositories/home:/Ximi1970/xUbuntu_23.10/Release.key +sudo mv -f Release.key /etc/apt/trusted.gpg.d/Systray-x.Ximi1970.asc +sudo bash -c 'echo "deb https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/xUbuntu_23.10 ./" > /etc/apt/sources.list.d/systray-x.list' +sudo apt update +``` + ###### 23.04 ```bash @@ -132,7 +141,7 @@ sudo bash -c 'echo "deb https://download.opensuse.org/repositories/home:/Ximi197 sudo apt update ``` -###### 22.04 +###### 22.04 LTS ```bash wget -q https://download.opensuse.org/repositories/home:/Ximi1970/xUbuntu_22.04/Release.key @@ -322,6 +331,13 @@ sudo dnf config-manager --add-repo https://download.opensuse.org/repositories/ho sudo dnf update --refresh ``` +###### 39 + +```bash +sudo dnf config-manager --add-repo https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/Fedora_39/home:Ximi1970:Mozilla:Add-ons.repo +sudo dnf update --refresh +``` + ###### 38 ```bash From b70975c6e8b065be180a256746190b84b165a040 Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Sat, 14 Oct 2023 16:00:27 +0200 Subject: [PATCH 3/3] Update TB version --- dist/arch/gnome/PKGBUILD | 2 +- dist/arch/kde/PKGBUILD | 2 +- dist/arch/minimal/PKGBUILD | 2 +- dist/deb/gnome/debian.control | 2 +- dist/deb/kde/debian.control | 2 +- dist/deb/minimal/debian.control | 2 +- dist/rpm/gnome/systray-x-gnome.spec | 4 ++-- dist/rpm/kde/systray-x.spec | 4 ++-- dist/rpm/minimal/systray-x-minimal.spec | 4 ++-- webext/manifest.json | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dist/arch/gnome/PKGBUILD b/dist/arch/gnome/PKGBUILD index cc8fb21..08d258b 100644 --- a/dist/arch/gnome/PKGBUILD +++ b/dist/arch/gnome/PKGBUILD @@ -12,7 +12,7 @@ depends=( 'qt5-base' 'gnome-shell-extension-appindicator' 'thunderbird>=91' - 'thunderbird<118' + 'thunderbird<120' ) makedepends=( 'git' diff --git a/dist/arch/kde/PKGBUILD b/dist/arch/kde/PKGBUILD index 0d0ff48..e0f83cd 100644 --- a/dist/arch/kde/PKGBUILD +++ b/dist/arch/kde/PKGBUILD @@ -12,7 +12,7 @@ depends=( 'qt5-base' 'knotifications' 'thunderbird>=91' - 'thunderbird<118' + 'thunderbird<120' ) makedepends=( 'git' diff --git a/dist/arch/minimal/PKGBUILD b/dist/arch/minimal/PKGBUILD index a90657c..e4083b1 100644 --- a/dist/arch/minimal/PKGBUILD +++ b/dist/arch/minimal/PKGBUILD @@ -11,7 +11,7 @@ license=(MPL-2.0) depends=( 'qt5-base' 'thunderbird>=91' - 'thunderbird<118' + 'thunderbird<120' ) makedepends=( 'git' diff --git a/dist/deb/gnome/debian.control b/dist/deb/gnome/debian.control index 0102f88..34e80e2 100644 --- a/dist/deb/gnome/debian.control +++ b/dist/deb/gnome/debian.control @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 4.1.16), zip, g++, libx11-dev, qt5-qmake, qtbase5-d Package: systray-x-gnome Architecture: any -Depends: ${shlibs:Depends}, gnome-shell-extension-appindicator, thunderbird (>= 1:91), thunderbird (< 1:118) +Depends: ${shlibs:Depends}, gnome-shell-extension-appindicator, thunderbird (>= 1:91), thunderbird (< 1:120) Description: SysTray-X is a system tray extension for Thunderbird (GNOME). This version is optimized for the GNOME desktop. The add-on uses the WebExtension API's to control an external system diff --git a/dist/deb/kde/debian.control b/dist/deb/kde/debian.control index 56b044b..ad99d41 100644 --- a/dist/deb/kde/debian.control +++ b/dist/deb/kde/debian.control @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 4.1.16), zip, g++, libx11-dev, qt5-qmake, qtbase5-d Package: systray-x Architecture: any -Depends: ${shlibs:Depends}, thunderbird (>= 1:91), thunderbird (< 1:118) +Depends: ${shlibs:Depends}, thunderbird (>= 1:91), thunderbird (< 1:120) Description: SysTray-X is a system tray extension for Thunderbird (KDE). This version is optimized for the KDE desktop. The add-on uses the WebExtension API's to control an external system diff --git a/dist/deb/minimal/debian.control b/dist/deb/minimal/debian.control index 89af9b0..3c36f0b 100644 --- a/dist/deb/minimal/debian.control +++ b/dist/deb/minimal/debian.control @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 4.1.16), zip, g++, libx11-dev, qt5-qmake, qtbase5-d Package: systray-x-minimal Architecture: any -Depends: ${shlibs:Depends}, thunderbird (>= 1:91), thunderbird (< 1:118) +Depends: ${shlibs:Depends}, thunderbird (>= 1:91), thunderbird (< 1:120) Description: SysTray-X is a system tray extension for Thunderbird (non-GNOME,non-KDE). This version is for non-KDE and non-GNOME desktops. The add-on uses the WebExtension API's to control an external system diff --git a/dist/rpm/gnome/systray-x-gnome.spec b/dist/rpm/gnome/systray-x-gnome.spec index 8a25afb..2f9eb72 100644 --- a/dist/rpm/gnome/systray-x-gnome.spec +++ b/dist/rpm/gnome/systray-x-gnome.spec @@ -33,10 +33,10 @@ BuildRequires: pkgconfig(x11) Requires: gnome-shell-extension-appindicator %if 0%{?fedora_version} || 0%{?centos_version} Requires: thunderbird >= 91 -Requires: thunderbird < 118 +Requires: thunderbird < 120 %else Requires: MozillaThunderbird >= 91 -Requires: MozillaThunderbird < 118 +Requires: MozillaThunderbird < 120 %endif %description diff --git a/dist/rpm/kde/systray-x.spec b/dist/rpm/kde/systray-x.spec index b39b603..a850e5e 100644 --- a/dist/rpm/kde/systray-x.spec +++ b/dist/rpm/kde/systray-x.spec @@ -34,12 +34,12 @@ BuildRequires: pkgconfig(x11) BuildRequires: kf5-knotifications-devel Requires: kf5-knotifications Requires: thunderbird >= 91 -Requires: thunderbird < 118 +Requires: thunderbird < 120 %else BuildRequires: knotifications-devel Requires: libKF5Notifications5 Requires: MozillaThunderbird >= 91 -Requires: MozillaThunderbird < 118 +Requires: MozillaThunderbird < 120 %endif %description diff --git a/dist/rpm/minimal/systray-x-minimal.spec b/dist/rpm/minimal/systray-x-minimal.spec index 67b5bb7..7654cc9 100644 --- a/dist/rpm/minimal/systray-x-minimal.spec +++ b/dist/rpm/minimal/systray-x-minimal.spec @@ -32,10 +32,10 @@ BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(x11) %if 0%{?fedora_version} || 0%{?centos_version} Requires: thunderbird >= 91 -Requires: thunderbird < 118 +Requires: thunderbird < 120 %else Requires: MozillaThunderbird >= 91 -Requires: MozillaThunderbird < 118 +Requires: MozillaThunderbird < 120 %endif %description diff --git a/webext/manifest.json b/webext/manifest.json index afed590..a538c34 100644 --- a/webext/manifest.json +++ b/webext/manifest.json @@ -10,7 +10,7 @@ "gecko": { "id": "systray-x@Ximi1970", "strict_min_version": "91.0", - "strict_max_version": "117.*" + "strict_max_version": "119.*" } },