[notify] qt6 monolithic port dropped in favor of modular qt6-*. Please update your dependencies, currently only contrib/cutemaze depends on qt6
This commit is contained in:
Danny Rawlins
parent
1b1d7130fd
commit
c333cdfc2e
10539
qt6/.footprint
10539
qt6/.footprint
File diff suppressed because it is too large
Load Diff
|
|
@ -1,6 +0,0 @@
|
|||
untrusted comment: verify with /etc/ports/opt.pub
|
||||
RWSE3ohX2g5d/cinFZRJqOHqSFqtMlm72h1sfhck5mtQ1EHeNJ8J6W34IR8esRi8NbMWcG0yAO6Or9KygsDoCe4pmWcJk3DGlQ8=
|
||||
SHA256 (Pkgfile) = 7e9f0fc46b6db561c36179b1cb4c5cb66514f9e0c0e929860adb0556e3b10b84
|
||||
SHA256 (.footprint) = 1c84354d8051a817ed4f5c770f40c0755bd968749fc53f72967b575dfad5b858
|
||||
SHA256 (qt-everywhere-src-6.1.3.tar.xz) = 552342a81fa76967656b0301233b4b586d36967fad5cd110765347aebe07413c
|
||||
SHA256 (qt6-cflags.patch) = cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c
|
||||
45
qt6/Pkgfile
45
qt6/Pkgfile
|
|
@ -1,45 +0,0 @@
|
|||
# Description: Qt Free Edition, version 6.x.
|
||||
# URL: http://www.qt.io/
|
||||
# Maintainer: Danny Rawlins, crux at romster dot me
|
||||
# Depends on: at-spi2-atk brotli double-conversion gdk-pixbuf jasper keyutils krb5 libepoxy libinput libmng libpcre2 libtool libwebp libxkbcommon pango xorg-libxcomposite xorg-libxcursor xorg-libxinerama xorg-xcb-util-image xorg-xcb-util-keysyms xorg-xcb-util-renderutil xorg-xcb-util-wm
|
||||
# Optional: icu hunspell mysql avahi graphite2 unixodbc gtk3
|
||||
|
||||
name=qt6
|
||||
version=6.1.3
|
||||
release=1
|
||||
source=(https://download.qt.io/official_releases/qt/${version%.*}/$version/single/qt-everywhere-src-$version.tar.xz
|
||||
qt6-cflags.patch)
|
||||
|
||||
build() {
|
||||
patch -d qt-everywhere-src-$version/qtbase -p1 -i $SRC/qt6-cflags.patch
|
||||
|
||||
prt-get isinst ninja && PKGMK_QT6+=' -G Ninja'
|
||||
prt-get isinst ccache && PKGMK_QT6+=' -D QT_USE_CCACHE=ON' && PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')"
|
||||
|
||||
cmake -B build -S qt-everywhere-src-$version $PKGMK_QT6 \
|
||||
-D CMAKE_INSTALL_PREFIX=/usr \
|
||||
-D INSTALL_BINDIR=lib/qt6/bin \
|
||||
-D INSTALL_DOCDIR=share/doc/qt6 \
|
||||
-D INSTALL_ARCHDATADIR=lib/qt6 \
|
||||
-D INSTALL_DATADIR=share/qt6 \
|
||||
-D INSTALL_INCLUDEDIR=include/qt6 \
|
||||
-D INSTALL_MKSPECSDIR=lib/qt6/mkspecs \
|
||||
-D INSTALL_EXAMPLESDIR=share/doc/qt6/examples \
|
||||
-D PYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3 \
|
||||
-D QT_DISABLE_RPATH=TRUE \
|
||||
-D QT_FEATURE_openssl_linked=ON \
|
||||
-D QT_FEATURE_system_sqlite=ON \
|
||||
-Wno-dev
|
||||
|
||||
cmake --build build
|
||||
DESTDIR=$PKG cmake --install build
|
||||
|
||||
rm -r $PKG/usr/share/doc
|
||||
|
||||
# Install useful symlinks
|
||||
install -d $PKG/usr/bin
|
||||
for file in $PKG/usr/lib/qt6/bin/*; do
|
||||
ln -s ../lib/qt6/bin/$(basename $file) $PKG/usr/bin/$(basename $file)-qt6
|
||||
#ln -s ../lib/qt6/bin/$(basename $file) $PKG/usr/bin/$(basename $file)
|
||||
done
|
||||
}
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
|
||||
index a493cd5984..41342f5020 100644
|
||||
--- a/mkspecs/common/g++-unix.conf
|
||||
+++ b/mkspecs/common/g++-unix.conf
|
||||
@@ -10,5 +10,6 @@
|
||||
|
||||
include(g++-base.conf)
|
||||
|
||||
-QMAKE_LFLAGS_RELEASE += -Wl,-O1
|
||||
+SYSTEM_LDFLAGS = $$(LDFLAGS)
|
||||
+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE += -Wl,-O1 }
|
||||
QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
|
||||
diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
|
||||
index 1f919d270a..7ef6046326 100644
|
||||
--- a/mkspecs/common/gcc-base.conf
|
||||
+++ b/mkspecs/common/gcc-base.conf
|
||||
@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
|
||||
QMAKE_CFLAGS_DEPS += -M
|
||||
QMAKE_CFLAGS_WARN_ON += -Wall -Wextra
|
||||
QMAKE_CFLAGS_WARN_OFF += -w
|
||||
-QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE
|
||||
-QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
|
||||
-QMAKE_CFLAGS_DEBUG += -g
|
||||
+SYSTEM_CFLAGS = $$(CFLAGS)
|
||||
+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
|
||||
+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CPPFLAGS) $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
|
||||
+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
|
||||
+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
|
||||
QMAKE_CFLAGS_SHLIB += $$QMAKE_CFLAGS_PIC
|
||||
QMAKE_CFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_PIC
|
||||
QMAKE_CFLAGS_APP += $$QMAKE_CFLAGS_PIC
|
||||
@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS += $$QMAKE_CFLAGS
|
||||
QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
|
||||
QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
|
||||
QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
|
||||
-QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE
|
||||
-QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
|
||||
-QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG
|
||||
+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
|
||||
+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
|
||||
+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CPPFLAGS) $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
|
||||
+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
|
||||
+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
|
||||
QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB
|
||||
QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
|
||||
QMAKE_CXXFLAGS_APP += $$QMAKE_CFLAGS_APP
|
||||
Loading…
Reference in New Issue
Block a user