From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: [PR PATCH] qt5: move conflicting files into correct subpkg
Date: Fri, 21 Jun 2019 18:17:09 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-12608@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 355 bytes --]
There is a new pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages qt5-conflicts
https://github.com/void-linux/void-packages/pull/12608
qt5: move conflicting files into correct subpkg
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/12608.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt5-conflicts-12608.patch --]
[-- Type: application/text/x-diff, Size: 1459 bytes --]
From a73dc3d653e3031872e9de475c83618c8095d76c Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Fri, 21 Jun 2019 18:16:15 +0200
Subject: [PATCH] qt5: move conflicting files into correct subpkg
[ci skip]
---
srcpkgs/qt5/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index bfd8712e7af..8d170535e89 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
# Template file for 'qt5'
pkgname=qt5
version=5.11.3
-revision=7
+revision=8
wrksrc="qt-everywhere-src-${version}"
build_style=gnu-configure
hostmakedepends="cmake clang flex git glib-devel gperf ninja pkg-config
@@ -1055,7 +1055,7 @@ qt5-host-tools_package() {
if [ -f ${DESTDIR}/usr/lib/qt5/bin/${f} ]; then
vmove usr/lib/qt5/bin/${f}
fi
- if [ -f ${DESTDIR}/usr/bin/${f}-qt5 ]; then
+ if [ -f ${DESTDIR}/usr/bin/${f}-qt5 ] || [ -h ${DESTDIR}/usr/bin/${f}-qt5 ]; then
vmove usr/bin/${f}-qt5
else
ln -sf ../lib/qt5/bin/${f} ${PKGDESTDIR}/usr/bin/${f}-qt5
@@ -1104,7 +1104,7 @@ qt5-tools_package() {
mkdir -p ${dest}/usr/lib/qt5/bin
mv -v ${PKGDESTDIR}/usr/lib/qt5/bin/${f} ${dest}/usr/lib/qt5/bin/
fi
- if [ -f ${PKGDESTDIR}/usr/bin/${f}-qt5 ]; then
+ if [ -f ${PKGDESTDIR}/usr/bin/${f}-qt5 ] || [ -h ${PKGDESTDIR}/usr/bin/${f}-qt5 ]; then
mkdir -p ${dest}/usr/bin
mv -v ${PKGDESTDIR}/usr/bin/${f}-qt5 ${dest}/usr/bin/
fi
next reply other threads:[~2019-06-21 16:17 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-21 16:17 voidlinux-github [this message]
2019-06-21 16:38 ` voidlinux-github
2019-06-21 16:43 ` voidlinux-github
2019-06-21 16:44 ` voidlinux-github
2019-06-21 16:51 ` voidlinux-github
2019-06-21 17:02 ` voidlinux-github
2019-06-21 17:10 ` voidlinux-github
2019-06-21 17:27 ` voidlinux-github
2019-06-21 17:33 ` [PR PATCH] [Merged]: " voidlinux-github
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-12608@inbox.vuxu.org \
--to=voidlinux-github@inbox.vuxu.org \
--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).