From e5174bf3dfe64c1134062da4673487dc13cc9d73 Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Sun, 22 Nov 2020 12:48:19 +0100 Subject: [PATCH] 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