From 6dad1a06f3ba30eb69617dcd35e2ca99ed1ab1099bf1e44c5a1a29656e1a7d84 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Fri, 11 Dec 2020 14:27:55 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:6.0/qt6-base?expand=0&rev=3 --- _multibuild | 4 ++ qt6-base-docs.spec | 141 --------------------------------------------- qt6-base.spec | 14 +++++ 3 files changed, 18 insertions(+), 141 deletions(-) create mode 100644 _multibuild delete mode 100644 qt6-base-docs.spec diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..46731da --- /dev/null +++ b/_multibuild @@ -0,0 +1,4 @@ + + docs + + diff --git a/qt6-base-docs.spec b/qt6-base-docs.spec deleted file mode 100644 index 68f022b..0000000 --- a/qt6-base-docs.spec +++ /dev/null @@ -1,141 +0,0 @@ -# -# 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 diff --git a/qt6-base.spec b/qt6-base.spec index cae5142..8b096e0 100644 --- a/qt6-base.spec +++ b/qt6-base.spec @@ -21,6 +21,8 @@ %define tar_name qtbase-everywhere-src %define tar_suffix %{nil} # +%global qt6_flavor @BUILD_FLAVOR@%{nil} +# %ifarch %{arm} aarch64 %global with_gles 1 %endif @@ -107,6 +109,10 @@ BuildRequires: pkgconfig(glesv2) %ifnarch %{arm} s390x riscv64 BuildRequires: pkgconfig(lttng-ust) %endif +%if "%{qt6_flavor}" == "docs" +BuildRequires: qt6-tools +%{qt6_doc_packages} +%endif %description Qt is a set of libraries for developing applications. @@ -114,6 +120,8 @@ Qt is a set of libraries for developing applications. This package contains base tools, like string, xml, and network handling. +%if !%{qt6_docs_flavor} + %package devel Summary: Qt 6 base development meta package Requires: qt6-base-common-devel @@ -657,6 +665,8 @@ installed on your system. %{qt6_examples_package} +%endif + %prep %autosetup -p1 -n %{tar_name}-%{real_version}%{tar_suffix}%{tar_suffix} @@ -689,6 +699,8 @@ EOF %install %{qt6_install} +%if !%{qt6_docs_flavor} + # Empty folders provided by libQt6Core6 and qt6-core-common-devel mkdir -p %{buildroot}%{_qt6_sysconfdir} mkdir -p %{buildroot}%{_qt6_testsdir} @@ -1146,4 +1158,6 @@ rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_xcb_qpa_lib_private.pri %files -n qt6-sql-unixODBC %{_qt6_pluginsdir}/sqldrivers/libqsqlodbc.so +%endif + %changelog