Update dependencies and source.sh script
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
name: qt6-base
|
name: qt6-base
|
||||||
description: Cross-platform application development framework for creating graphical user interfaces
|
description: Cross-platform application development framework for creating graphical user interfaces
|
||||||
version: 6.10.0
|
version: 6.10.0
|
||||||
revision: 1
|
revision: 2
|
||||||
url: https://www.qt.io/
|
url: https://www.qt.io/
|
||||||
license: FDL,GPL3,LGPL3,custom
|
license: FDL,GPL3,LGPL3,custom
|
||||||
architecture: any
|
architecture: any
|
||||||
@@ -19,20 +19,26 @@ depends:
|
|||||||
- harfbuzz
|
- harfbuzz
|
||||||
- icu
|
- icu
|
||||||
- krb5
|
- krb5
|
||||||
- cups
|
- libcups
|
||||||
- libdrm
|
- libdrm
|
||||||
|
- libglvnd
|
||||||
- libice
|
- libice
|
||||||
- libinput
|
- libinput
|
||||||
- libjpeg-turbo
|
- libjpeg-turbo
|
||||||
- libpng
|
- libpng
|
||||||
- libxi
|
- libproxy
|
||||||
|
- libsm
|
||||||
|
- libx11
|
||||||
|
- libxcb
|
||||||
- libxkbcommon
|
- libxkbcommon
|
||||||
- mesa
|
- mesa
|
||||||
|
- mtdev
|
||||||
- openssl
|
- openssl
|
||||||
- pcre2
|
- pcre2
|
||||||
|
- qt6-translations
|
||||||
- shared-mime-info
|
- shared-mime-info
|
||||||
- sqlite
|
- sqlite
|
||||||
- vulkan-headers
|
- wayland
|
||||||
- xcb-util-cursor
|
- xcb-util-cursor
|
||||||
- xcb-util-image
|
- xcb-util-image
|
||||||
- xcb-util-keysyms
|
- xcb-util-keysyms
|
||||||
@@ -41,16 +47,23 @@ depends:
|
|||||||
- zlib
|
- zlib
|
||||||
- zstd
|
- zstd
|
||||||
optional_depends:
|
optional_depends:
|
||||||
|
- freetds
|
||||||
- gdk-pixbuf
|
- gdk-pixbuf
|
||||||
- gtk3
|
- gtk3
|
||||||
- pango
|
- pango
|
||||||
- perl
|
- perl
|
||||||
|
- unixodbc
|
||||||
make_depends:
|
make_depends:
|
||||||
- alsa-lib
|
- alsa-lib
|
||||||
- cmake
|
- cmake
|
||||||
|
- cups
|
||||||
|
- freetds
|
||||||
- git
|
- git
|
||||||
|
- gst-plugins-base
|
||||||
- gtk3
|
- gtk3
|
||||||
|
- jemalloc
|
||||||
- libpulse
|
- libpulse
|
||||||
|
- unixodbc
|
||||||
- vulkan-headers
|
- vulkan-headers
|
||||||
downloads:
|
downloads:
|
||||||
- url: https://code.qt.io/qt/qtbase.git
|
- url: https://code.qt.io/qt/qtbase.git
|
||||||
|
|||||||
@@ -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 += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
|
|
||||||
+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -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 += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
|
|
||||||
+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -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
|
|
||||||
@@ -15,7 +15,7 @@ prepare() {
|
|||||||
build() {
|
build() {
|
||||||
cmake -B build \
|
cmake -B build \
|
||||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
-DINSTALL_BINDIR=lib/qt6/bin \
|
-DINSTALL_BINDIR=lib/qt6/bin \
|
||||||
-DINSTALL_PUBLICBINDIR=usr/bin \
|
-DINSTALL_PUBLICBINDIR=usr/bin \
|
||||||
-DINSTALL_LIBEXECDIR=lib/qt6 \
|
-DINSTALL_LIBEXECDIR=lib/qt6 \
|
||||||
@@ -26,9 +26,11 @@ build() {
|
|||||||
-DINSTALL_MKSPECSDIR=lib/qt6/mkspecs \
|
-DINSTALL_MKSPECSDIR=lib/qt6/mkspecs \
|
||||||
-DINSTALL_EXAMPLESDIR=share/doc/qt6/examples \
|
-DINSTALL_EXAMPLESDIR=share/doc/qt6/examples \
|
||||||
-DFEATURE_journald=OFF \
|
-DFEATURE_journald=OFF \
|
||||||
|
-DFEATURE_libproxy=ON \
|
||||||
-DFEATURE_openssl_linked=ON \
|
-DFEATURE_openssl_linked=ON \
|
||||||
-DFEATURE_system_sqlite=ON \
|
-DFEATURE_system_sqlite=ON \
|
||||||
-DFEATURE_system_xcb_xinput=ON \
|
-DFEATURE_system_xcb_xinput=ON \
|
||||||
|
-DFEATURE_no_direct_extern_access=ON \
|
||||||
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
|
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
|
||||||
-DCMAKE_MESSAGE_LOG_LEVEL=STATUS
|
-DCMAKE_MESSAGE_LOG_LEVEL=STATUS
|
||||||
cmake --build build
|
cmake --build build
|
||||||
|
|||||||
Reference in New Issue
Block a user