From fea8c3c7442f704bb1acff44573a61385c66ae05 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Sun, 26 Oct 2025 08:58:36 +0200 Subject: [PATCH] Update dependencies and source.sh script --- pkg.info | 21 ++++++++++--- source-files/qt6-base-nostrip.patch | 46 ----------------------------- source.sh | 4 ++- 3 files changed, 20 insertions(+), 51 deletions(-) delete mode 100644 source-files/qt6-base-nostrip.patch diff --git a/pkg.info b/pkg.info index c85f6a3..2f2e09f 100644 --- a/pkg.info +++ b/pkg.info @@ -1,7 +1,7 @@ name: qt6-base description: Cross-platform application development framework for creating graphical user interfaces version: 6.10.0 -revision: 1 +revision: 2 url: https://www.qt.io/ license: FDL,GPL3,LGPL3,custom architecture: any @@ -19,20 +19,26 @@ depends: - harfbuzz - icu - krb5 - - cups + - libcups - libdrm + - libglvnd - libice - libinput - libjpeg-turbo - libpng - - libxi + - libproxy + - libsm + - libx11 + - libxcb - libxkbcommon - mesa + - mtdev - openssl - pcre2 + - qt6-translations - shared-mime-info - sqlite - - vulkan-headers + - wayland - xcb-util-cursor - xcb-util-image - xcb-util-keysyms @@ -41,16 +47,23 @@ depends: - zlib - zstd optional_depends: + - freetds - gdk-pixbuf - gtk3 - pango - perl + - unixodbc make_depends: - alsa-lib - cmake + - cups + - freetds - git + - gst-plugins-base - gtk3 + - jemalloc - libpulse + - unixodbc - vulkan-headers downloads: - url: https://code.qt.io/qt/qtbase.git diff --git a/source-files/qt6-base-nostrip.patch b/source-files/qt6-base-nostrip.patch deleted file mode 100644 index 3325016..0000000 --- a/source-files/qt6-base-nostrip.patch +++ /dev/null @@ -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 diff --git a/source.sh b/source.sh index 61319b5..fd8f723 100644 --- a/source.sh +++ b/source.sh @@ -15,7 +15,7 @@ prepare() { build() { cmake -B build \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_BUILD_TYPE=Release \ -DINSTALL_BINDIR=lib/qt6/bin \ -DINSTALL_PUBLICBINDIR=usr/bin \ -DINSTALL_LIBEXECDIR=lib/qt6 \ @@ -26,9 +26,11 @@ build() { -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs \ -DINSTALL_EXAMPLESDIR=share/doc/qt6/examples \ -DFEATURE_journald=OFF \ + -DFEATURE_libproxy=ON \ -DFEATURE_openssl_linked=ON \ -DFEATURE_system_sqlite=ON \ -DFEATURE_system_xcb_xinput=ON \ + -DFEATURE_no_direct_extern_access=ON \ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ -DCMAKE_MESSAGE_LOG_LEVEL=STATUS cmake --build build