From e33a2f7783d315af8ecf8bec444548d9b7d53429 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 18 Feb 2021 19:13:45 +0700 Subject: [PATCH 1/2] New package: go-qt5-0.0.20200904 --- srcpkgs/go-qt5/patches/vendor-void.patch | 23 ++++++++++++++++++ srcpkgs/go-qt5/template | 31 ++++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 srcpkgs/go-qt5/patches/vendor-void.patch create mode 100644 srcpkgs/go-qt5/template diff --git a/srcpkgs/go-qt5/patches/vendor-void.patch b/srcpkgs/go-qt5/patches/vendor-void.patch new file mode 100644 index 00000000000..a45230f8150 --- /dev/null +++ b/srcpkgs/go-qt5/patches/vendor-void.patch @@ -0,0 +1,23 @@ +Index: internal/utils/linux.go +=================================================================== +--- internal/utils/linux.go.orig ++++ internal/utils/linux.go +@@ -20,7 +20,7 @@ func QT_DOC_DIR() string { + switch QT_DISTRO() { + case "arch": + return "/usr/share/doc/qt" +- case "fedora": ++ case "fedora", "void": + return "/usr/share/doc/qt5" + case "suse": + return "/usr/share/doc/packages/qt5" +@@ -56,6 +56,9 @@ func QT_DISTRO() string { + if runtime.GOOS == "darwin" || runtime.GOOS == "freebsd" { + return runtime.GOOS + } ++ if _, err := exec.LookPath("xbps-query"); err == nil { ++ return "void" ++ } + if _, err := exec.LookPath("pacman"); err == nil { + return "arch" + } diff --git a/srcpkgs/go-qt5/template b/srcpkgs/go-qt5/template new file mode 100644 index 00000000000..f204405dfca --- /dev/null +++ b/srcpkgs/go-qt5/template @@ -0,0 +1,31 @@ +# Template file for 'go-qt5' +pkgname=go-qt5 +version=0.0.20200904 +revision=1 +_git_hash=c0c124a5770d357908f16fa57e0aa0ec6ccd3f91 +wrksrc=qt-$_git_hash +build_style=go +go_import_path="github.com/therecipe/qt" +go_package=" + $go_import_path/cmd/qtdeploy + $go_import_path/cmd/qtminimal + $go_import_path/cmd/qtmoc + $go_import_path/cmd/qtrcc + $go_import_path/cmd/qtsetup" +depends="qt5-qmake qt5-host-tools qt5-base-docs qt5-doc" +short_desc="Qt binding for golang" +maintainer="Đoàn Trần Công Danh " +license="LGPL-3.0-only" +homepage="https://github.com/therecipe/qt" +distfiles="https://github.com/therecipe/qt/archive/$_git_hash.tar.gz" +checksum=e58a1957611a894611f0a06ce1efe42859b66c2cafd2219fe5b9d497be467e7a +nocross="experimental packages" + +if [ "$XBPS_TARGET_WORDSIZE" != 64 ]; then + broken="mapping integer size between go and C++" +fi + +post_install() { + vmkdir usr/libexec/go-qt5 + mv $DESTDIR/usr/bin/* $DESTDIR/usr/libexec/go-qt5 +} From b7da60264f10795b371c146ff910097c2446ad28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 18 Feb 2021 21:50:15 +0700 Subject: [PATCH 2/2] protonmail-bridge: update to 1.6.3, build from source --- srcpkgs/protonmail-bridge/template | 70 ++++++++++++++++++++++++------ 1 file changed, 57 insertions(+), 13 deletions(-) diff --git a/srcpkgs/protonmail-bridge/template b/srcpkgs/protonmail-bridge/template index e0bc8d92fc4..d1c5a25b126 100644 --- a/srcpkgs/protonmail-bridge/template +++ b/srcpkgs/protonmail-bridge/template @@ -1,23 +1,67 @@ # Template file for 'protonmail-bridge' pkgname=protonmail-bridge -version=1.5.6 +version=1.6.3 revision=1 -archs="x86_64" -build_style=fetch -depends="desktop-file-utils" +wrksrc=proton-bridge-br-$version +build_style=go +# disable rpath +build_helper=qmake +go_import_path="github.com/ProtonMail/proton-bridge" +go_mod_mode=vendor +go_package="$go_import_path/cmd/Desktop-Bridge" +go_build_tags="minimal" +go_ldflags=" + -X $go_import_path/internal/constants.Version=$version + -X $go_import_path/internal/constants.Revision=$version + -X $go_import_path/internal/constants.BuildTime=$(date +%FT%T%z)" +hostmakedepends="desktop-file-utils go-qt5 pkg-config" +makedepends="qt5-devel qt5-declarative-devel qt5-webview-devel + qt5-webengine-devel libsecret-devel qt5-quickcontrols2-devel" +# For qml files +depends="desktop-file-utils qt5-graphicaleffects qt5-quickcontrols2 + qt5-charts qt5-datavis3d qt5-multimedia qt5-quickcontrols + qt5-declarative qt5-webengine" short_desc="ProtonMail Bridge for use with E-mail software" maintainer="Rich G " license="GPL-3.0-or-later" homepage="https://protonmail.com/bridge" -distfiles="https://protonmail.com/download/beta/protonmail-bridge_${version}-1_amd64.deb" -checksum=3c18833c7b21ab97c9ba0a5e1267a620de3c8eece02bed49ff3d12961932b74c +distfiles="https://github.com/ProtonMail/proton-bridge/archive/br-$version.tar.gz" +checksum=e1565f8f3e175c27e61500cb8b13d768769b2eee4d83e0265d135d0d97e4acea +nocross="experimental" -restricted=yes -noverifyrdeps=yes -nopie=yes +CFLAGS=" + -I$XBPS_CROSS_BASE/usr/include/qt5 + -I$XBPS_CROSS_BASE/usr/include/qt5/QtCore + -I$XBPS_CROSS_BASE/usr/include/qt5/QtQml + -Wno-deprecated-declarations" +CXXFLAGS="$CFLAGS" +LDFLAGS="-Wl,--as-needed -lQt5Core" +export GO111MODULE=on +export QT_PKG_CONFIG=true -do_install() { - ar x protonmail-bridge_${version}-1_amd64.deb data.tar.gz - bsdtar xpvf data.tar.gz - cp -r usr ${DESTDIR} +if [ "$XBPS_TARGET_WORDSIZE" != 64 ]; then + broken="mapping integer size between go and C++" +fi + +pre_build() { + PATH=/usr/libexec/go-qt5:$PATH + export QT_QMAKE_DIR=$XBPS_WRAPPERDIR + ln -sf /usr/lib/qt5/bin/rcc $XBPS_WRAPPERDIR + ln -sf /usr/lib/qt5/bin/moc $XBPS_WRAPPERDIR + : qtdeploy -p "$XBPS_MAKEJOBS" \ + -debug \ + -tags "$go_build_tags" -ldflags "$go_ldflags" \ + build desktop cmd/Desktop-Bridge + qtrcc desktop cmd/Desktop-Bridge + qtmoc desktop cmd/Desktop-Bridge + qtminimal desktop cmd/Desktop-Bridge +} + +post_install() { + mv $DESTDIR/usr/bin/Desktop-Bridge $DESTDIR/usr/bin/protonmail-bridge + vmkdir usr/share/protonmail-bridge + vcopy internal/frontend/qml usr/share/protonmail-bridge + vinstall dist/proton-bridge.desktop 0644 usr/share/applications/ + vinstall internal/frontend/share/icons/logo.svg 0644 \ + usr/share/icons/hicolor/scalable/apps/ protonmail-bridge.svg }