Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: zoom-system-qt-5.0.403652.0509_1
@ 2020-05-13  7:37 mithodin
  2020-05-13 20:08 ` Chocimier
                   ` (7 more replies)
  0 siblings, 8 replies; 9+ messages in thread
From: mithodin @ 2020-05-13  7:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 674 bytes --]

There is a new pull request by mithodin against master on the void-packages repository

https://github.com/mithodin/void-packages newzoom
https://github.com/void-linux/void-packages/pull/21908

New package: zoom-system-qt-5.0.403652.0509_1
Add package for zoom using system libraries (modelled after https://aur.archlinux.org/packages/zoom-system-qt/). This adds e.g. wayland support and removes doubled and possibly outdated qt libraries. However, since this might break if zoom isn't updating to a close enough qt release, it's better to keep zoom with included qt around as well.

A patch file from https://github.com/void-linux/void-packages/pull/21908.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-newzoom-21908.patch --]
[-- Type: text/x-diff, Size: 3334 bytes --]

From 0191ba50e747a899dfb54ec14486af27f8f7d7f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Treffenst=C3=A4dt?=
 <lucas.treffenstaedt@tngtech.com>
Date: Wed, 13 May 2020 09:23:04 +0200
Subject: [PATCH] New package: zoom-system-qt-5.0.403652.0509_1

---
 .../zoom-system-qt/files/DISTRIBUTION-DETAILS |  1 +
 srcpkgs/zoom-system-qt/template               | 47 +++++++++++++++++++
 srcpkgs/zoom-system-qt/update                 |  2 +
 srcpkgs/zoom/template                         |  1 +
 4 files changed, 51 insertions(+)
 create mode 100644 srcpkgs/zoom-system-qt/files/DISTRIBUTION-DETAILS
 create mode 100644 srcpkgs/zoom-system-qt/template
 create mode 100644 srcpkgs/zoom-system-qt/update

diff --git a/srcpkgs/zoom-system-qt/files/DISTRIBUTION-DETAILS b/srcpkgs/zoom-system-qt/files/DISTRIBUTION-DETAILS
new file mode 100644
index 00000000000..f0dd4227896
--- /dev/null
+++ b/srcpkgs/zoom-system-qt/files/DISTRIBUTION-DETAILS
@@ -0,0 +1 @@
+Zoom is non-distributable software. See the terms of service at https://zoom.us/terms/
diff --git a/srcpkgs/zoom-system-qt/template b/srcpkgs/zoom-system-qt/template
new file mode 100644
index 00000000000..c3ecce8df96
--- /dev/null
+++ b/srcpkgs/zoom-system-qt/template
@@ -0,0 +1,47 @@
+# Template file for 'zoom-system-qt'
+pkgname=zoom-system-qt
+version=5.0.403652.0509
+revision=1
+archs="x86_64"
+wrksrc=zoom
+create_wrksrc=yes
+depends="qt5 qt5-graphicaleffects qt5-imageformats qt5-quickcontrols qt5-quickcontrols2 qt5-svg qt5-script qt5-declarative"
+short_desc="Video Conferencing and Web Conferencing Service (use system qt)"
+maintainer="Lucas L. Treffenstädt <lucas@treffenstaedt.de>"
+license="custom:Proprietary"
+homepage="https://zoom.us/"
+distfiles="https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"
+checksum=d21821d3f3068e03ea86751c4d1d72b737488d54ba770f4d42a26effd631f785
+conflicts="zoom>=0"
+repository=nonfree
+noshlibprovides=yes
+noverifyrdeps=yes
+restricted=yes
+nopie=yes
+
+pre_install() {
+	rm -f opt/zoom/libQt5*.so{,.*}
+	rm -f opt/zoom/libicu*.so{,.*}
+
+	rm -rf opt/zoom/*integrations
+	rm -rf opt/zoom/audio
+	rm -rf opt/zoom/generic
+	rm -rf opt/zoom/iconengines
+	rm -rf opt/zoom/imageformats
+	rm -rf opt/zoom/platforms
+	rm -rf opt/zoom/platforminputcontexts
+	rm -rf opt/zoom/platformthemes
+	rm -rf opt/zoom/Qt{,GraphicalEffects,Qml,Quick,Quick.2}
+	rm -f opt/zoom/libmpg123.so
+	rm -f opt/zoom/libfaac1.so
+	rm -f opt/zoom/libturbojpeg.so{,.*}
+	rm -f opt/zoom/libquazip.so{,.*}
+
+	rm opt/zoom/qt.conf
+}
+
+do_install() {
+	vcopy opt .
+	vcopy usr .
+	vlicense ${FILESDIR}/DISTRIBUTION-DETAILS
+}
diff --git a/srcpkgs/zoom-system-qt/update b/srcpkgs/zoom-system-qt/update
new file mode 100644
index 00000000000..7b40f77946c
--- /dev/null
+++ b/srcpkgs/zoom-system-qt/update
@@ -0,0 +1,2 @@
+site="https://zoom.us/download?os=linux"
+pattern='Version \K[\d.]+(?=)'
diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 308301fa571..a6aeb824658 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -11,6 +11,7 @@ license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"
 checksum=d21821d3f3068e03ea86751c4d1d72b737488d54ba770f4d42a26effd631f785
+conflicts="zoom-system-qt>=0"
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: New package: zoom-system-qt-5.0.403652.0509_1
  2020-05-13  7:37 [PR PATCH] New package: zoom-system-qt-5.0.403652.0509_1 mithodin
@ 2020-05-13 20:08 ` Chocimier
  2020-05-14 11:28 ` mithodin
                   ` (6 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: Chocimier @ 2020-05-13 20:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 171 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/21908#issuecomment-628218406

Comment:
This should be build option.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: New package: zoom-system-qt-5.0.403652.0509_1
  2020-05-13  7:37 [PR PATCH] New package: zoom-system-qt-5.0.403652.0509_1 mithodin
  2020-05-13 20:08 ` Chocimier
@ 2020-05-14 11:28 ` mithodin
  2020-05-14 15:43 ` [PR PATCH] [Updated] " mithodin
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: mithodin @ 2020-05-14 11:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 229 bytes --]

New comment by mithodin on void-packages repository

https://github.com/void-linux/void-packages/pull/21908#issuecomment-628571734

Comment:
I'll have to learn how build options work, then. I'll see what I can do on the weekend.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] New package: zoom-system-qt-5.0.403652.0509_1
  2020-05-13  7:37 [PR PATCH] New package: zoom-system-qt-5.0.403652.0509_1 mithodin
  2020-05-13 20:08 ` Chocimier
  2020-05-14 11:28 ` mithodin
@ 2020-05-14 15:43 ` mithodin
  2020-05-14 15:44 ` mithodin
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: mithodin @ 2020-05-14 15:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 679 bytes --]

There is an updated pull request by mithodin against master on the void-packages repository

https://github.com/mithodin/void-packages newzoom
https://github.com/void-linux/void-packages/pull/21908

New package: zoom-system-qt-5.0.403652.0509_1
Add package for zoom using system libraries (modelled after https://aur.archlinux.org/packages/zoom-system-qt/). This adds e.g. wayland support and removes doubled and possibly outdated qt libraries. However, since this might break if zoom isn't updating to a close enough qt release, it's better to keep zoom with included qt around as well.

A patch file from https://github.com/void-linux/void-packages/pull/21908.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-newzoom-21908.patch --]
[-- Type: text/x-diff, Size: 1670 bytes --]

From ed1eaa7b157f0a42b2ab7b09d8cfe63e2205d4e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Treffenst=C3=A4dt?=
 <lucas.treffenstaedt@tngtech.com>
Date: Wed, 13 May 2020 09:23:04 +0200
Subject: [PATCH] zoom: add build option to use system qt libraries

---
 srcpkgs/zoom/template | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 308301fa571..cf17d0b2cd8 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -5,6 +5,7 @@ revision=1
 archs="x86_64"
 wrksrc=zoom
 create_wrksrc=yes
+depends="$(vopt_if systemqt 'qt5 qt5-graphicaleffects qt5-imageformats qt5-quickcontrols qt5-quickcontrols2 qt5-svg qt5-script qt5-declarative')"
 short_desc="Video Conferencing and Web Conferencing Service"
 maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
@@ -16,6 +17,32 @@ noshlibprovides=yes
 noverifyrdeps=yes
 restricted=yes
 nopie=yes
+build_options="systemqt"
+desc_option_systemqt="Use system QT libraries"
+
+pre_install() {
+	if [ ${build_option_systemqt} ]
+	then
+		rm -f opt/zoom/libQt5*.so{,.*}
+		rm -f opt/zoom/libicu*.so{,.*}
+
+		rm -rf opt/zoom/*integrations
+		rm -rf opt/zoom/audio
+		rm -rf opt/zoom/generic
+		rm -rf opt/zoom/iconengines
+		rm -rf opt/zoom/imageformats
+		rm -rf opt/zoom/platforms
+		rm -rf opt/zoom/platforminputcontexts
+		rm -rf opt/zoom/platformthemes
+		rm -rf opt/zoom/Qt{,GraphicalEffects,Qml,Quick,Quick.2}
+		rm -f opt/zoom/libmpg123.so
+		rm -f opt/zoom/libfaac1.so
+		rm -f opt/zoom/libturbojpeg.so{,.*}
+		rm -f opt/zoom/libquazip.so{,.*}
+
+		rm opt/zoom/qt.conf
+	fi
+}
 
 do_install() {
 	vcopy opt .

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: New package: zoom-system-qt-5.0.403652.0509_1
  2020-05-13  7:37 [PR PATCH] New package: zoom-system-qt-5.0.403652.0509_1 mithodin
                   ` (2 preceding siblings ...)
  2020-05-14 15:43 ` [PR PATCH] [Updated] " mithodin
@ 2020-05-14 15:44 ` mithodin
  2020-05-15  7:30 ` [PR PATCH] [Updated] " mithodin
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: mithodin @ 2020-05-14 15:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 152 bytes --]

New comment by mithodin on void-packages repository

https://github.com/void-linux/void-packages/pull/21908#issuecomment-628720111

Comment:
Like this?

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] New package: zoom-system-qt-5.0.403652.0509_1
  2020-05-13  7:37 [PR PATCH] New package: zoom-system-qt-5.0.403652.0509_1 mithodin
                   ` (3 preceding siblings ...)
  2020-05-14 15:44 ` mithodin
@ 2020-05-15  7:30 ` mithodin
  2020-05-15  7:32 ` mithodin
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: mithodin @ 2020-05-15  7:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 679 bytes --]

There is an updated pull request by mithodin against master on the void-packages repository

https://github.com/mithodin/void-packages newzoom
https://github.com/void-linux/void-packages/pull/21908

New package: zoom-system-qt-5.0.403652.0509_1
Add package for zoom using system libraries (modelled after https://aur.archlinux.org/packages/zoom-system-qt/). This adds e.g. wayland support and removes doubled and possibly outdated qt libraries. However, since this might break if zoom isn't updating to a close enough qt release, it's better to keep zoom with included qt around as well.

A patch file from https://github.com/void-linux/void-packages/pull/21908.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-newzoom-21908.patch --]
[-- Type: text/x-diff, Size: 1670 bytes --]

From 1c6f4f4d008d99e1bf1ebaf4eb8b96f92dee24a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Treffenst=C3=A4dt?=
 <lucas.treffenstaedt@tngtech.com>
Date: Wed, 13 May 2020 09:23:04 +0200
Subject: [PATCH] zoom: add build option to use system qt libraries

---
 srcpkgs/zoom/template | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 308301fa571..cf17d0b2cd8 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -5,6 +5,7 @@ revision=1
 archs="x86_64"
 wrksrc=zoom
 create_wrksrc=yes
+depends="$(vopt_if systemqt 'qt5 qt5-graphicaleffects qt5-imageformats qt5-quickcontrols qt5-quickcontrols2 qt5-svg qt5-script qt5-declarative')"
 short_desc="Video Conferencing and Web Conferencing Service"
 maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
@@ -16,6 +17,32 @@ noshlibprovides=yes
 noverifyrdeps=yes
 restricted=yes
 nopie=yes
+build_options="systemqt"
+desc_option_systemqt="Use system QT libraries"
+
+pre_install() {
+	if [ ${build_option_systemqt} ]
+	then
+		rm -f opt/zoom/libQt5*.so{,.*}
+		rm -f opt/zoom/libicu*.so{,.*}
+
+		rm -rf opt/zoom/*integrations
+		rm -rf opt/zoom/audio
+		rm -rf opt/zoom/generic
+		rm -rf opt/zoom/iconengines
+		rm -rf opt/zoom/imageformats
+		rm -rf opt/zoom/platforms
+		rm -rf opt/zoom/platforminputcontexts
+		rm -rf opt/zoom/platformthemes
+		rm -rf opt/zoom/Qt{,GraphicalEffects,Qml,Quick,Quick.2}
+		rm -f opt/zoom/libmpg123.so
+		rm -f opt/zoom/libfaac1.so
+		rm -f opt/zoom/libturbojpeg.so{,.*}
+		rm -f opt/zoom/libquazip.so{,.*}
+
+		rm opt/zoom/qt.conf
+	fi
+}
 
 do_install() {
 	vcopy opt .

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] New package: zoom-system-qt-5.0.403652.0509_1
  2020-05-13  7:37 [PR PATCH] New package: zoom-system-qt-5.0.403652.0509_1 mithodin
                   ` (4 preceding siblings ...)
  2020-05-15  7:30 ` [PR PATCH] [Updated] " mithodin
@ 2020-05-15  7:32 ` mithodin
  2020-05-15  7:33 ` mithodin
  2020-05-21 16:00 ` [PR PATCH] [Merged]: " Hoshpak
  7 siblings, 0 replies; 9+ messages in thread
From: mithodin @ 2020-05-15  7:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 679 bytes --]

There is an updated pull request by mithodin against master on the void-packages repository

https://github.com/mithodin/void-packages newzoom
https://github.com/void-linux/void-packages/pull/21908

New package: zoom-system-qt-5.0.403652.0509_1
Add package for zoom using system libraries (modelled after https://aur.archlinux.org/packages/zoom-system-qt/). This adds e.g. wayland support and removes doubled and possibly outdated qt libraries. However, since this might break if zoom isn't updating to a close enough qt release, it's better to keep zoom with included qt around as well.

A patch file from https://github.com/void-linux/void-packages/pull/21908.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-newzoom-21908.patch --]
[-- Type: text/x-diff, Size: 1670 bytes --]

From e468ec83e76931eb85a9e1780afd791dd188d0ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Treffenst=C3=A4dt?=
 <lucas.treffenstaedt@tngtech.com>
Date: Wed, 13 May 2020 09:23:04 +0200
Subject: [PATCH] zoom: add build option to use system qt libraries

---
 srcpkgs/zoom/template | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 308301fa571..b238d7fdecc 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -5,6 +5,7 @@ revision=1
 archs="x86_64"
 wrksrc=zoom
 create_wrksrc=yes
+depends="$(vopt_if systemqt 'qt5 qt5-graphicaleffects qt5-imageformats qt5-quickcontrols qt5-quickcontrols2 qt5-svg qt5-script qt5-declarative')"
 short_desc="Video Conferencing and Web Conferencing Service"
 maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
@@ -16,6 +17,31 @@ noshlibprovides=yes
 noverifyrdeps=yes
 restricted=yes
 nopie=yes
+build_options="systemqt"
+desc_option_systemqt="Use system QT libraries"
+
+pre_install() {
+	if [ "${build_option_systemqt}" ]; then
+		rm -f opt/zoom/libQt5*.so{,.*}
+		rm -f opt/zoom/libicu*.so{,.*}
+
+		rm -rf opt/zoom/*integrations
+		rm -rf opt/zoom/audio
+		rm -rf opt/zoom/generic
+		rm -rf opt/zoom/iconengines
+		rm -rf opt/zoom/imageformats
+		rm -rf opt/zoom/platforms
+		rm -rf opt/zoom/platforminputcontexts
+		rm -rf opt/zoom/platformthemes
+		rm -rf opt/zoom/Qt{,GraphicalEffects,Qml,Quick,Quick.2}
+		rm -f opt/zoom/libmpg123.so
+		rm -f opt/zoom/libfaac1.so
+		rm -f opt/zoom/libturbojpeg.so{,.*}
+		rm -f opt/zoom/libquazip.so{,.*}
+
+		rm opt/zoom/qt.conf
+	fi
+}
 
 do_install() {
 	vcopy opt .

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: New package: zoom-system-qt-5.0.403652.0509_1
  2020-05-13  7:37 [PR PATCH] New package: zoom-system-qt-5.0.403652.0509_1 mithodin
                   ` (5 preceding siblings ...)
  2020-05-15  7:32 ` mithodin
@ 2020-05-15  7:33 ` mithodin
  2020-05-21 16:00 ` [PR PATCH] [Merged]: " Hoshpak
  7 siblings, 0 replies; 9+ messages in thread
From: mithodin @ 2020-05-15  7:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 181 bytes --]

New comment by mithodin on void-packages repository

https://github.com/void-linux/void-packages/pull/21908#issuecomment-629080444

Comment:
I have implemented the requested fixes.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Merged]: New package: zoom-system-qt-5.0.403652.0509_1
  2020-05-13  7:37 [PR PATCH] New package: zoom-system-qt-5.0.403652.0509_1 mithodin
                   ` (6 preceding siblings ...)
  2020-05-15  7:33 ` mithodin
@ 2020-05-21 16:00 ` Hoshpak
  7 siblings, 0 replies; 9+ messages in thread
From: Hoshpak @ 2020-05-21 16:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 521 bytes --]

There's a merged pull request on the void-packages repository

New package: zoom-system-qt-5.0.403652.0509_1
https://github.com/void-linux/void-packages/pull/21908

Description:
Add package for zoom using system libraries (modelled after https://aur.archlinux.org/packages/zoom-system-qt/). This adds e.g. wayland support and removes doubled and possibly outdated qt libraries. However, since this might break if zoom isn't updating to a close enough qt release, it's better to keep zoom with included qt around as well.

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2020-05-21 16:00 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-13  7:37 [PR PATCH] New package: zoom-system-qt-5.0.403652.0509_1 mithodin
2020-05-13 20:08 ` Chocimier
2020-05-14 11:28 ` mithodin
2020-05-14 15:43 ` [PR PATCH] [Updated] " mithodin
2020-05-14 15:44 ` mithodin
2020-05-15  7:30 ` [PR PATCH] [Updated] " mithodin
2020-05-15  7:32 ` mithodin
2020-05-15  7:33 ` mithodin
2020-05-21 16:00 ` [PR PATCH] [Merged]: " Hoshpak

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).