Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] qt5: Remove ineffective vseds
@ 2023-03-20 21:50 gmbeard
  2023-03-20 22:09 ` Duncaen
                   ` (6 more replies)
  0 siblings, 7 replies; 8+ messages in thread
From: gmbeard @ 2023-03-20 21:50 UTC (permalink / raw)
  To: ml

[-- 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 "{}" \

^ permalink raw reply	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-07-19  2:16 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-20 21:50 [PR PATCH] qt5: Remove ineffective vseds gmbeard
2023-03-20 22:09 ` Duncaen
2023-03-20 23:19 ` gmbeard
2023-03-22 21:00 ` [PR PATCH] [Updated] " gmbeard
2023-03-22 21:07 ` gmbeard
2023-04-05 20:05 ` [PR PATCH] [Updated] " gmbeard
2023-07-05  2:06 ` github-actions
2023-07-19  2:16 ` [PR PATCH] [Closed]: " github-actions

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