Robin Candau pushed to branch main at Arch Linux / Packaging / Packages /
systray-x
Commits:
85172f51 by Robin Candau at 2025-02-07T16:12:30+01:00
Add a more suitable name for the custom var in the Makefile.patch
PREFIX is usually used for something else in 'make' context. Rename it to 'APP'
to avoid confusion
- - - - -
3 changed files:
- .SRCINFO
- Makefile.patch
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -16,7 +16,7 @@ pkgbase = systray-x
source =
systray-x-0.9.10.tar.gz::https://github.com/Ximi1970/systray-x/archive/0.9.10.tar.gz
source = Makefile.patch
sha256sums =
7a9bc146f341288b0b41e65d56190dcead694681b1bed25ad36a35768abf3029
- sha256sums =
dac5b7a4a1ad38ed9429d40636b59cb6932d6c7afd20e50609a73e2ff260316a
+ sha256sums =
62affd86e6dbad6e9cf851768d99fd79f76f65ac2fd5e45ef5e89c5dcb63dbab
pkgname = systray-x-common
pkgdesc = A system tray extension for Thunderbird - Common version
=====================================
Makefile.patch
=====================================
@@ -6,7 +6,7 @@ index 9631a87..0add4ce 100644
endif
endif
-+PREFIX ?=
++APP ?=
+
#OPTIONS = "DEFINES += NO_KDE_INTEGRATION"
@@ -17,13 +17,13 @@ index 9631a87..0add4ce 100644
rm -f SysTray-X ;\
- mkdir -p app/build ;\
- cd app/build ;\
-+ mkdir -p app/${PREFIX}-build ;\
-+ cd app/${PREFIX}-build ;\
++ mkdir -p app/${APP}-build ;\
++ cd app/${APP}-build ;\
$(QMAKE) $(EXT_VERSION) $(OPTIONS) ../SysTray-X/SysTray-X.pro ;\
make ;\
cd ../.. ;\
- cp app/build/SysTray-X-app/SysTray-X .
-+ cp app/${PREFIX}-build/SysTray-X-app/SysTray-X .
++ cp app/${APP}-build/SysTray-X-app/SysTray-X .
else
systray-x-app:
@echo "Creating systray-x app" ;\
=====================================
PKGBUILD
=====================================
@@ -14,7 +14,7 @@ makedepends=('git' 'zip' 'unzip' 'libx11'
'kstatusnotifieritem')
source=("${pkgbase}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz"
"Makefile.patch")
sha256sums=('7a9bc146f341288b0b41e65d56190dcead694681b1bed25ad36a35768abf3029'
- 'dac5b7a4a1ad38ed9429d40636b59cb6932d6c7afd20e50609a73e2ff260316a')
+ '62affd86e6dbad6e9cf851768d99fd79f76f65ac2fd5e45ef5e89c5dcb63dbab')
prepare() {
cd "${pkgbase}-${pkgver}"
@@ -22,15 +22,15 @@ prepare() {
# Add the correct path to the binary in the json file
sed -i 's/\/path\/to\/native-messaging\/app/\/usr\/bin/g'
"app/${_pkgbase//-/_}.json"
- # Patch the Makefile to build both binaries into separate directories
- patch -Np1 < "${srcdir}"/Makefile.patch
+ # Patch the Makefile to build both versions of the app into separate
directories
+ patch -Np1 -i "${srcdir}/Makefile.patch"
}
_build() {
if [ "${1}" == "systray-x-common" ]; then
- make OPTIONS="DEFINES+=NO_KDE_INTEGRATION" PREFIX="${1}"
+ make OPTIONS="DEFINES+=NO_KDE_INTEGRATION" APP="${1}"
else
- make PREFIX="${1}"
+ make APP="${1}"
fi
}
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/systray-x/-/commit/85172f51b005ad87d7eb65f1c421b21e35241720
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/systray-x/-/commit/85172f51b005ad87d7eb65f1c421b21e35241720
You're receiving this email because of your account on gitlab.archlinux.org.
