From 4126372b40b1f924a1a3805b570e04aa824fedb7 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 09 2021 09:48:20 +0000 Subject: import qgnomeplatform-0.7.1-2.el8 --- diff --git a/.gitignore b/.gitignore index 3056d93..4fb53e7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/QGnomePlatform-0.4.tar.gz +SOURCES/QGnomePlatform-0.7.1.tar.gz diff --git a/.qgnomeplatform.metadata b/.qgnomeplatform.metadata index f1cb5ef..daaba09 100644 --- a/.qgnomeplatform.metadata +++ b/.qgnomeplatform.metadata @@ -1 +1 @@ -5a34a1a5ede6c4328519f2db2c0f55470efc5788 SOURCES/QGnomePlatform-0.4.tar.gz +307a105413ef155a5f8d9486b26fc4fd2151bc96 SOURCES/QGnomePlatform-0.7.1.tar.gz diff --git a/SOURCES/qgnomeplatform-avoid-double-scaling.patch b/SOURCES/qgnomeplatform-avoid-double-scaling.patch deleted file mode 100644 index 253a546..0000000 --- a/SOURCES/qgnomeplatform-avoid-double-scaling.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/gnomehintssettings.cpp b/src/gnomehintssettings.cpp -index ea007a7..c863654 100644 ---- a/src/gnomehintssettings.cpp -+++ b/src/gnomehintssettings.cpp -@@ -259,7 +259,9 @@ void GnomeHintsSettings::loadFonts() - qDeleteAll(m_fonts); - m_fonts.clear(); - -- gdouble scaling = g_settings_get_double(m_settings, "text-scaling-factor"); -+ //Do not use font scaling as it is already applied -+ //gdouble scaling = g_settings_get_double(m_settings, "text-scaling-factor"); -+ gdouble scaling = 1.0; - qCDebug(QGnomePlatform) << "Font scaling: " << scaling; - - const QStringList fontTypes { "font-name", "monospace-font-name" }; diff --git a/SPECS/qgnomeplatform.spec b/SPECS/qgnomeplatform.spec index 2a3bc7b..44c5498 100644 --- a/SPECS/qgnomeplatform.spec +++ b/SPECS/qgnomeplatform.spec @@ -1,7 +1,7 @@ Name: qgnomeplatform -Version: 0.4 -Release: 3%{?dist} +Version: 0.7.1 +Release: 2%{?dist} Summary: Qt Platform Theme aimed to accommodate Gnome settings License: LGPLv2+ @@ -9,7 +9,6 @@ URL: https://github.com/MartinBriza/QGnomePlatform Source0: https://github.com/MartinBriza/QGnomePlatform/archive/%{version}/QGnomePlatform-%{version}.tar.gz # Upstream patches -Patch0: qgnomeplatform-avoid-double-scaling.patch BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(udev) @@ -17,12 +16,13 @@ BuildRequires: pkgconfig(xkbcommon) BuildRequires: gtk3-devel BuildRequires: libinput-devel BuildRequires: libXrender-devel -# please document if/why this is needed, FTBFS against qt-5.7.0 in rawhide obviously -- rex -#BuildRequires: qt5-qtbase-devel >= 5.6.0 qt5-qtbase-devel <= 5.6.100 -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtbase-static +BuildRequires: qt5-qtbase-devel >= 5.12.0 +BuildRequires: qt5-qtbase-static >= 5.12.0 +BuildRequires: qt5-qtwayland-devel >= 5.12.0 -Requires: adwaita-qt%{?_isa} + +BuildRequires: libadwaita-qt5-devel >= 1.2.0 +Requires: adwaita-qt5%{?_isa} BuildRequires: qt5-qtbase-private-devel %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} @@ -53,9 +53,18 @@ make install INSTALL_ROOT=%{buildroot} -C %{_target_platform} %doc README.md %license LICENSE %{_qt5_libdir}/qt5/plugins/platformthemes/libqgnomeplatform.so +%{_qt5_libdir}/qt5/plugins/wayland-decoration-client/libqgnomeplatformdecoration.so %changelog +* Wed Apr 28 2021 Jan Grulich - 0.7.1-2 +- Rebuild (binutils) + Resolves: bz#1930073 + +* Thu Apr 08 2021 Jan Grulich - 0.7.1-1 +- 0.7.1 + Resolves: bz#1930073 + * Wed Nov 20 2019 Jan Grulich - 0.4-3 - Rebuild (qt5) Resolves: bz#1774418