[-- Attachment #1: Type: text/plain, Size: 1673 bytes --] There is a new pull request by sgn against master on the void-packages repository https://github.com/sgn/void-packages proton-bridge-build-from-source https://github.com/void-linux/void-packages/pull/28839 proton-bridge: 1.6.3 build from source <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [ ] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> <!-- #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [ ] I built this PR locally for my native architecture, (ARCH-LIBC) - [ ] I built this PR locally for these architectures (if supported. mark crossbuilds): - [ ] aarch64-musl - [ ] armv7l - [ ] armv6l-musl --> Not tested, not trying to cross-compile. Close #26058 A patch file from https://github.com/void-linux/void-packages/pull/28839.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-proton-bridge-build-from-source-28839.patch --] [-- Type: text/x-diff, Size: 5851 bytes --] From a2d41787d4c4a08874cff4c3f37662f5576273b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= <congdanhqx@gmail.com> 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 | 27 ++++++++++++++++++++++++ 2 files changed, 50 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..e62dcb3e1af --- /dev/null +++ b/srcpkgs/go-qt5/template @@ -0,0 +1,27 @@ +# 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" +short_desc="Qt binding for golang" +maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>" +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" + +post_install() { + vmkdir usr/libexec/go-qt5 + mv $DESTDIR/usr/bin/* $DESTDIR/usr/libexec/go-qt5 +} From 7a4f826eb07d9dc0f499948610007aa238077584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= <congdanhqx@gmail.com> 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 | 66 ++++++++++++++++++++++++------ 1 file changed, 54 insertions(+), 12 deletions(-) diff --git a/srcpkgs/protonmail-bridge/template b/srcpkgs/protonmail-bridge/template index e0bc8d92fc4..b59f0d1a729 100644 --- a/srcpkgs/protonmail-bridge/template +++ b/srcpkgs/protonmail-bridge/template @@ -1,23 +1,65 @@ # Template file for 'protonmail-bridge' pkgname=protonmail-bridge -version=1.5.6 +version=1.6.3 revision=1 -archs="x86_64" -build_style=fetch +wrksrc=proton-bridge-br-$version +build_style=go +# disable rpath +build_helper=qmake +go_import_path="github.com/ProtonMail/proton-bridge" +go_package=" + $go_import_path/cmd/Desktop-Bridge + $go_import_path/cmd/launcher" +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) + -X main.ConfigName=bridge + -X main.ExeName=proton-bridge" +hostmakedepends="go-qt5 pkg-config" +makedepends="qt5-devel qt5-declarative-devel qt5-webview-devel + qt5-webengine-devel libsecret-devel" depends="desktop-file-utils" short_desc="ProtonMail Bridge for use with E-mail software" maintainer="Rich G <rich@richgannon.net>" 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/QtQml + -I$XBPS_CROSS_BASE/usr/include/qt5/QtCore + -Wno-deprecated-declarations" +CXXFLAGS="$CFLAGS" +LDFLAGS=-lQt5Qml -do_install() { - ar x protonmail-bridge_${version}-1_amd64.deb data.tar.gz - bsdtar xpvf data.tar.gz - cp -r usr ${DESTDIR} +pre_build() { + export GO111MODULE=on + export QT_PKG_CONFIG=true + export QT_QMAKE_DIR=$XBPS_WRAPPERDIR + QT_VERSION=$(pkg-config --modversion Qt5Core) + export QT_VERSION + PATH="/usr/libexec/go-qt5:$PATH" + ln -sf /usr/lib/qt5/bin/rcc $XBPS_WRAPPERDIR + ln -sf /usr/lib/qt5/bin/moc $XBPS_WRAPPERDIR + : qtdeploy -p "$XBPS_MAKEJOBS" \ + -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() { + local libexec=usr/libexec/protonmail + vmkdir $libexec + mv $DESTDIR/usr/bin/Desktop-Bridge $DESTDIR/$libexec/proton-bridge + mv $DESTDIR/usr/bin/launcher $DESTDIR/$libexec/proton-bridge-launcher + 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 + ln -sf /$libexec/proton-bridge-launcher \ + $DESTDIR/usr/bin/protonmail-bridge }
[-- Attachment #1: Type: text/plain, Size: 173 bytes --] New comment by sgn on void-packages repository https://github.com/void-linux/void-packages/pull/28839#issuecomment-781401190 Comment: Build fail intermittent in local o-0
[-- Attachment #1: Type: text/plain, Size: 1692 bytes --] There is an updated pull request by sgn against master on the void-packages repository https://github.com/sgn/void-packages proton-bridge-build-from-source https://github.com/void-linux/void-packages/pull/28839 proton-bridge: 1.6.3 build from source <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [ ] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> <!-- #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [ ] I built this PR locally for my native architecture, (ARCH-LIBC) - [ ] I built this PR locally for these architectures (if supported. mark crossbuilds): - [ ] aarch64-musl - [ ] armv7l - [ ] armv6l-musl --> Not tested, not trying to cross-compile. Close #26058 Close #28810 A patch file from https://github.com/void-linux/void-packages/pull/28839.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-proton-bridge-build-from-source-28839.patch --] [-- Type: text/x-diff, Size: 5565 bytes --] From a2d41787d4c4a08874cff4c3f37662f5576273b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= <congdanhqx@gmail.com> 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 | 27 ++++++++++++++++++++++++ 2 files changed, 50 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..e62dcb3e1af --- /dev/null +++ b/srcpkgs/go-qt5/template @@ -0,0 +1,27 @@ +# 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" +short_desc="Qt binding for golang" +maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>" +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" + +post_install() { + vmkdir usr/libexec/go-qt5 + mv $DESTDIR/usr/bin/* $DESTDIR/usr/libexec/go-qt5 +} From 8f04633e2141fee5cc30018e51453ecc18bd7553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= <congdanhqx@gmail.com> 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 | 59 ++++++++++++++++++++++++------ 1 file changed, 47 insertions(+), 12 deletions(-) diff --git a/srcpkgs/protonmail-bridge/template b/srcpkgs/protonmail-bridge/template index e0bc8d92fc4..63673eb04a2 100644 --- a/srcpkgs/protonmail-bridge/template +++ b/srcpkgs/protonmail-bridge/template @@ -1,23 +1,58 @@ # Template file for 'protonmail-bridge' pkgname=protonmail-bridge -version=1.5.6 +version=1.6.3 revision=1 -archs="x86_64" -build_style=fetch +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="go-qt5 pkg-config" +makedepends="qt5-devel qt5-declarative-devel qt5-webview-devel + qt5-webengine-devel libsecret-devel" depends="desktop-file-utils" short_desc="ProtonMail Bridge for use with E-mail software" maintainer="Rich G <rich@richgannon.net>" 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="-lQt5Core -lQt5Qml" -do_install() { - ar x protonmail-bridge_${version}-1_amd64.deb data.tar.gz - bsdtar xpvf data.tar.gz - cp -r usr ${DESTDIR} +pre_build() { + export GO111MODULE=on + export QT_PKG_CONFIG=true + 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 + 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 }
[-- Attachment #1: Type: text/plain, Size: 1692 bytes --] There is an updated pull request by sgn against master on the void-packages repository https://github.com/sgn/void-packages proton-bridge-build-from-source https://github.com/void-linux/void-packages/pull/28839 proton-bridge: 1.6.3 build from source <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [ ] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> <!-- #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [ ] I built this PR locally for my native architecture, (ARCH-LIBC) - [ ] I built this PR locally for these architectures (if supported. mark crossbuilds): - [ ] aarch64-musl - [ ] armv7l - [ ] armv6l-musl --> Not tested, not trying to cross-compile. Close #26058 Close #28810 A patch file from https://github.com/void-linux/void-packages/pull/28839.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-proton-bridge-build-from-source-28839.patch --] [-- Type: text/x-diff, Size: 5611 bytes --] From a2d41787d4c4a08874cff4c3f37662f5576273b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= <congdanhqx@gmail.com> 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 | 27 ++++++++++++++++++++++++ 2 files changed, 50 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..e62dcb3e1af --- /dev/null +++ b/srcpkgs/go-qt5/template @@ -0,0 +1,27 @@ +# 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" +short_desc="Qt binding for golang" +maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>" +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" + +post_install() { + vmkdir usr/libexec/go-qt5 + mv $DESTDIR/usr/bin/* $DESTDIR/usr/libexec/go-qt5 +} From f1a6478f7e4a81dced21eac8eac7ff8d1193d555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= <congdanhqx@gmail.com> 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 | 59 ++++++++++++++++++++++++------ 1 file changed, 47 insertions(+), 12 deletions(-) diff --git a/srcpkgs/protonmail-bridge/template b/srcpkgs/protonmail-bridge/template index e0bc8d92fc4..3e4bbaf34b0 100644 --- a/srcpkgs/protonmail-bridge/template +++ b/srcpkgs/protonmail-bridge/template @@ -1,23 +1,58 @@ # Template file for 'protonmail-bridge' pkgname=protonmail-bridge -version=1.5.6 +version=1.6.3 revision=1 -archs="x86_64" -build_style=fetch +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-base-docs qt5-doc" depends="desktop-file-utils" short_desc="ProtonMail Bridge for use with E-mail software" maintainer="Rich G <rich@richgannon.net>" 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" -do_install() { - ar x protonmail-bridge_${version}-1_amd64.deb data.tar.gz - bsdtar xpvf data.tar.gz - cp -r usr ${DESTDIR} +pre_build() { + export GO111MODULE=on + export QT_PKG_CONFIG=true + 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 + 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 }
[-- Attachment #1: Type: text/plain, Size: 1692 bytes --] There is an updated pull request by sgn against master on the void-packages repository https://github.com/sgn/void-packages proton-bridge-build-from-source https://github.com/void-linux/void-packages/pull/28839 proton-bridge: 1.6.3 build from source <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [ ] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> <!-- #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [ ] I built this PR locally for my native architecture, (ARCH-LIBC) - [ ] I built this PR locally for these architectures (if supported. mark crossbuilds): - [ ] aarch64-musl - [ ] armv7l - [ ] armv6l-musl --> Not tested, not trying to cross-compile. Close #26058 Close #28810 A patch file from https://github.com/void-linux/void-packages/pull/28839.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-proton-bridge-build-from-source-28839.patch --] [-- Type: text/x-diff, Size: 5965 bytes --] From a2d41787d4c4a08874cff4c3f37662f5576273b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= <congdanhqx@gmail.com> 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 | 27 ++++++++++++++++++++++++ 2 files changed, 50 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..e62dcb3e1af --- /dev/null +++ b/srcpkgs/go-qt5/template @@ -0,0 +1,27 @@ +# 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" +short_desc="Qt binding for golang" +maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>" +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" + +post_install() { + vmkdir usr/libexec/go-qt5 + mv $DESTDIR/usr/bin/* $DESTDIR/usr/libexec/go-qt5 +} From 341d80da18988831b9fd90515fd38c352e477685 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= <congdanhqx@gmail.com> 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 | 67 ++++++++++++++++++++++++------ 1 file changed, 54 insertions(+), 13 deletions(-) diff --git a/srcpkgs/protonmail-bridge/template b/srcpkgs/protonmail-bridge/template index e0bc8d92fc4..4645e7fb8f1 100644 --- a/srcpkgs/protonmail-bridge/template +++ b/srcpkgs/protonmail-bridge/template @@ -1,23 +1,64 @@ # 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-base-docs qt5-doc + qt5-quickcontrols2-devel" +depends="desktop-file-utils qt5-graphicaleffects qt5-quickcontrols2" short_desc="ProtonMail Bridge for use with E-mail software" maintainer="Rich G <rich@richgannon.net>" 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 +export QML_IMPORT_PATH=/usr/share/protonmail-bridge/qml +export QML2_IMPORT_PATH=/usr/share/protonmail-bridge/qml +export QT_MISC_DIR=/usr/share/protonmail-bridge -do_install() { - ar x protonmail-bridge_${version}-1_amd64.deb data.tar.gz - bsdtar xpvf data.tar.gz - cp -r usr ${DESTDIR} +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 }
[-- Attachment #1: Type: text/plain, Size: 197 bytes --] New comment by sgn on void-packages repository https://github.com/void-linux/void-packages/pull/28839#issuecomment-782258820 Comment: I think we're better keep this package in restricted mode xD
[-- Attachment #1: Type: text/plain, Size: 1692 bytes --] There is an updated pull request by sgn against master on the void-packages repository https://github.com/sgn/void-packages proton-bridge-build-from-source https://github.com/void-linux/void-packages/pull/28839 proton-bridge: 1.6.3 build from source <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [x] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> <!-- #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [ ] I built this PR locally for my native architecture, (ARCH-LIBC) - [ ] I built this PR locally for these architectures (if supported. mark crossbuilds): - [ ] aarch64-musl - [ ] armv7l - [ ] armv6l-musl --> Not tested, not trying to cross-compile. Close #26058 Close #28810 A patch file from https://github.com/void-linux/void-packages/pull/28839.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-proton-bridge-build-from-source-28839.patch --] [-- Type: text/x-diff, Size: 6110 bytes --] From df20947d425e4a7aba0fce7c595ceeba60b499fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= <congdanhqx@gmail.com> 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..d6444025350 --- /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" +short_desc="Qt binding for golang" +maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>" +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 d5d1913ca419835755a577927a57ca24c3ab0da0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= <congdanhqx@gmail.com> 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 | 71 ++++++++++++++++++++++++------ 1 file changed, 58 insertions(+), 13 deletions(-) diff --git a/srcpkgs/protonmail-bridge/template b/srcpkgs/protonmail-bridge/template index e0bc8d92fc4..3d5ee511f37 100644 --- a/srcpkgs/protonmail-bridge/template +++ b/srcpkgs/protonmail-bridge/template @@ -1,23 +1,68 @@ # 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-base-docs qt5-doc + 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 <rich@richgannon.net>" 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 }
[-- Attachment #1: Type: text/plain, Size: 1692 bytes --] There is an updated pull request by sgn against master on the void-packages repository https://github.com/sgn/void-packages proton-bridge-build-from-source https://github.com/void-linux/void-packages/pull/28839 proton-bridge: 1.6.3 build from source <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [x] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> <!-- #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [ ] I built this PR locally for my native architecture, (ARCH-LIBC) - [ ] I built this PR locally for these architectures (if supported. mark crossbuilds): - [ ] aarch64-musl - [ ] armv7l - [ ] armv6l-musl --> Not tested, not trying to cross-compile. Close #26058 Close #28810 A patch file from https://github.com/void-linux/void-packages/pull/28839.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-proton-bridge-build-from-source-28839.patch --] [-- Type: text/x-diff, Size: 6108 bytes --] 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?= <congdanhqx@gmail.com> 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 <congdanhqx@gmail.com>" +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?= <congdanhqx@gmail.com> 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 <rich@richgannon.net>" 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 }
[-- Attachment #1: Type: text/plain, Size: 266 bytes --] New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/28839#issuecomment-782948235 Comment: For testing purposes, I'm tagging everyone who's touched the original package :p @cinerea0 @vivlim @ArmedAviator @jbenden
[-- Attachment #1: Type: text/plain, Size: 2342 bytes --] New comment by jbenden on void-packages repository https://github.com/void-linux/void-packages/pull/28839#issuecomment-782953853 Comment: I will attempt to test, but I've already hit a road block with an error during package build: ``` => protonmail-bridge-1.6.3_1: removing autodeps, please wait... => protonmail-bridge-1.6.3_1: building [go] [qmake] for x86_64... [host] desktop-file-utils-0.26_1: found (/host/binpkgs) [host] go-qt5-0.0.20200904_1: found (/host/binpkgs) [host] pkg-config-0.29.2_2: found (https://alpha.de.repo.voidlinux.org/current) [host] go-1.15.8_1: found (https://alpha.de.repo.voidlinux.org/current) [target] qt5-devel-5.15.2_2: not found [target] qt5-declarative-devel-5.15.2_2: not found [target] qt5-webview-devel-5.15.2_1: found (https://alpha.de.repo.voidlinux.org/current) [target] qt5-webengine-devel-5.15.2_2: not found [target] libsecret-devel-0.20.4_1: found (https://alpha.de.repo.voidlinux.org/current) [target] qt5-quickcontrols2-devel-5.15.2_2: not found [runtime] desktop-file-utils-0.26_1: found (/host/binpkgs) [runtime] qt5-graphicaleffects-5.15.2_2: not found [runtime] qt5-quickcontrols2-5.15.2_2: not found [runtime] qt5-charts-5.15.2_2: not found [runtime] qt5-datavis3d-5.15.2_2: not found [runtime] qt5-multimedia-5.15.2_2: not found [runtime] qt5-quickcontrols-5.15.2_2: not found [runtime] qt5-declarative-5.15.2_2: not found [runtime] qt5-webengine-5.15.2_2: not found => protonmail-bridge-1.6.3_1: installing host dependencies: desktop-file-utils-0.26_1 go-qt5-0.0.20200904_1 pkg-config-0.29.2_2 go-1.15.8_1 ... => protonmail-bridge-1.6.3_1: removing autodeps, please wait... => ERROR: protonmail-bridge-1.6.3_1: failed to install 'desktop-file-utils-0.26_1' dependency! (error 8) qt5-core-5.14.2_2: broken, unresolvable shlib `libicui18n.so.64' qt5-core-5.14.2_2: broken, unresolvable shlib `libicuuc.so.64' Transaction aborted due to unresolved shlibs. => ERROR: Please see above for the real error, exiting... ``` I am trying to build qt5, to see if it improves the situation. I already rebuilt `desktop-file-utils`. Also, if the download of all go modules can be separate from the build; you could then place the go module downloads in a retry loop (I saw a mention of intermittent errors).
[-- Attachment #1: Type: text/plain, Size: 276 bytes --] New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/28839#issuecomment-782956033 Comment: You might have to clean up `hostdir/binpkgs`, it could be causing some confusion... But not finding the qr stuff is quite weird anyway.
[-- Attachment #1: Type: text/plain, Size: 194 bytes --] New comment by sgn on void-packages repository https://github.com/void-linux/void-packages/pull/28839#issuecomment-782971642 Comment: @jbenden Please pull void-packages into your fork. Thanks
[-- Attachment #1: Type: text/plain, Size: 373 bytes --] New comment by jbenden on void-packages repository https://github.com/void-linux/void-packages/pull/28839#issuecomment-783137594 Comment: After building qt5, this package built. So next, I installed it. Started it. Sent a test to PM. Sent a test from PM. All confirmed working! I'll leave it running and let you know if any problems crop up. Best regards, -Joe
[-- Attachment #1: Type: text/plain, Size: 561 bytes --] New comment by cinerea0 on void-packages repository https://github.com/void-linux/void-packages/pull/28839#issuecomment-783789724 Comment: I can confirm that it compiles and launches fine on my machine. Excellent job on that, I had no idea how to solve the Qt problems! However, since I don't have a premium account, I can't test its functionality. A minor point that I want to bring up is the name of "go-qt5": Shouldn't it be "qt5-go" as per [package naming conventions](https://github.com/void-linux/void-packages/blob/master/Manual.md#language_bindings)?
[-- Attachment #1: Type: text/plain, Size: 3745 bytes --] New comment by vivlim on void-packages repository https://github.com/void-linux/void-packages/pull/28839#issuecomment-790949699 Comment: I tried to build the package but got the below error, clearing hostdir/binpkgs fixed it. ``` => go-qt5-0.0.20200904_1: removing autodeps, please wait... => go-qt5-0.0.20200904_1: cleaning build directory... => go-qt5: removing files from destdir... => protonmail-bridge-1.6.3_1: installing host dependencies: desktop-file-utils-0.26_1 pkg-config-0.29.2_2 go-1.15.8_1 go-qt5-0.0.20200904_1 ... => protonmail-bridge-1.6.3_1: installing target dependencies: qt5-devel-5.15.2_2 qt5-declarative-devel-5.15.2_2 qt5-webview-devel-5.15.2_1 qt5-webengine-devel-5.15.2_2 libsecret-devel-0.20.4_1 qt5-quickcontrols2-devel-5.15.2_2 ... => protonmail-bridge-1.6.3_1: removing autodeps, please wait... => ERROR: protonmail-bridge-1.6.3_1: failed to install 'qt5-devel-5.15.2_2' dependency! (error 19) libcrypto46-3.1.4_1 in transaction breaks installed pkg `libressl-3.1.5_2' libssl48-3.1.4_1 in transaction breaks installed pkg `libressl-3.1.5_2' libtls20-3.1.4_1 in transaction breaks installed pkg `libressl-3.1.5_2' Transaction aborted due to unresolved dependencies. => ERROR: Please see above for the real error, exiting... ``` When I launched the bridge, I was no longer signed in, during previous upgrades I did not have to sign in again. Then when I tried to sign in, I got this: ![image](https://user-images.githubusercontent.com/1565930/110030558-c12bd980-7cea-11eb-8ff2-b14d56d4dd19.png) I tried clearing the keychain (Settings > Clear Keychain) but that didn't help. I also deleted ~/.cache/protonmail, ~/.cache/ProtonMail Bridge, and .config/protonmail, but it is still broken for me. I was able to get more detailed errors from my log in ~/.cache/protonmail/bridge/logs/: ``` time="Mar 4 13:11:42.745" level=info msg="No active accounts" pkg=frontend-qt time="Mar 4 13:11:42.769" level=info msg="No active accounts" pkg=frontend-qt time="Mar 4 13:11:57.565" level=info msg="Updating token" userID=anonymous-4 time="Mar 4 13:11:57.565" level=info msg="User not available for auth update" pkg=users userID=anonymous-4 time="Mar 4 13:12:07.078" level=info msg="Got API user" pkg=users time="Mar 4 13:12:07.078" level=info msg="Setting token because it is currently unset" userID="(redacted)" time="Mar 4 13:12:07.421" level=info msg="Updating token" userID="(redacted)" time="Mar 4 13:12:07.422" level=info msg="User not available for auth update" pkg=users userID="(redacted)" time="Mar 4 13:12:08.656" level=error msg="Could not get credentials from native keychain" error="no usernames for protonmail/bridge/users/(redacted)" pkg=credentials user="(redacted)" time="Mar 4 13:12:08.656" level=info msg="Generating credentials for new user" pkg=credentials time="Mar 4 13:12:08.687" level=error msg="Failed to add new user" error="failed to add user to credentials store: exit status 1: gpg: (redacted): There is no assurance this key belongs to the named user\ngpg: [stdin]: encryption failed: Unusable public key\nPassword encryption aborted.\n" pkg=users time="Mar 4 13:12:08.990" level=warning msg="request DELETE /auth NOT OK: 401 Unauthorized" pkg=pmapi userID=anonymous-4 time="Mar 4 13:12:08.990" level=error msg="Failed to clear login session after unlock" error="Invalid access token" pkg=users time="Mar 4 13:12:08.990" level=error msg="Login was unsuccessful" error="failed to add user to credentials store: exit status 1: gpg: (redacted): There is no assurance this key belongs to the named user\ngpg: [stdin]: encryption failed: Unusable public key\nPassword encryption aborted.\n" pkg=frontend-qt ``` Any ideas how I can fix this?
[-- Attachment #1: Type: text/plain, Size: 274 bytes --] New comment by jbenden on void-packages repository https://github.com/void-linux/void-packages/pull/28839#issuecomment-792350748 Comment: Hi, Do you have the `pass` tool installed and initialized? It uses this to store credentials on my machine. Best regards, -Joe
[-- Attachment #1: Type: text/plain, Size: 302 bytes --] New comment by vivlim on void-packages repository https://github.com/void-linux/void-packages/pull/28839#issuecomment-792371493 Comment: @jbenden I do have pass set up from around a year ago, though I don't use it regularly. It does apparently still work since I can access passwords I stored in it.
[-- Attachment #1: Type: text/plain, Size: 2513 bytes --] New comment by sgn on void-packages repository https://github.com/void-linux/void-packages/pull/28839#issuecomment-792386173 Comment: > I tried to build the package but got the below error, clearing hostdir/binpkgs fixed it. clear the `hostdir/binpkgs` and sync your repo with latest `void-packages`. > I was able to get more detailed errors from my log in ~/.cache/protonmail/bridge/logs/: > > ``` > time="Mar 4 13:11:42.745" level=info msg="No active accounts" pkg=frontend-qt > time="Mar 4 13:11:42.769" level=info msg="No active accounts" pkg=frontend-qt > time="Mar 4 13:11:57.565" level=info msg="Updating token" userID=anonymous-4 > time="Mar 4 13:11:57.565" level=info msg="User not available for auth update" pkg=users userID=anonymous-4 > time="Mar 4 13:12:07.078" level=info msg="Got API user" pkg=users > time="Mar 4 13:12:07.078" level=info msg="Setting token because it is currently unset" userID="(redacted)" > time="Mar 4 13:12:07.421" level=info msg="Updating token" userID="(redacted)" > time="Mar 4 13:12:07.422" level=info msg="User not available for auth update" pkg=users userID="(redacted)" > time="Mar 4 13:12:08.656" level=error msg="Could not get credentials from native keychain" error="no usernames for protonmail/bridge/users/(redacted)" pkg=credentials user="(redacted)" > time="Mar 4 13:12:08.656" level=info msg="Generating credentials for new user" pkg=credentials > time="Mar 4 13:12:08.687" level=error msg="Failed to add new user" error="failed to add user to credentials store: exit status 1: gpg: (redacted): There is no assurance this key belongs to the named user\ngpg: [stdin]: encryption failed: Unusable public key\nPassword encryption aborted.\n" pkg=users > time="Mar 4 13:12:08.990" level=warning msg="request DELETE /auth NOT OK: 401 Unauthorized" pkg=pmapi userID=anonymous-4 > time="Mar 4 13:12:08.990" level=error msg="Failed to clear login session after unlock" error="Invalid access token" pkg=users > time="Mar 4 13:12:08.990" level=error msg="Login was unsuccessful" error="failed to add user to credentials store: exit status 1: gpg: (redacted): There is no assurance this key belongs to the named user\ngpg: [stdin]: encryption failed: Unusable public key\nPassword encryption aborted.\n" pkg=frontend-qt > ``` > > Any ideas how I can fix this? I guess it's related to this bug https://github.com/ProtonMail/proton-bridge/issues/169 Anyway, I'll update bridge to latest version when OpenSSL rebuild is done.
[-- Attachment #1: Type: text/plain, Size: 244 bytes --] New comment by vivlim on void-packages repository https://github.com/void-linux/void-packages/pull/28839#issuecomment-792543794 Comment: Yep, setting `preferred_keychain` in `~/.config/protonmail/bridge/prefs.json` to `gnome-keyring` worked.
[-- Attachment #1: Type: text/plain, Size: 172 bytes --] New comment by cinerea0 on void-packages repository https://github.com/void-linux/void-packages/pull/28839#issuecomment-839166038 Comment: Is this still being worked on?
[-- Attachment #1: Type: text/plain, Size: 224 bytes --] New comment by sgn on void-packages repository https://github.com/void-linux/void-packages/pull/28839#issuecomment-839275416 Comment: @cinerea0 It's used to be builtable. Not sure about current status. You can pick it up.
[-- Attachment #1: Type: text/plain, Size: 305 bytes --] New comment by github-actions[bot] on void-packages repository https://github.com/void-linux/void-packages/pull/28839#issuecomment-1116868107 Comment: Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
[-- Attachment #1: Type: text/plain, Size: 1520 bytes --] There's a closed pull request on the void-packages repository proton-bridge: 1.6.3 build from source https://github.com/void-linux/void-packages/pull/28839 Description: <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [x] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> <!-- #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [ ] I built this PR locally for my native architecture, (ARCH-LIBC) - [ ] I built this PR locally for these architectures (if supported. mark crossbuilds): - [ ] aarch64-musl - [ ] armv7l - [ ] armv6l-musl --> Not tested, not trying to cross-compile. Close #26058 Close #28810