[PR PATCH] qt5: Remove ineffective vseds

[PR PATCH] qt5: Remove ineffective vseds

[gmbeard]

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

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

https://github.com/gmbeard/void-packages fix/qt5-ineffective-vsed
https://github.com/void-linux/void-packages/pull/42896

qt5: Remove ineffective vseds
<!-- Uncomment relevant sections and delete options which are not applicable -->

Addresses part of tracking issue #42441

- [x] qt5

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### 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/42896.patch is attached

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

From c18b34c9890691761d1349bf6d6a7e2e07087fcb Mon Sep 17 00:00:00 2001
From: Greg Beard <gmbeard@googlemail.com>
Date: Mon, 20 Mar 2023 21:49:24 +0000
Subject: [PATCH] qt5: Remove ineffective vseds

---
 srcpkgs/qt5/template | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index f4f9f5b5344a..32fd3a83cc26 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -52,18 +52,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 fi
 
 _cleanup_wrksrc_leak() {
-	if [ -d "${PKGDESTDIR}/usr/lib/cmake" ]; then
-		# Replace references to ${wrksrc} in cmake files
-		vsed -i ${PKGDESTDIR}/usr/lib/cmake/*/*.cmake \
-			-e "s;${wrksrc}/host;/usr/lib/qt5;g" \
-			-e "s;devices/void-${XBPS_CROSS_TRIPLET}-g++;linux-g++;g"
-	fi
-	if [ -d "${PKGDESTDIR}/usr/lib/pkgconfig" ]; then
-		# Replace references to ${wrksrc} in pkgconfig files
-		vsed -i ${PKGDESTDIR}/usr/lib/pkgconfig/*.pc \
-			-e "s;${wrksrc}/host;/usr/lib/qt5;g" \
-			-e "s;devices/void-${XBPS_CROSS_TRIPLET}-g++;linux-g++;g"
-	fi
 	# Remove QMAKE_PRL_BUILD_DIR from hint files for static libraries
 	# and replace references to ${wrksrc}
 	find ${PKGDESTDIR} -iname "*.prl" -exec sed -i "{}" \
@@ -1131,9 +1119,6 @@ qt5-qmake_package() {
 		vmove usr/lib/qt5/mkspecs
 		vmove usr/bin/qmake-qt5
 
-		# Change -isystem to -I to avoid "#include_next <stdlib.h>" errors
-		vsed -i ${PKGDESTDIR}/usr/lib/qt5/mkspecs/common/gcc-base.conf \
-			-e '/^QMAKE_CFLAGS_ISYSTEM/s;-isystem;-I;'
 		find ${PKGDESTDIR} -iname "*.prl" -exec sed -i "{}" \
 			-e 's%/usr/lib/lib\([^[:space:]]*\)\.[sa][o]*%-l\1%g' \;
 		find ${PKGDESTDIR} -iname "*.pri" -exec sed -i "{}" \

Re: qt5: Remove ineffective vseds

[Duncaen]

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

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/42896#issuecomment-1477003329

Comment:
add `[ci skip]` to prs with really big packages, this basically blocks the CI with a build that would timeout after hours.

Re: qt5: Remove ineffective vseds

[gmbeard]

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

New comment by gmbeard on void-packages repository

https://github.com/void-linux/void-packages/pull/42896#issuecomment-1477077764

Comment:
@Duncaen Thanks. I’ve updated the PR. Is that format enough to prevent the CI running?

Re: [PR PATCH] [Updated] qt5: Remove ineffective vseds

[gmbeard]

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

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

https://github.com/gmbeard/void-packages fix/qt5-ineffective-vsed
https://github.com/void-linux/void-packages/pull/42896

qt5: Remove ineffective vseds
[ci skip]

<!-- Uncomment relevant sections and delete options which are not applicable -->

Addresses part of tracking issue #42441

- [x] qt5

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### 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/42896.patch is attached

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

From e6dc3af570ddb7561151a771ea5b084bb40f67f1 Mon Sep 17 00:00:00 2001
From: Greg Beard <gmbeard@googlemail.com>
Date: Mon, 20 Mar 2023 21:49:24 +0000
Subject: [PATCH] qt5: Remove ineffective vseds

---
 srcpkgs/qt5/template | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index f4f9f5b5344a..6cb5ebbdadea 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,9 +3,9 @@
 # revbump libqtxdg after bumping patch version
 pkgname=qt5
 version=5.15.7+20221119
+revision=1
 # commit f8c9fb304bc3e53b3aa07f962cd74e9160decccc
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=1
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"
@@ -31,7 +31,7 @@ homepage="https://qt.io/"
 # can be marked with the export-ignore attribute
 distfiles="https://void.johnnynator.dev/distfiles/qt5-${version}.tar.gz"
 checksum=9d57af471c78029a362276b7c99108ea009f511bb9ba6ff6cb884f6ddd255e9f
-python_version=2 #unverified
+python_version=2
 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"
 lib32mode=full
@@ -52,18 +52,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 fi
 
 _cleanup_wrksrc_leak() {
-	if [ -d "${PKGDESTDIR}/usr/lib/cmake" ]; then
-		# Replace references to ${wrksrc} in cmake files
-		vsed -i ${PKGDESTDIR}/usr/lib/cmake/*/*.cmake \
-			-e "s;${wrksrc}/host;/usr/lib/qt5;g" \
-			-e "s;devices/void-${XBPS_CROSS_TRIPLET}-g++;linux-g++;g"
-	fi
-	if [ -d "${PKGDESTDIR}/usr/lib/pkgconfig" ]; then
-		# Replace references to ${wrksrc} in pkgconfig files
-		vsed -i ${PKGDESTDIR}/usr/lib/pkgconfig/*.pc \
-			-e "s;${wrksrc}/host;/usr/lib/qt5;g" \
-			-e "s;devices/void-${XBPS_CROSS_TRIPLET}-g++;linux-g++;g"
-	fi
 	# Remove QMAKE_PRL_BUILD_DIR from hint files for static libraries
 	# and replace references to ${wrksrc}
 	find ${PKGDESTDIR} -iname "*.prl" -exec sed -i "{}" \
@@ -1131,9 +1119,6 @@ qt5-qmake_package() {
 		vmove usr/lib/qt5/mkspecs
 		vmove usr/bin/qmake-qt5
 
-		# Change -isystem to -I to avoid "#include_next <stdlib.h>" errors
-		vsed -i ${PKGDESTDIR}/usr/lib/qt5/mkspecs/common/gcc-base.conf \
-			-e '/^QMAKE_CFLAGS_ISYSTEM/s;-isystem;-I;'
 		find ${PKGDESTDIR} -iname "*.prl" -exec sed -i "{}" \
 			-e 's%/usr/lib/lib\([^[:space:]]*\)\.[sa][o]*%-l\1%g' \;
 		find ${PKGDESTDIR} -iname "*.pri" -exec sed -i "{}" \

Re: qt5: Remove ineffective vseds

[gmbeard]

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

New comment by gmbeard on void-packages repository

https://github.com/void-linux/void-packages/pull/42896#issuecomment-1480261029

Comment:
I've fixed all but the following `xlint`s:

    srcpkgs/qt5/template:517: use <pkgname>-doc subpackage for documentation

However, applying this fix would change the name of the existing subpkg. Not sure if that's ok to do.

Re: [PR PATCH] [Updated] qt5: Remove ineffective vseds

[gmbeard]

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

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

https://github.com/gmbeard/void-packages fix/qt5-ineffective-vsed
https://github.com/void-linux/void-packages/pull/42896

qt5: Remove ineffective vseds
[ci skip]

<!-- Uncomment relevant sections and delete options which are not applicable -->

Addresses part of tracking issue #42441

- [x] qt5

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### 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/42896.patch is attached

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

From c9d5bd886e6a929c083071f7e83a4ee7f8e78f99 Mon Sep 17 00:00:00 2001
From: Greg Beard <gmbeard@googlemail.com>
Date: Mon, 20 Mar 2023 21:49:24 +0000
Subject: [PATCH] qt5: Remove ineffective vseds

---
 srcpkgs/qt5/template | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 87d250b9b38d..d99a55127aaa 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,9 +3,9 @@
 # revbump libqtxdg after bumping patch version
 pkgname=qt5
 version=5.15.7+20221119
+revision=3
 # commit f8c9fb304bc3e53b3aa07f962cd74e9160decccc
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=3
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"
@@ -31,7 +31,7 @@ homepage="https://qt.io/"
 # can be marked with the export-ignore attribute
 distfiles="https://void.johnnynator.dev/distfiles/qt5-${version}.tar.gz"
 checksum=9d57af471c78029a362276b7c99108ea009f511bb9ba6ff6cb884f6ddd255e9f
-python_version=2 #unverified
+python_version=2
 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"
 lib32mode=full
@@ -52,18 +52,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 fi
 
 _cleanup_wrksrc_leak() {
-	if [ -d "${PKGDESTDIR}/usr/lib/cmake" ]; then
-		# Replace references to ${wrksrc} in cmake files
-		vsed -i ${PKGDESTDIR}/usr/lib/cmake/*/*.cmake \
-			-e "s;${wrksrc}/host;/usr/lib/qt5;g" \
-			-e "s;devices/void-${XBPS_CROSS_TRIPLET}-g++;linux-g++;g"
-	fi
-	if [ -d "${PKGDESTDIR}/usr/lib/pkgconfig" ]; then
-		# Replace references to ${wrksrc} in pkgconfig files
-		vsed -i ${PKGDESTDIR}/usr/lib/pkgconfig/*.pc \
-			-e "s;${wrksrc}/host;/usr/lib/qt5;g" \
-			-e "s;devices/void-${XBPS_CROSS_TRIPLET}-g++;linux-g++;g"
-	fi
 	# Remove QMAKE_PRL_BUILD_DIR from hint files for static libraries
 	# and replace references to ${wrksrc}
 	find ${PKGDESTDIR} -iname "*.prl" -exec sed -i "{}" \
@@ -1131,9 +1119,6 @@ qt5-qmake_package() {
 		vmove usr/lib/qt5/mkspecs
 		vmove usr/bin/qmake-qt5
 
-		# Change -isystem to -I to avoid "#include_next <stdlib.h>" errors
-		vsed -i ${PKGDESTDIR}/usr/lib/qt5/mkspecs/common/gcc-base.conf \
-			-e '/^QMAKE_CFLAGS_ISYSTEM/s;-isystem;-I;'
 		find ${PKGDESTDIR} -iname "*.prl" -exec sed -i "{}" \
 			-e 's%/usr/lib/lib\([^[:space:]]*\)\.[sa][o]*%-l\1%g' \;
 		find ${PKGDESTDIR} -iname "*.pri" -exec sed -i "{}" \

Re: qt5: Remove ineffective vseds

[github-actions]

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/42896#issuecomment-1620914498

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

Re: [PR PATCH] [Closed]: qt5: Remove ineffective vseds

[github-actions]

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

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

qt5: Remove ineffective vseds
https://github.com/void-linux/void-packages/pull/42896

Description:
[ci skip]

<!-- Uncomment relevant sections and delete options which are not applicable -->

Addresses part of tracking issue #42441

- [x] qt5

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86\_64-glibc