Mirror/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-07-13 03:09:51 +03:00
Code Issues Wiki Activity

community/qt6-qtbase: fix broken qmake6 symlink

Browse source 
Fixes https://gitlab.alpinelinux.org/alpine/aports/-/issues/17240
Ref 6a4df2ac24
This commit is contained in:
Sertonix 2025-07-04 09:06:11 +02:00 • committed by Bart Ribbers
parent 37e6be34fe
commit a72bdd5363
2 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
community/qt6-qtbase/APKBUILD
View file

@ -4,6 +4,7 @@ maintainer="Bart Ribbers <bribbers@disroot.org>"
pkgname=qt6-qtbase pkgname=qt6-qtbase
pkgver=6.9.1 pkgver=6.9.1
pkgrel=0 pkgrel=0
pkgrel=1
pkgdesc="A cross-platform application and UI framework" pkgdesc="A cross-platform application and UI framework"
url="https://qt.io/" url="https://qt.io/"
arch="all" arch="all"
@ -75,6 +76,7 @@ esac
source="https://download.qt.io/$_rel/qt/${pkgver%.*}/${pkgver/_/-}/submodules/qtbase-everywhere-src-${pkgver/_/-}.tar.xz source="https://download.qt.io/$_rel/qt/${pkgver%.*}/${pkgver/_/-}/submodules/qtbase-everywhere-src-${pkgver/_/-}.tar.xz
0001-qt6-qtbase-lfs64.patch 0001-qt6-qtbase-lfs64.patch
0002-qt6-qtbase-dns-resolver.patch 0002-qt6-qtbase-dns-resolver.patch
symlinks.patch
" "
options="!check" # Tests don't currently run for some reason options="!check" # Tests don't currently run for some reason
@ -100,7 +102,7 @@ build() {
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
-DINSTALL_BINDIR=lib/qt6/bin \ -DINSTALL_BINDIR=lib/qt6/bin \
-DINSTALL_PUBLICBINDIR=usr/bin \ -DINSTALL_PUBLICBINDIR=bin \
-DINSTALL_DOCDIR=share/doc/qt6 \ -DINSTALL_DOCDIR=share/doc/qt6 \
-DINSTALL_ARCHDATADIR=lib/qt6 \ -DINSTALL_ARCHDATADIR=lib/qt6 \
-DINSTALL_DATADIR=share/qt6 \ -DINSTALL_DATADIR=share/qt6 \
@ -123,10 +125,10 @@ package() {
DESTDIR="$pkgdir" cmake --install build DESTDIR="$pkgdir" cmake --install build
# add symlinks for qt6 dev tools # add symlinks for qt6 dev tools
cd "$pkgdir" mkdir -p "$pkgdir"/usr/bin
mkdir -p usr/bin local target name
while read -r _line; do while read -r target name; do
ln -sv $_line ln -sv "$target" "$pkgdir/$name"
done < "$builddir"/build/user_facing_tool_links.txt done < "$builddir"/build/user_facing_tool_links.txt
} }
@ -190,4 +192,5 @@ sha512sums="
f0fdf4e2c10db73d8036e4b1324f04f48eced78feeed450b0ffa1fac5574daa4173996a4d25da761f5eeaa6037eab02418a88a59fd760d96a08d813c9b8136ed qtbase-everywhere-src-6.9.1.tar.xz f0fdf4e2c10db73d8036e4b1324f04f48eced78feeed450b0ffa1fac5574daa4173996a4d25da761f5eeaa6037eab02418a88a59fd760d96a08d813c9b8136ed qtbase-everywhere-src-6.9.1.tar.xz
390e2998483696e4af6f754be6611eb01f93b5185e81f8ad21c45cd267bab58a347902230b456b4c9fae339d6b8ecb6f7cf695e90fb086d92b9c5f7561993898 0001-qt6-qtbase-lfs64.patch 390e2998483696e4af6f754be6611eb01f93b5185e81f8ad21c45cd267bab58a347902230b456b4c9fae339d6b8ecb6f7cf695e90fb086d92b9c5f7561993898 0001-qt6-qtbase-lfs64.patch
aaa6336a2c58df647bd668fc9e4608eb362c1ef6212491938fc28f94590f4690c2c9bf3f995ad915f9ed70229cef66c45ca69fb3d693bdc3273e335a9d6ccca0 0002-qt6-qtbase-dns-resolver.patch aaa6336a2c58df647bd668fc9e4608eb362c1ef6212491938fc28f94590f4690c2c9bf3f995ad915f9ed70229cef66c45ca69fb3d693bdc3273e335a9d6ccca0 0002-qt6-qtbase-dns-resolver.patch
89d324b8f8db6603a847d018680405a309917e95f49e2a7e611550be5caea681c8f06935b52214c089ea66bbea634cdf4bac86d92ae1b1def5c250be5b2ab3d8 symlinks.patch
" "

13
community/qt6-qtbase/symlinks.patch Normal file
View file

@ -0,0 +1,13 @@
Fix broken symlink path
--- a/cmake/QtPostProcessHelpers.cmake
+++ b/cmake/QtPostProcessHelpers.cmake
@@ -883,7 +883,7 @@
endif()
endif()
qt_path_join(tool_target_path "${CMAKE_INSTALL_PREFIX}" "${INSTALL_BINDIR}" "${filename}")
- qt_path_join(tool_link_path "${INSTALL_PUBLICBINDIR}" "${linkname}${PROJECT_VERSION_MAJOR}")
+ qt_path_join(tool_link_path "${CMAKE_INSTALL_PREFIX}" "${INSTALL_PUBLICBINDIR}" "${linkname}${PROJECT_VERSION_MAJOR}")
_qt_internal_relative_path(tool_target_path BASE_DIRECTORY ${tool_link_base_dir})
list(APPEND lines "${tool_target_path} ${tool_link_path}")
endforeach()