Github messages for voidlinux
 help / color / mirror / Atom feed
* [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
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).