* [PR PATCH] qt5: move conflicting files into correct subpkg
@ 2019-06-21 16:17 voidlinux-github
2019-06-21 16:38 ` voidlinux-github
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: voidlinux-github @ 2019-06-21 16:17 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: qt5: move conflicting files into correct subpkg
2019-06-21 16:17 [PR PATCH] qt5: move conflicting files into correct subpkg voidlinux-github
@ 2019-06-21 16:38 ` voidlinux-github
2019-06-21 16:43 ` voidlinux-github
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-06-21 16:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 316 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/12608#issuecomment-504490788
Comment:
@Johnnynator I think this is it. I was also working on a solution, trying to remove the qt5-host-tools installed files in the qt5-tools sub-package, but did not yet succeed.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: qt5: move conflicting files into correct subpkg
2019-06-21 16:17 [PR PATCH] qt5: move conflicting files into correct subpkg voidlinux-github
2019-06-21 16:38 ` voidlinux-github
@ 2019-06-21 16:43 ` voidlinux-github
2019-06-21 16:44 ` voidlinux-github
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-06-21 16:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 456 bytes --]
New comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/12608#issuecomment-504492371
Comment:
> @Johnnynator I think this is it. I was also working on a solution, trying to remove the qt5-host-tools installed files in the qt5-tools sub-package, but did not yet succeed.
These changes worked fine for qt5.13. I wasn't yet able to run the qt5.11 build, but I don't see any reason why it should fail there.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: qt5: move conflicting files into correct subpkg
2019-06-21 16:17 [PR PATCH] qt5: move conflicting files into correct subpkg voidlinux-github
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
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-06-21 16:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 237 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/12608#issuecomment-504492729
Comment:
Yeah, same problem here. Even with ccache testing such a change takes time. I'll verify it here.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: qt5: move conflicting files into correct subpkg
2019-06-21 16:17 [PR PATCH] qt5: move conflicting files into correct subpkg voidlinux-github
` (2 preceding siblings ...)
2019-06-21 16:44 ` voidlinux-github
@ 2019-06-21 16:51 ` voidlinux-github
2019-06-21 17:02 ` voidlinux-github
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-06-21 16:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 291 bytes --]
New comment by xtraeme on void-packages repository
https://github.com/void-linux/void-packages/pull/12608#issuecomment-504494677
Comment:
We can now see file conflicts while building packages,
see https://github.com/void-linux/void-packages/commit/e2f098b97271ec9c91ddc320171cedf1a5fad273
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: qt5: move conflicting files into correct subpkg
2019-06-21 16:17 [PR PATCH] qt5: move conflicting files into correct subpkg voidlinux-github
` (3 preceding siblings ...)
2019-06-21 16:51 ` voidlinux-github
@ 2019-06-21 17:02 ` voidlinux-github
2019-06-21 17:10 ` voidlinux-github
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-06-21 17:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 802 bytes --]
New comment by xtraeme on void-packages repository
https://github.com/void-linux/void-packages/pull/12608#issuecomment-504498347
Comment:
```
=> vlc-3.0.7_1: installing target dependency 'qt5-x11extras-devel-5.11.3_7' ...
ERROR: qt5-host-tools-5.11.3_7: file `/usr/bin/qdbuscpp2xml-qt5' already installed by package qt5-5.11.3_7.
ERROR: qt5-host-tools-5.11.3_7: file `/usr/bin/qdbusxml2cpp-qt5' already installed by package qt5-5.11.3_7.
ERROR: qt5-host-tools-5.11.3_7: file `/usr/bin/qlalr-qt5' already installed by package qt5-5.11.3_7.
ERROR: qt5-host-tools-5.11.3_7: file `/usr/bin/rcc-qt5' already installed by package qt5-5.11.3_7.
ERROR: qt5-host-tools-5.11.3_7: file `/usr/bin/uic-qt5' already installed by package qt5-5.11.3_7.
```
Not sure if this is fixed here, but just in case.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: qt5: move conflicting files into correct subpkg
2019-06-21 16:17 [PR PATCH] qt5: move conflicting files into correct subpkg voidlinux-github
` (4 preceding siblings ...)
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
7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-06-21 17:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 939 bytes --]
New comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/12608#issuecomment-504501057
Comment:
> ```
> => vlc-3.0.7_1: installing target dependency 'qt5-x11extras-devel-5.11.3_7' ...
> ERROR: qt5-host-tools-5.11.3_7: file `/usr/bin/qdbuscpp2xml-qt5' already installed by package qt5-5.11.3_7.
> ERROR: qt5-host-tools-5.11.3_7: file `/usr/bin/qdbusxml2cpp-qt5' already installed by package qt5-5.11.3_7.
> ERROR: qt5-host-tools-5.11.3_7: file `/usr/bin/qlalr-qt5' already installed by package qt5-5.11.3_7.
> ERROR: qt5-host-tools-5.11.3_7: file `/usr/bin/rcc-qt5' already installed by package qt5-5.11.3_7.
> ERROR: qt5-host-tools-5.11.3_7: file `/usr/bin/uic-qt5' already installed by package qt5-5.11.3_7.
> ```
>
> Not sure if this is fixed here, but just in case.
This should be fixed here, at least it is on my qt 5.13 branch https://void.johnnynator.dev/qt5.13/ / #11891
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: qt5: move conflicting files into correct subpkg
2019-06-21 16:17 [PR PATCH] qt5: move conflicting files into correct subpkg voidlinux-github
` (5 preceding siblings ...)
2019-06-21 17:10 ` voidlinux-github
@ 2019-06-21 17:27 ` voidlinux-github
2019-06-21 17:33 ` [PR PATCH] [Merged]: " voidlinux-github
7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-06-21 17:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 263 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/12608#issuecomment-504506316
Comment:
Yes, this PR solves the issue. No warning during the build (x86_64) and trying to build vlc doesn't print warnings either.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Merged]: qt5: move conflicting files into correct subpkg
2019-06-21 16:17 [PR PATCH] qt5: move conflicting files into correct subpkg voidlinux-github
` (6 preceding siblings ...)
2019-06-21 17:27 ` voidlinux-github
@ 2019-06-21 17:33 ` voidlinux-github
7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-06-21 17:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
There's a merged pull request on the void-packages repository
qt5: move conflicting files into correct subpkg
https://github.com/void-linux/void-packages/pull/12608
Description: [ci skip]
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2019-06-21 17:33 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-21 16:17 [PR PATCH] qt5: move conflicting files into correct subpkg voidlinux-github
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
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).