From 692ce04279d04e9e8af9f67a421ae0f3e32d9ea0 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Mon, 26 Sep 2022 21:06:11 +0200
Subject: [PATCH] Fix broken/conflicting symlinks in mingw-w64-qt6 packages

See https://github.com/Martchus/PKGBUILDs/issues/147
---
 qt6-activeqt/mingw-w64-static/PKGBUILD     |  2 +-
 qt6-activeqt/mingw-w64/PKGBUILD            | 12 +-----------
 qt6-activeqt/mingw-w64/PKGBUILD.sh.ep      |  4 ++--
 qt6-imageformats/mingw-w64-static/PKGBUILD |  2 +-
 qt6-imageformats/mingw-w64/PKGBUILD        | 12 +-----------
 qt6-imageformats/mingw-w64/PKGBUILD.sh.ep  |  4 ++--
 6 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/qt6-activeqt/mingw-w64-static/PKGBUILD b/qt6-activeqt/mingw-w64-static/PKGBUILD
index f9e8130a..54d2423d 100644
--- a/qt6-activeqt/mingw-w64-static/PKGBUILD
+++ b/qt6-activeqt/mingw-w64-static/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=mingw-w64-qt6-activeqt-static
 _qtver=6.3.2
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=(any)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
diff --git a/qt6-activeqt/mingw-w64/PKGBUILD b/qt6-activeqt/mingw-w64/PKGBUILD
index 26cfb6cb..18cfb883 100644
--- a/qt6-activeqt/mingw-w64/PKGBUILD
+++ b/qt6-activeqt/mingw-w64/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=mingw-w64-qt6-activeqt
 _qtver=6.3.2
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=(any)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
@@ -51,16 +51,6 @@ package() {
   for _arch in ${_architectures}; do
     DESTDIR="$pkgdir" cmake --install build-$_arch
 
-    # Add symlinks of DLLs in usual bin directory
-    mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/$_arch/bin"
-    for dll in "$pkgdir"/usr/$_arch/lib/qt6/bin/*.dll; do
-        ln -rs "$dll" "$pkgdir/usr/$_arch/bin/${dll##*/}"
-    done
-
-    # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir/usr/$_arch/lib" -type f -name '*.prl' \
-      -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
     find "$pkgdir/usr/$_arch" -iname '*.exe' -exec $_arch-strip --strip-all {} \;
     find "$pkgdir/usr/$_arch" -iname '*.dll' -exec $_arch-strip --strip-unneeded {} \;
     find "$pkgdir/usr/$_arch" -iname '*.a'   -exec $_arch-strip -g {} \;
diff --git a/qt6-activeqt/mingw-w64/PKGBUILD.sh.ep b/qt6-activeqt/mingw-w64/PKGBUILD.sh.ep
index 935db8c4..cb1c4430 100644
--- a/qt6-activeqt/mingw-w64/PKGBUILD.sh.ep
+++ b/qt6-activeqt/mingw-w64/PKGBUILD.sh.ep
@@ -1,8 +1,8 @@
-% layout 'mingw-w64-qt6-module';
+% layout 'mingw-w64-qt6-module', no_libs => 1;
 \
 _qtver=6.3.2
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=(any)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
diff --git a/qt6-imageformats/mingw-w64-static/PKGBUILD b/qt6-imageformats/mingw-w64-static/PKGBUILD
index 9fb7965f..5ffcacb0 100644
--- a/qt6-imageformats/mingw-w64-static/PKGBUILD
+++ b/qt6-imageformats/mingw-w64-static/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=mingw-w64-qt6-imageformats-static
 _qtver=6.3.2
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=(any)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
diff --git a/qt6-imageformats/mingw-w64/PKGBUILD b/qt6-imageformats/mingw-w64/PKGBUILD
index f4a1cc8e..71f88766 100644
--- a/qt6-imageformats/mingw-w64/PKGBUILD
+++ b/qt6-imageformats/mingw-w64/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=mingw-w64-qt6-imageformats
 _qtver=6.3.2
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=(any)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
@@ -37,16 +37,6 @@ package() {
   for _arch in ${_architectures}; do
     DESTDIR="$pkgdir" cmake --install build-$_arch
 
-    # Add symlinks of DLLs in usual bin directory
-    mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/$_arch/bin"
-    for dll in "$pkgdir"/usr/$_arch/lib/qt6/bin/*.dll; do
-        ln -rs "$dll" "$pkgdir/usr/$_arch/bin/${dll##*/}"
-    done
-
-    # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    find "$pkgdir/usr/$_arch/lib" -type f -name '*.prl' \
-      -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
     find "$pkgdir/usr/$_arch" -iname '*.exe' -exec $_arch-strip --strip-all {} \;
     find "$pkgdir/usr/$_arch" -iname '*.dll' -exec $_arch-strip --strip-unneeded {} \;
     find "$pkgdir/usr/$_arch" -iname '*.a'   -exec $_arch-strip -g {} \;
diff --git a/qt6-imageformats/mingw-w64/PKGBUILD.sh.ep b/qt6-imageformats/mingw-w64/PKGBUILD.sh.ep
index ef46002d..e1384926 100644
--- a/qt6-imageformats/mingw-w64/PKGBUILD.sh.ep
+++ b/qt6-imageformats/mingw-w64/PKGBUILD.sh.ep
@@ -1,8 +1,8 @@
-% layout 'mingw-w64-qt6-module';
+% layout 'mingw-w64-qt6-module', no_libs => 1;
 \
 _qtver=6.3.2
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=(any)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)