commit 46359075d68be517999418e038e33c6eae543847
Author: Jakub Bogusz <[email protected]>
Date: Sat Jul 30 08:47:12 2022 +0200
- added gn patch (no static libstdc++ for internal gn)
- drop gcc 9+ specific options when using older compiler
- pass oracle instantclient include dir
qt6-gn.patch | 10 ++++++++++
qt6.spec | 12 ++++++++++++
2 files changed, 22 insertions(+)
---
diff --git a/qt6.spec b/qt6.spec
index d7ef365..af5e36b 100644
--- a/qt6.spec
+++ b/qt6.spec
@@ -68,6 +68,7 @@ Source0:
https://download.qt.io/official_releases/qt/6.3/%{version}/single/qt-ev
# Source0-md5: 957a304773b281a4584f4c0254773456
Patch0: system-cacerts.patch
Patch1: ninja-program.patch
+Patch2: %{name}-gn.patch
URL: https://www.qt.io/
%{?with_directfb:BuildRequires: DirectFB-devel}
BuildRequires: EGL-devel
@@ -77,6 +78,8 @@ BuildRequires: OpenGL-devel
%{?with_kms:BuildRequires: OpenGLESv2-devel}
BuildRequires: Vulkan-Loader-devel
BuildRequires: at-spi2-core-devel
+# base dir requires 3.16, gn 3.19
+BuildRequires: cmake >= 3.19
%{?with_cups:BuildRequires: cups-devel >= 1.4}
BuildRequires: dbus-devel >= 1.2
BuildRequires: double-conversion-devel
@@ -1138,6 +1141,7 @@ Generator plików makefile dla aplikacji Qt6.
%setup -q -n qt-everywhere-src-%{version}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%{__sed} -i -e 's,usr/X11R6/,usr/,g' qtbase/mkspecs/linux-g++-64/qmake.conf
@@ -1165,6 +1169,13 @@ Generator plików makefile dla aplikacji Qt6.
%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python3(\s|$),#!%{__python3}\1,' \
qtbase/mkspecs/features/uikit/devices.py
+%if %(echo %{cxx_version} | cut -d. -f1) < 9
+# available since gcc 9
+%{__sed} -i -e '/-Wdeprecated-copy/d' \
+
qtwebengine/src/3rdparty/chromium/third_party/{angle,dawn/src/common,pdfium,skia/gn/skia}/BUILD.gn
\
+ qtwebengine/src/3rdparty/chromium/third_party/swiftshader/CMakeLists.txt
+%endif
+
%build
#TODO optflags
# We're using samurai instead of ninja because teh later
@@ -1192,6 +1203,7 @@ cd build
-DINSTALL_TRANSLATIONSDIR=%{_datadir}/qt6/translations \
-DBUILD_SHARED_LIBS=ON \
-DFEATURE_webengine_jumbo_build=OFF \
+ %{?with_oci:-DOracle_INCLUDE_DIR=%{_includedir}/oracle/client} \
-DQT_FEATURE_webengine_jumbo_build=OFF \
-DINPUT_webengine_jumbo_file_merge_limit=1 \
-DQT_DISABLE_RPATH=TRUE \
diff --git a/qt6-gn.patch b/qt6-gn.patch
new file mode 100644
index 0000000..1439fcc
--- /dev/null
+++ b/qt6-gn.patch
@@ -0,0 +1,10 @@
+--- qt-everywhere-src-6.3.1/qtwebengine/src/gn/CMakeLists.txt.orig
2022-06-08 08:40:31.000000000 +0200
++++ qt-everywhere-src-6.3.1/qtwebengine/src/gn/CMakeLists.txt 2022-07-29
16:53:34.712173434 +0200
+@@ -32,6 +32,7 @@ add_custom_command(
+ WORKING_DIRECTORY ${GN_BINARY_DIR}
+ COMMAND ${Python3_EXECUTABLE} ${GN_SOURCE_DIR}/build/gen.py
+ --no-last-commit-position
++ --no-static-libstdc
+ --out-path ${GN_BINARY_DIR}/$<CONFIG>
+ --cc ${CMAKE_C_COMPILER}
+ --cxx ${CMAKE_CXX_COMPILER}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt6.git/commitdiff/46359075d68be517999418e038e33c6eae543847
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
