Accepting request 854134 from home:cgiboudeaux:Qt6:release
Qt 6.0.0 OBS-URL: https://build.opensuse.org/request/show/854134 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:6.0/qt6-base?expand=0&rev=1
This commit is contained in:
Christophe Giboudeaux
Git OBS Bridge
commit
227143768f
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
||||
## Default LFS
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
.osc
|
||||
103
0001-CMake-Fix-conditions-for-some-subarch-features.patch
Normal file
103
0001-CMake-Fix-conditions-for-some-subarch-features.patch
Normal file
@ -0,0 +1,103 @@
|
||||
From 0189d88d3472fd32deaeeb53359716086afea679 Mon Sep 17 00:00:00 2001
|
||||
From: Alexandru Croitor <alexandru.croitor@qt.io>
|
||||
Date: Mon, 30 Nov 2020 16:54:17 +0100
|
||||
Subject: [PATCH] CMake: Fix conditions for some subarch features
|
||||
|
||||
The AES and SHA features were checking for the wrong TEST_subarch_foo
|
||||
variables.
|
||||
|
||||
Pick-to: 6.0
|
||||
Task-number: QTBUG-87376
|
||||
Change-Id: I46cd14d98832529aebac22cfcb01180330c5e091
|
||||
---
|
||||
.prev_configure.cmake | 6 +++---
|
||||
configure.cmake | 6 +++---
|
||||
util/cmake/configurejson2cmake.py | 6 +++---
|
||||
3 files changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/.prev_configure.cmake b/.prev_configure.cmake
|
||||
index 3390c85588..0e476eea01 100644
|
||||
--- a/.prev_configure.cmake
|
||||
+++ b/.prev_configure.cmake
|
||||
@@ -761,13 +761,13 @@ qt_feature_definition("avx512vbmi" "QT_COMPILER_SUPPORTS_AVX512VBMI" VALUE "1")
|
||||
qt_feature_config("avx512vbmi" QMAKE_PRIVATE_CONFIG)
|
||||
qt_feature("aesni"
|
||||
LABEL "AES"
|
||||
- CONDITION QT_FEATURE_sse2 AND TEST_subarch_aes
|
||||
+ CONDITION QT_FEATURE_sse2 AND TEST_subarch_aesni
|
||||
)
|
||||
qt_feature_definition("aesni" "QT_COMPILER_SUPPORTS_AES" VALUE "1")
|
||||
qt_feature_config("aesni" QMAKE_PRIVATE_CONFIG)
|
||||
qt_feature("rdrnd"
|
||||
LABEL "RDRAND"
|
||||
- CONDITION TEST_subarch_rdseed
|
||||
+ CONDITION TEST_subarch_rdrnd
|
||||
)
|
||||
qt_feature_definition("rdrnd" "QT_COMPILER_SUPPORTS_RDRND" VALUE "1")
|
||||
qt_feature_config("rdrnd" QMAKE_PRIVATE_CONFIG)
|
||||
@@ -779,7 +779,7 @@ qt_feature_definition("rdseed" "QT_COMPILER_SUPPORTS_RDSEED" VALUE "1")
|
||||
qt_feature_config("rdseed" QMAKE_PRIVATE_CONFIG)
|
||||
qt_feature("shani"
|
||||
LABEL "SHA"
|
||||
- CONDITION QT_FEATURE_sse2 AND TEST_subarch_sha
|
||||
+ CONDITION QT_FEATURE_sse2 AND TEST_subarch_shani
|
||||
)
|
||||
qt_feature_definition("shani" "QT_COMPILER_SUPPORTS_SHA" VALUE "1")
|
||||
qt_feature_config("shani" QMAKE_PRIVATE_CONFIG)
|
||||
diff --git a/configure.cmake b/configure.cmake
|
||||
index 0aceaaf905..d65341aa1a 100644
|
||||
--- a/configure.cmake
|
||||
+++ b/configure.cmake
|
||||
@@ -774,13 +774,13 @@ qt_feature_definition("avx512vbmi" "QT_COMPILER_SUPPORTS_AVX512VBMI" VALUE "1")
|
||||
qt_feature_config("avx512vbmi" QMAKE_PRIVATE_CONFIG)
|
||||
qt_feature("aesni"
|
||||
LABEL "AES"
|
||||
- CONDITION QT_FEATURE_sse2 AND TEST_subarch_aes
|
||||
+ CONDITION QT_FEATURE_sse2 AND TEST_subarch_aesni
|
||||
)
|
||||
qt_feature_definition("aesni" "QT_COMPILER_SUPPORTS_AES" VALUE "1")
|
||||
qt_feature_config("aesni" QMAKE_PRIVATE_CONFIG)
|
||||
qt_feature("rdrnd"
|
||||
LABEL "RDRAND"
|
||||
- CONDITION TEST_subarch_rdseed
|
||||
+ CONDITION TEST_subarch_rdrnd
|
||||
)
|
||||
qt_feature_definition("rdrnd" "QT_COMPILER_SUPPORTS_RDRND" VALUE "1")
|
||||
qt_feature_config("rdrnd" QMAKE_PRIVATE_CONFIG)
|
||||
@@ -792,7 +792,7 @@ qt_feature_definition("rdseed" "QT_COMPILER_SUPPORTS_RDSEED" VALUE "1")
|
||||
qt_feature_config("rdseed" QMAKE_PRIVATE_CONFIG)
|
||||
qt_feature("shani"
|
||||
LABEL "SHA"
|
||||
- CONDITION QT_FEATURE_sse2 AND TEST_subarch_sha
|
||||
+ CONDITION QT_FEATURE_sse2 AND TEST_subarch_shani
|
||||
)
|
||||
qt_feature_definition("shani" "QT_COMPILER_SUPPORTS_SHA" VALUE "1")
|
||||
qt_feature_config("shani" QMAKE_PRIVATE_CONFIG)
|
||||
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py
|
||||
index 7d7984b574..15dc067f26 100755
|
||||
--- a/util/cmake/configurejson2cmake.py
|
||||
+++ b/util/cmake/configurejson2cmake.py
|
||||
@@ -60,7 +60,7 @@ def map_tests(test: str) -> Optional[str]:
|
||||
"c99": "c_std_99 IN_LIST CMAKE_C_COMPILE_FEATURES",
|
||||
"c11": "c_std_11 IN_LIST CMAKE_C_COMPILE_FEATURES",
|
||||
"x86SimdAlways": "ON", # FIXME: Make this actually do a compile test.
|
||||
- "aesni": "TEST_subarch_aes",
|
||||
+ "aesni": "TEST_subarch_aesni",
|
||||
"avx": "TEST_subarch_avx",
|
||||
"avx2": "TEST_subarch_avx2",
|
||||
"avx512f": "TEST_subarch_avx512f",
|
||||
@@ -99,9 +99,9 @@ def map_tests(test: str) -> Optional[str]:
|
||||
"pdpid": "TEST_subarch_rdpid",
|
||||
"rdpid": "TEST_subarch_rdpid",
|
||||
"rdseed": "TEST_subarch_rdseed",
|
||||
- "rdrnd": "TEST_subarch_rdseed", # FIXME: Is this the right thing?
|
||||
+ "rdrnd": "TEST_subarch_rdrnd",
|
||||
"rtm": "TEST_subarch_rtm",
|
||||
- "shani": "TEST_subarch_sha",
|
||||
+ "shani": "TEST_subarch_shani",
|
||||
"shstk": "TEST_subarch_shstk",
|
||||
"sse2": "TEST_subarch_sse2",
|
||||
"sse3": "TEST_subarch_sse3",
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@ -0,0 +1,36 @@
|
||||
From 72eee71d1693fc971fa4114e7df7642e5ea9c50f Mon Sep 17 00:00:00 2001
|
||||
From: Christophe Giboudeaux <christophe@krop.fr>
|
||||
Date: Mon, 30 Nov 2020 10:01:51 +0100
|
||||
Subject: [PATCH] CMake: strip the executable bit from
|
||||
qt-cmake-private-install.cmake
|
||||
|
||||
Despite being installed in the the binary directory, this
|
||||
CMake snippet cannot be executed.
|
||||
|
||||
Pick-to: 6.0
|
||||
Change-Id: Ibfd31e51184f0688d19ac063804cc200c95555a7
|
||||
---
|
||||
bin/qt-cmake-standalone-test.in | 0
|
||||
cmake/QtWrapperScriptHelpers.cmake | 2 +-
|
||||
2 files changed, 1 insertion(+), 1 deletion(-)
|
||||
mode change 100755 => 100644 bin/qt-cmake-standalone-test.in
|
||||
|
||||
diff --git a/bin/qt-cmake-standalone-test.in b/bin/qt-cmake-standalone-test.in
|
||||
old mode 100755
|
||||
new mode 100644
|
||||
diff --git a/cmake/QtWrapperScriptHelpers.cmake b/cmake/QtWrapperScriptHelpers.cmake
|
||||
index 63cb770131..803ed676ad 100644
|
||||
--- a/cmake/QtWrapperScriptHelpers.cmake
|
||||
+++ b/cmake/QtWrapperScriptHelpers.cmake
|
||||
@@ -121,7 +121,7 @@ function(qt_internal_create_wrapper_scripts)
|
||||
endif()
|
||||
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/${__qt_cmake_install_script_name}.in"
|
||||
"${QT_BUILD_DIR}/${INSTALL_BINDIR}/${__qt_cmake_install_script_name}" @ONLY)
|
||||
- qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_BINDIR}/${__qt_cmake_install_script_name}"
|
||||
+ qt_install(FILES "${QT_BUILD_DIR}/${INSTALL_BINDIR}/${__qt_cmake_install_script_name}"
|
||||
DESTINATION "${INSTALL_BINDIR}")
|
||||
|
||||
qt_internal_create_qt_configure_tests_wrapper_script()
|
||||
--
|
||||
2.29.2
|
||||
|
||||
51
0001-Tell-the-truth-about-private-API.patch
Normal file
51
0001-Tell-the-truth-about-private-API.patch
Normal file
@ -0,0 +1,51 @@
|
||||
From 32456cdbc7f375e5048cb75ee2a992db1e436a61 Mon Sep 17 00:00:00 2001
|
||||
From: Christophe Giboudeaux <christophe@krop.fr>
|
||||
Date: Sun, 20 Sep 2020 09:57:22 +0200
|
||||
Subject: [PATCH] Tell the truth about private API
|
||||
|
||||
Mark private API with symbols only for the current patch release
|
||||
|
||||
This change is a port of the libqt5-qtbase patch which was
|
||||
added during the Qt 5.6 cycle.
|
||||
|
||||
Change-Id: Iada0be6e7d4eaa3a6683b82183643c88dbfa6580
|
||||
---
|
||||
cmake/QtFlagHandlingHelpers.cmake | 4 ++--
|
||||
mkspecs/features/qt_module.prf | 4 ++--
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake
|
||||
index a71c083717..27bd349924 100644
|
||||
--- a/cmake/QtFlagHandlingHelpers.cmake
|
||||
+++ b/cmake/QtFlagHandlingHelpers.cmake
|
||||
@@ -3,9 +3,9 @@ function(qt_internal_add_linker_version_script target)
|
||||
|
||||
if (TEST_ld_version_script)
|
||||
if (arg_INTERNAL)
|
||||
- set(contents "Qt_${PROJECT_VERSION_MAJOR}_PRIVATE_API { *; };")
|
||||
+ set(contents "Qt_${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}_PRIVATE_API { *; };")
|
||||
else()
|
||||
- set(contents "Qt_${PROJECT_VERSION_MAJOR}_PRIVATE_API {\n qt_private_api_tag*;\n")
|
||||
+ set(contents "Qt_${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}_PRIVATE_API {\n qt_private_api_tag*;\n")
|
||||
foreach(ph ${arg_PRIVATE_HEADERS})
|
||||
string(APPEND contents " @FILE:${ph}@\n")
|
||||
endforeach()
|
||||
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
|
||||
index 828a9621b9..805d8b301a 100644
|
||||
--- a/mkspecs/features/qt_module.prf
|
||||
+++ b/mkspecs/features/qt_module.prf
|
||||
@@ -220,9 +220,9 @@ android: CONFIG += qt_android_deps no_linker_version_script
|
||||
QMAKE_LFLAGS += $${QMAKE_LFLAGS_VERSION_SCRIPT}$$verscript
|
||||
|
||||
internal_module {
|
||||
- verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API { *; };"
|
||||
+ verscript_content = "Qt_$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}_PRIVATE_API { *; };"
|
||||
} else {
|
||||
- verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API {" \
|
||||
+ verscript_content = "Qt_$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}_PRIVATE_API {" \
|
||||
" qt_private_api_tag*;"
|
||||
|
||||
private_api_headers = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.QPA_HEADER_FILES
|
||||
--
|
||||
2.28.0
|
||||
|
||||
11
_constraints
Normal file
11
_constraints
Normal file
@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<constraints>
|
||||
<hardware>
|
||||
<disk>
|
||||
<size unit="G">10</size>
|
||||
</disk>
|
||||
<memory>
|
||||
<size unit="M">3500</size>
|
||||
</memory>
|
||||
</hardware>
|
||||
</constraints>
|
||||
52
fix-fixqt4headers.patch
Normal file
52
fix-fixqt4headers.patch
Normal file
@ -0,0 +1,52 @@
|
||||
From 1ccba0570b40b149e755f4aa771552a9a6418317 Mon Sep 17 00:00:00 2001
|
||||
From: Christophe Giboudeaux <christophe@krop.fr>
|
||||
Date: Wed, 1 Jan 2020 15:27:35 +0100
|
||||
Subject: [PATCH] Fix the qmake command and the include subdir for openSUSE
|
||||
|
||||
---
|
||||
bin/fixqt4headers.pl | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/bin/fixqt4headers.pl b/bin/fixqt4headers.pl
|
||||
index b572f469dc..0f949f68ad 100755
|
||||
--- a/bin/fixqt4headers.pl
|
||||
+++ b/bin/fixqt4headers.pl
|
||||
@@ -139,14 +139,14 @@ sub findQtHeaders
|
||||
# -------- MAIN
|
||||
|
||||
if ($qtdir) {
|
||||
- $qtIncludeDir = $qtdir . '/include';
|
||||
+ $qtIncludeDir = $qtdir . '/include/qt6';
|
||||
} else {
|
||||
- $qtIncludeDir = `qmake -query QT_INSTALL_HEADERS`;
|
||||
+ $qtIncludeDir = `qmake-qt6 -query QT_INSTALL_HEADERS`;
|
||||
chop($qtIncludeDir);
|
||||
}
|
||||
|
||||
die "The location of the Qt 5 include files could not be determined.\n"
|
||||
- ."Please ensure qmake can be found in PATH or pass the command line option --qtdir.\n"
|
||||
+ ."Please ensure qmake-qt6 can be found in PATH or pass the command line option --qtdir.\n"
|
||||
unless -d $qtIncludeDir;
|
||||
|
||||
findQtHeaders('QtCore', $qtIncludeDir);
|
||||
@@ -154,7 +154,7 @@ findQtHeaders('QtConcurrent', $qtIncludeDir);
|
||||
findQtHeaders('QtWidgets', $qtIncludeDir);
|
||||
findQtHeaders('QtPrintSupport', $qtIncludeDir);
|
||||
|
||||
-if (-d $qtIncludeDir . '/include/QtMultimedia') {
|
||||
+if (-d $qtIncludeDir . '/include/qt6/QtMultimedia') {
|
||||
findQtHeaders('QtMultimedia', $qtIncludeDir);
|
||||
findQtHeaders('QtMultimediaWidgets', $qtIncludeDir);
|
||||
} elsif (-d $qtIncludeDir . '/../qtmultimedia' ) {
|
||||
@@ -164,7 +164,7 @@ if (-d $qtIncludeDir . '/include/QtMultimedia') {
|
||||
}
|
||||
|
||||
# Support porting from "Qt 4.99" QtDeclarative to QtQuick (QQuickItem et al)
|
||||
-if (-d $qtIncludeDir . '/include/QtQuick') {
|
||||
+if (-d $qtIncludeDir . '/include/qt6/QtQuick') {
|
||||
findQtHeaders('QtQuick', $qtIncludeDir);
|
||||
} elsif (-d $qtIncludeDir . '/../qtdeclarative' ) {
|
||||
# This is the case if QTDIR points to a source tree instead of an installed Qt
|
||||
--
|
||||
2.24.1
|
||||
|
||||
141
qt6-base-docs.spec
Normal file
141
qt6-base-docs.spec
Normal file
@ -0,0 +1,141 @@
|
||||
#
|
||||
# spec file for package qt6-base-docs
|
||||
#
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
%define real_version 6.0.0
|
||||
%define short_version 6.0
|
||||
%define tar_name qtbase-everywhere-src
|
||||
%define tar_suffix %{nil}
|
||||
#
|
||||
%ifarch %{arm} aarch64
|
||||
%global with_gles 1
|
||||
%endif
|
||||
Name: qt6-base-docs
|
||||
Version: 6.0.0
|
||||
Release: 0
|
||||
Summary: Qt 6 Base Documentation
|
||||
License: GFDL-1.3-only
|
||||
URL: https://www.qt.io
|
||||
Source: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz
|
||||
# Patches 0-100 are upstream patches #
|
||||
Patch0: 0001-CMake-strip-the-executable-bit-from-qt-cmake-private.patch
|
||||
Patch1: 0001-CMake-Fix-conditions-for-some-subarch-features.patch
|
||||
# Patches 100-200 are openSUSE and/or non-upstream(able) patches #
|
||||
Patch100: fix-fixqt4headers.patch
|
||||
Patch101: 0001-Tell-the-truth-about-private-API.patch
|
||||
##
|
||||
BuildRequires: cmake >= 3.18.3
|
||||
BuildRequires: cups-devel
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: libicu-devel
|
||||
BuildRequires: libmysqlclient-devel
|
||||
BuildRequires: libproxy-devel
|
||||
# Feature is disabled by default
|
||||
# BuildRequires: lksctp-tools-devel
|
||||
BuildRequires: pcre2-devel
|
||||
BuildRequires: perl
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: postgresql-server-devel
|
||||
BuildRequires: qt6-macros
|
||||
BuildRequires: xmlstarlet
|
||||
BuildRequires: cmake(double-conversion)
|
||||
BuildRequires: pkgconfig(atspi-2)
|
||||
BuildRequires: pkgconfig(dbus-1)
|
||||
BuildRequires: pkgconfig(egl)
|
||||
BuildRequires: pkgconfig(fontconfig)
|
||||
BuildRequires: pkgconfig(freetype2)
|
||||
BuildRequires: pkgconfig(gbm)
|
||||
BuildRequires: pkgconfig(glib-2.0)
|
||||
BuildRequires: pkgconfig(gtk+-3.0)
|
||||
BuildRequires: pkgconfig(harfbuzz)
|
||||
BuildRequires: pkgconfig(krb5-gssapi)
|
||||
BuildRequires: pkgconfig(libb2)
|
||||
BuildRequires: pkgconfig(libbrotlicommon)
|
||||
BuildRequires: pkgconfig(libbrotlidec)
|
||||
BuildRequires: pkgconfig(libbrotlienc)
|
||||
BuildRequires: pkgconfig(libdrm)
|
||||
BuildRequires: pkgconfig(libinput)
|
||||
BuildRequires: pkgconfig(libpng)
|
||||
BuildRequires: pkgconfig(libsystemd)
|
||||
BuildRequires: pkgconfig(libturbojpeg)
|
||||
BuildRequires: pkgconfig(libudev)
|
||||
BuildRequires: pkgconfig(libzstd)
|
||||
BuildRequires: pkgconfig(mtdev)
|
||||
BuildRequires: pkgconfig(odbc)
|
||||
BuildRequires: pkgconfig(opengl)
|
||||
BuildRequires: pkgconfig(openssl) >= 1.1.1
|
||||
BuildRequires: pkgconfig(sqlite3)
|
||||
BuildRequires: pkgconfig(tslib)
|
||||
BuildRequires: pkgconfig(vulkan)
|
||||
BuildRequires: pkgconfig(wayland-client)
|
||||
BuildRequires: pkgconfig(wayland-cursor)
|
||||
BuildRequires: pkgconfig(wayland-egl)
|
||||
BuildRequires: pkgconfig(wayland-server)
|
||||
BuildRequires: pkgconfig(x11)
|
||||
BuildRequires: pkgconfig(x11-xcb)
|
||||
BuildRequires: pkgconfig(xcb)
|
||||
BuildRequires: pkgconfig(xcb-cursor)
|
||||
BuildRequires: pkgconfig(xcb-icccm)
|
||||
BuildRequires: pkgconfig(xcb-image)
|
||||
BuildRequires: pkgconfig(xcb-keysyms)
|
||||
BuildRequires: pkgconfig(xcb-renderutil)
|
||||
BuildRequires: pkgconfig(xcb-util)
|
||||
BuildRequires: pkgconfig(xkbcommon)
|
||||
BuildRequires: pkgconfig(xkbcommon-x11)
|
||||
BuildRequires: pkgconfig(xrender)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
%if 0%{?with_gles}
|
||||
BuildRequires: Mesa-libGLESv3-devel
|
||||
BuildRequires: pkgconfig(glesv2)
|
||||
%endif
|
||||
# Not available for armv7l, s390x and riscv64
|
||||
%ifnarch %{arm} s390x riscv64
|
||||
BuildRequires: pkgconfig(lttng-ust)
|
||||
%endif
|
||||
BuildRequires: qt6-tools
|
||||
|
||||
%description
|
||||
The Qt6 base documentation.
|
||||
|
||||
%{qt6_doc_packages}
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{tar_name}-%{real_version}%{tar_suffix}
|
||||
|
||||
# We don't want to use these 3rdparty libraries
|
||||
rm -r src/3rdparty/{double-conversion,libjpeg,libpng,freetype,harfbuzz-ng,sqlite,xcb,zlib}
|
||||
|
||||
%build
|
||||
%cmake_qt6 \
|
||||
-Denable_new_dtags=ON \
|
||||
-DQT_FEATURE_journald=ON \
|
||||
-DQT_FEATURE_libproxy=ON \
|
||||
-DQT_FEATURE_openssl_linked=ON \
|
||||
-DQT_FEATURE_reduce_relocations=OFF \
|
||||
-DQT_FEATURE_relocatable=OFF \
|
||||
-DQT_FEATURE_system_sqlite=ON \
|
||||
%if 0%{?with_gles}
|
||||
-DQT_FEATURE_opengles2=ON \
|
||||
-DQT_FEATURE_opengles3=ON
|
||||
%endif
|
||||
|
||||
%{qt6_build_docs}
|
||||
|
||||
%install
|
||||
%{qt6_install_docs}
|
||||
|
||||
%changelog -n qt6-base.changes
|
||||
9
qt6-base-rpmlintrc
Normal file
9
qt6-base-rpmlintrc
Normal file
@ -0,0 +1,9 @@
|
||||
# using fdupes on include directories is just calling for troubles
|
||||
addFilter("files-duplicated-waste .*")
|
||||
addFilter("files-duplicate .*")
|
||||
|
||||
# library and development package names don't match
|
||||
addFilter("no-dependency-on .*")
|
||||
|
||||
# Only libraries used at link time are guaranteed to work
|
||||
addFilter("shlib-fixed-dependency .*")
|
||||
106
qt6-base.changes
Normal file
106
qt6-base.changes
Normal file
@ -0,0 +1,106 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 8 14:09:01 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Update to 6.0.0:
|
||||
* https://www.qt.io/blog/qt-6.0-released
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 7 18:42:26 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- libQt6Core6 now owns most of runtime folders and
|
||||
qt6-base-common-devel owns development ones.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 3 17:59:47 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Disable the reduce_relocations option. (boo#1175278, QTBUG-86173)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 2 12:08:58 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Qt 6.0.0 RC2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 2 11:06:59 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Add the missing openssl dependency for qt6-network-private-devel
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 30 16:55:57 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Add upstream patches:
|
||||
* 0001-CMake-strip-the-executable-bit-from-qt-cmake-private.patch
|
||||
* 0001-CMake-Fix-conditions-for-some-subarch-features.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 25 14:19:54 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Update to 6.0.0~rc1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 17 07:26:23 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Update to 6.0.0~beta5
|
||||
- Drop upstream patches:
|
||||
* 0001-CMake-Potentially-use-INSTALL_LIBDIR-in-qt6_extract_.patch
|
||||
* 0001-CMake-Allow-using-DESTDIR-when-installing-documentat.patch
|
||||
* 0001-CMake-Make-zstd-config-based-lookup-quiet.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 10 18:40:31 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Update to 6.0.0~beta4
|
||||
- Replace patches:
|
||||
* 0001-CMake-Allow-using-DESTDIR-when-installing-documentat.patch
|
||||
(replaces 0001-cmake-Fix-doc-installation.patch)
|
||||
* 0001-CMake-Potentially-use-INSTALL_LIBDIR-in-qt6_extract_.patch
|
||||
(replaces 0001-cmake-Don-t-hardcode-the-library-directory-name.patch)
|
||||
- Add upstream patch:
|
||||
* 0001-CMake-Locate-zstd-using-CONFIG.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 20 07:47:07 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Update to 6.0.0beta1
|
||||
https://www.qt.io/blog/qt-6.0-beta-released
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 7 12:24:40 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Turn more options on:
|
||||
* link to openSSL
|
||||
* libproxy usage
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 6 19:41:23 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Update to 6.0.0-alpha
|
||||
https://www.qt.io/blog/qt-6.0-alpha-released
|
||||
- Import fix-fixqt4headers.patch from libqt5-qtbase
|
||||
- Add patches:
|
||||
* 0001-cmake-Fix-doc-installation.patch
|
||||
* 0001-cmake-Don-t-hardcode-the-library-directory-name.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Sep 20 08:25:20 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Resurrect 0001-Tell-the-truth-about-private-API.patch from
|
||||
libqt5-qtbase
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 21 22:38:13 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Add a qt6-printsupport-cups package for the cups plugin
|
||||
- Add the journald option back
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 21 22:19:11 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Split the changes into smaller commits
|
||||
- Fixed the wrong paths in CMake config files
|
||||
- Fixed the mkspecs install dir. Everything is in qt6_mkspecsdir now.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 31 09:06:08 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Experimental qt6-qtbase package
|
||||
1149
qt6-base.spec
Normal file
1149
qt6-base.spec
Normal file
File diff suppressed because it is too large
Load Diff
3
qtbase-everywhere-src-6.0.0.tar.xz
Normal file
3
qtbase-everywhere-src-6.0.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ae227180272d199cbb15318e3353716afada5c57fd5185b812ae26912c958656
|
||||
size 46234820
|
||||
Loading…
Reference in New Issue
Block a user