From b2e18aa6148c627f0e2d32fe1e636968d590f52c Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Wed, 18 Nov 2020 22:17:47 +0100 Subject: [PATCH 01/14] Update TB version to 84 --- 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 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dist/deb/gnome/debian.control b/dist/deb/gnome/debian.control index c231647..b77076b 100644 --- a/dist/deb/gnome/debian.control +++ b/dist/deb/gnome/debian.control @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 4.1.16), zip, qt5-default, qtbase5-dev, qdbus-qt5, Package: systray-x-gnome Architecture: any -Depends: ${shlibs:Depends}, gnome-shell-extension-appindicator, thunderbird (>= 1:68), thunderbird (<= 1:83) +Depends: ${shlibs:Depends}, gnome-shell-extension-appindicator, thunderbird (>= 1:68), thunderbird (<= 1:84) Description: SysTray-X is a system tray extension for Thunderbird 68+. 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 d1fcf0d..a65525e 100644 --- a/dist/deb/kde/debian.control +++ b/dist/deb/kde/debian.control @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 4.1.16), zip, qt5-default, qtbase5-dev, qdbus-qt5, Package: systray-x Architecture: any -Depends: ${shlibs:Depends}, thunderbird (>= 1:68), thunderbird (<= 1:83) +Depends: ${shlibs:Depends}, thunderbird (>= 1:68), thunderbird (<= 1:84) Description: SysTray-X is a system tray extension for Thunderbird 68+. 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 e051fe6..44362ab 100644 --- a/dist/deb/minimal/debian.control +++ b/dist/deb/minimal/debian.control @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 4.1.16), zip, qt5-default, qtbase5-dev, qdbus-qt5, Package: systray-x-minimal Architecture: any -Depends: ${shlibs:Depends}, thunderbird (>= 1:68), thunderbird (<= 1:83) +Depends: ${shlibs:Depends}, thunderbird (>= 1:68), thunderbird (<= 1:84) Description: SysTray-X is a system tray extension for Thunderbird 68+. 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 66504a6..19427cf 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} Requires: thunderbird >= 68 -Requires: thunderbird <= 83 +Requires: thunderbird <= 84 %else Requires: MozillaThunderbird >= 68 -Requires: MozillaThunderbird <= 83 +Requires: MozillaThunderbird <= 84 %endif %description diff --git a/dist/rpm/kde/systray-x.spec b/dist/rpm/kde/systray-x.spec index cd2d12f..3445577 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 >= 68 -Requires: thunderbird <= 83 +Requires: thunderbird <= 84 %else BuildRequires: knotifications-devel Requires: libKF5Notifications5 Requires: MozillaThunderbird >= 68 -Requires: MozillaThunderbird <= 83 +Requires: MozillaThunderbird <= 84 %endif %description diff --git a/dist/rpm/minimal/systray-x-minimal.spec b/dist/rpm/minimal/systray-x-minimal.spec index d2aa734..140bc90 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} Requires: thunderbird >= 68 -Requires: thunderbird <= 83 +Requires: thunderbird <= 84 %else Requires: MozillaThunderbird >= 68 -Requires: MozillaThunderbird <= 83 +Requires: MozillaThunderbird <= 84 %endif %description diff --git a/webext/manifest.json b/webext/manifest.json index 287257e..7156cc3 100644 --- a/webext/manifest.json +++ b/webext/manifest.json @@ -10,7 +10,7 @@ "gecko": { "id": "systray-x@Ximi1970", "strict_min_version": "68.0", - "strict_max_version": "83.*" + "strict_max_version": "84.*" } }, From 83767a7e2024b60cacb2ccf13d79fccdec17be60 Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Wed, 18 Nov 2020 22:19:54 +0100 Subject: [PATCH 02/14] Remove obsolete title and window handling --- app/SysTray-X/systrayx.cpp | 1 - app/SysTray-X/systrayxlink.cpp | 12 +++--------- app/SysTray-X/windowctrl.cpp | 17 ----------------- app/SysTray-X/windowctrl.h | 12 ------------ webext/background.js | 31 ------------------------------- 5 files changed, 3 insertions(+), 70 deletions(-) diff --git a/app/SysTray-X/systrayx.cpp b/app/SysTray-X/systrayx.cpp index 3f389cd..f509a89 100644 --- a/app/SysTray-X/systrayx.cpp +++ b/app/SysTray-X/systrayx.cpp @@ -148,7 +148,6 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent ) connect( m_link, &SysTrayXLink::signalErrorAddOnShutdown, this, &SysTrayX::slotErrorAddOnShutdown ); connect( m_link, &SysTrayXLink::signalWindowState, m_win_ctrl, &WindowCtrl::slotWindowState ); connect( m_link, &SysTrayXLink::signalUnreadMail, this, &SysTrayX::slotSetUnreadMail ); - connect( m_link, &SysTrayXLink::signalTitle, m_win_ctrl, &WindowCtrl::slotWindowTitle ); connect( m_link, &SysTrayXLink::signalVersion, this, &SysTrayX::slotVersion ); connect( m_link, &SysTrayXLink::signalKdeIntegration, this, &SysTrayX::slotSelectIconObject ); connect( m_link, &SysTrayXLink::signalLocale, this, &SysTrayX::slotLoadLanguage ); diff --git a/app/SysTray-X/systrayxlink.cpp b/app/SysTray-X/systrayxlink.cpp index 8615015..966046e 100644 --- a/app/SysTray-X/systrayxlink.cpp +++ b/app/SysTray-X/systrayxlink.cpp @@ -255,13 +255,13 @@ void SysTrayXLink::sendShutdown() */ void SysTrayXLink::sendDisableKdeIntegration() { - QJsonObject shutdownObject; - shutdownObject.insert("kdeIntegration", QJsonValue::fromVariant( "false" ) ); + QJsonObject integrationObject; + integrationObject.insert("kdeIntegration", QJsonValue::fromVariant( "false" ) ); /* * Store the new document */ - QJsonDocument json_doc = QJsonDocument( shutdownObject ); + QJsonDocument json_doc = QJsonDocument( integrationObject ); /* * Send it to the add-on @@ -296,12 +296,6 @@ void SysTrayXLink::DecodeMessage( const QByteArray& message ) emit signalUnreadMail( unreadMail ); } - if( jsonObject.contains( "title" ) && jsonObject[ "title" ].isString() ) - { - QString title = jsonObject[ "title" ].toString(); - emit signalTitle( title ); - } - if( jsonObject.contains( "version" ) && jsonObject[ "version" ].isString() ) { QString version = jsonObject[ "version" ].toString(); diff --git a/app/SysTray-X/windowctrl.cpp b/app/SysTray-X/windowctrl.cpp index b855f5b..24e9cfb 100644 --- a/app/SysTray-X/windowctrl.cpp +++ b/app/SysTray-X/windowctrl.cpp @@ -126,23 +126,6 @@ void WindowCtrl::slotWindowTest3() } -/* - * Handle window title signal - */ -void WindowCtrl::slotWindowTitle( QString title ) -{ - /* - * Store the window title - */ - m_window_title = title; - - /* - * Get the window IDs - */ - findWindow( title ); -} - - /* * Handle change in minimize type change */ diff --git a/app/SysTray-X/windowctrl.h b/app/SysTray-X/windowctrl.h index 9177a59..67b50f7 100644 --- a/app/SysTray-X/windowctrl.h +++ b/app/SysTray-X/windowctrl.h @@ -71,13 +71,6 @@ class WindowCtrl : public QObject */ void slotWindowTest3(); - /** - * @brief slotWindowTitle. Handle the window title signal. - * - * @param state The windows title. - */ - void slotWindowTitle( QString title ); - /** * @brief slotMinimizeTypeChange. Handle the minimize type signal. */ @@ -127,11 +120,6 @@ class WindowCtrl : public QObject */ QWindow* m_tb_window; - /** - * @brief m_window_title. Title of the TB window. - */ - QString m_window_title; - /** * @brief m_start_minimized. State of start minimized. */ diff --git a/webext/background.js b/webext/background.js index 8652914..2e70bbc 100644 --- a/webext/background.js +++ b/webext/background.js @@ -32,9 +32,6 @@ SysTrayX.Messaging = { // Send the browser info to app SysTrayX.Messaging.sendBrowserInfo(); - // Send the window title to app - SysTrayX.Messaging.sendTitle(); - // Send version to app SysTrayX.Messaging.sendVersion(); @@ -256,11 +253,6 @@ SysTrayX.Messaging = { SysTrayX.Link.postSysTrayXMessage({ platformInfo: info }); }, - sendTitle: function () { - const title = "-" + SysTrayX.Window.startWindow.title.split("-").pop(); - SysTrayX.Link.postSysTrayXMessage({ title: title }); - }, - sendVersion: function () { SysTrayX.Link.postSysTrayXMessage({ version: SysTrayX.version }); }, @@ -274,8 +266,6 @@ SysTrayX.Messaging = { sendLocale: function () { const locale = browser.i18n.getUILanguage(); - console.log("Locale: " + locale); - SysTrayX.Link.postSysTrayXMessage({ locale: locale, }); @@ -383,21 +373,6 @@ SysTrayX.Link = { }, receiveSysTrayXMessage: function (response) { - if (response["window"]) { - if (response["window"] === "minimized") { - browser.windows.update(SysTrayX.Window.startWindow.id, { - state: "minimized", - }); - } - - if (response["window"] === "normal") { - browser.windows.update(SysTrayX.Window.startWindow.id, { - state: "normal", - focused: true, - }); - } - } - if (response["shutdown"]) { browser.windowEvent.onCloseButtonClick.removeListener( SysTrayX.Messaging.onCloseButton @@ -524,8 +499,6 @@ SysTrayX.Link = { }; SysTrayX.Window = { - startWindow: undefined, - focusChanged: function (windowId) { browser.windows.getCurrent().then((win) => { SysTrayX.Link.postSysTrayXMessage({ window: win.state }); @@ -606,10 +579,6 @@ async function start() { await getDefaultIcon(); await getIcon(); - SysTrayX.Window.startWindow = await browser.windows - .getCurrent() - .then((currentWindow) => currentWindow); - // Get all accounts SysTrayX.Messaging.accounts = await browser.accounts.list(); From e5174bf3dfe64c1134062da4673487dc13cc9d73 Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Sun, 22 Nov 2020 12:48:19 +0100 Subject: [PATCH 03/14] Add arch package --- README.md | 37 ++++++++++ dist/arch/gnome/PKGBUILD | 138 +++++++++++++++++++++++++++++++++++++ dist/arch/kde/PKGBUILD | 58 ++++++++++++++++ dist/arch/minimal/PKGBUILD | 56 +++++++++++++++ dist/rpm/gnome/_service | 1 + dist/rpm/kde/_service | 1 + dist/rpm/minimal/_service | 17 ++--- update_tb_version.sh | 9 +++ 8 files changed, 309 insertions(+), 8 deletions(-) create mode 100644 dist/arch/gnome/PKGBUILD create mode 100644 dist/arch/kde/PKGBUILD create mode 100644 dist/arch/minimal/PKGBUILD diff --git a/README.md b/README.md index e05a0d2..c115534 100644 --- a/README.md +++ b/README.md @@ -250,6 +250,43 @@ sudo dnf install systray-x-minimal ``` +### Arch + +#### Repository + +Installing the repository: + +```bash +wget -q https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/Arch/x86_64/home_Ximi1970_Mozilla_Add-ons_Arch.key +sudo pacman-key --add home_Ximi1970_Mozilla_Add-ons_Arch.key +sudo pacman-key --lsign-key BEEF5C3607D86FE9 +sudo echo -e "\n[home_Ximi1970_Mozilla_Add-ons_Arch]\nSigLevel = PackageOptional\nServer = https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/Arch/x86_64" | sudo tee -a /etc/pacman.conf +sudo pacman -Syyu +``` + +#### Package + +Installing the SysTray-X addon and companion app package: + +###### KDE + +```bash +sudo pacman -S systray-x +``` + +###### GNOME + +```bash +sudo pacman -S systray-x-gnome +``` + +###### XFCE / Others (non-KDE, non-GNOME) + +```bash +sudo pacman -S systray-x-minimal +``` + + ## Binaries (User) User installable package. diff --git a/dist/arch/gnome/PKGBUILD b/dist/arch/gnome/PKGBUILD new file mode 100644 index 0000000..1da3d5f --- /dev/null +++ b/dist/arch/gnome/PKGBUILD @@ -0,0 +1,138 @@ +# Maintainer: Maxime Rijnders + +pkgname=systray-x-gnome +pkgver=0 +pkgrel=0 +epoch=1 +pkgdesc='A system tray extension for Thunderbird 68+ (GNOME)' +arch=(x86_64) +url=https://github.com/Ximi1970/systray-x +license=(MPL-2.0) +depends=( + 'qt5-base' + 'gnome-shell-extension-appindicator' + 'thunderbird>=68' + 'thunderbird<=84' +) +makedepends=( + 'git' + 'unzip' + 'zip' + 'libx11' + 'qt5-base' + 'notifications' +) +provides=( + 'systray-x' +) +source=($pkgname-$pkgver.tar.xz) +sha256sums=(SKIP) + +build() { + cd $pkgname-$pkgver + + export VERSION=$(cat dist/rpm/VERSION | grep VERSION | sed -e "s/VERSION=\(.*\)/\1/") + + export VERSION_MAJOR=$(echo $VERSION | cut -d'.' -f1) + export VERSION_MINOR=$(echo $VERSION | cut -d'.' -f2) + export VERSION_PATCH=$(echo $VERSION | cut -d'.' -f3) + + export BUILD_NUMBER=$(cat dist/rpm/VERSION | grep BUILD_NUMBER | sed -e "s/BUILD_NUMBER=\(.*\)/\1/") + export GIT_HASH=$(cat dist/rpm/VERSION | grep GIT_HASH | sed -e "s/GIT_HASH=\(.*\)/\1/") + export GIT_BRANCH=$(cat dist/rpm/VERSION | grep GIT_BRANCH | sed -e "s/GIT_BRANCH=\(.*\)/\1/") + + sed < app/config/linux/SysTray_X.json.template -e 's|SYSTRAY_X_PATH|/usr/bin/SysTray-X|' > SysTray_X.json + + make EXT_VERSION="DEFINES+=EXT_VERSION DEFINES+=APP_VERSION_MAJOR=\\\\\\\\\\\\\\\"$VERSION_MAJOR\\\\\\\\\\\\\\\" DEFINES+=APP_VERSION_MINOR=\\\\\\\\\\\\\\\"$VERSION_MINOR\\\\\\\\\\\\\\\" DEFINES+=APP_VERSION_PATCH=\\\\\\\\\\\\\\\"$VERSION_PATCH\\\\\\\\\\\\\\\" DEFINES+=APP_BUILD=\\\\\\\\\\\\\\\"$BUILD_NUMBER\\\\\\\\\\\\\\\" DEFINES+=APP_GITHASH=\\\\\\\\\\\\\\\"$GIT_HASH\\\\\\\\\\\\\\\" DEFINES+=APP_GITBRANCH=\\\\\\\\\\\\\\\"$GIT_BRANCH\\\\\\\\\\\\\\\"" +} + +package() { + mkdir -p "${pkgdir}"/usr/bin + cp -f ${pkgname}-${pkgver}/app/build/SysTray-X "${pkgdir}"/usr/bin/SysTray-X + + mkdir -p "${pkgdir}"/usr/lib/mozilla/native-messaging-hosts + cp -f ${pkgname}-${pkgver}/SysTray_X.json "${pkgdir}"/usr/lib/mozilla/native-messaging-hosts/SysTray_X.json + + mkdir -p "${pkgdir}"/usr/lib/thunderbird/distribution/extensions + cp -f ${pkgname}-${pkgver}/systray-x@Ximi1970.xpi "${pkgdir}"/usr/lib//thunderbird/distribution/extensions/systray-x@Ximi1970.xpi +} + +post_install() { + PROF_DIR=/etc/dconf/profile + PROF_FILE=user + + if [ -f $PROF_DIR/$PROF_FILE ] ; then + # + # Edit user file + # + grep -q "user-db:user" $PROF_DIR/$PROF_FILE + if [ "$?" = "1" ] ; then + echo "user-db:user" >> $PROF_DIR/$PROF_FILE + fi + + grep -q "system-db:local" $PROF_DIR/$PROF_FILE + if [ "$?" = "1" ] ; then + echo "system-db:local" >> $PROF_DIR/$PROF_FILE + fi + else + # + # Generate user file + # + mkdir -p $PROF_DIR + cat >$PROF_DIR/$PROF_FILE < $CONF_DIR/$CONF_FILE + echo "# List all extensions that you want to have enabled for all users" >> $CONF_DIR/$CONF_FILE + echo "enabled-extensions=['${EXTENSION}']" >> $CONF_DIR/$CONF_FILE + fi + + which dconf > /dev/null 2>&1 + if [ "$?" = "0" ] ; then + dconf update + fi +} diff --git a/dist/arch/kde/PKGBUILD b/dist/arch/kde/PKGBUILD new file mode 100644 index 0000000..afec6b9 --- /dev/null +++ b/dist/arch/kde/PKGBUILD @@ -0,0 +1,58 @@ +# Maintainer: Maxime Rijnders + +pkgname=systray-x +pkgver=0 +pkgrel=0 +epoch=1 +pkgdesc='A system tray extension for Thunderbird 68+ (KDE)' +arch=(x86_64) +url=https://github.com/Ximi1970/systray-x +license=(MPL-2.0) +depends=( + 'qt5-base' + 'knotifications' + 'thunderbird>=68' + 'thunderbird<=84' +) +makedepends=( + 'git' + 'unzip' + 'zip' + 'libx11' + 'qt5-base' + 'knotifications' +) +provides=( + 'systray-x' +) +source=($pkgname-$pkgver.tar.xz) +sha256sums=(SKIP) + +build() { + cd $pkgname-$pkgver + + export VERSION=$(cat dist/rpm/VERSION | grep VERSION | sed -e "s/VERSION=\(.*\)/\1/") + + export VERSION_MAJOR=$(echo $VERSION | cut -d'.' -f1) + export VERSION_MINOR=$(echo $VERSION | cut -d'.' -f2) + export VERSION_PATCH=$(echo $VERSION | cut -d'.' -f3) + + export BUILD_NUMBER=$(cat dist/rpm/VERSION | grep BUILD_NUMBER | sed -e "s/BUILD_NUMBER=\(.*\)/\1/") + export GIT_HASH=$(cat dist/rpm/VERSION | grep GIT_HASH | sed -e "s/GIT_HASH=\(.*\)/\1/") + export GIT_BRANCH=$(cat dist/rpm/VERSION | grep GIT_BRANCH | sed -e "s/GIT_BRANCH=\(.*\)/\1/") + + sed < app/config/linux/SysTray_X.json.template -e 's|SYSTRAY_X_PATH|/usr/bin/SysTray-X|' > SysTray_X.json + + make EXT_VERSION="DEFINES+=EXT_VERSION DEFINES+=APP_VERSION_MAJOR=\\\\\\\\\\\\\\\"$VERSION_MAJOR\\\\\\\\\\\\\\\" DEFINES+=APP_VERSION_MINOR=\\\\\\\\\\\\\\\"$VERSION_MINOR\\\\\\\\\\\\\\\" DEFINES+=APP_VERSION_PATCH=\\\\\\\\\\\\\\\"$VERSION_PATCH\\\\\\\\\\\\\\\" DEFINES+=APP_BUILD=\\\\\\\\\\\\\\\"$BUILD_NUMBER\\\\\\\\\\\\\\\" DEFINES+=APP_GITHASH=\\\\\\\\\\\\\\\"$GIT_HASH\\\\\\\\\\\\\\\" DEFINES+=APP_GITBRANCH=\\\\\\\\\\\\\\\"$GIT_BRANCH\\\\\\\\\\\\\\\"" +} + +package() { + mkdir -p "${pkgdir}"/usr/bin + cp -f ${pkgname}-${pkgver}/app/build/SysTray-X "${pkgdir}"/usr/bin/SysTray-X + + mkdir -p "${pkgdir}"/usr/lib/mozilla/native-messaging-hosts + cp -f ${pkgname}-${pkgver}/SysTray_X.json "${pkgdir}"/usr/lib/mozilla/native-messaging-hosts/SysTray_X.json + + mkdir -p "${pkgdir}"/usr/lib/thunderbird/distribution/extensions + cp -f ${pkgname}-${pkgver}/systray-x@Ximi1970.xpi "${pkgdir}"/usr/lib//thunderbird/distribution/extensions/systray-x@Ximi1970.xpi +} diff --git a/dist/arch/minimal/PKGBUILD b/dist/arch/minimal/PKGBUILD new file mode 100644 index 0000000..80ab696 --- /dev/null +++ b/dist/arch/minimal/PKGBUILD @@ -0,0 +1,56 @@ +# Maintainer: Maxime Rijnders + +pkgname=systray-x-minimal +pkgver=0 +pkgrel=0 +epoch=1 +pkgdesc='A system tray extension for Thunderbird 68+ (Unity/XFCE/other)' +arch=(x86_64) +url=https://github.com/Ximi1970/systray-x +license=(MPL-2.0) +depends=( + 'qt5-base' + 'thunderbird>=68' + 'hunderbird<=84' +) +makedepends=( + 'git' + 'unzip' + 'zip' + 'libx11' + 't5-base' +) +provides=( + 'systray-x' +) +source=($pkgname-$pkgver.tar.xz) +sha256sums=(SKIP) + +build() { + cd $pkgname-$pkgver + + export VERSION=$(cat dist/rpm/VERSION | grep VERSION | sed -e "s/VERSION=\(.*\)/\1/") + + export VERSION_MAJOR=$(echo $VERSION | cut -d'.' -f1) + export VERSION_MINOR=$(echo $VERSION | cut -d'.' -f2) + export VERSION_PATCH=$(echo $VERSION | cut -d'.' -f3) + + export BUILD_NUMBER=$(cat dist/rpm/VERSION | grep BUILD_NUMBER | sed -e "s/BUILD_NUMBER=\(.*\)/\1/") + export GIT_HASH=$(cat dist/rpm/VERSION | grep GIT_HASH | sed -e "s/GIT_HASH=\(.*\)/\1/") + export GIT_BRANCH=$(cat dist/rpm/VERSION | grep GIT_BRANCH | sed -e "s/GIT_BRANCH=\(.*\)/\1/") + + sed < app/config/linux/SysTray_X.json.template -e 's|SYSTRAY_X_PATH|/usr/bin/SysTray-X|' > SysTray_X.json + + make OPTIONS="DEFINES+=NO_KDE_INTEGRATION" EXT_VERSION="DEFINES+=EXT_VERSION DEFINES+=APP_VERSION_MAJOR=\\\\\\\\\\\\\\\"$VERSION_MAJOR\\\\\\\\\\\\\\\" DEFINES+=APP_VERSION_MINOR=\\\\\\\\\\\\\\\"$VERSION_MINOR\\\\\\\\\\\\\\\" DEFINES+=APP_VERSION_PATCH=\\\\\\\\\\\\\\\"$VERSION_PATCH\\\\\\\\\\\\\\\" DEFINES+=APP_BUILD=\\\\\\\\\\\\\\\"$BUILD_NUMBER\\\\\\\\\\\\\\\" DEFINES+=APP_GITHASH=\\\\\\\\\\\\\\\"$GIT_HASH\\\\\\\\\\\\\\\" DEFINES+=APP_GITBRANCH=\\\\\\\\\\\\\\\"$GIT_BRANCH\\\\\\\\\\\\\\\"" +} + +package() { + mkdir -p "${pkgdir}"/usr/bin + cp -f ${pkgname}-${pkgver}/app/build/SysTray-X "${pkgdir}"/usr/bin/SysTray-X + + mkdir -p "${pkgdir}"/usr/lib/mozilla/native-messaging-hosts + cp -f ${pkgname}-${pkgver}/SysTray_X.json "${pkgdir}"/usr/lib/mozilla/native-messaging-hosts/SysTray_X.json + + mkdir -p "${pkgdir}"/usr/lib/thunderbird/distribution/extensions + cp -f ${pkgname}-${pkgver}/systray-x@Ximi1970.xpi "${pkgdir}"/usr/lib//thunderbird/distribution/extensions/systray-x@Ximi1970.xpi +} diff --git a/dist/rpm/gnome/_service b/dist/rpm/gnome/_service index f6f948f..b620b85 100644 --- a/dist/rpm/gnome/_service +++ b/dist/rpm/gnome/_service @@ -14,6 +14,7 @@ dist/deb/gnome/debian.rules dist/deb/gnome/debian.postinst dist/deb/gnome/systray-x-gnome.dsc + dist/arch/gnome/PKGBUILD diff --git a/dist/rpm/kde/_service b/dist/rpm/kde/_service index 327ceb8..2b79e06 100644 --- a/dist/rpm/kde/_service +++ b/dist/rpm/kde/_service @@ -12,6 +12,7 @@ dist/deb/kde/debian.control dist/deb/kde/debian.rules dist/deb/kde/systray-x.dsc + dist/arch/kde/PKGBUILD diff --git a/dist/rpm/minimal/_service b/dist/rpm/minimal/_service index f2dd38b..46e6bdb 100644 --- a/dist/rpm/minimal/_service +++ b/dist/rpm/minimal/_service @@ -5,15 +5,16 @@ 0.5.0 0.5.0 systray-x-minimal - dist/rpm/gnome/systray-x-minimal.changes - dist/rpm/gnome/systray-x-minimal.spec + dist/rpm/minimal/systray-x-minimal.changes + dist/rpm/minimal/systray-x-minimal.spec dist/rpm/VERSION - dist/deb/gnome/debian.changelog - dist/deb/gnome/debian.compat - dist/deb/gnome/debian.control - dist/deb/gnome/debian.rules - dist/deb/gnome/debian.postinst - dist/deb/gnome/systray-x-minimal.dsc + dist/deb/minimal/debian.changelog + dist/deb/minimal/debian.compat + dist/deb/minimal/debian.control + dist/deb/minimal/debian.rules + dist/deb/minimal/debian.postinst + dist/deb/minimal/systray-x-minimal.dsc + dist/arch/minimal/PKGBUILD diff --git a/update_tb_version.sh b/update_tb_version.sh index 4513934..7902f05 100755 --- a/update_tb_version.sh +++ b/update_tb_version.sh @@ -23,5 +23,14 @@ sed -i -e "s?\(^Depends:.*, thunderbird (<= 1:\).*?\1$VERSION)?" $SERVICE_FILE SERVICE_FILE="./dist/deb/minimal/debian.control" sed -i -e "s?\(^Depends:.*, thunderbird (<= 1:\).*?\1$VERSION)?" $SERVICE_FILE +SERVICE_FILE="./dist/arch/kde/PKGBUILD" +sed -i -e "s?\(^.*thunderbird<=\).*?\1$VERSION?" $SERVICE_FILE + +SERVICE_FILE="./dist/arch/gnome/PKGBUILD" +sed -i -e "s?\(^.*thunderbird<=\).*?\1$VERSION?" $SERVICE_FILE + +SERVICE_FILE="./dist/arch/minimal/PKGBUILD" +sed -i -e "s?\(^.*thunderbird<=\).*?\1$VERSION?" $SERVICE_FILE + MANIFEST_FILE="./webext/manifest.json" sed -i -e "s?\(^.*\"strict_max_version\": \"\).*\(\.\*\"\)?\1$VERSION\2?" $MANIFEST_FILE From 21c5e0df4f1178293136f14a72eeb3ada5c87c11 Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Sun, 22 Nov 2020 17:20:43 +0100 Subject: [PATCH 04/14] Fix typos --- dist/arch/gnome/PKGBUILD | 92 ++++++++++++++------------------------ dist/arch/minimal/PKGBUILD | 4 +- 2 files changed, 36 insertions(+), 60 deletions(-) diff --git a/dist/arch/gnome/PKGBUILD b/dist/arch/gnome/PKGBUILD index 1da3d5f..e5b2130 100644 --- a/dist/arch/gnome/PKGBUILD +++ b/dist/arch/gnome/PKGBUILD @@ -20,7 +20,6 @@ makedepends=( 'zip' 'libx11' 'qt5-base' - 'notifications' ) provides=( 'systray-x' @@ -58,81 +57,58 @@ package() { } post_install() { - PROF_DIR=/etc/dconf/profile - PROF_FILE=user + PROF_DIR="/etc/dconf/profile" + PROF_FILE="user" - if [ -f $PROF_DIR/$PROF_FILE ] ; then + if [ -f ${PROF_DIR}/${PROF_FILE} ] ; then # # Edit user file # - grep -q "user-db:user" $PROF_DIR/$PROF_FILE + grep -q "user-db:user" ${PROF_DIR}/${PROF_FILE} if [ "$?" = "1" ] ; then - echo "user-db:user" >> $PROF_DIR/$PROF_FILE + echo "user-db:user" >> ${PROF_DIR}/${PROF_FILE} fi - - grep -q "system-db:local" $PROF_DIR/$PROF_FILE + + grep -q "system-db:local" ${PROF_DIR}/${PROF_FILE} if [ "$?" = "1" ] ; then - echo "system-db:local" >> $PROF_DIR/$PROF_FILE + echo "system-db:local" >> ${PROF_DIR}/${PROF_FILE} fi else # # Generate user file # - mkdir -p $PROF_DIR - cat >$PROF_DIR/$PROF_FILE <${PROF_DIR}/${PROF_FILE} < $CONF_DIR/$CONF_FILE - echo "# List all extensions that you want to have enabled for all users" >> $CONF_DIR/$CONF_FILE - echo "enabled-extensions=['${EXTENSION}']" >> $CONF_DIR/$CONF_FILE + # + # Generate extensions file + # + mkdir -p ${CONF_DIR} + cat >${CONF_DIR}/${CONF_FILE} < /dev/null 2>&1 - if [ "$?" = "0" ] ; then - dconf update + # + if [ -x /usr/bin/dconf ] ; then + dconf update fi } diff --git a/dist/arch/minimal/PKGBUILD b/dist/arch/minimal/PKGBUILD index 80ab696..9afc55a 100644 --- a/dist/arch/minimal/PKGBUILD +++ b/dist/arch/minimal/PKGBUILD @@ -11,14 +11,14 @@ license=(MPL-2.0) depends=( 'qt5-base' 'thunderbird>=68' - 'hunderbird<=84' + 'thunderbird<=84' ) makedepends=( 'git' 'unzip' 'zip' 'libx11' - 't5-base' + 'qt5-base' ) provides=( 'systray-x' From 9aced9bdf220fab9137808c8e3659be4ae9a4f30 Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Sun, 22 Nov 2020 17:24:51 +0100 Subject: [PATCH 05/14] Fix version --- dist/arch/gnome/PKGBUILD | 2 +- dist/arch/kde/PKGBUILD | 2 +- dist/arch/minimal/PKGBUILD | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/arch/gnome/PKGBUILD b/dist/arch/gnome/PKGBUILD index e5b2130..94aa999 100644 --- a/dist/arch/gnome/PKGBUILD +++ b/dist/arch/gnome/PKGBUILD @@ -12,7 +12,7 @@ depends=( 'qt5-base' 'gnome-shell-extension-appindicator' 'thunderbird>=68' - 'thunderbird<=84' + 'thunderbird<=83 ) makedepends=( 'git' diff --git a/dist/arch/kde/PKGBUILD b/dist/arch/kde/PKGBUILD index afec6b9..ad8e798 100644 --- a/dist/arch/kde/PKGBUILD +++ b/dist/arch/kde/PKGBUILD @@ -12,7 +12,7 @@ depends=( 'qt5-base' 'knotifications' 'thunderbird>=68' - 'thunderbird<=84' + 'thunderbird<=83 ) makedepends=( 'git' diff --git a/dist/arch/minimal/PKGBUILD b/dist/arch/minimal/PKGBUILD index 9afc55a..b27dee5 100644 --- a/dist/arch/minimal/PKGBUILD +++ b/dist/arch/minimal/PKGBUILD @@ -11,7 +11,7 @@ license=(MPL-2.0) depends=( 'qt5-base' 'thunderbird>=68' - 'thunderbird<=84' + 'thunderbird<=83 ) makedepends=( 'git' From 4db0aed5a97a213ccc7dad55227a36066108ab76 Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Sun, 22 Nov 2020 17:33:04 +0100 Subject: [PATCH 06/14] Fix EOF --- dist/arch/gnome/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dist/arch/gnome/PKGBUILD b/dist/arch/gnome/PKGBUILD index 94aa999..10a5ea9 100644 --- a/dist/arch/gnome/PKGBUILD +++ b/dist/arch/gnome/PKGBUILD @@ -82,7 +82,7 @@ post_install() { user-db:user system-db:local EOF -fi + fi EXTENSION="appindicatorsupport@rgcjonas.gmail.com" CONF_DIR="/etc/dconf/db/local.d" @@ -102,10 +102,10 @@ fi # mkdir -p ${CONF_DIR} cat >${CONF_DIR}/${CONF_FILE} < Date: Sun, 22 Nov 2020 17:36:54 +0100 Subject: [PATCH 07/14] Update version --- dist/arch/gnome/PKGBUILD | 2 +- dist/arch/kde/PKGBUILD | 2 +- dist/arch/minimal/PKGBUILD | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/arch/gnome/PKGBUILD b/dist/arch/gnome/PKGBUILD index 10a5ea9..7cdc8ad 100644 --- a/dist/arch/gnome/PKGBUILD +++ b/dist/arch/gnome/PKGBUILD @@ -12,7 +12,7 @@ depends=( 'qt5-base' 'gnome-shell-extension-appindicator' 'thunderbird>=68' - 'thunderbird<=83 + 'thunderbird<=84 ) makedepends=( 'git' diff --git a/dist/arch/kde/PKGBUILD b/dist/arch/kde/PKGBUILD index ad8e798..1826a04 100644 --- a/dist/arch/kde/PKGBUILD +++ b/dist/arch/kde/PKGBUILD @@ -12,7 +12,7 @@ depends=( 'qt5-base' 'knotifications' 'thunderbird>=68' - 'thunderbird<=83 + 'thunderbird<=84 ) makedepends=( 'git' diff --git a/dist/arch/minimal/PKGBUILD b/dist/arch/minimal/PKGBUILD index b27dee5..7a9ec3d 100644 --- a/dist/arch/minimal/PKGBUILD +++ b/dist/arch/minimal/PKGBUILD @@ -11,7 +11,7 @@ license=(MPL-2.0) depends=( 'qt5-base' 'thunderbird>=68' - 'thunderbird<=83 + 'thunderbird<=84 ) makedepends=( 'git' From 75d4f374612d873f536994095d900ae79610ed82 Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Sun, 22 Nov 2020 17:39:47 +0100 Subject: [PATCH 08/14] Fix typo --- dist/arch/gnome/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/arch/gnome/PKGBUILD b/dist/arch/gnome/PKGBUILD index 7cdc8ad..f68fea9 100644 --- a/dist/arch/gnome/PKGBUILD +++ b/dist/arch/gnome/PKGBUILD @@ -12,7 +12,7 @@ depends=( 'qt5-base' 'gnome-shell-extension-appindicator' 'thunderbird>=68' - 'thunderbird<=84 + 'thunderbird<=84' ) makedepends=( 'git' From 1ffa84665fe40df978f904f3204c595f9d1d5012 Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Sun, 22 Nov 2020 17:52:15 +0100 Subject: [PATCH 09/14] Fix typos --- dist/arch/gnome/PKGBUILD | 2 +- dist/arch/minimal/PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/arch/gnome/PKGBUILD b/dist/arch/gnome/PKGBUILD index f68fea9..3d7e411 100644 --- a/dist/arch/gnome/PKGBUILD +++ b/dist/arch/gnome/PKGBUILD @@ -42,7 +42,7 @@ build() { sed < app/config/linux/SysTray_X.json.template -e 's|SYSTRAY_X_PATH|/usr/bin/SysTray-X|' > SysTray_X.json - make EXT_VERSION="DEFINES+=EXT_VERSION DEFINES+=APP_VERSION_MAJOR=\\\\\\\\\\\\\\\"$VERSION_MAJOR\\\\\\\\\\\\\\\" DEFINES+=APP_VERSION_MINOR=\\\\\\\\\\\\\\\"$VERSION_MINOR\\\\\\\\\\\\\\\" DEFINES+=APP_VERSION_PATCH=\\\\\\\\\\\\\\\"$VERSION_PATCH\\\\\\\\\\\\\\\" DEFINES+=APP_BUILD=\\\\\\\\\\\\\\\"$BUILD_NUMBER\\\\\\\\\\\\\\\" DEFINES+=APP_GITHASH=\\\\\\\\\\\\\\\"$GIT_HASH\\\\\\\\\\\\\\\" DEFINES+=APP_GITBRANCH=\\\\\\\\\\\\\\\"$GIT_BRANCH\\\\\\\\\\\\\\\"" + make OPTIONS="DEFINES+=NO_KDE_INTEGRATION" EXT_VERSION="DEFINES+=EXT_VERSION DEFINES+=APP_VERSION_MAJOR=\\\\\\\\\\\\\\\"$VERSION_MAJOR\\\\\\\\\\\\\\\" DEFINES+=APP_VERSION_MINOR=\\\\\\\\\\\\\\\"$VERSION_MINOR\\\\\\\\\\\\\\\" DEFINES+=APP_VERSION_PATCH=\\\\\\\\\\\\\\\"$VERSION_PATCH\\\\\\\\\\\\\\\" DEFINES+=APP_BUILD=\\\\\\\\\\\\\\\"$BUILD_NUMBER\\\\\\\\\\\\\\\" DEFINES+=APP_GITHASH=\\\\\\\\\\\\\\\"$GIT_HASH\\\\\\\\\\\\\\\" DEFINES+=APP_GITBRANCH=\\\\\\\\\\\\\\\"$GIT_BRANCH\\\\\\\\\\\\\\\"" } package() { diff --git a/dist/arch/minimal/PKGBUILD b/dist/arch/minimal/PKGBUILD index 7a9ec3d..9afc55a 100644 --- a/dist/arch/minimal/PKGBUILD +++ b/dist/arch/minimal/PKGBUILD @@ -11,7 +11,7 @@ license=(MPL-2.0) depends=( 'qt5-base' 'thunderbird>=68' - 'thunderbird<=84 + 'thunderbird<=84' ) makedepends=( 'git' From 58f68477c6400231b60f3d8c757ac266514ea67e Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Sun, 22 Nov 2020 17:55:54 +0100 Subject: [PATCH 10/14] Fix typo --- dist/arch/kde/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/arch/kde/PKGBUILD b/dist/arch/kde/PKGBUILD index 1826a04..afec6b9 100644 --- a/dist/arch/kde/PKGBUILD +++ b/dist/arch/kde/PKGBUILD @@ -12,7 +12,7 @@ depends=( 'qt5-base' 'knotifications' 'thunderbird>=68' - 'thunderbird<=84 + 'thunderbird<=84' ) makedepends=( 'git' From 92de63a88d0a4b9437052f2052ab2bc8eea34cff Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Sun, 22 Nov 2020 17:57:39 +0100 Subject: [PATCH 11/14] Fix version script --- update_tb_version.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/update_tb_version.sh b/update_tb_version.sh index 7902f05..c863e4f 100755 --- a/update_tb_version.sh +++ b/update_tb_version.sh @@ -24,13 +24,13 @@ SERVICE_FILE="./dist/deb/minimal/debian.control" sed -i -e "s?\(^Depends:.*, thunderbird (<= 1:\).*?\1$VERSION)?" $SERVICE_FILE SERVICE_FILE="./dist/arch/kde/PKGBUILD" -sed -i -e "s?\(^.*thunderbird<=\).*?\1$VERSION?" $SERVICE_FILE +sed -i -e "s?\(^.*thunderbird<=\).*?\1$VERSION'?" $SERVICE_FILE SERVICE_FILE="./dist/arch/gnome/PKGBUILD" -sed -i -e "s?\(^.*thunderbird<=\).*?\1$VERSION?" $SERVICE_FILE +sed -i -e "s?\(^.*thunderbird<=\).*?\1$VERSION'?" $SERVICE_FILE SERVICE_FILE="./dist/arch/minimal/PKGBUILD" -sed -i -e "s?\(^.*thunderbird<=\).*?\1$VERSION?" $SERVICE_FILE +sed -i -e "s?\(^.*thunderbird<=\).*?\1$VERSION'?" $SERVICE_FILE MANIFEST_FILE="./webext/manifest.json" sed -i -e "s?\(^.*\"strict_max_version\": \"\).*\(\.\*\"\)?\1$VERSION\2?" $MANIFEST_FILE From 009cf68a65f2f8862be4a8fbb1526c4b66c1991f Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Sun, 22 Nov 2020 20:15:28 +0100 Subject: [PATCH 12/14] Fix post install --- README.md | 8 ++++ dist/arch/gnome/PKGBUILD | 58 +------------------------ dist/arch/gnome/systray-x-gnome.install | 56 ++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 57 deletions(-) create mode 100644 dist/arch/gnome/systray-x-gnome.install diff --git a/README.md b/README.md index c115534..86a14e3 100644 --- a/README.md +++ b/README.md @@ -280,6 +280,14 @@ sudo pacman -S systray-x sudo pacman -S systray-x-gnome ``` +##### Activation + +Use `Tweaks` to activate the gnome shell extension `Kstatusnotifieritem/appindicator support` or reboot the system. + +``` bash +sudo pacman -S gnome-tweaks +``` + ###### XFCE / Others (non-KDE, non-GNOME) ```bash diff --git a/dist/arch/gnome/PKGBUILD b/dist/arch/gnome/PKGBUILD index 3d7e411..76ba9a4 100644 --- a/dist/arch/gnome/PKGBUILD +++ b/dist/arch/gnome/PKGBUILD @@ -26,6 +26,7 @@ provides=( ) source=($pkgname-$pkgver.tar.xz) sha256sums=(SKIP) +install=systray-x-gnome.install build() { cd $pkgname-$pkgver @@ -55,60 +56,3 @@ package() { mkdir -p "${pkgdir}"/usr/lib/thunderbird/distribution/extensions cp -f ${pkgname}-${pkgver}/systray-x@Ximi1970.xpi "${pkgdir}"/usr/lib//thunderbird/distribution/extensions/systray-x@Ximi1970.xpi } - -post_install() { - PROF_DIR="/etc/dconf/profile" - PROF_FILE="user" - - if [ -f ${PROF_DIR}/${PROF_FILE} ] ; then - # - # Edit user file - # - grep -q "user-db:user" ${PROF_DIR}/${PROF_FILE} - if [ "$?" = "1" ] ; then - echo "user-db:user" >> ${PROF_DIR}/${PROF_FILE} - fi - - grep -q "system-db:local" ${PROF_DIR}/${PROF_FILE} - if [ "$?" = "1" ] ; then - echo "system-db:local" >> ${PROF_DIR}/${PROF_FILE} - fi - else - # - # Generate user file - # - mkdir -p ${PROF_DIR} - cat >${PROF_DIR}/${PROF_FILE} <${CONF_DIR}/${CONF_FILE} <> ${PROF_DIR}/${PROF_FILE} + fi + + grep -q "system-db:local" ${PROF_DIR}/${PROF_FILE} + if [ "$?" = "1" ] ; then + echo "system-db:local" >> ${PROF_DIR}/${PROF_FILE} + fi + else + # + # Generate user file + # + mkdir -p ${PROF_DIR} + cat >${PROF_DIR}/${PROF_FILE} <${CONF_DIR}/${CONF_FILE} < Date: Sun, 22 Nov 2020 20:18:21 +0100 Subject: [PATCH 13/14] Add post install to the service --- dist/rpm/gnome/_service | 1 + 1 file changed, 1 insertion(+) diff --git a/dist/rpm/gnome/_service b/dist/rpm/gnome/_service index b620b85..aefd859 100644 --- a/dist/rpm/gnome/_service +++ b/dist/rpm/gnome/_service @@ -15,6 +15,7 @@ dist/deb/gnome/debian.postinst dist/deb/gnome/systray-x-gnome.dsc dist/arch/gnome/PKGBUILD + dist/arch/gnome/systray-x-gnome.install From c628745d77c3e495ada8432b49af91c2c30a243b Mon Sep 17 00:00:00 2001 From: Maxime Rijnders Date: Sun, 22 Nov 2020 20:50:15 +0100 Subject: [PATCH 14/14] Update README.md --- README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index 86a14e3..bf4168d 100644 --- a/README.md +++ b/README.md @@ -279,10 +279,7 @@ sudo pacman -S systray-x ```bash sudo pacman -S systray-x-gnome ``` - -##### Activation - -Use `Tweaks` to activate the gnome shell extension `Kstatusnotifieritem/appindicator support` or reboot the system. +Please use `Tweaks` to activate the gnome shell extension `Kstatusnotifieritem/appindicator support` or reboot the system. ``` bash sudo pacman -S gnome-tweaks