From 7006bcddd4855e9bbc3571940eaba09b737e36e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Wed, 14 Oct 2020 21:33:46 +0200 Subject: [PATCH] RHEL 9.0.0 Alpha bootstrap The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/adwaita-qt#7a75bc37b17e6ef012272d67f474ca39d5397d52 --- .gitignore | 14 +++ adwaita-qt-upstream-fixes.patch | 39 ++++++ adwaita-qt.spec | 207 ++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 261 insertions(+) create mode 100644 adwaita-qt-upstream-fixes.patch create mode 100644 adwaita-qt.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore index e69de29..bd20259 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,14 @@ +/024b00bfd7c8cb27d09188ddc239391c2c05bac4.tar.gz +/0.3.tar.gz +/adwaita-qt-0.4.tar.gz +/adwaita-qt-0.95.tar.gz +/adwaita-qt-0.97.tar.gz +/adwaita-qt-0.98.tar.gz +/adwaita-qt-1.0.tar.gz +/adwaita-qt-1.0.90.tar.gz +/adwaita-qt-1.0.91.tar.gz +/adwaita-qt-1.1.0.tar.gz +/adwaita-qt-1.1.1.tar.gz +/adwaita-qt-1.1.2.tar.gz +/adwaita-qt-1.1.3.tar.gz +/adwaita-qt-1.1.90.tar.gz diff --git a/adwaita-qt-upstream-fixes.patch b/adwaita-qt-upstream-fixes.patch new file mode 100644 index 0000000..45840e2 --- /dev/null +++ b/adwaita-qt-upstream-fixes.patch @@ -0,0 +1,39 @@ +diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt +index d3be838..b6bd930 100644 +--- a/src/lib/CMakeLists.txt ++++ b/src/lib/CMakeLists.txt +@@ -74,6 +74,8 @@ target_link_libraries(adwaitaqt + adwaitaqtpriv + ) + ++set_target_properties(adwaitaqtpriv PROPERTIES VERSION ${ADWAITAQT_VERSION} SOVERSION 1) ++ + set_target_properties(adwaitaqt PROPERTIES VERSION ${ADWAITAQT_VERSION} SOVERSION 1) + target_include_directories(adwaitaqt PUBLIC ${Qt5Core_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}) + +diff --git a/src/lib/adwaita.h b/src/lib/adwaita.h +index 1cb7e2c..ba8306d 100644 +--- a/src/lib/adwaita.h ++++ b/src/lib/adwaita.h +@@ -168,7 +168,7 @@ enum Metrics { + // checkboxes and radio buttons + CheckBox_Size = 22, + CheckBox_FocusMarginWidth = 3, +- CheckBox_ItemSpacing = 8, ++ CheckBox_ItemSpacing = 4, + + // menubar items + MenuBarItem_MarginWidth = 8, +diff --git a/src/style/adwaitastyle.cpp b/src/style/adwaitastyle.cpp +index 86ba710..08f31ac 100644 +--- a/src/style/adwaitastyle.cpp ++++ b/src/style/adwaitastyle.cpp +@@ -1686,7 +1686,7 @@ QRect Style::checkBoxContentsRect(const QStyleOption *option, const QWidget *) c + //___________________________________________________________________________________________________________________ + QRect Style::checkBoxIndicatorRect(const QStyleOption *option, const QWidget *widget) const + { +- return ParentStyleClass::subElementRect(SE_CheckBoxIndicator, option, widget).translated(Metrics::CheckBox_ItemSpacing, 0); ++ return ParentStyleClass::subElementRect(SE_CheckBoxIndicator, option, widget); + } + + //___________________________________________________________________________________________________________________ diff --git a/adwaita-qt.spec b/adwaita-qt.spec new file mode 100644 index 0000000..613fd13 --- /dev/null +++ b/adwaita-qt.spec @@ -0,0 +1,207 @@ +# Force out of source build +%undefine __cmake_in_source_build + +Name: adwaita-qt +Version: 1.1.90 +Release: 1%{?dist} +License: LGPLv2+ and GPLv2+ +Summary: Adwaita theme for Qt-based applications + +Url: https://github.com/FedoraQt/adwaita-qt +Source0: https://github.com/FedoraQt/adwaita-qt/archive/%{version}/adwaita-qt-%{version}.tar.gz + +Patch0: adwaita-qt-upstream-fixes.patch + +BuildRequires: cmake + +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtx11extras-devel + +BuildRequires: libxcb-devel + +Obsoletes: adwaita-qt4 < 1.1.90 +Obsoletes: adwaita-qt-common < 1.1.90 + +Requires: adwaita-qt5 + +%description +Theme to let Qt applications fit nicely into Fedora Workstation + +# Use -qt5 naming in case we provide -qt6 version in the future +%package -n adwaita-qt5 +Summary: Adwaita Qt5 theme +Requires: libadwaita-qt5%{?_isa} = %{version}-%{release} + +%description -n adwaita-qt5 +Adwaita theme variant for applications utilizing Qt5. + +%package -n libadwaita-qt5 +Summary: Adwaita Qt5 library + +%description -n libadwaita-qt5 +%{summary}. + +%package -n libadwaita-qt5-devel +Summary: Development files for libadwaita-qt5 +Requires: libadwaita-qt5%{?_isa} = %{version}-%{release} + +%description -n libadwaita-qt5-devel +The libadwaita-qt5-devel package contains libraries and header files for +developing applications that use libadwaita-qt5. + +%prep +%autosetup -n %{name}-%{version} -p1 + +%build +%cmake + +%cmake_build + +%install +%cmake_install + +%files -n adwaita-qt5 +%doc LICENSE.LGPL2 README.md +%{_qt5_plugindir}/styles/adwaita.so + +%files -n libadwaita-qt5 +%{_libdir}/libadwaitaqt.so.* +%{_libdir}/libadwaitaqtpriv.so.* + +%files -n libadwaita-qt5-devel +%dir %{_includedir}/AdwaitaQt +%{_includedir}/AdwaitaQt/*.h +%dir %{_libdir}/cmake/AdwaitaQt +%{_libdir}/cmake/AdwaitaQt/*.cmake +%{_libdir}/pkgconfig/adwaita-qt.pc +%{_libdir}/libadwaitaqt.so +%{_libdir}/libadwaitaqtpriv.so + +%changelog +* Wed Sep 30 2020 Jan Grulich - 1.1.90-1 +- 1.1.90 + +* Fri Jul 31 2020 Fedora Release Engineering - 1.1.3-4 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1.1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed May 20 2020 Jan Grulich - 1.1.3-2 +- Views: do not set color to views which don't use our palette + +* Fri May 15 2020 Jan Grulich - 1.1.3-1 +- 1.1.3 + +* Mon May 11 2020 Jan Grulich - 1.1.2-1 +- 1.1.2 + +* Tue Jan 28 2020 Fedora Release Engineering - 1.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Dec 11 2019 Jan Grulich - 1.1.1-2 +- Set correct Light, Midlight, Dark and Mid colors + +* Wed Nov 20 2019 Jan Grulich - 1.1.1-1 +- Update to 1.1.1 + +* Mon Oct 21 2019 Jan Grulich - 1.1.0-5 +- Actually apply all the fixes + +* Mon Sep 02 2019 Jan Grulich - 1.1.0-4 +- Pull in upstream fixes + +* Tue Aug 13 2019 Jan Grulich - 1.1.0-3 +- Pull in upstream fixes + +* Tue Jul 30 2019 Jan Grulich - 1.1.0-2 +- Pull in upstream fixes + +* Mon Jul 29 2019 Jan Grulich - 1.1.0-1 +- Update to 1.1.0 + +* Wed Jul 24 2019 Fedora Release Engineering - 1.0.91-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jul 11 2019 Jan Grulich - 1.0.91-1 +- Update to 1.0.91 + +* Mon Jul 08 2019 Jan Grulich - 1.0.90-2 +- Fix Qt4 item view widgets + +* Tue Jul 02 2019 Jan Grulich - 1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Aug 02 2017 Fedora Release Engineering - 1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri May 26 2017 Martin Bříza - 1.0-1 +- Update to 1.0 + +* Mon Feb 27 2017 Martin Briza - 0.98-1 +- Update to 0.98 +- Fixes #1410597 + +* Fri Feb 10 2017 Fedora Release Engineering - 0.97-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Jan 05 2017 Rex Dieter - 0.97-2 +- drop hardcoded Requires: qt4/qt5-qtbase + +* Wed Dec 14 2016 Martin Briza - 0.97-1 +- Update to 0.97 + +* Tue Dec 13 2016 Martin Briza - 0.95-1 +- Update to 0.95 + +* Thu Jun 30 2016 Jan Grulich - 0.4-3 +- Properly fix missing menubar in QtCreator + +* Wed Jun 22 2016 Jan Grulich - 0.4-2 +- Attempt to fix missing menubar issue in QtCreator + +* Thu Apr 21 2016 Jan Grulich - 0.4-1 +- Update to version 0.4 + +* Wed Feb 03 2016 Fedora Release Engineering - 0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Jul 20 2015 Martin Briza - 0.3-1 +- Updated to the latest release +- Added a Qt5 build + +* Tue Jun 16 2015 Fedora Release Engineering - 0-0.7.20141216git024b00bf +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 02 2015 Kalev Lember - 0-0.6.20141216git024b00bf +- Rebuilt for GCC 5 C++11 ABI change + +* Fri Jan 16 2015 Martin Briza - 0-0.5 +- Package review cleanup +- Split into a base and a subpackage +- Fedora import + +* Tue Dec 16 2014 Martin Briza - 0-0.4.copr +- Update to latest commit + +* Fri Dec 05 2014 Martin Briza - 0-0.3.copr +- Update to latest commit + +* Mon Sep 15 2014 Martin Briza - 0-0.2.copr +- Update to latest commit + +* Mon Sep 15 2014 Martin Briza - 0-0.1.copr +- Initial build diff --git a/sources b/sources new file mode 100644 index 0000000..8b2f0d7 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (adwaita-qt-1.1.90.tar.gz) = ae23a9d018dd64570d03bd7741ef3eafeaf812f55843e1cc527632bda18bd6f23a1ca58185b034b3a48025444c940a4f4b719d8e4cbf60454c8fc8bb7d2189ca