From: gmbeard <gmbeard@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] qt5: Remove ineffective vseds
Date: Mon, 20 Mar 2023 22:50:38 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-42896@inbox.vuxu.org> (raw)
[-- 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 "{}" \
next reply other threads:[~2023-03-20 21:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-20 21:50 gmbeard [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-42896@inbox.vuxu.org \
--to=gmbeard@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).