* Re: [PR PATCH] [Updated] protonmail-bridge: update to 3.12.0.
2024-08-05 14:21 [PR PATCH] protonmail-bridge: update to 3.12.0 M4RZ3R0
@ 2024-08-05 14:42 ` M4RZ3R0
2024-08-05 14:44 ` M4RZ3R0
` (20 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: M4RZ3R0 @ 2024-08-05 14:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 504 bytes --]
There is an updated pull request by M4RZ3R0 against master on the void-packages repository
https://github.com/M4RZ3R0/void-packages protonmail-bridge
https://github.com/void-linux/void-packages/pull/51670
protonmail-bridge: update to 3.12.0.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/51670.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-protonmail-bridge-51670.patch --]
[-- Type: text/x-diff, Size: 1805 bytes --]
From 7c695009ada3dc0748dbbd792fd4ea8e8c2d3889 Mon Sep 17 00:00:00 2001
From: M4RZ3R0 <github@m4rz3r0.anonaddy.com>
Date: Mon, 5 Aug 2024 16:15:21 +0200
Subject: [PATCH] protonmail-bridge: update to 3.12.0.
---
srcpkgs/protonmail-bridge/template | 19 +++++--------------
1 file changed, 5 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/protonmail-bridge/template b/srcpkgs/protonmail-bridge/template
index ff08aee8720d7b..00b9beceadadbf 100644
--- a/srcpkgs/protonmail-bridge/template
+++ b/srcpkgs/protonmail-bridge/template
@@ -1,7 +1,7 @@
# Template file for 'protonmail-bridge'
pkgname=protonmail-bridge
-version=3.3.0
-revision=2
+version=3.12.0
+revision=3
archs="x86_64"
create_wrksrc=yes
depends="desktop-file-utils"
@@ -10,21 +10,12 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://proton.me/mail/bridge"
distfiles="https://proton.me/download/bridge/protonmail-bridge_${version}-1_amd64.deb"
-checksum=4541f8aa145097ee171889b0c9d058450d09dc23be10231c83d6659789a27627
+checksum=e95402b18bb232aec64c761fbf9866d0fe6516bdc4978c1b804f99c289a34725
restricted=yes
nopie=yes
do_install() {
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlmysql.so
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlodbc.so
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlpsql.so
- rm -rf usr/lib/protonmail/bridge/plugins/designer
- rm -rf usr/lib/protonmail/bridge/plugins/qmltooling
- rm -rf usr/lib/protonmail/bridge/qml/QtTest
- rm -rf usr/lib/protonmail/bridge/qml/Qt/labs
- rm -rf usr/lib/protonmail/bridge/lib/cmake
- rm -rf usr/lib/protonmail/bridge/lib/pkgconfig
- rm -rf usr/lib/protonmail/bridge/lib/*.a
- vcopy usr /
+ rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlmysql.so
+ vcopy usr /
}
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [PR PATCH] [Updated] protonmail-bridge: update to 3.12.0.
2024-08-05 14:21 [PR PATCH] protonmail-bridge: update to 3.12.0 M4RZ3R0
2024-08-05 14:42 ` [PR PATCH] [Updated] " M4RZ3R0
@ 2024-08-05 14:44 ` M4RZ3R0
2024-08-05 14:47 ` M4RZ3R0
` (19 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: M4RZ3R0 @ 2024-08-05 14:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 504 bytes --]
There is an updated pull request by M4RZ3R0 against master on the void-packages repository
https://github.com/M4RZ3R0/void-packages protonmail-bridge
https://github.com/void-linux/void-packages/pull/51670
protonmail-bridge: update to 3.12.0.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/51670.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-protonmail-bridge-51670.patch --]
[-- Type: text/x-diff, Size: 1712 bytes --]
From b158e1369dbdddc89421c3b1e1f87621e90fee21 Mon Sep 17 00:00:00 2001
From: M4RZ3R0 <github@m4rz3r0.anonaddy.com>
Date: Mon, 5 Aug 2024 16:15:21 +0200
Subject: [PATCH] protonmail-bridge: update to 3.12.0.
---
srcpkgs/protonmail-bridge/template | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/protonmail-bridge/template b/srcpkgs/protonmail-bridge/template
index ff08aee8720d7b..8a4f6c87991ad1 100644
--- a/srcpkgs/protonmail-bridge/template
+++ b/srcpkgs/protonmail-bridge/template
@@ -1,7 +1,7 @@
# Template file for 'protonmail-bridge'
pkgname=protonmail-bridge
-version=3.3.0
-revision=2
+version=3.12.0
+revision=1
archs="x86_64"
create_wrksrc=yes
depends="desktop-file-utils"
@@ -10,21 +10,12 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://proton.me/mail/bridge"
distfiles="https://proton.me/download/bridge/protonmail-bridge_${version}-1_amd64.deb"
-checksum=4541f8aa145097ee171889b0c9d058450d09dc23be10231c83d6659789a27627
+checksum=e95402b18bb232aec64c761fbf9866d0fe6516bdc4978c1b804f99c289a34725
restricted=yes
nopie=yes
do_install() {
rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlmysql.so
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlodbc.so
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlpsql.so
- rm -rf usr/lib/protonmail/bridge/plugins/designer
- rm -rf usr/lib/protonmail/bridge/plugins/qmltooling
- rm -rf usr/lib/protonmail/bridge/qml/QtTest
- rm -rf usr/lib/protonmail/bridge/qml/Qt/labs
- rm -rf usr/lib/protonmail/bridge/lib/cmake
- rm -rf usr/lib/protonmail/bridge/lib/pkgconfig
- rm -rf usr/lib/protonmail/bridge/lib/*.a
vcopy usr /
}
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [PR PATCH] [Updated] protonmail-bridge: update to 3.12.0.
2024-08-05 14:21 [PR PATCH] protonmail-bridge: update to 3.12.0 M4RZ3R0
2024-08-05 14:42 ` [PR PATCH] [Updated] " M4RZ3R0
2024-08-05 14:44 ` M4RZ3R0
@ 2024-08-05 14:47 ` M4RZ3R0
2024-08-05 18:08 ` M4RZ3R0
` (18 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: M4RZ3R0 @ 2024-08-05 14:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 504 bytes --]
There is an updated pull request by M4RZ3R0 against master on the void-packages repository
https://github.com/M4RZ3R0/void-packages protonmail-bridge
https://github.com/void-linux/void-packages/pull/51670
protonmail-bridge: update to 3.12.0.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/51670.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-protonmail-bridge-51670.patch --]
[-- Type: text/x-diff, Size: 1712 bytes --]
From b158e1369dbdddc89421c3b1e1f87621e90fee21 Mon Sep 17 00:00:00 2001
From: M4RZ3R0 <github@m4rz3r0.anonaddy.com>
Date: Mon, 5 Aug 2024 16:15:21 +0200
Subject: [PATCH] protonmail-bridge: update to 3.12.0.
---
srcpkgs/protonmail-bridge/template | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/protonmail-bridge/template b/srcpkgs/protonmail-bridge/template
index ff08aee8720d7b..8a4f6c87991ad1 100644
--- a/srcpkgs/protonmail-bridge/template
+++ b/srcpkgs/protonmail-bridge/template
@@ -1,7 +1,7 @@
# Template file for 'protonmail-bridge'
pkgname=protonmail-bridge
-version=3.3.0
-revision=2
+version=3.12.0
+revision=1
archs="x86_64"
create_wrksrc=yes
depends="desktop-file-utils"
@@ -10,21 +10,12 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://proton.me/mail/bridge"
distfiles="https://proton.me/download/bridge/protonmail-bridge_${version}-1_amd64.deb"
-checksum=4541f8aa145097ee171889b0c9d058450d09dc23be10231c83d6659789a27627
+checksum=e95402b18bb232aec64c761fbf9866d0fe6516bdc4978c1b804f99c289a34725
restricted=yes
nopie=yes
do_install() {
rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlmysql.so
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlodbc.so
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlpsql.so
- rm -rf usr/lib/protonmail/bridge/plugins/designer
- rm -rf usr/lib/protonmail/bridge/plugins/qmltooling
- rm -rf usr/lib/protonmail/bridge/qml/QtTest
- rm -rf usr/lib/protonmail/bridge/qml/Qt/labs
- rm -rf usr/lib/protonmail/bridge/lib/cmake
- rm -rf usr/lib/protonmail/bridge/lib/pkgconfig
- rm -rf usr/lib/protonmail/bridge/lib/*.a
vcopy usr /
}
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [PR PATCH] [Updated] protonmail-bridge: update to 3.12.0.
2024-08-05 14:21 [PR PATCH] protonmail-bridge: update to 3.12.0 M4RZ3R0
` (2 preceding siblings ...)
2024-08-05 14:47 ` M4RZ3R0
@ 2024-08-05 18:08 ` M4RZ3R0
2024-08-05 18:22 ` M4RZ3R0
` (17 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: M4RZ3R0 @ 2024-08-05 18:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 504 bytes --]
There is an updated pull request by M4RZ3R0 against master on the void-packages repository
https://github.com/M4RZ3R0/void-packages protonmail-bridge
https://github.com/void-linux/void-packages/pull/51670
protonmail-bridge: update to 3.12.0.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/51670.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-protonmail-bridge-51670.patch --]
[-- Type: text/x-diff, Size: 1712 bytes --]
From b158e1369dbdddc89421c3b1e1f87621e90fee21 Mon Sep 17 00:00:00 2001
From: M4RZ3R0 <github@m4rz3r0.anonaddy.com>
Date: Mon, 5 Aug 2024 16:15:21 +0200
Subject: [PATCH] protonmail-bridge: update to 3.12.0.
---
srcpkgs/protonmail-bridge/template | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/protonmail-bridge/template b/srcpkgs/protonmail-bridge/template
index ff08aee8720d7b..8a4f6c87991ad1 100644
--- a/srcpkgs/protonmail-bridge/template
+++ b/srcpkgs/protonmail-bridge/template
@@ -1,7 +1,7 @@
# Template file for 'protonmail-bridge'
pkgname=protonmail-bridge
-version=3.3.0
-revision=2
+version=3.12.0
+revision=1
archs="x86_64"
create_wrksrc=yes
depends="desktop-file-utils"
@@ -10,21 +10,12 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://proton.me/mail/bridge"
distfiles="https://proton.me/download/bridge/protonmail-bridge_${version}-1_amd64.deb"
-checksum=4541f8aa145097ee171889b0c9d058450d09dc23be10231c83d6659789a27627
+checksum=e95402b18bb232aec64c761fbf9866d0fe6516bdc4978c1b804f99c289a34725
restricted=yes
nopie=yes
do_install() {
rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlmysql.so
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlodbc.so
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlpsql.so
- rm -rf usr/lib/protonmail/bridge/plugins/designer
- rm -rf usr/lib/protonmail/bridge/plugins/qmltooling
- rm -rf usr/lib/protonmail/bridge/qml/QtTest
- rm -rf usr/lib/protonmail/bridge/qml/Qt/labs
- rm -rf usr/lib/protonmail/bridge/lib/cmake
- rm -rf usr/lib/protonmail/bridge/lib/pkgconfig
- rm -rf usr/lib/protonmail/bridge/lib/*.a
vcopy usr /
}
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [PR PATCH] [Updated] protonmail-bridge: update to 3.12.0.
2024-08-05 14:21 [PR PATCH] protonmail-bridge: update to 3.12.0 M4RZ3R0
` (3 preceding siblings ...)
2024-08-05 18:08 ` M4RZ3R0
@ 2024-08-05 18:22 ` M4RZ3R0
2024-08-05 20:07 ` classabbyamp
` (16 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: M4RZ3R0 @ 2024-08-05 18:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 504 bytes --]
There is an updated pull request by M4RZ3R0 against master on the void-packages repository
https://github.com/M4RZ3R0/void-packages protonmail-bridge
https://github.com/void-linux/void-packages/pull/51670
protonmail-bridge: update to 3.12.0.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/51670.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-protonmail-bridge-51670.patch --]
[-- Type: text/x-diff, Size: 1712 bytes --]
From b158e1369dbdddc89421c3b1e1f87621e90fee21 Mon Sep 17 00:00:00 2001
From: M4RZ3R0 <github@m4rz3r0.anonaddy.com>
Date: Mon, 5 Aug 2024 16:15:21 +0200
Subject: [PATCH] protonmail-bridge: update to 3.12.0.
---
srcpkgs/protonmail-bridge/template | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/protonmail-bridge/template b/srcpkgs/protonmail-bridge/template
index ff08aee8720d7b..8a4f6c87991ad1 100644
--- a/srcpkgs/protonmail-bridge/template
+++ b/srcpkgs/protonmail-bridge/template
@@ -1,7 +1,7 @@
# Template file for 'protonmail-bridge'
pkgname=protonmail-bridge
-version=3.3.0
-revision=2
+version=3.12.0
+revision=1
archs="x86_64"
create_wrksrc=yes
depends="desktop-file-utils"
@@ -10,21 +10,12 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://proton.me/mail/bridge"
distfiles="https://proton.me/download/bridge/protonmail-bridge_${version}-1_amd64.deb"
-checksum=4541f8aa145097ee171889b0c9d058450d09dc23be10231c83d6659789a27627
+checksum=e95402b18bb232aec64c761fbf9866d0fe6516bdc4978c1b804f99c289a34725
restricted=yes
nopie=yes
do_install() {
rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlmysql.so
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlodbc.so
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlpsql.so
- rm -rf usr/lib/protonmail/bridge/plugins/designer
- rm -rf usr/lib/protonmail/bridge/plugins/qmltooling
- rm -rf usr/lib/protonmail/bridge/qml/QtTest
- rm -rf usr/lib/protonmail/bridge/qml/Qt/labs
- rm -rf usr/lib/protonmail/bridge/lib/cmake
- rm -rf usr/lib/protonmail/bridge/lib/pkgconfig
- rm -rf usr/lib/protonmail/bridge/lib/*.a
vcopy usr /
}
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: protonmail-bridge: update to 3.12.0.
2024-08-05 14:21 [PR PATCH] protonmail-bridge: update to 3.12.0 M4RZ3R0
` (4 preceding siblings ...)
2024-08-05 18:22 ` M4RZ3R0
@ 2024-08-05 20:07 ` classabbyamp
2024-08-05 23:07 ` [PR PATCH] [Updated] [WIP] " classabbyamp
` (15 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: classabbyamp @ 2024-08-05 20:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 250 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/51670#issuecomment-2269825620
Comment:
would be nice to [build from source](https://github.com/ProtonMail/proton-bridge/blob/master/BUILDS.md)
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [PR PATCH] [Updated] [WIP] protonmail-bridge: update to 3.12.0.
2024-08-05 14:21 [PR PATCH] protonmail-bridge: update to 3.12.0 M4RZ3R0
` (5 preceding siblings ...)
2024-08-05 20:07 ` classabbyamp
@ 2024-08-05 23:07 ` classabbyamp
2024-08-05 23:08 ` classabbyamp
` (14 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: classabbyamp @ 2024-08-05 23:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 552 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/M4RZ3R0/void-packages protonmail-bridge
https://github.com/void-linux/void-packages/pull/51670
[WIP] protonmail-bridge: update to 3.12.0.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
#### Tasks
- [ ] Build from source
A patch file from https://github.com/void-linux/void-packages/pull/51670.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-protonmail-bridge-51670.patch --]
[-- Type: text/x-diff, Size: 12184 bytes --]
From 45eb42f4ce6fc624c358198b81b5f9d88b514fa5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 5 Aug 2024 19:06:26 -0400
Subject: [PATCH 1/3] protobuf: install cmake files
---
srcpkgs/protobuf/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template
index 0b6f27a360f8ed..e5abffe389daa3 100644
--- a/srcpkgs/protobuf/template
+++ b/srcpkgs/protobuf/template
@@ -1,7 +1,7 @@
# Template file for 'protobuf'
pkgname=protobuf
version=25.2
-revision=1
+revision=2
build_style=cmake
configure_args="-Dprotobuf_BUILD_SHARED_LIBS=ON -Dprotobuf_USE_EXTERNAL_GTEST=ON
-Dprotobuf_BUILD_LIBPROTOC=ON -Dprotobuf_ABSL_PROVIDER=package
@@ -29,7 +29,6 @@ if [ "$CROSS_BUILD" ]; then
fi
post_install() {
- rm -rf "${DESTDIR}/usr/lib/cmake"
vlicense LICENSE
}
@@ -73,8 +72,9 @@ libprotoc-devel_package() {
protobuf-devel_package() {
depends="zlib-devel
- libprotobuf-${version}_${revision}
- libprotobuf-lite-${version}_${revision}
+ libprotobuf>=${version}_${revision}
+ libprotobuf-lite>=${version}_${revision}
+ libprotoc-devel>=${version}_${revision}
abseil-cpp-devel"
short_desc="Protocol buffers C++ library - development files"
# Switch to versioned package
@@ -87,6 +87,7 @@ protobuf-devel_package() {
vmove usr/lib/libprotobuf.so
vmove usr/lib/libprotobuf-lite.so
vmove usr/lib/pkgconfig
+ vmove usr/lib/cmake
vmove "usr/lib/*.a"
}
}
From ebd580c2a1fc70909271dbf8cec6c18800037f8b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 5 Aug 2024 19:07:01 -0400
Subject: [PATCH 2/3] New package: sentry-native-0.7.7
---
common/shlibs | 1 +
srcpkgs/sentry-native-devel | 1 +
srcpkgs/sentry-native/template | 27 +++++++++++++++++++++++++++
3 files changed, 29 insertions(+)
create mode 120000 srcpkgs/sentry-native-devel
create mode 100644 srcpkgs/sentry-native/template
diff --git a/common/shlibs b/common/shlibs
index 883fec65b478a2..f6cea713c75a29 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4527,3 +4527,4 @@ libbox2d.so.2 box2d-2.4.1_1
libhwy.so.1 highway-1.2.0_1
libscenefx.so.1 scenefx-0.1_1
libnng.so.1 nng-1.5.2_1
+libsentry.so sentry-native-0.7.7_1
diff --git a/srcpkgs/sentry-native-devel b/srcpkgs/sentry-native-devel
new file mode 120000
index 00000000000000..1a2e9f22f8dd32
--- /dev/null
+++ b/srcpkgs/sentry-native-devel
@@ -0,0 +1 @@
+sentry-native
\ No newline at end of file
diff --git a/srcpkgs/sentry-native/template b/srcpkgs/sentry-native/template
new file mode 100644
index 00000000000000..64b32abcc88f52
--- /dev/null
+++ b/srcpkgs/sentry-native/template
@@ -0,0 +1,27 @@
+# Template file for 'sentry-native'
+pkgname=sentry-native
+version=0.7.7
+revision=1
+build_style=cmake
+configure_args="-DSENTRY_BACKEND=inproc"
+makedepends="libcurl-devel"
+short_desc="Sentry SDK for C, C++ and native applications"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/getsentry/sentry-native"
+changelog="https://github.com/getsentry/sentry-native/raw/master/CHANGELOG.md"
+distfiles="https://github.com/getsentry/sentry-native/archive/refs/tags/${version}.tar.gz"
+checksum="3b785c3794867450a54c45eb9d22ab6fb5e49b6eb8abde27660ab2741b846d6a"
+
+post_install() {
+ vlicense LICENSE
+}
+
+sentry-native-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ }
+}
From d29046fe9d041a2adda06a07ff8a51a010feb581 Mon Sep 17 00:00:00 2001
From: M4RZ3R0 <github@m4rz3r0.anonaddy.com>
Date: Mon, 5 Aug 2024 16:15:21 +0200
Subject: [PATCH 3/3] protonmail-bridge: update to 3.12.0.
---
.../patches/no-gui-tester.patch | 7 +++
.../protonmail-bridge/patches/no-vcpkg.patch | 40 +++++++++++++
.../patches/system-gtest.patch | 22 +++++++
.../patches/system-icu.patch | 15 +++++
srcpkgs/protonmail-bridge/template | 60 ++++++++++++-------
5 files changed, 124 insertions(+), 20 deletions(-)
create mode 100644 srcpkgs/protonmail-bridge/patches/no-gui-tester.patch
create mode 100644 srcpkgs/protonmail-bridge/patches/no-vcpkg.patch
create mode 100644 srcpkgs/protonmail-bridge/patches/system-gtest.patch
create mode 100644 srcpkgs/protonmail-bridge/patches/system-icu.patch
diff --git a/srcpkgs/protonmail-bridge/patches/no-gui-tester.patch b/srcpkgs/protonmail-bridge/patches/no-gui-tester.patch
new file mode 100644
index 00000000000000..364ee903a94a40
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/no-gui-tester.patch
@@ -0,0 +1,7 @@
+--- a/internal/frontend/bridge-gui/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/CMakeLists.txt
+@@ -29,4 +29,3 @@
+
+ add_subdirectory(bridgepp)
+ add_subdirectory(bridge-gui)
+-add_subdirectory(bridge-gui-tester)
diff --git a/srcpkgs/protonmail-bridge/patches/no-vcpkg.patch b/srcpkgs/protonmail-bridge/patches/no-vcpkg.patch
new file mode 100644
index 00000000000000..8c43fa6bb05bf3
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/no-vcpkg.patch
@@ -0,0 +1,40 @@
+--- a/internal/frontend/bridge-gui/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/CMakeLists.txt
+@@ -23,7 +23,6 @@
+ # Project
+ #*****************************************************************************************************************************************************
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../..")
+-include("BridgeSetup.cmake")
+
+ project(frontend)
+
+--- a/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt
+@@ -18,7 +18,6 @@
+
+ cmake_minimum_required(VERSION 3.22)
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../..")
+-include(../BridgeSetup.cmake)
+
+
+ #*****************************************************************************************************************************************************
+--- a/internal/frontend/bridge-gui/bridge-gui-tester/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/bridge-gui-tester/CMakeLists.txt
+@@ -20,7 +20,6 @@
+
+
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../..")
+-include(../BridgeSetup.cmake)
+
+
+ #*****************************************************************************************************************************************************
+--- a/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
+@@ -19,7 +19,6 @@
+ cmake_minimum_required(VERSION 3.22)
+
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../..")
+-include(../BridgeSetup.cmake)
+
+
+ #****************************************************************************************************************************************************
diff --git a/srcpkgs/protonmail-bridge/patches/system-gtest.patch b/srcpkgs/protonmail-bridge/patches/system-gtest.patch
new file mode 100644
index 00000000000000..70f960c47aa57e
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/system-gtest.patch
@@ -0,0 +1,22 @@
+diff --git a/bridgepp/CMakeLists.txt b/bridgepp/CMakeLists.txt
+index f4a0a553..02d631dc 100644
+--- a/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
++++ b/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
+@@ -172,16 +172,7 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
+ cmake_policy(SET CMP0135 NEW) # avoid warning DOWNLOAD_EXTRACT_TIMESTAMP
+ endif ()
+
+-include(FetchContent)
+-FetchContent_Declare(
+- googletest
+- URL https://github.com/google/googletest/archive/b796f7d44681514f58a683a3a71ff17c94edb0c1.zip
+-)
+-
+-# For Windows: Prevent overriding the parent project's compiler/linker settings
+-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+-
+-FetchContent_MakeAvailable(googletest)
++find_package(GTest REQUIRED)
+
+ enable_testing()
+
diff --git a/srcpkgs/protonmail-bridge/patches/system-icu.patch b/srcpkgs/protonmail-bridge/patches/system-icu.patch
new file mode 100644
index 00000000000000..7794a582a0e20f
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/system-icu.patch
@@ -0,0 +1,15 @@
+--- a/internal/frontend/bridge-gui/bridge-gui/DeployLinux.cmake.orig
++++ b/internal/frontend/bridge-gui/bridge-gui/DeployLinux.cmake
+@@ -54,9 +54,9 @@
+ AppendQt6Lib("libQt6Core.so.6")
+ AppendQt6Lib("libQt6QuickTemplates2.so.6")
+ AppendQt6Lib("libQt6DBus.so.6")
+-AppendQt6Lib("libicui18n.so.56")
+-AppendQt6Lib("libicuuc.so.56")
+-AppendQt6Lib("libicudata.so.56")
++AppendQt6Lib("libicui18n.so")
++AppendQt6Lib("libicuuc.so")
++AppendQt6Lib("libicudata.so")
+ AppendQt6Lib("libQt6XcbQpa.so.6")
+ AppendQt6Lib("libQt6WaylandClient.so.6")
+ AppendQt6Lib("libQt6WlShellIntegration.so.6")
diff --git a/srcpkgs/protonmail-bridge/template b/srcpkgs/protonmail-bridge/template
index ff08aee8720d7b..a148b7857153ed 100644
--- a/srcpkgs/protonmail-bridge/template
+++ b/srcpkgs/protonmail-bridge/template
@@ -1,30 +1,50 @@
# Template file for 'protonmail-bridge'
pkgname=protonmail-bridge
-version=3.3.0
-revision=2
-archs="x86_64"
-create_wrksrc=yes
-depends="desktop-file-utils"
+version=3.12.0
+revision=1
+archs="x86_64* aarch64* riscv64*"
+build_style=cmake
+build_wrksrc="internal/frontend/bridge-gui/bridge-gui"
+configure_args="-DBRIDGE_APP_FULL_NAME=ProtonMailBridge -DBRIDGE_VENDOR=ProtonAG
+ -DBRIDGE_BUILD_ENV=xbps -DBRIDGE_TAG=${version} -DBRIDGE_REVISION=${revision}
+ -DBRIDGE_APP_VERSION=${version}"
+go_import_path="github.com/ProtonMail/proton-bridge/v3"
+go_ldflags="-X ${go_import_path}/internal/constants.Version=${version}
+ -X ${go_import_path}/internal/constants.Revision=${revision}
+ -X ${go_import_path}/internal/constants.Tag=${version}
+ -X ${go_import_path}/internal/constants.FullAppName=ProtonMailBridge
+ -X ${go_import_path}/internal/constants.BuildEnv=xbps"
+hostmakedepends="go pkg-config qt6-base protobuf"
+makedepends="libglvnd-devel libsecret-devel qt6-base-devel qt6-declarative-devel
+ qt6-svg-devel qt6-wayland-devel sentry-native-devel protobuf-devel grpc-devel
+ gtest-devel"
+depends="qt6-svg"
short_desc="ProtonMail Bridge for use with E-mail software"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://proton.me/mail/bridge"
-distfiles="https://proton.me/download/bridge/protonmail-bridge_${version}-1_amd64.deb"
-checksum=4541f8aa145097ee171889b0c9d058450d09dc23be10231c83d6659789a27627
+distfiles="https://github.com/ProtonMail/proton-bridge/archive/refs/tags/v${version}.tar.gz"
+checksum=4215fd1848fff262da55194270f495e19722cdf8bbf98dbe3ca4ff5ca5aa4a1f
+nopie_files="/usr/libexec/protonmail/bridge"
-restricted=yes
-nopie=yes
+post_patch() {
+ vsed -i -e 's/^Exec=.*$/Exec=protonmail-bridge-gui/' "$wrksrc"/dist/proton-bridge.desktop
+}
+
+pre_build() {
+ cd "$wrksrc"
+ ( cd ./utils/ && ./credits.sh bridge )
+ . /void-packages/common/environment/build-style/go.sh
+ go build -p "$XBPS_MAKEJOBS" -modcacherw -v -tags "${go_build_tags}" -ldflags "${go_ldflags}" \
+ -o proton-bridge ./cmd/Desktop-Bridge
+}
do_install() {
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlmysql.so
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlodbc.so
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlpsql.so
- rm -rf usr/lib/protonmail/bridge/plugins/designer
- rm -rf usr/lib/protonmail/bridge/plugins/qmltooling
- rm -rf usr/lib/protonmail/bridge/qml/QtTest
- rm -rf usr/lib/protonmail/bridge/qml/Qt/labs
- rm -rf usr/lib/protonmail/bridge/lib/cmake
- rm -rf usr/lib/protonmail/bridge/lib/pkgconfig
- rm -rf usr/lib/protonmail/bridge/lib/*.a
- vcopy usr /
+ vinstall "$wrksrc"/proton-bridge 755 usr/libexec/protonmail bridge
+ vinstall build/bridge-gui 755 usr/libexec/protonmail bridge-gui
+ vmkdir usr/bin
+ ln -s ../libexec/protonmail/bridge "$DESTDIR"/usr/bin/protonmail-bridge
+ ln -s ../libexec/protonmail/bridge-gui "$DESTDIR"/usr/bin/protonmail-bridge-gui
+ vinstall "$wrksrc"/dist/proton-bridge.desktop 644 usr/share/applications
+ vinstall "$wrksrc"/dist/bridge.svg 644 usr/share/icons/hicolor/scalable/apps protonmail-bridge.svg
}
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [WIP] protonmail-bridge: update to 3.12.0.
2024-08-05 14:21 [PR PATCH] protonmail-bridge: update to 3.12.0 M4RZ3R0
` (6 preceding siblings ...)
2024-08-05 23:07 ` [PR PATCH] [Updated] [WIP] " classabbyamp
@ 2024-08-05 23:08 ` classabbyamp
2024-08-05 23:09 ` classabbyamp
` (13 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: classabbyamp @ 2024-08-05 23:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 315 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/51670#issuecomment-2270068567
Comment:
I just pushed what should be necessary for building from source, please try this out (I don't have a protonmail account to test that it does anything other than launch)
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [WIP] protonmail-bridge: update to 3.12.0.
2024-08-05 14:21 [PR PATCH] protonmail-bridge: update to 3.12.0 M4RZ3R0
` (7 preceding siblings ...)
2024-08-05 23:08 ` classabbyamp
@ 2024-08-05 23:09 ` classabbyamp
2024-08-05 23:09 ` classabbyamp
` (12 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: classabbyamp @ 2024-08-05 23:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1017 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/51670#issuecomment-2270068567
Comment:
I just pushed what should be necessary for building from source, please try this out (I don't have a protonmail account to test that it does anything other than launch)
also, does the package layout make sense for how the package should be used?>
```
.
└── usr
├── bin
│ ├── protonmail-bridge -> /usr/libexec/protonmail/bridge
│ └── protonmail-bridge-gui -> /usr/libexec/protonmail/bridge-gui
├── libexec
│ └── protonmail
│ ├── bridge
│ └── bridge-gui
└── share
├── applications
│ └── proton-bridge.desktop
└── icons
└── hicolor
└── scalable
└── apps
└── protonmail-bridge.svg
```
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [WIP] protonmail-bridge: update to 3.12.0.
2024-08-05 14:21 [PR PATCH] protonmail-bridge: update to 3.12.0 M4RZ3R0
` (8 preceding siblings ...)
2024-08-05 23:09 ` classabbyamp
@ 2024-08-05 23:09 ` classabbyamp
2024-08-05 23:16 ` [PR PATCH] [Updated] " classabbyamp
` (11 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: classabbyamp @ 2024-08-05 23:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 196 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/51670#issuecomment-2270069737
Comment:
(ignore that lint failure, it's a false positive)
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [PR PATCH] [Updated] [WIP] protonmail-bridge: update to 3.12.0.
2024-08-05 14:21 [PR PATCH] protonmail-bridge: update to 3.12.0 M4RZ3R0
` (9 preceding siblings ...)
2024-08-05 23:09 ` classabbyamp
@ 2024-08-05 23:16 ` classabbyamp
2024-08-05 23:43 ` classabbyamp
` (10 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: classabbyamp @ 2024-08-05 23:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 552 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/M4RZ3R0/void-packages protonmail-bridge
https://github.com/void-linux/void-packages/pull/51670
[WIP] protonmail-bridge: update to 3.12.0.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
#### Tasks
- [ ] Build from source
A patch file from https://github.com/void-linux/void-packages/pull/51670.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-protonmail-bridge-51670.patch --]
[-- Type: text/x-diff, Size: 13213 bytes --]
From 45eb42f4ce6fc624c358198b81b5f9d88b514fa5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 5 Aug 2024 19:06:26 -0400
Subject: [PATCH 1/3] protobuf: install cmake files
---
srcpkgs/protobuf/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template
index 0b6f27a360f8ed..e5abffe389daa3 100644
--- a/srcpkgs/protobuf/template
+++ b/srcpkgs/protobuf/template
@@ -1,7 +1,7 @@
# Template file for 'protobuf'
pkgname=protobuf
version=25.2
-revision=1
+revision=2
build_style=cmake
configure_args="-Dprotobuf_BUILD_SHARED_LIBS=ON -Dprotobuf_USE_EXTERNAL_GTEST=ON
-Dprotobuf_BUILD_LIBPROTOC=ON -Dprotobuf_ABSL_PROVIDER=package
@@ -29,7 +29,6 @@ if [ "$CROSS_BUILD" ]; then
fi
post_install() {
- rm -rf "${DESTDIR}/usr/lib/cmake"
vlicense LICENSE
}
@@ -73,8 +72,9 @@ libprotoc-devel_package() {
protobuf-devel_package() {
depends="zlib-devel
- libprotobuf-${version}_${revision}
- libprotobuf-lite-${version}_${revision}
+ libprotobuf>=${version}_${revision}
+ libprotobuf-lite>=${version}_${revision}
+ libprotoc-devel>=${version}_${revision}
abseil-cpp-devel"
short_desc="Protocol buffers C++ library - development files"
# Switch to versioned package
@@ -87,6 +87,7 @@ protobuf-devel_package() {
vmove usr/lib/libprotobuf.so
vmove usr/lib/libprotobuf-lite.so
vmove usr/lib/pkgconfig
+ vmove usr/lib/cmake
vmove "usr/lib/*.a"
}
}
From 62954c51e7de03bacc9fe842df9ed43f2d7a23af Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 5 Aug 2024 19:07:01 -0400
Subject: [PATCH 2/3] New package: sentry-native-0.7.7
---
common/shlibs | 1 +
srcpkgs/sentry-native-devel | 1 +
.../sentry-native/patches/no-fuzz-test.patch | 20 ++++++++++++++
srcpkgs/sentry-native/template | 27 +++++++++++++++++++
4 files changed, 49 insertions(+)
create mode 120000 srcpkgs/sentry-native-devel
create mode 100644 srcpkgs/sentry-native/patches/no-fuzz-test.patch
create mode 100644 srcpkgs/sentry-native/template
diff --git a/common/shlibs b/common/shlibs
index 883fec65b478a2..f6cea713c75a29 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4527,3 +4527,4 @@ libbox2d.so.2 box2d-2.4.1_1
libhwy.so.1 highway-1.2.0_1
libscenefx.so.1 scenefx-0.1_1
libnng.so.1 nng-1.5.2_1
+libsentry.so sentry-native-0.7.7_1
diff --git a/srcpkgs/sentry-native-devel b/srcpkgs/sentry-native-devel
new file mode 120000
index 00000000000000..1a2e9f22f8dd32
--- /dev/null
+++ b/srcpkgs/sentry-native-devel
@@ -0,0 +1 @@
+sentry-native
\ No newline at end of file
diff --git a/srcpkgs/sentry-native/patches/no-fuzz-test.patch b/srcpkgs/sentry-native/patches/no-fuzz-test.patch
new file mode 100644
index 00000000000000..70231c02da9e7d
--- /dev/null
+++ b/srcpkgs/sentry-native/patches/no-fuzz-test.patch
@@ -0,0 +1,20 @@
+On the one hand the bundled upstream README only mentions sentry_test_unit
+as a test suite meant for the users to run, on the other comments
+in sentry_fuzz_json sources state that it has to be built in a very
+special - and performance-killing - way in order to work.
+
+--- a/tests/unit/CMakeLists.txt
++++ b/tests/unit/CMakeLists.txt
+@@ -89,6 +89,7 @@
+
+ add_test(NAME sentry_test_unit COMMAND sentry_test_unit)
+
++if(0)
+ add_executable(sentry_fuzz_json
+ ${SENTRY_SOURCES}
+ fuzz.c
+@@ -114,3 +115,4 @@
+ endif()
+
+ add_test(NAME sentry_fuzz_json COMMAND sentry_fuzz_json)
++endif()
diff --git a/srcpkgs/sentry-native/template b/srcpkgs/sentry-native/template
new file mode 100644
index 00000000000000..64b32abcc88f52
--- /dev/null
+++ b/srcpkgs/sentry-native/template
@@ -0,0 +1,27 @@
+# Template file for 'sentry-native'
+pkgname=sentry-native
+version=0.7.7
+revision=1
+build_style=cmake
+configure_args="-DSENTRY_BACKEND=inproc"
+makedepends="libcurl-devel"
+short_desc="Sentry SDK for C, C++ and native applications"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/getsentry/sentry-native"
+changelog="https://github.com/getsentry/sentry-native/raw/master/CHANGELOG.md"
+distfiles="https://github.com/getsentry/sentry-native/archive/refs/tags/${version}.tar.gz"
+checksum="3b785c3794867450a54c45eb9d22ab6fb5e49b6eb8abde27660ab2741b846d6a"
+
+post_install() {
+ vlicense LICENSE
+}
+
+sentry-native-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ }
+}
From f9a8015fdd44b53ae15fe0ba96be36dbf93d7f7c Mon Sep 17 00:00:00 2001
From: M4RZ3R0 <github@m4rz3r0.anonaddy.com>
Date: Mon, 5 Aug 2024 16:15:21 +0200
Subject: [PATCH 3/3] protonmail-bridge: update to 3.12.0.
---
.../patches/no-gui-tester.patch | 7 +++
.../protonmail-bridge/patches/no-vcpkg.patch | 40 +++++++++++++
.../patches/system-gtest.patch | 22 +++++++
.../patches/system-icu.patch | 15 +++++
srcpkgs/protonmail-bridge/template | 60 ++++++++++++-------
5 files changed, 124 insertions(+), 20 deletions(-)
create mode 100644 srcpkgs/protonmail-bridge/patches/no-gui-tester.patch
create mode 100644 srcpkgs/protonmail-bridge/patches/no-vcpkg.patch
create mode 100644 srcpkgs/protonmail-bridge/patches/system-gtest.patch
create mode 100644 srcpkgs/protonmail-bridge/patches/system-icu.patch
diff --git a/srcpkgs/protonmail-bridge/patches/no-gui-tester.patch b/srcpkgs/protonmail-bridge/patches/no-gui-tester.patch
new file mode 100644
index 00000000000000..364ee903a94a40
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/no-gui-tester.patch
@@ -0,0 +1,7 @@
+--- a/internal/frontend/bridge-gui/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/CMakeLists.txt
+@@ -29,4 +29,3 @@
+
+ add_subdirectory(bridgepp)
+ add_subdirectory(bridge-gui)
+-add_subdirectory(bridge-gui-tester)
diff --git a/srcpkgs/protonmail-bridge/patches/no-vcpkg.patch b/srcpkgs/protonmail-bridge/patches/no-vcpkg.patch
new file mode 100644
index 00000000000000..8c43fa6bb05bf3
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/no-vcpkg.patch
@@ -0,0 +1,40 @@
+--- a/internal/frontend/bridge-gui/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/CMakeLists.txt
+@@ -23,7 +23,6 @@
+ # Project
+ #*****************************************************************************************************************************************************
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../..")
+-include("BridgeSetup.cmake")
+
+ project(frontend)
+
+--- a/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt
+@@ -18,7 +18,6 @@
+
+ cmake_minimum_required(VERSION 3.22)
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../..")
+-include(../BridgeSetup.cmake)
+
+
+ #*****************************************************************************************************************************************************
+--- a/internal/frontend/bridge-gui/bridge-gui-tester/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/bridge-gui-tester/CMakeLists.txt
+@@ -20,7 +20,6 @@
+
+
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../..")
+-include(../BridgeSetup.cmake)
+
+
+ #*****************************************************************************************************************************************************
+--- a/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
+@@ -19,7 +19,6 @@
+ cmake_minimum_required(VERSION 3.22)
+
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../..")
+-include(../BridgeSetup.cmake)
+
+
+ #****************************************************************************************************************************************************
diff --git a/srcpkgs/protonmail-bridge/patches/system-gtest.patch b/srcpkgs/protonmail-bridge/patches/system-gtest.patch
new file mode 100644
index 00000000000000..70f960c47aa57e
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/system-gtest.patch
@@ -0,0 +1,22 @@
+diff --git a/bridgepp/CMakeLists.txt b/bridgepp/CMakeLists.txt
+index f4a0a553..02d631dc 100644
+--- a/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
++++ b/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
+@@ -172,16 +172,7 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
+ cmake_policy(SET CMP0135 NEW) # avoid warning DOWNLOAD_EXTRACT_TIMESTAMP
+ endif ()
+
+-include(FetchContent)
+-FetchContent_Declare(
+- googletest
+- URL https://github.com/google/googletest/archive/b796f7d44681514f58a683a3a71ff17c94edb0c1.zip
+-)
+-
+-# For Windows: Prevent overriding the parent project's compiler/linker settings
+-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+-
+-FetchContent_MakeAvailable(googletest)
++find_package(GTest REQUIRED)
+
+ enable_testing()
+
diff --git a/srcpkgs/protonmail-bridge/patches/system-icu.patch b/srcpkgs/protonmail-bridge/patches/system-icu.patch
new file mode 100644
index 00000000000000..7794a582a0e20f
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/system-icu.patch
@@ -0,0 +1,15 @@
+--- a/internal/frontend/bridge-gui/bridge-gui/DeployLinux.cmake.orig
++++ b/internal/frontend/bridge-gui/bridge-gui/DeployLinux.cmake
+@@ -54,9 +54,9 @@
+ AppendQt6Lib("libQt6Core.so.6")
+ AppendQt6Lib("libQt6QuickTemplates2.so.6")
+ AppendQt6Lib("libQt6DBus.so.6")
+-AppendQt6Lib("libicui18n.so.56")
+-AppendQt6Lib("libicuuc.so.56")
+-AppendQt6Lib("libicudata.so.56")
++AppendQt6Lib("libicui18n.so")
++AppendQt6Lib("libicuuc.so")
++AppendQt6Lib("libicudata.so")
+ AppendQt6Lib("libQt6XcbQpa.so.6")
+ AppendQt6Lib("libQt6WaylandClient.so.6")
+ AppendQt6Lib("libQt6WlShellIntegration.so.6")
diff --git a/srcpkgs/protonmail-bridge/template b/srcpkgs/protonmail-bridge/template
index ff08aee8720d7b..a148b7857153ed 100644
--- a/srcpkgs/protonmail-bridge/template
+++ b/srcpkgs/protonmail-bridge/template
@@ -1,30 +1,50 @@
# Template file for 'protonmail-bridge'
pkgname=protonmail-bridge
-version=3.3.0
-revision=2
-archs="x86_64"
-create_wrksrc=yes
-depends="desktop-file-utils"
+version=3.12.0
+revision=1
+archs="x86_64* aarch64* riscv64*"
+build_style=cmake
+build_wrksrc="internal/frontend/bridge-gui/bridge-gui"
+configure_args="-DBRIDGE_APP_FULL_NAME=ProtonMailBridge -DBRIDGE_VENDOR=ProtonAG
+ -DBRIDGE_BUILD_ENV=xbps -DBRIDGE_TAG=${version} -DBRIDGE_REVISION=${revision}
+ -DBRIDGE_APP_VERSION=${version}"
+go_import_path="github.com/ProtonMail/proton-bridge/v3"
+go_ldflags="-X ${go_import_path}/internal/constants.Version=${version}
+ -X ${go_import_path}/internal/constants.Revision=${revision}
+ -X ${go_import_path}/internal/constants.Tag=${version}
+ -X ${go_import_path}/internal/constants.FullAppName=ProtonMailBridge
+ -X ${go_import_path}/internal/constants.BuildEnv=xbps"
+hostmakedepends="go pkg-config qt6-base protobuf"
+makedepends="libglvnd-devel libsecret-devel qt6-base-devel qt6-declarative-devel
+ qt6-svg-devel qt6-wayland-devel sentry-native-devel protobuf-devel grpc-devel
+ gtest-devel"
+depends="qt6-svg"
short_desc="ProtonMail Bridge for use with E-mail software"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://proton.me/mail/bridge"
-distfiles="https://proton.me/download/bridge/protonmail-bridge_${version}-1_amd64.deb"
-checksum=4541f8aa145097ee171889b0c9d058450d09dc23be10231c83d6659789a27627
+distfiles="https://github.com/ProtonMail/proton-bridge/archive/refs/tags/v${version}.tar.gz"
+checksum=4215fd1848fff262da55194270f495e19722cdf8bbf98dbe3ca4ff5ca5aa4a1f
+nopie_files="/usr/libexec/protonmail/bridge"
-restricted=yes
-nopie=yes
+post_patch() {
+ vsed -i -e 's/^Exec=.*$/Exec=protonmail-bridge-gui/' "$wrksrc"/dist/proton-bridge.desktop
+}
+
+pre_build() {
+ cd "$wrksrc"
+ ( cd ./utils/ && ./credits.sh bridge )
+ . /void-packages/common/environment/build-style/go.sh
+ go build -p "$XBPS_MAKEJOBS" -modcacherw -v -tags "${go_build_tags}" -ldflags "${go_ldflags}" \
+ -o proton-bridge ./cmd/Desktop-Bridge
+}
do_install() {
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlmysql.so
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlodbc.so
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlpsql.so
- rm -rf usr/lib/protonmail/bridge/plugins/designer
- rm -rf usr/lib/protonmail/bridge/plugins/qmltooling
- rm -rf usr/lib/protonmail/bridge/qml/QtTest
- rm -rf usr/lib/protonmail/bridge/qml/Qt/labs
- rm -rf usr/lib/protonmail/bridge/lib/cmake
- rm -rf usr/lib/protonmail/bridge/lib/pkgconfig
- rm -rf usr/lib/protonmail/bridge/lib/*.a
- vcopy usr /
+ vinstall "$wrksrc"/proton-bridge 755 usr/libexec/protonmail bridge
+ vinstall build/bridge-gui 755 usr/libexec/protonmail bridge-gui
+ vmkdir usr/bin
+ ln -s ../libexec/protonmail/bridge "$DESTDIR"/usr/bin/protonmail-bridge
+ ln -s ../libexec/protonmail/bridge-gui "$DESTDIR"/usr/bin/protonmail-bridge-gui
+ vinstall "$wrksrc"/dist/proton-bridge.desktop 644 usr/share/applications
+ vinstall "$wrksrc"/dist/bridge.svg 644 usr/share/icons/hicolor/scalable/apps protonmail-bridge.svg
}
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [PR PATCH] [Updated] [WIP] protonmail-bridge: update to 3.12.0.
2024-08-05 14:21 [PR PATCH] protonmail-bridge: update to 3.12.0 M4RZ3R0
` (10 preceding siblings ...)
2024-08-05 23:16 ` [PR PATCH] [Updated] " classabbyamp
@ 2024-08-05 23:43 ` classabbyamp
2024-08-05 23:56 ` classabbyamp
` (9 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: classabbyamp @ 2024-08-05 23:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 552 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/M4RZ3R0/void-packages protonmail-bridge
https://github.com/void-linux/void-packages/pull/51670
[WIP] protonmail-bridge: update to 3.12.0.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
#### Tasks
- [ ] Build from source
A patch file from https://github.com/void-linux/void-packages/pull/51670.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-protonmail-bridge-51670.patch --]
[-- Type: text/x-diff, Size: 12226 bytes --]
From 45eb42f4ce6fc624c358198b81b5f9d88b514fa5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 5 Aug 2024 19:06:26 -0400
Subject: [PATCH 1/3] protobuf: install cmake files
---
srcpkgs/protobuf/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template
index 0b6f27a360f8ed..e5abffe389daa3 100644
--- a/srcpkgs/protobuf/template
+++ b/srcpkgs/protobuf/template
@@ -1,7 +1,7 @@
# Template file for 'protobuf'
pkgname=protobuf
version=25.2
-revision=1
+revision=2
build_style=cmake
configure_args="-Dprotobuf_BUILD_SHARED_LIBS=ON -Dprotobuf_USE_EXTERNAL_GTEST=ON
-Dprotobuf_BUILD_LIBPROTOC=ON -Dprotobuf_ABSL_PROVIDER=package
@@ -29,7 +29,6 @@ if [ "$CROSS_BUILD" ]; then
fi
post_install() {
- rm -rf "${DESTDIR}/usr/lib/cmake"
vlicense LICENSE
}
@@ -73,8 +72,9 @@ libprotoc-devel_package() {
protobuf-devel_package() {
depends="zlib-devel
- libprotobuf-${version}_${revision}
- libprotobuf-lite-${version}_${revision}
+ libprotobuf>=${version}_${revision}
+ libprotobuf-lite>=${version}_${revision}
+ libprotoc-devel>=${version}_${revision}
abseil-cpp-devel"
short_desc="Protocol buffers C++ library - development files"
# Switch to versioned package
@@ -87,6 +87,7 @@ protobuf-devel_package() {
vmove usr/lib/libprotobuf.so
vmove usr/lib/libprotobuf-lite.so
vmove usr/lib/pkgconfig
+ vmove usr/lib/cmake
vmove "usr/lib/*.a"
}
}
From d109bc628e1fc323f69d3ed55a1b9956c56d4f9c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 5 Aug 2024 19:07:01 -0400
Subject: [PATCH 2/3] New package: sentry-native-0.7.7
---
common/shlibs | 1 +
srcpkgs/sentry-native-devel | 1 +
srcpkgs/sentry-native/template | 28 ++++++++++++++++++++++++++++
3 files changed, 30 insertions(+)
create mode 120000 srcpkgs/sentry-native-devel
create mode 100644 srcpkgs/sentry-native/template
diff --git a/common/shlibs b/common/shlibs
index 883fec65b478a2..f6cea713c75a29 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4527,3 +4527,4 @@ libbox2d.so.2 box2d-2.4.1_1
libhwy.so.1 highway-1.2.0_1
libscenefx.so.1 scenefx-0.1_1
libnng.so.1 nng-1.5.2_1
+libsentry.so sentry-native-0.7.7_1
diff --git a/srcpkgs/sentry-native-devel b/srcpkgs/sentry-native-devel
new file mode 120000
index 00000000000000..1a2e9f22f8dd32
--- /dev/null
+++ b/srcpkgs/sentry-native-devel
@@ -0,0 +1 @@
+sentry-native
\ No newline at end of file
diff --git a/srcpkgs/sentry-native/template b/srcpkgs/sentry-native/template
new file mode 100644
index 00000000000000..324c857180573e
--- /dev/null
+++ b/srcpkgs/sentry-native/template
@@ -0,0 +1,28 @@
+# Template file for 'sentry-native'
+pkgname=sentry-native
+version=0.7.7
+revision=1
+build_style=cmake
+configure_args="-DSENTRY_BACKEND=inproc -DSENTRY_TRANSPORT=none"
+short_desc="Sentry SDK for C, C++ and native applications"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/getsentry/sentry-native"
+changelog="https://github.com/getsentry/sentry-native/raw/master/CHANGELOG.md"
+distfiles="https://github.com/getsentry/sentry-native/archive/refs/tags/${version}.tar.gz"
+checksum="3b785c3794867450a54c45eb9d22ab6fb5e49b6eb8abde27660ab2741b846d6a"
+# XXX: various minor failures
+make_check=no
+
+post_install() {
+ vlicense LICENSE
+}
+
+sentry-native-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ }
+}
From d5fa04c035b39677220863674fb9e5a73a43f5ad Mon Sep 17 00:00:00 2001
From: M4RZ3R0 <github@m4rz3r0.anonaddy.com>
Date: Mon, 5 Aug 2024 16:15:21 +0200
Subject: [PATCH 3/3] protonmail-bridge: update to 3.12.0.
---
.../patches/no-gui-tester.patch | 7 +++
.../protonmail-bridge/patches/no-vcpkg.patch | 40 +++++++++++++
.../patches/system-gtest.patch | 22 +++++++
.../patches/system-icu.patch | 15 +++++
srcpkgs/protonmail-bridge/template | 60 ++++++++++++-------
5 files changed, 124 insertions(+), 20 deletions(-)
create mode 100644 srcpkgs/protonmail-bridge/patches/no-gui-tester.patch
create mode 100644 srcpkgs/protonmail-bridge/patches/no-vcpkg.patch
create mode 100644 srcpkgs/protonmail-bridge/patches/system-gtest.patch
create mode 100644 srcpkgs/protonmail-bridge/patches/system-icu.patch
diff --git a/srcpkgs/protonmail-bridge/patches/no-gui-tester.patch b/srcpkgs/protonmail-bridge/patches/no-gui-tester.patch
new file mode 100644
index 00000000000000..364ee903a94a40
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/no-gui-tester.patch
@@ -0,0 +1,7 @@
+--- a/internal/frontend/bridge-gui/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/CMakeLists.txt
+@@ -29,4 +29,3 @@
+
+ add_subdirectory(bridgepp)
+ add_subdirectory(bridge-gui)
+-add_subdirectory(bridge-gui-tester)
diff --git a/srcpkgs/protonmail-bridge/patches/no-vcpkg.patch b/srcpkgs/protonmail-bridge/patches/no-vcpkg.patch
new file mode 100644
index 00000000000000..8c43fa6bb05bf3
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/no-vcpkg.patch
@@ -0,0 +1,40 @@
+--- a/internal/frontend/bridge-gui/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/CMakeLists.txt
+@@ -23,7 +23,6 @@
+ # Project
+ #*****************************************************************************************************************************************************
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../..")
+-include("BridgeSetup.cmake")
+
+ project(frontend)
+
+--- a/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt
+@@ -18,7 +18,6 @@
+
+ cmake_minimum_required(VERSION 3.22)
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../..")
+-include(../BridgeSetup.cmake)
+
+
+ #*****************************************************************************************************************************************************
+--- a/internal/frontend/bridge-gui/bridge-gui-tester/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/bridge-gui-tester/CMakeLists.txt
+@@ -20,7 +20,6 @@
+
+
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../..")
+-include(../BridgeSetup.cmake)
+
+
+ #*****************************************************************************************************************************************************
+--- a/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
+@@ -19,7 +19,6 @@
+ cmake_minimum_required(VERSION 3.22)
+
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../..")
+-include(../BridgeSetup.cmake)
+
+
+ #****************************************************************************************************************************************************
diff --git a/srcpkgs/protonmail-bridge/patches/system-gtest.patch b/srcpkgs/protonmail-bridge/patches/system-gtest.patch
new file mode 100644
index 00000000000000..70f960c47aa57e
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/system-gtest.patch
@@ -0,0 +1,22 @@
+diff --git a/bridgepp/CMakeLists.txt b/bridgepp/CMakeLists.txt
+index f4a0a553..02d631dc 100644
+--- a/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
++++ b/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
+@@ -172,16 +172,7 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
+ cmake_policy(SET CMP0135 NEW) # avoid warning DOWNLOAD_EXTRACT_TIMESTAMP
+ endif ()
+
+-include(FetchContent)
+-FetchContent_Declare(
+- googletest
+- URL https://github.com/google/googletest/archive/b796f7d44681514f58a683a3a71ff17c94edb0c1.zip
+-)
+-
+-# For Windows: Prevent overriding the parent project's compiler/linker settings
+-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+-
+-FetchContent_MakeAvailable(googletest)
++find_package(GTest REQUIRED)
+
+ enable_testing()
+
diff --git a/srcpkgs/protonmail-bridge/patches/system-icu.patch b/srcpkgs/protonmail-bridge/patches/system-icu.patch
new file mode 100644
index 00000000000000..7794a582a0e20f
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/system-icu.patch
@@ -0,0 +1,15 @@
+--- a/internal/frontend/bridge-gui/bridge-gui/DeployLinux.cmake.orig
++++ b/internal/frontend/bridge-gui/bridge-gui/DeployLinux.cmake
+@@ -54,9 +54,9 @@
+ AppendQt6Lib("libQt6Core.so.6")
+ AppendQt6Lib("libQt6QuickTemplates2.so.6")
+ AppendQt6Lib("libQt6DBus.so.6")
+-AppendQt6Lib("libicui18n.so.56")
+-AppendQt6Lib("libicuuc.so.56")
+-AppendQt6Lib("libicudata.so.56")
++AppendQt6Lib("libicui18n.so")
++AppendQt6Lib("libicuuc.so")
++AppendQt6Lib("libicudata.so")
+ AppendQt6Lib("libQt6XcbQpa.so.6")
+ AppendQt6Lib("libQt6WaylandClient.so.6")
+ AppendQt6Lib("libQt6WlShellIntegration.so.6")
diff --git a/srcpkgs/protonmail-bridge/template b/srcpkgs/protonmail-bridge/template
index ff08aee8720d7b..a148b7857153ed 100644
--- a/srcpkgs/protonmail-bridge/template
+++ b/srcpkgs/protonmail-bridge/template
@@ -1,30 +1,50 @@
# Template file for 'protonmail-bridge'
pkgname=protonmail-bridge
-version=3.3.0
-revision=2
-archs="x86_64"
-create_wrksrc=yes
-depends="desktop-file-utils"
+version=3.12.0
+revision=1
+archs="x86_64* aarch64* riscv64*"
+build_style=cmake
+build_wrksrc="internal/frontend/bridge-gui/bridge-gui"
+configure_args="-DBRIDGE_APP_FULL_NAME=ProtonMailBridge -DBRIDGE_VENDOR=ProtonAG
+ -DBRIDGE_BUILD_ENV=xbps -DBRIDGE_TAG=${version} -DBRIDGE_REVISION=${revision}
+ -DBRIDGE_APP_VERSION=${version}"
+go_import_path="github.com/ProtonMail/proton-bridge/v3"
+go_ldflags="-X ${go_import_path}/internal/constants.Version=${version}
+ -X ${go_import_path}/internal/constants.Revision=${revision}
+ -X ${go_import_path}/internal/constants.Tag=${version}
+ -X ${go_import_path}/internal/constants.FullAppName=ProtonMailBridge
+ -X ${go_import_path}/internal/constants.BuildEnv=xbps"
+hostmakedepends="go pkg-config qt6-base protobuf"
+makedepends="libglvnd-devel libsecret-devel qt6-base-devel qt6-declarative-devel
+ qt6-svg-devel qt6-wayland-devel sentry-native-devel protobuf-devel grpc-devel
+ gtest-devel"
+depends="qt6-svg"
short_desc="ProtonMail Bridge for use with E-mail software"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://proton.me/mail/bridge"
-distfiles="https://proton.me/download/bridge/protonmail-bridge_${version}-1_amd64.deb"
-checksum=4541f8aa145097ee171889b0c9d058450d09dc23be10231c83d6659789a27627
+distfiles="https://github.com/ProtonMail/proton-bridge/archive/refs/tags/v${version}.tar.gz"
+checksum=4215fd1848fff262da55194270f495e19722cdf8bbf98dbe3ca4ff5ca5aa4a1f
+nopie_files="/usr/libexec/protonmail/bridge"
-restricted=yes
-nopie=yes
+post_patch() {
+ vsed -i -e 's/^Exec=.*$/Exec=protonmail-bridge-gui/' "$wrksrc"/dist/proton-bridge.desktop
+}
+
+pre_build() {
+ cd "$wrksrc"
+ ( cd ./utils/ && ./credits.sh bridge )
+ . /void-packages/common/environment/build-style/go.sh
+ go build -p "$XBPS_MAKEJOBS" -modcacherw -v -tags "${go_build_tags}" -ldflags "${go_ldflags}" \
+ -o proton-bridge ./cmd/Desktop-Bridge
+}
do_install() {
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlmysql.so
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlodbc.so
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlpsql.so
- rm -rf usr/lib/protonmail/bridge/plugins/designer
- rm -rf usr/lib/protonmail/bridge/plugins/qmltooling
- rm -rf usr/lib/protonmail/bridge/qml/QtTest
- rm -rf usr/lib/protonmail/bridge/qml/Qt/labs
- rm -rf usr/lib/protonmail/bridge/lib/cmake
- rm -rf usr/lib/protonmail/bridge/lib/pkgconfig
- rm -rf usr/lib/protonmail/bridge/lib/*.a
- vcopy usr /
+ vinstall "$wrksrc"/proton-bridge 755 usr/libexec/protonmail bridge
+ vinstall build/bridge-gui 755 usr/libexec/protonmail bridge-gui
+ vmkdir usr/bin
+ ln -s ../libexec/protonmail/bridge "$DESTDIR"/usr/bin/protonmail-bridge
+ ln -s ../libexec/protonmail/bridge-gui "$DESTDIR"/usr/bin/protonmail-bridge-gui
+ vinstall "$wrksrc"/dist/proton-bridge.desktop 644 usr/share/applications
+ vinstall "$wrksrc"/dist/bridge.svg 644 usr/share/icons/hicolor/scalable/apps protonmail-bridge.svg
}
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [PR PATCH] [Updated] [WIP] protonmail-bridge: update to 3.12.0.
2024-08-05 14:21 [PR PATCH] protonmail-bridge: update to 3.12.0 M4RZ3R0
` (11 preceding siblings ...)
2024-08-05 23:43 ` classabbyamp
@ 2024-08-05 23:56 ` classabbyamp
2024-08-06 0:06 ` classabbyamp
` (8 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: classabbyamp @ 2024-08-05 23:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 552 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/M4RZ3R0/void-packages protonmail-bridge
https://github.com/void-linux/void-packages/pull/51670
[WIP] protonmail-bridge: update to 3.12.0.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
#### Tasks
- [ ] Build from source
A patch file from https://github.com/void-linux/void-packages/pull/51670.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-protonmail-bridge-51670.patch --]
[-- Type: text/x-diff, Size: 12236 bytes --]
From 45eb42f4ce6fc624c358198b81b5f9d88b514fa5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 5 Aug 2024 19:06:26 -0400
Subject: [PATCH 1/3] protobuf: install cmake files
---
srcpkgs/protobuf/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template
index 0b6f27a360f8ed..e5abffe389daa3 100644
--- a/srcpkgs/protobuf/template
+++ b/srcpkgs/protobuf/template
@@ -1,7 +1,7 @@
# Template file for 'protobuf'
pkgname=protobuf
version=25.2
-revision=1
+revision=2
build_style=cmake
configure_args="-Dprotobuf_BUILD_SHARED_LIBS=ON -Dprotobuf_USE_EXTERNAL_GTEST=ON
-Dprotobuf_BUILD_LIBPROTOC=ON -Dprotobuf_ABSL_PROVIDER=package
@@ -29,7 +29,6 @@ if [ "$CROSS_BUILD" ]; then
fi
post_install() {
- rm -rf "${DESTDIR}/usr/lib/cmake"
vlicense LICENSE
}
@@ -73,8 +72,9 @@ libprotoc-devel_package() {
protobuf-devel_package() {
depends="zlib-devel
- libprotobuf-${version}_${revision}
- libprotobuf-lite-${version}_${revision}
+ libprotobuf>=${version}_${revision}
+ libprotobuf-lite>=${version}_${revision}
+ libprotoc-devel>=${version}_${revision}
abseil-cpp-devel"
short_desc="Protocol buffers C++ library - development files"
# Switch to versioned package
@@ -87,6 +87,7 @@ protobuf-devel_package() {
vmove usr/lib/libprotobuf.so
vmove usr/lib/libprotobuf-lite.so
vmove usr/lib/pkgconfig
+ vmove usr/lib/cmake
vmove "usr/lib/*.a"
}
}
From d109bc628e1fc323f69d3ed55a1b9956c56d4f9c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 5 Aug 2024 19:07:01 -0400
Subject: [PATCH 2/3] New package: sentry-native-0.7.7
---
common/shlibs | 1 +
srcpkgs/sentry-native-devel | 1 +
srcpkgs/sentry-native/template | 28 ++++++++++++++++++++++++++++
3 files changed, 30 insertions(+)
create mode 120000 srcpkgs/sentry-native-devel
create mode 100644 srcpkgs/sentry-native/template
diff --git a/common/shlibs b/common/shlibs
index 883fec65b478a2..f6cea713c75a29 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4527,3 +4527,4 @@ libbox2d.so.2 box2d-2.4.1_1
libhwy.so.1 highway-1.2.0_1
libscenefx.so.1 scenefx-0.1_1
libnng.so.1 nng-1.5.2_1
+libsentry.so sentry-native-0.7.7_1
diff --git a/srcpkgs/sentry-native-devel b/srcpkgs/sentry-native-devel
new file mode 120000
index 00000000000000..1a2e9f22f8dd32
--- /dev/null
+++ b/srcpkgs/sentry-native-devel
@@ -0,0 +1 @@
+sentry-native
\ No newline at end of file
diff --git a/srcpkgs/sentry-native/template b/srcpkgs/sentry-native/template
new file mode 100644
index 00000000000000..324c857180573e
--- /dev/null
+++ b/srcpkgs/sentry-native/template
@@ -0,0 +1,28 @@
+# Template file for 'sentry-native'
+pkgname=sentry-native
+version=0.7.7
+revision=1
+build_style=cmake
+configure_args="-DSENTRY_BACKEND=inproc -DSENTRY_TRANSPORT=none"
+short_desc="Sentry SDK for C, C++ and native applications"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/getsentry/sentry-native"
+changelog="https://github.com/getsentry/sentry-native/raw/master/CHANGELOG.md"
+distfiles="https://github.com/getsentry/sentry-native/archive/refs/tags/${version}.tar.gz"
+checksum="3b785c3794867450a54c45eb9d22ab6fb5e49b6eb8abde27660ab2741b846d6a"
+# XXX: various minor failures
+make_check=no
+
+post_install() {
+ vlicense LICENSE
+}
+
+sentry-native-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ }
+}
From f0aae824084ccdec5fb8e3228e7bfec1ba35fbe4 Mon Sep 17 00:00:00 2001
From: M4RZ3R0 <github@m4rz3r0.anonaddy.com>
Date: Mon, 5 Aug 2024 16:15:21 +0200
Subject: [PATCH 3/3] protonmail-bridge: update to 3.12.0.
---
.../patches/no-gui-tester.patch | 7 +++
.../protonmail-bridge/patches/no-vcpkg.patch | 40 +++++++++++++
.../patches/system-gtest.patch | 22 +++++++
.../patches/system-icu.patch | 15 +++++
srcpkgs/protonmail-bridge/template | 60 ++++++++++++-------
5 files changed, 124 insertions(+), 20 deletions(-)
create mode 100644 srcpkgs/protonmail-bridge/patches/no-gui-tester.patch
create mode 100644 srcpkgs/protonmail-bridge/patches/no-vcpkg.patch
create mode 100644 srcpkgs/protonmail-bridge/patches/system-gtest.patch
create mode 100644 srcpkgs/protonmail-bridge/patches/system-icu.patch
diff --git a/srcpkgs/protonmail-bridge/patches/no-gui-tester.patch b/srcpkgs/protonmail-bridge/patches/no-gui-tester.patch
new file mode 100644
index 00000000000000..364ee903a94a40
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/no-gui-tester.patch
@@ -0,0 +1,7 @@
+--- a/internal/frontend/bridge-gui/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/CMakeLists.txt
+@@ -29,4 +29,3 @@
+
+ add_subdirectory(bridgepp)
+ add_subdirectory(bridge-gui)
+-add_subdirectory(bridge-gui-tester)
diff --git a/srcpkgs/protonmail-bridge/patches/no-vcpkg.patch b/srcpkgs/protonmail-bridge/patches/no-vcpkg.patch
new file mode 100644
index 00000000000000..8c43fa6bb05bf3
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/no-vcpkg.patch
@@ -0,0 +1,40 @@
+--- a/internal/frontend/bridge-gui/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/CMakeLists.txt
+@@ -23,7 +23,6 @@
+ # Project
+ #*****************************************************************************************************************************************************
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../..")
+-include("BridgeSetup.cmake")
+
+ project(frontend)
+
+--- a/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt
+@@ -18,7 +18,6 @@
+
+ cmake_minimum_required(VERSION 3.22)
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../..")
+-include(../BridgeSetup.cmake)
+
+
+ #*****************************************************************************************************************************************************
+--- a/internal/frontend/bridge-gui/bridge-gui-tester/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/bridge-gui-tester/CMakeLists.txt
+@@ -20,7 +20,6 @@
+
+
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../..")
+-include(../BridgeSetup.cmake)
+
+
+ #*****************************************************************************************************************************************************
+--- a/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
+@@ -19,7 +19,6 @@
+ cmake_minimum_required(VERSION 3.22)
+
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../..")
+-include(../BridgeSetup.cmake)
+
+
+ #****************************************************************************************************************************************************
diff --git a/srcpkgs/protonmail-bridge/patches/system-gtest.patch b/srcpkgs/protonmail-bridge/patches/system-gtest.patch
new file mode 100644
index 00000000000000..70f960c47aa57e
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/system-gtest.patch
@@ -0,0 +1,22 @@
+diff --git a/bridgepp/CMakeLists.txt b/bridgepp/CMakeLists.txt
+index f4a0a553..02d631dc 100644
+--- a/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
++++ b/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
+@@ -172,16 +172,7 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
+ cmake_policy(SET CMP0135 NEW) # avoid warning DOWNLOAD_EXTRACT_TIMESTAMP
+ endif ()
+
+-include(FetchContent)
+-FetchContent_Declare(
+- googletest
+- URL https://github.com/google/googletest/archive/b796f7d44681514f58a683a3a71ff17c94edb0c1.zip
+-)
+-
+-# For Windows: Prevent overriding the parent project's compiler/linker settings
+-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+-
+-FetchContent_MakeAvailable(googletest)
++find_package(GTest REQUIRED)
+
+ enable_testing()
+
diff --git a/srcpkgs/protonmail-bridge/patches/system-icu.patch b/srcpkgs/protonmail-bridge/patches/system-icu.patch
new file mode 100644
index 00000000000000..7794a582a0e20f
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/system-icu.patch
@@ -0,0 +1,15 @@
+--- a/internal/frontend/bridge-gui/bridge-gui/DeployLinux.cmake.orig
++++ b/internal/frontend/bridge-gui/bridge-gui/DeployLinux.cmake
+@@ -54,9 +54,9 @@
+ AppendQt6Lib("libQt6Core.so.6")
+ AppendQt6Lib("libQt6QuickTemplates2.so.6")
+ AppendQt6Lib("libQt6DBus.so.6")
+-AppendQt6Lib("libicui18n.so.56")
+-AppendQt6Lib("libicuuc.so.56")
+-AppendQt6Lib("libicudata.so.56")
++AppendQt6Lib("libicui18n.so")
++AppendQt6Lib("libicuuc.so")
++AppendQt6Lib("libicudata.so")
+ AppendQt6Lib("libQt6XcbQpa.so.6")
+ AppendQt6Lib("libQt6WaylandClient.so.6")
+ AppendQt6Lib("libQt6WlShellIntegration.so.6")
diff --git a/srcpkgs/protonmail-bridge/template b/srcpkgs/protonmail-bridge/template
index ff08aee8720d7b..f6a1e7bf4bea35 100644
--- a/srcpkgs/protonmail-bridge/template
+++ b/srcpkgs/protonmail-bridge/template
@@ -1,30 +1,50 @@
# Template file for 'protonmail-bridge'
pkgname=protonmail-bridge
-version=3.3.0
-revision=2
-archs="x86_64"
-create_wrksrc=yes
-depends="desktop-file-utils"
+version=3.12.0
+revision=1
+archs="x86_64* aarch64* riscv64*"
+build_style=cmake
+build_wrksrc="internal/frontend/bridge-gui/bridge-gui"
+configure_args="-DBRIDGE_APP_FULL_NAME=ProtonMailBridge -DBRIDGE_VENDOR=ProtonAG
+ -DBRIDGE_BUILD_ENV=xbps -DBRIDGE_TAG=${version} -DBRIDGE_REVISION=${revision}
+ -DBRIDGE_APP_VERSION=${version}"
+go_import_path="github.com/ProtonMail/proton-bridge/v3"
+go_ldflags="-X ${go_import_path}/internal/constants.Version=${version}
+ -X ${go_import_path}/internal/constants.Revision=${revision}
+ -X ${go_import_path}/internal/constants.Tag=${version}
+ -X ${go_import_path}/internal/constants.FullAppName=ProtonMailBridge
+ -X ${go_import_path}/internal/constants.BuildEnv=xbps"
+hostmakedepends="go pkg-config qt6-base qt6-tools protobuf"
+makedepends="libglvnd-devel libsecret-devel qt6-base-devel qt6-declarative-devel
+ qt6-svg-devel qt6-wayland-devel sentry-native-devel protobuf-devel grpc-devel
+ gtest-devel"
+depends="qt6-svg"
short_desc="ProtonMail Bridge for use with E-mail software"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://proton.me/mail/bridge"
-distfiles="https://proton.me/download/bridge/protonmail-bridge_${version}-1_amd64.deb"
-checksum=4541f8aa145097ee171889b0c9d058450d09dc23be10231c83d6659789a27627
+distfiles="https://github.com/ProtonMail/proton-bridge/archive/refs/tags/v${version}.tar.gz"
+checksum=4215fd1848fff262da55194270f495e19722cdf8bbf98dbe3ca4ff5ca5aa4a1f
+nopie_files="/usr/libexec/protonmail/bridge"
-restricted=yes
-nopie=yes
+post_patch() {
+ vsed -i -e 's/^Exec=.*$/Exec=protonmail-bridge-gui/' "$wrksrc"/dist/proton-bridge.desktop
+}
+
+pre_build() {
+ cd "$wrksrc"
+ ( cd ./utils/ && ./credits.sh bridge )
+ . /void-packages/common/environment/build-style/go.sh
+ go build -p "$XBPS_MAKEJOBS" -modcacherw -v -tags "${go_build_tags}" -ldflags "${go_ldflags}" \
+ -o proton-bridge ./cmd/Desktop-Bridge
+}
do_install() {
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlmysql.so
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlodbc.so
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlpsql.so
- rm -rf usr/lib/protonmail/bridge/plugins/designer
- rm -rf usr/lib/protonmail/bridge/plugins/qmltooling
- rm -rf usr/lib/protonmail/bridge/qml/QtTest
- rm -rf usr/lib/protonmail/bridge/qml/Qt/labs
- rm -rf usr/lib/protonmail/bridge/lib/cmake
- rm -rf usr/lib/protonmail/bridge/lib/pkgconfig
- rm -rf usr/lib/protonmail/bridge/lib/*.a
- vcopy usr /
+ vinstall "$wrksrc"/proton-bridge 755 usr/libexec/protonmail bridge
+ vinstall build/bridge-gui 755 usr/libexec/protonmail bridge-gui
+ vmkdir usr/bin
+ ln -s ../libexec/protonmail/bridge "$DESTDIR"/usr/bin/protonmail-bridge
+ ln -s ../libexec/protonmail/bridge-gui "$DESTDIR"/usr/bin/protonmail-bridge-gui
+ vinstall "$wrksrc"/dist/proton-bridge.desktop 644 usr/share/applications
+ vinstall "$wrksrc"/dist/bridge.svg 644 usr/share/icons/hicolor/scalable/apps protonmail-bridge.svg
}
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [WIP] protonmail-bridge: update to 3.12.0.
2024-08-05 14:21 [PR PATCH] protonmail-bridge: update to 3.12.0 M4RZ3R0
` (12 preceding siblings ...)
2024-08-05 23:56 ` classabbyamp
@ 2024-08-06 0:06 ` classabbyamp
2024-08-06 0:06 ` classabbyamp
` (7 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: classabbyamp @ 2024-08-06 0:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 204 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/51670#issuecomment-2270126522
Comment:
not sure why it's failing in CI, it finds Qt fine locally
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [WIP] protonmail-bridge: update to 3.12.0.
2024-08-05 14:21 [PR PATCH] protonmail-bridge: update to 3.12.0 M4RZ3R0
` (13 preceding siblings ...)
2024-08-06 0:06 ` classabbyamp
@ 2024-08-06 0:06 ` classabbyamp
2024-08-06 9:24 ` [PR PATCH] [Updated] " M4RZ3R0
` (6 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: classabbyamp @ 2024-08-06 0:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1016 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/51670#issuecomment-2270068567
Comment:
I just pushed what should be necessary for building from source, please try this out (I don't have a protonmail account to test that it does anything other than launch)
also, does the package layout make sense for how the package should be used?
```
.
└── usr
├── bin
│ ├── protonmail-bridge -> /usr/libexec/protonmail/bridge
│ └── protonmail-bridge-gui -> /usr/libexec/protonmail/bridge-gui
├── libexec
│ └── protonmail
│ ├── bridge
│ └── bridge-gui
└── share
├── applications
│ └── proton-bridge.desktop
└── icons
└── hicolor
└── scalable
└── apps
└── protonmail-bridge.svg
```
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [PR PATCH] [Updated] [WIP] protonmail-bridge: update to 3.12.0.
2024-08-05 14:21 [PR PATCH] protonmail-bridge: update to 3.12.0 M4RZ3R0
` (14 preceding siblings ...)
2024-08-06 0:06 ` classabbyamp
@ 2024-08-06 9:24 ` M4RZ3R0
2024-08-06 9:35 ` M4RZ3R0
` (5 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: M4RZ3R0 @ 2024-08-06 9:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 547 bytes --]
There is an updated pull request by M4RZ3R0 against master on the void-packages repository
https://github.com/M4RZ3R0/void-packages protonmail-bridge
https://github.com/void-linux/void-packages/pull/51670
[WIP] protonmail-bridge: update to 3.12.0.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
#### Tasks
- [ ] Build from source
A patch file from https://github.com/void-linux/void-packages/pull/51670.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-protonmail-bridge-51670.patch --]
[-- Type: text/x-diff, Size: 12236 bytes --]
From 45eb42f4ce6fc624c358198b81b5f9d88b514fa5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 5 Aug 2024 19:06:26 -0400
Subject: [PATCH 1/3] protobuf: install cmake files
---
srcpkgs/protobuf/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template
index 0b6f27a360f8ed..e5abffe389daa3 100644
--- a/srcpkgs/protobuf/template
+++ b/srcpkgs/protobuf/template
@@ -1,7 +1,7 @@
# Template file for 'protobuf'
pkgname=protobuf
version=25.2
-revision=1
+revision=2
build_style=cmake
configure_args="-Dprotobuf_BUILD_SHARED_LIBS=ON -Dprotobuf_USE_EXTERNAL_GTEST=ON
-Dprotobuf_BUILD_LIBPROTOC=ON -Dprotobuf_ABSL_PROVIDER=package
@@ -29,7 +29,6 @@ if [ "$CROSS_BUILD" ]; then
fi
post_install() {
- rm -rf "${DESTDIR}/usr/lib/cmake"
vlicense LICENSE
}
@@ -73,8 +72,9 @@ libprotoc-devel_package() {
protobuf-devel_package() {
depends="zlib-devel
- libprotobuf-${version}_${revision}
- libprotobuf-lite-${version}_${revision}
+ libprotobuf>=${version}_${revision}
+ libprotobuf-lite>=${version}_${revision}
+ libprotoc-devel>=${version}_${revision}
abseil-cpp-devel"
short_desc="Protocol buffers C++ library - development files"
# Switch to versioned package
@@ -87,6 +87,7 @@ protobuf-devel_package() {
vmove usr/lib/libprotobuf.so
vmove usr/lib/libprotobuf-lite.so
vmove usr/lib/pkgconfig
+ vmove usr/lib/cmake
vmove "usr/lib/*.a"
}
}
From d109bc628e1fc323f69d3ed55a1b9956c56d4f9c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 5 Aug 2024 19:07:01 -0400
Subject: [PATCH 2/3] New package: sentry-native-0.7.7
---
common/shlibs | 1 +
srcpkgs/sentry-native-devel | 1 +
srcpkgs/sentry-native/template | 28 ++++++++++++++++++++++++++++
3 files changed, 30 insertions(+)
create mode 120000 srcpkgs/sentry-native-devel
create mode 100644 srcpkgs/sentry-native/template
diff --git a/common/shlibs b/common/shlibs
index 883fec65b478a2..f6cea713c75a29 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4527,3 +4527,4 @@ libbox2d.so.2 box2d-2.4.1_1
libhwy.so.1 highway-1.2.0_1
libscenefx.so.1 scenefx-0.1_1
libnng.so.1 nng-1.5.2_1
+libsentry.so sentry-native-0.7.7_1
diff --git a/srcpkgs/sentry-native-devel b/srcpkgs/sentry-native-devel
new file mode 120000
index 00000000000000..1a2e9f22f8dd32
--- /dev/null
+++ b/srcpkgs/sentry-native-devel
@@ -0,0 +1 @@
+sentry-native
\ No newline at end of file
diff --git a/srcpkgs/sentry-native/template b/srcpkgs/sentry-native/template
new file mode 100644
index 00000000000000..324c857180573e
--- /dev/null
+++ b/srcpkgs/sentry-native/template
@@ -0,0 +1,28 @@
+# Template file for 'sentry-native'
+pkgname=sentry-native
+version=0.7.7
+revision=1
+build_style=cmake
+configure_args="-DSENTRY_BACKEND=inproc -DSENTRY_TRANSPORT=none"
+short_desc="Sentry SDK for C, C++ and native applications"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/getsentry/sentry-native"
+changelog="https://github.com/getsentry/sentry-native/raw/master/CHANGELOG.md"
+distfiles="https://github.com/getsentry/sentry-native/archive/refs/tags/${version}.tar.gz"
+checksum="3b785c3794867450a54c45eb9d22ab6fb5e49b6eb8abde27660ab2741b846d6a"
+# XXX: various minor failures
+make_check=no
+
+post_install() {
+ vlicense LICENSE
+}
+
+sentry-native-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ }
+}
From 23af8ac00a2fa0409435ea81b25edb3c293de427 Mon Sep 17 00:00:00 2001
From: M4RZ3R0 <github@m4rz3r0.anonaddy.com>
Date: Mon, 5 Aug 2024 16:15:21 +0200
Subject: [PATCH 3/3] protonmail-bridge: update to 3.12.0.
---
.../patches/no-gui-tester.patch | 7 +++
.../protonmail-bridge/patches/no-vcpkg.patch | 40 +++++++++++++
.../patches/system-gtest.patch | 22 +++++++
.../patches/system-icu.patch | 15 +++++
srcpkgs/protonmail-bridge/template | 60 ++++++++++++-------
5 files changed, 124 insertions(+), 20 deletions(-)
create mode 100644 srcpkgs/protonmail-bridge/patches/no-gui-tester.patch
create mode 100644 srcpkgs/protonmail-bridge/patches/no-vcpkg.patch
create mode 100644 srcpkgs/protonmail-bridge/patches/system-gtest.patch
create mode 100644 srcpkgs/protonmail-bridge/patches/system-icu.patch
diff --git a/srcpkgs/protonmail-bridge/patches/no-gui-tester.patch b/srcpkgs/protonmail-bridge/patches/no-gui-tester.patch
new file mode 100644
index 00000000000000..364ee903a94a40
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/no-gui-tester.patch
@@ -0,0 +1,7 @@
+--- a/internal/frontend/bridge-gui/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/CMakeLists.txt
+@@ -29,4 +29,3 @@
+
+ add_subdirectory(bridgepp)
+ add_subdirectory(bridge-gui)
+-add_subdirectory(bridge-gui-tester)
diff --git a/srcpkgs/protonmail-bridge/patches/no-vcpkg.patch b/srcpkgs/protonmail-bridge/patches/no-vcpkg.patch
new file mode 100644
index 00000000000000..8c43fa6bb05bf3
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/no-vcpkg.patch
@@ -0,0 +1,40 @@
+--- a/internal/frontend/bridge-gui/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/CMakeLists.txt
+@@ -23,7 +23,6 @@
+ # Project
+ #*****************************************************************************************************************************************************
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../..")
+-include("BridgeSetup.cmake")
+
+ project(frontend)
+
+--- a/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt
+@@ -18,7 +18,6 @@
+
+ cmake_minimum_required(VERSION 3.22)
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../..")
+-include(../BridgeSetup.cmake)
+
+
+ #*****************************************************************************************************************************************************
+--- a/internal/frontend/bridge-gui/bridge-gui-tester/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/bridge-gui-tester/CMakeLists.txt
+@@ -20,7 +20,6 @@
+
+
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../..")
+-include(../BridgeSetup.cmake)
+
+
+ #*****************************************************************************************************************************************************
+--- a/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
+@@ -19,7 +19,6 @@
+ cmake_minimum_required(VERSION 3.22)
+
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../..")
+-include(../BridgeSetup.cmake)
+
+
+ #****************************************************************************************************************************************************
diff --git a/srcpkgs/protonmail-bridge/patches/system-gtest.patch b/srcpkgs/protonmail-bridge/patches/system-gtest.patch
new file mode 100644
index 00000000000000..70f960c47aa57e
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/system-gtest.patch
@@ -0,0 +1,22 @@
+diff --git a/bridgepp/CMakeLists.txt b/bridgepp/CMakeLists.txt
+index f4a0a553..02d631dc 100644
+--- a/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
++++ b/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
+@@ -172,16 +172,7 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
+ cmake_policy(SET CMP0135 NEW) # avoid warning DOWNLOAD_EXTRACT_TIMESTAMP
+ endif ()
+
+-include(FetchContent)
+-FetchContent_Declare(
+- googletest
+- URL https://github.com/google/googletest/archive/b796f7d44681514f58a683a3a71ff17c94edb0c1.zip
+-)
+-
+-# For Windows: Prevent overriding the parent project's compiler/linker settings
+-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+-
+-FetchContent_MakeAvailable(googletest)
++find_package(GTest REQUIRED)
+
+ enable_testing()
+
diff --git a/srcpkgs/protonmail-bridge/patches/system-icu.patch b/srcpkgs/protonmail-bridge/patches/system-icu.patch
new file mode 100644
index 00000000000000..7794a582a0e20f
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/system-icu.patch
@@ -0,0 +1,15 @@
+--- a/internal/frontend/bridge-gui/bridge-gui/DeployLinux.cmake.orig
++++ b/internal/frontend/bridge-gui/bridge-gui/DeployLinux.cmake
+@@ -54,9 +54,9 @@
+ AppendQt6Lib("libQt6Core.so.6")
+ AppendQt6Lib("libQt6QuickTemplates2.so.6")
+ AppendQt6Lib("libQt6DBus.so.6")
+-AppendQt6Lib("libicui18n.so.56")
+-AppendQt6Lib("libicuuc.so.56")
+-AppendQt6Lib("libicudata.so.56")
++AppendQt6Lib("libicui18n.so")
++AppendQt6Lib("libicuuc.so")
++AppendQt6Lib("libicudata.so")
+ AppendQt6Lib("libQt6XcbQpa.so.6")
+ AppendQt6Lib("libQt6WaylandClient.so.6")
+ AppendQt6Lib("libQt6WlShellIntegration.so.6")
diff --git a/srcpkgs/protonmail-bridge/template b/srcpkgs/protonmail-bridge/template
index ff08aee8720d7b..f6a1e7bf4bea35 100644
--- a/srcpkgs/protonmail-bridge/template
+++ b/srcpkgs/protonmail-bridge/template
@@ -1,30 +1,50 @@
# Template file for 'protonmail-bridge'
pkgname=protonmail-bridge
-version=3.3.0
-revision=2
-archs="x86_64"
-create_wrksrc=yes
-depends="desktop-file-utils"
+version=3.12.0
+revision=1
+archs="x86_64* aarch64* riscv64*"
+build_style=cmake
+build_wrksrc="internal/frontend/bridge-gui/bridge-gui"
+configure_args="-DBRIDGE_APP_FULL_NAME=ProtonMailBridge -DBRIDGE_VENDOR=ProtonAG
+ -DBRIDGE_BUILD_ENV=xbps -DBRIDGE_TAG=${version} -DBRIDGE_REVISION=${revision}
+ -DBRIDGE_APP_VERSION=${version}"
+go_import_path="github.com/ProtonMail/proton-bridge/v3"
+go_ldflags="-X ${go_import_path}/internal/constants.Version=${version}
+ -X ${go_import_path}/internal/constants.Revision=${revision}
+ -X ${go_import_path}/internal/constants.Tag=${version}
+ -X ${go_import_path}/internal/constants.FullAppName=ProtonMailBridge
+ -X ${go_import_path}/internal/constants.BuildEnv=xbps"
+hostmakedepends="go pkg-config qt6-base qt6-tools protobuf"
+makedepends="libglvnd-devel libsecret-devel qt6-base-devel qt6-declarative-devel
+ qt6-svg-devel qt6-wayland-devel sentry-native-devel protobuf-devel grpc-devel
+ gtest-devel"
+depends="qt6-svg"
short_desc="ProtonMail Bridge for use with E-mail software"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://proton.me/mail/bridge"
-distfiles="https://proton.me/download/bridge/protonmail-bridge_${version}-1_amd64.deb"
-checksum=4541f8aa145097ee171889b0c9d058450d09dc23be10231c83d6659789a27627
+distfiles="https://github.com/ProtonMail/proton-bridge/archive/refs/tags/v${version}.tar.gz"
+checksum=4215fd1848fff262da55194270f495e19722cdf8bbf98dbe3ca4ff5ca5aa4a1f
+nopie_files="/usr/libexec/protonmail/bridge"
-restricted=yes
-nopie=yes
+post_patch() {
+ vsed -i -e 's/^Exec=.*$/Exec=protonmail-bridge-gui/' "$wrksrc"/dist/proton-bridge.desktop
+}
+
+pre_build() {
+ cd "$wrksrc"
+ ( cd ./utils/ && ./credits.sh bridge )
+ . /void-packages/common/environment/build-style/go.sh
+ go build -p "$XBPS_MAKEJOBS" -modcacherw -v -tags "${go_build_tags}" -ldflags "${go_ldflags}" \
+ -o proton-bridge ./cmd/Desktop-Bridge
+}
do_install() {
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlmysql.so
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlodbc.so
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlpsql.so
- rm -rf usr/lib/protonmail/bridge/plugins/designer
- rm -rf usr/lib/protonmail/bridge/plugins/qmltooling
- rm -rf usr/lib/protonmail/bridge/qml/QtTest
- rm -rf usr/lib/protonmail/bridge/qml/Qt/labs
- rm -rf usr/lib/protonmail/bridge/lib/cmake
- rm -rf usr/lib/protonmail/bridge/lib/pkgconfig
- rm -rf usr/lib/protonmail/bridge/lib/*.a
- vcopy usr /
+ vinstall "$wrksrc"/proton-bridge 755 usr/libexec/protonmail bridge
+ vinstall build/bridge-gui 755 usr/libexec/protonmail bridge-gui
+ vmkdir usr/bin
+ ln -s ../libexec/protonmail/bridge "$DESTDIR"/usr/bin/protonmail-bridge
+ ln -s ../libexec/protonmail/bridge-gui "$DESTDIR"/usr/bin/protonmail-bridge-gui
+ vinstall "$wrksrc"/dist/proton-bridge.desktop 644 usr/share/applications
+ vinstall "$wrksrc"/dist/bridge.svg 644 usr/share/icons/hicolor/scalable/apps protonmail-bridge.svg
}
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [PR PATCH] [Updated] [WIP] protonmail-bridge: update to 3.12.0.
2024-08-05 14:21 [PR PATCH] protonmail-bridge: update to 3.12.0 M4RZ3R0
` (15 preceding siblings ...)
2024-08-06 9:24 ` [PR PATCH] [Updated] " M4RZ3R0
@ 2024-08-06 9:35 ` M4RZ3R0
2024-08-06 9:35 ` M4RZ3R0
` (4 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: M4RZ3R0 @ 2024-08-06 9:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 547 bytes --]
There is an updated pull request by M4RZ3R0 against master on the void-packages repository
https://github.com/M4RZ3R0/void-packages protonmail-bridge
https://github.com/void-linux/void-packages/pull/51670
[WIP] protonmail-bridge: update to 3.12.0.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
#### Tasks
- [ ] Build from source
A patch file from https://github.com/void-linux/void-packages/pull/51670.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-protonmail-bridge-51670.patch --]
[-- Type: text/x-diff, Size: 12256 bytes --]
From 45eb42f4ce6fc624c358198b81b5f9d88b514fa5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 5 Aug 2024 19:06:26 -0400
Subject: [PATCH 1/3] protobuf: install cmake files
---
srcpkgs/protobuf/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template
index 0b6f27a360f8ed..e5abffe389daa3 100644
--- a/srcpkgs/protobuf/template
+++ b/srcpkgs/protobuf/template
@@ -1,7 +1,7 @@
# Template file for 'protobuf'
pkgname=protobuf
version=25.2
-revision=1
+revision=2
build_style=cmake
configure_args="-Dprotobuf_BUILD_SHARED_LIBS=ON -Dprotobuf_USE_EXTERNAL_GTEST=ON
-Dprotobuf_BUILD_LIBPROTOC=ON -Dprotobuf_ABSL_PROVIDER=package
@@ -29,7 +29,6 @@ if [ "$CROSS_BUILD" ]; then
fi
post_install() {
- rm -rf "${DESTDIR}/usr/lib/cmake"
vlicense LICENSE
}
@@ -73,8 +72,9 @@ libprotoc-devel_package() {
protobuf-devel_package() {
depends="zlib-devel
- libprotobuf-${version}_${revision}
- libprotobuf-lite-${version}_${revision}
+ libprotobuf>=${version}_${revision}
+ libprotobuf-lite>=${version}_${revision}
+ libprotoc-devel>=${version}_${revision}
abseil-cpp-devel"
short_desc="Protocol buffers C++ library - development files"
# Switch to versioned package
@@ -87,6 +87,7 @@ protobuf-devel_package() {
vmove usr/lib/libprotobuf.so
vmove usr/lib/libprotobuf-lite.so
vmove usr/lib/pkgconfig
+ vmove usr/lib/cmake
vmove "usr/lib/*.a"
}
}
From d109bc628e1fc323f69d3ed55a1b9956c56d4f9c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 5 Aug 2024 19:07:01 -0400
Subject: [PATCH 2/3] New package: sentry-native-0.7.7
---
common/shlibs | 1 +
srcpkgs/sentry-native-devel | 1 +
srcpkgs/sentry-native/template | 28 ++++++++++++++++++++++++++++
3 files changed, 30 insertions(+)
create mode 120000 srcpkgs/sentry-native-devel
create mode 100644 srcpkgs/sentry-native/template
diff --git a/common/shlibs b/common/shlibs
index 883fec65b478a2..f6cea713c75a29 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4527,3 +4527,4 @@ libbox2d.so.2 box2d-2.4.1_1
libhwy.so.1 highway-1.2.0_1
libscenefx.so.1 scenefx-0.1_1
libnng.so.1 nng-1.5.2_1
+libsentry.so sentry-native-0.7.7_1
diff --git a/srcpkgs/sentry-native-devel b/srcpkgs/sentry-native-devel
new file mode 120000
index 00000000000000..1a2e9f22f8dd32
--- /dev/null
+++ b/srcpkgs/sentry-native-devel
@@ -0,0 +1 @@
+sentry-native
\ No newline at end of file
diff --git a/srcpkgs/sentry-native/template b/srcpkgs/sentry-native/template
new file mode 100644
index 00000000000000..324c857180573e
--- /dev/null
+++ b/srcpkgs/sentry-native/template
@@ -0,0 +1,28 @@
+# Template file for 'sentry-native'
+pkgname=sentry-native
+version=0.7.7
+revision=1
+build_style=cmake
+configure_args="-DSENTRY_BACKEND=inproc -DSENTRY_TRANSPORT=none"
+short_desc="Sentry SDK for C, C++ and native applications"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/getsentry/sentry-native"
+changelog="https://github.com/getsentry/sentry-native/raw/master/CHANGELOG.md"
+distfiles="https://github.com/getsentry/sentry-native/archive/refs/tags/${version}.tar.gz"
+checksum="3b785c3794867450a54c45eb9d22ab6fb5e49b6eb8abde27660ab2741b846d6a"
+# XXX: various minor failures
+make_check=no
+
+post_install() {
+ vlicense LICENSE
+}
+
+sentry-native-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ }
+}
From 6c870d57414e4ef1ce7f8b298aa064b95f4df6ca Mon Sep 17 00:00:00 2001
From: M4RZ3R0 <github@m4rz3r0.anonaddy.com>
Date: Mon, 5 Aug 2024 16:15:21 +0200
Subject: [PATCH 3/3] protonmail-bridge: update to 3.12.0.
---
.../patches/no-gui-tester.patch | 7 +++
.../protonmail-bridge/patches/no-vcpkg.patch | 40 ++++++++++++
.../patches/system-gtest.patch | 22 +++++++
.../patches/system-icu.patch | 15 +++++
srcpkgs/protonmail-bridge/template | 61 +++++++++++++------
5 files changed, 125 insertions(+), 20 deletions(-)
create mode 100644 srcpkgs/protonmail-bridge/patches/no-gui-tester.patch
create mode 100644 srcpkgs/protonmail-bridge/patches/no-vcpkg.patch
create mode 100644 srcpkgs/protonmail-bridge/patches/system-gtest.patch
create mode 100644 srcpkgs/protonmail-bridge/patches/system-icu.patch
diff --git a/srcpkgs/protonmail-bridge/patches/no-gui-tester.patch b/srcpkgs/protonmail-bridge/patches/no-gui-tester.patch
new file mode 100644
index 00000000000000..364ee903a94a40
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/no-gui-tester.patch
@@ -0,0 +1,7 @@
+--- a/internal/frontend/bridge-gui/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/CMakeLists.txt
+@@ -29,4 +29,3 @@
+
+ add_subdirectory(bridgepp)
+ add_subdirectory(bridge-gui)
+-add_subdirectory(bridge-gui-tester)
diff --git a/srcpkgs/protonmail-bridge/patches/no-vcpkg.patch b/srcpkgs/protonmail-bridge/patches/no-vcpkg.patch
new file mode 100644
index 00000000000000..8c43fa6bb05bf3
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/no-vcpkg.patch
@@ -0,0 +1,40 @@
+--- a/internal/frontend/bridge-gui/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/CMakeLists.txt
+@@ -23,7 +23,6 @@
+ # Project
+ #*****************************************************************************************************************************************************
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../..")
+-include("BridgeSetup.cmake")
+
+ project(frontend)
+
+--- a/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt
+@@ -18,7 +18,6 @@
+
+ cmake_minimum_required(VERSION 3.22)
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../..")
+-include(../BridgeSetup.cmake)
+
+
+ #*****************************************************************************************************************************************************
+--- a/internal/frontend/bridge-gui/bridge-gui-tester/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/bridge-gui-tester/CMakeLists.txt
+@@ -20,7 +20,6 @@
+
+
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../..")
+-include(../BridgeSetup.cmake)
+
+
+ #*****************************************************************************************************************************************************
+--- a/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
+@@ -19,7 +19,6 @@
+ cmake_minimum_required(VERSION 3.22)
+
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../..")
+-include(../BridgeSetup.cmake)
+
+
+ #****************************************************************************************************************************************************
diff --git a/srcpkgs/protonmail-bridge/patches/system-gtest.patch b/srcpkgs/protonmail-bridge/patches/system-gtest.patch
new file mode 100644
index 00000000000000..70f960c47aa57e
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/system-gtest.patch
@@ -0,0 +1,22 @@
+diff --git a/bridgepp/CMakeLists.txt b/bridgepp/CMakeLists.txt
+index f4a0a553..02d631dc 100644
+--- a/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
++++ b/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
+@@ -172,16 +172,7 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
+ cmake_policy(SET CMP0135 NEW) # avoid warning DOWNLOAD_EXTRACT_TIMESTAMP
+ endif ()
+
+-include(FetchContent)
+-FetchContent_Declare(
+- googletest
+- URL https://github.com/google/googletest/archive/b796f7d44681514f58a683a3a71ff17c94edb0c1.zip
+-)
+-
+-# For Windows: Prevent overriding the parent project's compiler/linker settings
+-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+-
+-FetchContent_MakeAvailable(googletest)
++find_package(GTest REQUIRED)
+
+ enable_testing()
+
diff --git a/srcpkgs/protonmail-bridge/patches/system-icu.patch b/srcpkgs/protonmail-bridge/patches/system-icu.patch
new file mode 100644
index 00000000000000..7794a582a0e20f
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/system-icu.patch
@@ -0,0 +1,15 @@
+--- a/internal/frontend/bridge-gui/bridge-gui/DeployLinux.cmake.orig
++++ b/internal/frontend/bridge-gui/bridge-gui/DeployLinux.cmake
+@@ -54,9 +54,9 @@
+ AppendQt6Lib("libQt6Core.so.6")
+ AppendQt6Lib("libQt6QuickTemplates2.so.6")
+ AppendQt6Lib("libQt6DBus.so.6")
+-AppendQt6Lib("libicui18n.so.56")
+-AppendQt6Lib("libicuuc.so.56")
+-AppendQt6Lib("libicudata.so.56")
++AppendQt6Lib("libicui18n.so")
++AppendQt6Lib("libicuuc.so")
++AppendQt6Lib("libicudata.so")
+ AppendQt6Lib("libQt6XcbQpa.so.6")
+ AppendQt6Lib("libQt6WaylandClient.so.6")
+ AppendQt6Lib("libQt6WlShellIntegration.so.6")
diff --git a/srcpkgs/protonmail-bridge/template b/srcpkgs/protonmail-bridge/template
index ff08aee8720d7b..ee22afe1912593 100644
--- a/srcpkgs/protonmail-bridge/template
+++ b/srcpkgs/protonmail-bridge/template
@@ -1,30 +1,51 @@
# Template file for 'protonmail-bridge'
pkgname=protonmail-bridge
-version=3.3.0
-revision=2
-archs="x86_64"
-create_wrksrc=yes
-depends="desktop-file-utils"
+version=3.12.0
+revision=1
+archs="x86_64* aarch64* riscv64*"
+build_style=cmake
+build_helper=qmake6
+build_wrksrc="internal/frontend/bridge-gui/bridge-gui"
+configure_args="-DBRIDGE_APP_FULL_NAME=ProtonMailBridge -DBRIDGE_VENDOR=ProtonAG
+ -DBRIDGE_BUILD_ENV=xbps -DBRIDGE_TAG=${version} -DBRIDGE_REVISION=${revision}
+ -DBRIDGE_APP_VERSION=${version}"
+go_import_path="github.com/ProtonMail/proton-bridge/v3"
+go_ldflags="-X ${go_import_path}/internal/constants.Version=${version}
+ -X ${go_import_path}/internal/constants.Revision=${revision}
+ -X ${go_import_path}/internal/constants.Tag=${version}
+ -X ${go_import_path}/internal/constants.FullAppName=ProtonMailBridge
+ -X ${go_import_path}/internal/constants.BuildEnv=xbps"
+hostmakedepends="go pkg-config qt6-base qt6-tools protobuf"
+makedepends="libglvnd-devel libsecret-devel qt6-base-devel qt6-declarative-devel
+ qt6-svg-devel qt6-wayland-devel sentry-native-devel protobuf-devel grpc-devel
+ gtest-devel"
+depends="qt6-svg"
short_desc="ProtonMail Bridge for use with E-mail software"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://proton.me/mail/bridge"
-distfiles="https://proton.me/download/bridge/protonmail-bridge_${version}-1_amd64.deb"
-checksum=4541f8aa145097ee171889b0c9d058450d09dc23be10231c83d6659789a27627
+distfiles="https://github.com/ProtonMail/proton-bridge/archive/refs/tags/v${version}.tar.gz"
+checksum=4215fd1848fff262da55194270f495e19722cdf8bbf98dbe3ca4ff5ca5aa4a1f
+nopie_files="/usr/libexec/protonmail/bridge"
-restricted=yes
-nopie=yes
+post_patch() {
+ vsed -i -e 's/^Exec=.*$/Exec=protonmail-bridge-gui/' "$wrksrc"/dist/proton-bridge.desktop
+}
+
+pre_build() {
+ cd "$wrksrc"
+ ( cd ./utils/ && ./credits.sh bridge )
+ . /void-packages/common/environment/build-style/go.sh
+ go build -p "$XBPS_MAKEJOBS" -modcacherw -v -tags "${go_build_tags}" -ldflags "${go_ldflags}" \
+ -o proton-bridge ./cmd/Desktop-Bridge
+}
do_install() {
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlmysql.so
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlodbc.so
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlpsql.so
- rm -rf usr/lib/protonmail/bridge/plugins/designer
- rm -rf usr/lib/protonmail/bridge/plugins/qmltooling
- rm -rf usr/lib/protonmail/bridge/qml/QtTest
- rm -rf usr/lib/protonmail/bridge/qml/Qt/labs
- rm -rf usr/lib/protonmail/bridge/lib/cmake
- rm -rf usr/lib/protonmail/bridge/lib/pkgconfig
- rm -rf usr/lib/protonmail/bridge/lib/*.a
- vcopy usr /
+ vinstall "$wrksrc"/proton-bridge 755 usr/libexec/protonmail bridge
+ vinstall build/bridge-gui 755 usr/libexec/protonmail bridge-gui
+ vmkdir usr/bin
+ ln -s ../libexec/protonmail/bridge "$DESTDIR"/usr/bin/protonmail-bridge
+ ln -s ../libexec/protonmail/bridge-gui "$DESTDIR"/usr/bin/protonmail-bridge-gui
+ vinstall "$wrksrc"/dist/proton-bridge.desktop 644 usr/share/applications
+ vinstall "$wrksrc"/dist/bridge.svg 644 usr/share/icons/hicolor/scalable/apps protonmail-bridge.svg
}
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [WIP] protonmail-bridge: update to 3.12.0.
2024-08-05 14:21 [PR PATCH] protonmail-bridge: update to 3.12.0 M4RZ3R0
` (16 preceding siblings ...)
2024-08-06 9:35 ` M4RZ3R0
@ 2024-08-06 9:35 ` M4RZ3R0
2024-08-06 10:02 ` classabbyamp
` (3 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: M4RZ3R0 @ 2024-08-06 9:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1220 bytes --]
New comment by M4RZ3R0 on void-packages repository
https://github.com/void-linux/void-packages/pull/51670#issuecomment-2270834787
Comment:
I've updated build_helper to use qmake6 for better qmake detection. This fixes the previous issues, and it works fine on my setup now.
> I just pushed what should be necessary for building from source, please try this out (I don't have a protonmail account to test that it does anything other than launch)
>
> also, does the package layout make sense for how the package should be used?
>
> ```
> .
> └── usr
> ├── bin
> │ ├── protonmail-bridge -> /usr/libexec/protonmail/bridge
> │ └── protonmail-bridge-gui -> /usr/libexec/protonmail/bridge-gui
> ├── libexec
> │ └── protonmail
> │ ├── bridge
> │ └── bridge-gui
> └── share
> ├── applications
> │ └── proton-bridge.desktop
> └── icons
> └── hicolor
> └── scalable
> └── apps
> └── protonmail-bridge.svg
> ```
I think this layout makes sense
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [WIP] protonmail-bridge: update to 3.12.0.
2024-08-05 14:21 [PR PATCH] protonmail-bridge: update to 3.12.0 M4RZ3R0
` (17 preceding siblings ...)
2024-08-06 9:35 ` M4RZ3R0
@ 2024-08-06 10:02 ` classabbyamp
2024-08-06 21:06 ` [PR PATCH] [Updated] " classabbyamp
` (2 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: classabbyamp @ 2024-08-06 10:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 209 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/51670#issuecomment-2270890293
Comment:
i know what's causing that build failure and I'll fix it soon
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [PR PATCH] [Updated] [WIP] protonmail-bridge: update to 3.12.0.
2024-08-05 14:21 [PR PATCH] protonmail-bridge: update to 3.12.0 M4RZ3R0
` (18 preceding siblings ...)
2024-08-06 10:02 ` classabbyamp
@ 2024-08-06 21:06 ` classabbyamp
2024-08-06 21:47 ` classabbyamp
2024-08-07 3:11 ` [PR PATCH] [Merged]: " classabbyamp
21 siblings, 0 replies; 23+ messages in thread
From: classabbyamp @ 2024-08-06 21:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 552 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/M4RZ3R0/void-packages protonmail-bridge
https://github.com/void-linux/void-packages/pull/51670
[WIP] protonmail-bridge: update to 3.12.0.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
#### Tasks
- [ ] Build from source
A patch file from https://github.com/void-linux/void-packages/pull/51670.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-protonmail-bridge-51670.patch --]
[-- Type: text/x-diff, Size: 10809 bytes --]
From 60f131b97609b8448f297808fc68b047ba5865c2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 5 Aug 2024 19:07:01 -0400
Subject: [PATCH 1/2] New package: sentry-native-0.7.7
---
common/shlibs | 1 +
srcpkgs/sentry-native-devel | 1 +
srcpkgs/sentry-native/template | 28 ++++++++++++++++++++++++++++
3 files changed, 30 insertions(+)
create mode 120000 srcpkgs/sentry-native-devel
create mode 100644 srcpkgs/sentry-native/template
diff --git a/common/shlibs b/common/shlibs
index a5314955498e24..e80b071f048315 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4527,3 +4527,4 @@ libbox2d.so.2 box2d-2.4.1_1
libhwy.so.1 highway-1.2.0_1
libscenefx.so.1 scenefx-0.1_1
libnng.so.1 nng-1.5.2_1
+libsentry.so sentry-native-0.7.7_1
diff --git a/srcpkgs/sentry-native-devel b/srcpkgs/sentry-native-devel
new file mode 120000
index 00000000000000..1a2e9f22f8dd32
--- /dev/null
+++ b/srcpkgs/sentry-native-devel
@@ -0,0 +1 @@
+sentry-native
\ No newline at end of file
diff --git a/srcpkgs/sentry-native/template b/srcpkgs/sentry-native/template
new file mode 100644
index 00000000000000..324c857180573e
--- /dev/null
+++ b/srcpkgs/sentry-native/template
@@ -0,0 +1,28 @@
+# Template file for 'sentry-native'
+pkgname=sentry-native
+version=0.7.7
+revision=1
+build_style=cmake
+configure_args="-DSENTRY_BACKEND=inproc -DSENTRY_TRANSPORT=none"
+short_desc="Sentry SDK for C, C++ and native applications"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/getsentry/sentry-native"
+changelog="https://github.com/getsentry/sentry-native/raw/master/CHANGELOG.md"
+distfiles="https://github.com/getsentry/sentry-native/archive/refs/tags/${version}.tar.gz"
+checksum="3b785c3794867450a54c45eb9d22ab6fb5e49b6eb8abde27660ab2741b846d6a"
+# XXX: various minor failures
+make_check=no
+
+post_install() {
+ vlicense LICENSE
+}
+
+sentry-native-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ }
+}
From 4cf1ed79e23d96008c066277f884a0af363ebf73 Mon Sep 17 00:00:00 2001
From: M4RZ3R0 <github@m4rz3r0.anonaddy.com>
Date: Mon, 5 Aug 2024 16:15:21 +0200
Subject: [PATCH 2/2] protonmail-bridge: update to 3.12.0.
---
.../patches/no-gui-tester.patch | 7 +++
.../protonmail-bridge/patches/no-vcpkg.patch | 40 ++++++++++++
.../patches/system-gtest.patch | 22 +++++++
.../patches/system-icu.patch | 15 +++++
srcpkgs/protonmail-bridge/template | 61 +++++++++++++------
5 files changed, 125 insertions(+), 20 deletions(-)
create mode 100644 srcpkgs/protonmail-bridge/patches/no-gui-tester.patch
create mode 100644 srcpkgs/protonmail-bridge/patches/no-vcpkg.patch
create mode 100644 srcpkgs/protonmail-bridge/patches/system-gtest.patch
create mode 100644 srcpkgs/protonmail-bridge/patches/system-icu.patch
diff --git a/srcpkgs/protonmail-bridge/patches/no-gui-tester.patch b/srcpkgs/protonmail-bridge/patches/no-gui-tester.patch
new file mode 100644
index 00000000000000..364ee903a94a40
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/no-gui-tester.patch
@@ -0,0 +1,7 @@
+--- a/internal/frontend/bridge-gui/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/CMakeLists.txt
+@@ -29,4 +29,3 @@
+
+ add_subdirectory(bridgepp)
+ add_subdirectory(bridge-gui)
+-add_subdirectory(bridge-gui-tester)
diff --git a/srcpkgs/protonmail-bridge/patches/no-vcpkg.patch b/srcpkgs/protonmail-bridge/patches/no-vcpkg.patch
new file mode 100644
index 00000000000000..8c43fa6bb05bf3
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/no-vcpkg.patch
@@ -0,0 +1,40 @@
+--- a/internal/frontend/bridge-gui/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/CMakeLists.txt
+@@ -23,7 +23,6 @@
+ # Project
+ #*****************************************************************************************************************************************************
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../..")
+-include("BridgeSetup.cmake")
+
+ project(frontend)
+
+--- a/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt
+@@ -18,7 +18,6 @@
+
+ cmake_minimum_required(VERSION 3.22)
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../..")
+-include(../BridgeSetup.cmake)
+
+
+ #*****************************************************************************************************************************************************
+--- a/internal/frontend/bridge-gui/bridge-gui-tester/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/bridge-gui-tester/CMakeLists.txt
+@@ -20,7 +20,6 @@
+
+
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../..")
+-include(../BridgeSetup.cmake)
+
+
+ #*****************************************************************************************************************************************************
+--- a/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
+@@ -19,7 +19,6 @@
+ cmake_minimum_required(VERSION 3.22)
+
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../..")
+-include(../BridgeSetup.cmake)
+
+
+ #****************************************************************************************************************************************************
diff --git a/srcpkgs/protonmail-bridge/patches/system-gtest.patch b/srcpkgs/protonmail-bridge/patches/system-gtest.patch
new file mode 100644
index 00000000000000..70f960c47aa57e
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/system-gtest.patch
@@ -0,0 +1,22 @@
+diff --git a/bridgepp/CMakeLists.txt b/bridgepp/CMakeLists.txt
+index f4a0a553..02d631dc 100644
+--- a/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
++++ b/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
+@@ -172,16 +172,7 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
+ cmake_policy(SET CMP0135 NEW) # avoid warning DOWNLOAD_EXTRACT_TIMESTAMP
+ endif ()
+
+-include(FetchContent)
+-FetchContent_Declare(
+- googletest
+- URL https://github.com/google/googletest/archive/b796f7d44681514f58a683a3a71ff17c94edb0c1.zip
+-)
+-
+-# For Windows: Prevent overriding the parent project's compiler/linker settings
+-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+-
+-FetchContent_MakeAvailable(googletest)
++find_package(GTest REQUIRED)
+
+ enable_testing()
+
diff --git a/srcpkgs/protonmail-bridge/patches/system-icu.patch b/srcpkgs/protonmail-bridge/patches/system-icu.patch
new file mode 100644
index 00000000000000..7794a582a0e20f
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/system-icu.patch
@@ -0,0 +1,15 @@
+--- a/internal/frontend/bridge-gui/bridge-gui/DeployLinux.cmake.orig
++++ b/internal/frontend/bridge-gui/bridge-gui/DeployLinux.cmake
+@@ -54,9 +54,9 @@
+ AppendQt6Lib("libQt6Core.so.6")
+ AppendQt6Lib("libQt6QuickTemplates2.so.6")
+ AppendQt6Lib("libQt6DBus.so.6")
+-AppendQt6Lib("libicui18n.so.56")
+-AppendQt6Lib("libicuuc.so.56")
+-AppendQt6Lib("libicudata.so.56")
++AppendQt6Lib("libicui18n.so")
++AppendQt6Lib("libicuuc.so")
++AppendQt6Lib("libicudata.so")
+ AppendQt6Lib("libQt6XcbQpa.so.6")
+ AppendQt6Lib("libQt6WaylandClient.so.6")
+ AppendQt6Lib("libQt6WlShellIntegration.so.6")
diff --git a/srcpkgs/protonmail-bridge/template b/srcpkgs/protonmail-bridge/template
index ff08aee8720d7b..c92cd5e2e36ac4 100644
--- a/srcpkgs/protonmail-bridge/template
+++ b/srcpkgs/protonmail-bridge/template
@@ -1,30 +1,51 @@
# Template file for 'protonmail-bridge'
pkgname=protonmail-bridge
-version=3.3.0
-revision=2
-archs="x86_64"
-create_wrksrc=yes
-depends="desktop-file-utils"
+version=3.12.0
+revision=1
+archs="x86_64* aarch64* riscv64*"
+build_style=cmake
+build_helper=qmake6
+build_wrksrc="internal/frontend/bridge-gui/bridge-gui"
+configure_args="-DBRIDGE_APP_FULL_NAME=ProtonMailBridge -DBRIDGE_VENDOR=ProtonAG
+ -DBRIDGE_BUILD_ENV=xbps -DBRIDGE_TAG=${version} -DBRIDGE_REVISION=${revision}
+ -DBRIDGE_APP_VERSION=${version}"
+go_import_path="github.com/ProtonMail/proton-bridge/v3"
+go_ldflags="-X ${go_import_path}/internal/constants.Version=${version}
+ -X ${go_import_path}/internal/constants.Revision=${revision}
+ -X ${go_import_path}/internal/constants.Tag=${version}
+ -X ${go_import_path}/internal/constants.FullAppName=ProtonMailBridge
+ -X ${go_import_path}/internal/constants.BuildEnv=xbps"
+hostmakedepends="go pkg-config qt6-base qt6-tools protobuf"
+makedepends="libglvnd-devel libsecret-devel qt6-base-devel qt6-declarative-devel
+ qt6-svg-devel qt6-wayland-devel sentry-native-devel grpc-devel gtest-devel protobuf-devel"
+depends="qt6-svg"
short_desc="ProtonMail Bridge for use with E-mail software"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://proton.me/mail/bridge"
-distfiles="https://proton.me/download/bridge/protonmail-bridge_${version}-1_amd64.deb"
-checksum=4541f8aa145097ee171889b0c9d058450d09dc23be10231c83d6659789a27627
+distfiles="https://github.com/ProtonMail/proton-bridge/archive/refs/tags/v${version}.tar.gz"
+checksum=4215fd1848fff262da55194270f495e19722cdf8bbf98dbe3ca4ff5ca5aa4a1f
+nopie_files="/usr/libexec/protonmail/bridge"
+nocross="cmake can't find protobuf properly"
-restricted=yes
-nopie=yes
+post_patch() {
+ vsed -i -e 's/^Exec=.*$/Exec=protonmail-bridge-gui/' "$wrksrc"/dist/proton-bridge.desktop
+}
+
+pre_build() {
+ cd "$wrksrc"
+ ( cd ./utils/ && ./credits.sh bridge )
+ . /void-packages/common/environment/build-style/go.sh
+ go build -p "$XBPS_MAKEJOBS" -modcacherw -v -tags "${go_build_tags}" -ldflags "${go_ldflags}" \
+ -o proton-bridge ./cmd/Desktop-Bridge
+}
do_install() {
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlmysql.so
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlodbc.so
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlpsql.so
- rm -rf usr/lib/protonmail/bridge/plugins/designer
- rm -rf usr/lib/protonmail/bridge/plugins/qmltooling
- rm -rf usr/lib/protonmail/bridge/qml/QtTest
- rm -rf usr/lib/protonmail/bridge/qml/Qt/labs
- rm -rf usr/lib/protonmail/bridge/lib/cmake
- rm -rf usr/lib/protonmail/bridge/lib/pkgconfig
- rm -rf usr/lib/protonmail/bridge/lib/*.a
- vcopy usr /
+ vinstall "$wrksrc"/proton-bridge 755 usr/libexec/protonmail bridge
+ vinstall build/bridge-gui 755 usr/libexec/protonmail bridge-gui
+ vmkdir usr/bin
+ ln -s ../libexec/protonmail/bridge "$DESTDIR"/usr/bin/protonmail-bridge
+ ln -s ../libexec/protonmail/bridge-gui "$DESTDIR"/usr/bin/protonmail-bridge-gui
+ vinstall "$wrksrc"/dist/proton-bridge.desktop 644 usr/share/applications
+ vinstall "$wrksrc"/dist/bridge.svg 644 usr/share/icons/hicolor/scalable/apps protonmail-bridge.svg
}
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [PR PATCH] [Updated] [WIP] protonmail-bridge: update to 3.12.0.
2024-08-05 14:21 [PR PATCH] protonmail-bridge: update to 3.12.0 M4RZ3R0
` (19 preceding siblings ...)
2024-08-06 21:06 ` [PR PATCH] [Updated] " classabbyamp
@ 2024-08-06 21:47 ` classabbyamp
2024-08-07 3:11 ` [PR PATCH] [Merged]: " classabbyamp
21 siblings, 0 replies; 23+ messages in thread
From: classabbyamp @ 2024-08-06 21:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 552 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/M4RZ3R0/void-packages protonmail-bridge
https://github.com/void-linux/void-packages/pull/51670
[WIP] protonmail-bridge: update to 3.12.0.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
#### Tasks
- [ ] Build from source
A patch file from https://github.com/void-linux/void-packages/pull/51670.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-protonmail-bridge-51670.patch --]
[-- Type: text/x-diff, Size: 13418 bytes --]
From 4e68f4f5643d80e6fb10eaf7db4cb55138c0a139 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 6 Aug 2024 17:47:22 -0400
Subject: [PATCH 1/3] grpc: fix cmake files
---
srcpkgs/grpc/patches/revert-find-protobuf.patch | 8 ++++++++
srcpkgs/grpc/template | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/grpc/patches/revert-find-protobuf.patch b/srcpkgs/grpc/patches/revert-find-protobuf.patch
index 8f2bc44d901284..1ff5554954da71 100644
--- a/srcpkgs/grpc/patches/revert-find-protobuf.patch
+++ b/srcpkgs/grpc/patches/revert-find-protobuf.patch
@@ -13,3 +13,11 @@ all packages are updated to the new system
if(Protobuf_FOUND OR PROTOBUF_FOUND)
if(TARGET protobuf::${_gRPC_PROTOBUF_LIBRARY_NAME})
+@@ -86,6 +86,6 @@
+ set(_gRPC_PROTOBUF_PROTOC_EXECUTABLE ${PROTOBUF_PROTOC_EXECUTABLE})
+ endif()
+ endif()
+- set(_gRPC_FIND_PROTOBUF "include(CMakeFindDependencyMacro)\nfind_dependency(Protobuf CONFIG)")
++ set(_gRPC_FIND_PROTOBUF "include(CMakeFindDependencyMacro)\nfind_dependency(Protobuf)")
+ endif()
+ endif()
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index ac9610bcf84a43..4839a80731476d 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,7 @@
# Template file for 'grpc'
pkgname=grpc
version=1.61.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON
-DgRPC_CARES_PROVIDER=package -DgRPC_PROTOBUF_PROVIDER=package
From 7c0080c3582343eb6b468bb008bd34d219c4cc2e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 5 Aug 2024 19:07:01 -0400
Subject: [PATCH 2/3] New package: sentry-native-0.7.7
---
common/shlibs | 1 +
srcpkgs/sentry-native-devel | 1 +
srcpkgs/sentry-native/template | 28 ++++++++++++++++++++++++++++
3 files changed, 30 insertions(+)
create mode 120000 srcpkgs/sentry-native-devel
create mode 100644 srcpkgs/sentry-native/template
diff --git a/common/shlibs b/common/shlibs
index a5314955498e24..e80b071f048315 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4527,3 +4527,4 @@ libbox2d.so.2 box2d-2.4.1_1
libhwy.so.1 highway-1.2.0_1
libscenefx.so.1 scenefx-0.1_1
libnng.so.1 nng-1.5.2_1
+libsentry.so sentry-native-0.7.7_1
diff --git a/srcpkgs/sentry-native-devel b/srcpkgs/sentry-native-devel
new file mode 120000
index 00000000000000..1a2e9f22f8dd32
--- /dev/null
+++ b/srcpkgs/sentry-native-devel
@@ -0,0 +1 @@
+sentry-native
\ No newline at end of file
diff --git a/srcpkgs/sentry-native/template b/srcpkgs/sentry-native/template
new file mode 100644
index 00000000000000..324c857180573e
--- /dev/null
+++ b/srcpkgs/sentry-native/template
@@ -0,0 +1,28 @@
+# Template file for 'sentry-native'
+pkgname=sentry-native
+version=0.7.7
+revision=1
+build_style=cmake
+configure_args="-DSENTRY_BACKEND=inproc -DSENTRY_TRANSPORT=none"
+short_desc="Sentry SDK for C, C++ and native applications"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/getsentry/sentry-native"
+changelog="https://github.com/getsentry/sentry-native/raw/master/CHANGELOG.md"
+distfiles="https://github.com/getsentry/sentry-native/archive/refs/tags/${version}.tar.gz"
+checksum="3b785c3794867450a54c45eb9d22ab6fb5e49b6eb8abde27660ab2741b846d6a"
+# XXX: various minor failures
+make_check=no
+
+post_install() {
+ vlicense LICENSE
+}
+
+sentry-native-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ }
+}
From 65d9960296d0e607a926076828f5a6827611156d Mon Sep 17 00:00:00 2001
From: M4RZ3R0 <github@m4rz3r0.anonaddy.com>
Date: Mon, 5 Aug 2024 16:15:21 +0200
Subject: [PATCH 3/3] protonmail-bridge: update to 3.12.0.
---
.../patches/no-gui-tester.patch | 7 +++
.../protonmail-bridge/patches/no-vcpkg.patch | 40 ++++++++++++
.../patches/protobuf-cmake.patch | 11 ++++
.../patches/system-gtest.patch | 22 +++++++
.../patches/system-icu.patch | 15 +++++
srcpkgs/protonmail-bridge/template | 62 +++++++++++++------
6 files changed, 137 insertions(+), 20 deletions(-)
create mode 100644 srcpkgs/protonmail-bridge/patches/no-gui-tester.patch
create mode 100644 srcpkgs/protonmail-bridge/patches/no-vcpkg.patch
create mode 100644 srcpkgs/protonmail-bridge/patches/protobuf-cmake.patch
create mode 100644 srcpkgs/protonmail-bridge/patches/system-gtest.patch
create mode 100644 srcpkgs/protonmail-bridge/patches/system-icu.patch
diff --git a/srcpkgs/protonmail-bridge/patches/no-gui-tester.patch b/srcpkgs/protonmail-bridge/patches/no-gui-tester.patch
new file mode 100644
index 00000000000000..364ee903a94a40
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/no-gui-tester.patch
@@ -0,0 +1,7 @@
+--- a/internal/frontend/bridge-gui/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/CMakeLists.txt
+@@ -29,4 +29,3 @@
+
+ add_subdirectory(bridgepp)
+ add_subdirectory(bridge-gui)
+-add_subdirectory(bridge-gui-tester)
diff --git a/srcpkgs/protonmail-bridge/patches/no-vcpkg.patch b/srcpkgs/protonmail-bridge/patches/no-vcpkg.patch
new file mode 100644
index 00000000000000..8c43fa6bb05bf3
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/no-vcpkg.patch
@@ -0,0 +1,40 @@
+--- a/internal/frontend/bridge-gui/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/CMakeLists.txt
+@@ -23,7 +23,6 @@
+ # Project
+ #*****************************************************************************************************************************************************
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../..")
+-include("BridgeSetup.cmake")
+
+ project(frontend)
+
+--- a/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt
+@@ -18,7 +18,6 @@
+
+ cmake_minimum_required(VERSION 3.22)
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../..")
+-include(../BridgeSetup.cmake)
+
+
+ #*****************************************************************************************************************************************************
+--- a/internal/frontend/bridge-gui/bridge-gui-tester/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/bridge-gui-tester/CMakeLists.txt
+@@ -20,7 +20,6 @@
+
+
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../..")
+-include(../BridgeSetup.cmake)
+
+
+ #*****************************************************************************************************************************************************
+--- a/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
+@@ -19,7 +19,6 @@
+ cmake_minimum_required(VERSION 3.22)
+
+ set(BRIDGE_REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../..")
+-include(../BridgeSetup.cmake)
+
+
+ #****************************************************************************************************************************************************
diff --git a/srcpkgs/protonmail-bridge/patches/protobuf-cmake.patch b/srcpkgs/protonmail-bridge/patches/protobuf-cmake.patch
new file mode 100644
index 00000000000000..337c346a64f135
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/protobuf-cmake.patch
@@ -0,0 +1,11 @@
+--- a/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt.orig
++++ b/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
+@@ -48,7 +48,7 @@
+ #****************************************************************************************************************************************************
+ # gRPC / Protobuf
+ #****************************************************************************************************************************************************
+-find_package(Protobuf CONFIG REQUIRED)
++find_package(Protobuf REQUIRED)
+ message(STATUS "Using protobuf ${Protobuf_VERSION}")
+
+ find_package(gRPC CONFIG REQUIRED)
diff --git a/srcpkgs/protonmail-bridge/patches/system-gtest.patch b/srcpkgs/protonmail-bridge/patches/system-gtest.patch
new file mode 100644
index 00000000000000..70f960c47aa57e
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/system-gtest.patch
@@ -0,0 +1,22 @@
+diff --git a/bridgepp/CMakeLists.txt b/bridgepp/CMakeLists.txt
+index f4a0a553..02d631dc 100644
+--- a/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
++++ b/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
+@@ -172,16 +172,7 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
+ cmake_policy(SET CMP0135 NEW) # avoid warning DOWNLOAD_EXTRACT_TIMESTAMP
+ endif ()
+
+-include(FetchContent)
+-FetchContent_Declare(
+- googletest
+- URL https://github.com/google/googletest/archive/b796f7d44681514f58a683a3a71ff17c94edb0c1.zip
+-)
+-
+-# For Windows: Prevent overriding the parent project's compiler/linker settings
+-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+-
+-FetchContent_MakeAvailable(googletest)
++find_package(GTest REQUIRED)
+
+ enable_testing()
+
diff --git a/srcpkgs/protonmail-bridge/patches/system-icu.patch b/srcpkgs/protonmail-bridge/patches/system-icu.patch
new file mode 100644
index 00000000000000..7794a582a0e20f
--- /dev/null
+++ b/srcpkgs/protonmail-bridge/patches/system-icu.patch
@@ -0,0 +1,15 @@
+--- a/internal/frontend/bridge-gui/bridge-gui/DeployLinux.cmake.orig
++++ b/internal/frontend/bridge-gui/bridge-gui/DeployLinux.cmake
+@@ -54,9 +54,9 @@
+ AppendQt6Lib("libQt6Core.so.6")
+ AppendQt6Lib("libQt6QuickTemplates2.so.6")
+ AppendQt6Lib("libQt6DBus.so.6")
+-AppendQt6Lib("libicui18n.so.56")
+-AppendQt6Lib("libicuuc.so.56")
+-AppendQt6Lib("libicudata.so.56")
++AppendQt6Lib("libicui18n.so")
++AppendQt6Lib("libicuuc.so")
++AppendQt6Lib("libicudata.so")
+ AppendQt6Lib("libQt6XcbQpa.so.6")
+ AppendQt6Lib("libQt6WaylandClient.so.6")
+ AppendQt6Lib("libQt6WlShellIntegration.so.6")
diff --git a/srcpkgs/protonmail-bridge/template b/srcpkgs/protonmail-bridge/template
index ff08aee8720d7b..9d528bb4992e95 100644
--- a/srcpkgs/protonmail-bridge/template
+++ b/srcpkgs/protonmail-bridge/template
@@ -1,30 +1,52 @@
# Template file for 'protonmail-bridge'
pkgname=protonmail-bridge
-version=3.3.0
-revision=2
-archs="x86_64"
-create_wrksrc=yes
-depends="desktop-file-utils"
+version=3.12.0
+revision=1
+archs="x86_64* aarch64* riscv64*"
+build_style=cmake
+build_helper=qmake6
+build_wrksrc="internal/frontend/bridge-gui/bridge-gui"
+configure_args="-DBRIDGE_APP_FULL_NAME=ProtonMailBridge -DBRIDGE_VENDOR=ProtonAG
+ -DBRIDGE_BUILD_ENV=xbps -DBRIDGE_TAG=${version} -DBRIDGE_REVISION=${revision}
+ -DBRIDGE_APP_VERSION=${version} -DProtobuf_PROTOC_EXECUTABLE=/usr/bin/protoc"
+go_import_path="github.com/ProtonMail/proton-bridge/v3"
+go_ldflags="-X ${go_import_path}/internal/constants.Version=${version}
+ -X ${go_import_path}/internal/constants.Revision=${revision}
+ -X ${go_import_path}/internal/constants.Tag=${version}
+ -X ${go_import_path}/internal/constants.FullAppName=ProtonMailBridge
+ -X ${go_import_path}/internal/constants.BuildEnv=xbps"
+hostmakedepends="go pkg-config qt6-base qt6-tools protobuf grpc"
+makedepends="libglvnd-devel libsecret-devel qt6-base-devel qt6-declarative-devel
+ qt6-svg-devel qt6-wayland-devel sentry-native-devel grpc-devel protobuf-devel
+ gtest-devel"
+depends="qt6-svg"
short_desc="ProtonMail Bridge for use with E-mail software"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://proton.me/mail/bridge"
-distfiles="https://proton.me/download/bridge/protonmail-bridge_${version}-1_amd64.deb"
-checksum=4541f8aa145097ee171889b0c9d058450d09dc23be10231c83d6659789a27627
+distfiles="https://github.com/ProtonMail/proton-bridge/archive/refs/tags/v${version}.tar.gz"
+checksum=4215fd1848fff262da55194270f495e19722cdf8bbf98dbe3ca4ff5ca5aa4a1f
+nopie_files="/usr/libexec/protonmail/bridge"
+nocross="protobuf generation fails"
-restricted=yes
-nopie=yes
+post_patch() {
+ vsed -i -e 's/^Exec=.*$/Exec=protonmail-bridge-gui/' "$wrksrc"/dist/proton-bridge.desktop
+}
+
+pre_build() {
+ cd "$wrksrc"
+ ( cd ./utils/ && ./credits.sh bridge )
+ . /void-packages/common/environment/build-style/go.sh
+ go build -p "$XBPS_MAKEJOBS" -modcacherw -v -tags "${go_build_tags}" -ldflags "${go_ldflags}" \
+ -o proton-bridge ./cmd/Desktop-Bridge
+}
do_install() {
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlmysql.so
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlodbc.so
- rm -f usr/lib/protonmail/bridge/plugins/sqldrivers/libqsqlpsql.so
- rm -rf usr/lib/protonmail/bridge/plugins/designer
- rm -rf usr/lib/protonmail/bridge/plugins/qmltooling
- rm -rf usr/lib/protonmail/bridge/qml/QtTest
- rm -rf usr/lib/protonmail/bridge/qml/Qt/labs
- rm -rf usr/lib/protonmail/bridge/lib/cmake
- rm -rf usr/lib/protonmail/bridge/lib/pkgconfig
- rm -rf usr/lib/protonmail/bridge/lib/*.a
- vcopy usr /
+ vinstall "$wrksrc"/proton-bridge 755 usr/libexec/protonmail bridge
+ vinstall build/bridge-gui 755 usr/libexec/protonmail bridge-gui
+ vmkdir usr/bin
+ ln -s ../libexec/protonmail/bridge "$DESTDIR"/usr/bin/protonmail-bridge
+ ln -s ../libexec/protonmail/bridge-gui "$DESTDIR"/usr/bin/protonmail-bridge-gui
+ vinstall "$wrksrc"/dist/proton-bridge.desktop 644 usr/share/applications
+ vinstall "$wrksrc"/dist/bridge.svg 644 usr/share/icons/hicolor/scalable/apps protonmail-bridge.svg
}
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [PR PATCH] [Merged]: [WIP] protonmail-bridge: update to 3.12.0.
2024-08-05 14:21 [PR PATCH] protonmail-bridge: update to 3.12.0 M4RZ3R0
` (20 preceding siblings ...)
2024-08-06 21:47 ` classabbyamp
@ 2024-08-07 3:11 ` classabbyamp
21 siblings, 0 replies; 23+ messages in thread
From: classabbyamp @ 2024-08-07 3:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 381 bytes --]
There's a merged pull request on the void-packages repository
[WIP] protonmail-bridge: update to 3.12.0.
https://github.com/void-linux/void-packages/pull/51670
Description:
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
#### Tasks
- [ ] Build from source
^ permalink raw reply [flat|nested] 23+ messages in thread