Github messages for voidlinux
 help / color / mirror / Atom feed
From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] proton-bridge: 1.6.3 build from source
Date: Fri, 19 Feb 2021 19:26:13 +0100	[thread overview]
Message-ID: <20210219182613.tBQNZlHKw5ohvImxsADMMPCJr-sC8cgv77HX7mMys-M@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28839@inbox.vuxu.org>

[-- 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
 }

  parent reply	other threads:[~2021-02-19 18:26 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-18 14:53 [PR PATCH] " sgn
2021-02-18 14:57 ` sgn
2021-02-19 16:34 ` [PR PATCH] [Updated] " sgn
2021-02-19 17:21 ` sgn
2021-02-19 18:26 ` sgn [this message]
2021-02-19 18:30 ` sgn
2021-02-19 23:50 ` [PR PATCH] [Updated] " sgn
2021-02-19 23:58 ` sgn
2021-02-21 23:20 ` ericonr
2021-02-21 23:52 ` jbenden
2021-02-22  0:05 ` ericonr
2021-02-22  0:53 ` sgn
2021-02-22  6:56 ` jbenden
2021-02-23  0:59 ` cinerea0
2021-03-04 21:17 ` vivlim
2021-03-07 20:52 ` jbenden
2021-03-07 23:10 ` vivlim
2021-03-08  0:28 ` sgn
2021-03-08  7:39 ` vivlim
2021-05-11 21:02 ` cinerea0
2021-05-11 23:21 ` sgn
2022-05-04  2:15 ` github-actions
2022-05-19  2:15 ` [PR PATCH] [Closed]: " github-actions

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210219182613.tBQNZlHKw5ohvImxsADMMPCJr-sC8cgv77HX7mMys-M@z \
    --to=sgn@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).