Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] qt5: update to 5.15.3+20210429.
@ 2021-05-02 19:23 Johnnynator
  2021-05-02 19:42 ` [PR REVIEW] " ericonr
                   ` (6 more replies)
  0 siblings, 7 replies; 8+ messages in thread
From: Johnnynator @ 2021-05-02 19:23 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Johnnynator/void-packages qt5
https://github.com/void-linux/void-packages/pull/30633

qt5: update to 5.15.3+20210429.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 7a178c456eb991a3edad937da0afac970fdc9c65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 23:36:13 +0200
Subject: [PATCH] qt5: update to 5.15.3+20210429.

switch to the KDE patchset
---
 srcpkgs/qt5/template | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index c8e93578e94d..1f0c4c31d8d9 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,8 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
-version=5.15.2
-revision=5
-wrksrc="qt-everywhere-src-${version}"
+version=5.15.3+20210429
+revision=1
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"
@@ -21,8 +20,8 @@ short_desc="Cross-platform application and UI framework (QT5)"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/single/qt-everywhere-src-${version}.tar.xz"
-checksum=3a530d1b243b5dec00bc54937455471aaa3e56849d2593edb8ded07228202240
+distfiles="https://void.johnnynator.dev/distfiles/qt5-${version}.tar.gz"
+checksum=6936ecf7c35162832bde5b5685f24c0924868745983f030e377924c1d80f68d1
 python_version=2 #unverified
 replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-webkit-devel<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
@@ -170,6 +169,12 @@ _msg_cross() {
 	msg_normal "***************************************************\n"
 }
 
+post_extract() {
+	find -maxdepth 1 -type d -exec mkdir -p {}/.git \;
+	# just keep module_version at 5.15.2, since some external modules are still 5.15.2
+	find -maxdepth 1 -type d -exec sed -e "/^MODULE_VERSION/s/5.*/5.15.2/" -i {}/.qmake.conf \;
+}
+
 do_configure() {
 	local opts spec
 
@@ -241,6 +246,8 @@ do_configure() {
 	# opts+=" -v"
 	opts+=" -skip qtwebengine"
 	opts+=" -skip qtwebview"
+	opts+=" -skip qtdocgallery"
+	opts+=" -skip qtpim"
 	LDFLAGS+=" -Wl,--no-keep-memory"  # needs more than 8GB RAM else
 	if [ "$CROSS_BUILD" ]; then
 		spec=void-${XBPS_CROSS_TRIPLET}-g++

^ permalink raw reply	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-05-03 10:57 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-02 19:23 [PR PATCH] qt5: update to 5.15.3+20210429 Johnnynator
2021-05-02 19:42 ` [PR REVIEW] " ericonr
2021-05-02 19:51 ` [PR PATCH] [Updated] " Johnnynator
2021-05-02 19:52 ` [PR REVIEW] " Johnnynator
2021-05-02 19:58 ` ericonr
2021-05-02 20:43 ` Johnnynator
2021-05-03 10:55 ` [PR PATCH] [Updated] " Johnnynator
2021-05-03 10:57 ` [PR PATCH] [Merged]: " Johnnynator

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).