SHA256
1
0
forked from pool/breeze

Accepting request 349202 from KDE:Frameworks5

Update to 5.5.1

OBS-URL: https://build.opensuse.org/request/show/349202
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/breeze?expand=0&rev=20
This commit is contained in:
Dominique Leuenberger 2015-12-29 11:55:48 +00:00 committed by Git OBS Bridge
commit 908a8435f7
7 changed files with 54 additions and 104 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fc89d5edcc8c3c13263d1b1759f0f8400ea79c76df0eeafcce91d462d4cf93fa
size 36568668

3
breeze-5.5.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7cc284bcad00fc7505c76e6d6baff5f953a4aa03fd1ebfcd6729a383a293900d
size 29670368

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Tue Dec 15 17:49:47 UTC 2015 - hrvoje.senjan@gmail.com
- Update to 5.5.1:
* Bugfix release
* For more details please see:
https://www.kde.org/announcements/plasma-5.5.1.php
-------------------------------------------------------------------
Sat Dec 12 17:31:02 UTC 2015 - hrvoje.senjan@gmail.com
- Update to 5.5.0:
* For more details please see:
https://dot.kde.org/2015/12/08/plasma-55-beautiful-new-artwork
- Move to cmake(...) BuildRequires where possible
- Drop set-breezyGTK-as-default-gtk-theme.patch, no longer needed
-------------------------------------------------------------------
Sun Nov 8 18:09:42 UTC 2015 - hrvoje.senjan@gmail.com

View File

@ -18,24 +18,24 @@
%bcond_without lang
Name: breeze
Version: 5.4.3
Version: 5.5.1
Release: 0
BuildRequires: cmake >= 2.8.12
BuildRequires: extra-cmake-modules >= 0.0.12
BuildRequires: frameworkintegration-devel
BuildRequires: extra-cmake-modules >= 0.0.13
BuildRequires: hicolor-icon-theme
BuildRequires: kcmutils-devel
BuildRequires: kcompletion-devel
BuildRequires: kconfig-devel
BuildRequires: kcoreaddons-devel
BuildRequires: kf5-filesystem
BuildRequires: kguiaddons-devel
BuildRequires: ki18n-devel
BuildRequires: kwindowsystem-devel
BuildRequires: libkdecoration2-devel >= %{version}
BuildRequires: pkgconfig(Qt5DBus) >= 5.4.0
BuildRequires: pkgconfig(Qt5Widgets) >= 5.4.0
BuildRequires: pkgconfig(Qt5X11Extras) >= 5.4.0
BuildRequires: cmake(KDecoration2) >= %{version}
BuildRequires: cmake(KF5ConfigWidgets)
BuildRequires: cmake(KF5CoreAddons)
BuildRequires: cmake(KF5FrameworkIntegration)
BuildRequires: cmake(KF5GuiAddons)
BuildRequires: cmake(KF5I18n)
BuildRequires: cmake(KF5KCMUtils)
BuildRequires: cmake(KF5Plasma)
BuildRequires: cmake(KF5WindowSystem)
BuildRequires: cmake(Qt5DBus) >= 5.4.0
BuildRequires: cmake(Qt5Widgets) >= 5.4.0
BuildRequires: cmake(Qt5X11Extras) >= 5.4.0
BuildRequires: pkgconfig(x11-xcb)
BuildRequires: pkgconfig(xcb)
Requires: breeze5-cursors >= %{version}
@ -50,23 +50,11 @@ Url: http://www.kde.org
#Source: http://download.kde.org/stable/plasma/%{version}/%{name}-%{version}.tar.xz
Source: %{name}-%{version}.tar.xz
Source99: %{name}-rpmlintrc
# PATCH-FIX-OPENSUSE set-breezyGTK-as-default-gtk-theme.patch
Patch0: set-breezyGTK-as-default-gtk-theme.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Artwork, styles and assets for the Breeze visual style for the Plasma Desktop.
%package -n breeze5-icons
Summary: Plasma Desktop artwork, styles and assets
Group: System/GUI/KDE
BuildArch: noarch
Requires: oxygen-icon-theme
%description -n breeze5-icons
Artwork, styles and assets for the Breeze visual style for the Plasma Desktop.
This package provides Breeze icon theme.
%package -n breeze5-cursors
Summary: Plasma Desktop artwork, styles and assets
Group: System/GUI/KDE
@ -111,7 +99,6 @@ This package provides Breeze KWin decoration.
%lang_package -n breeze5-style
%prep
%setup -q
%patch0 -p1
%build
%cmake_kf5 -d build -- -DBUILD_po=OFF -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5
@ -120,13 +107,6 @@ This package provides Breeze KWin decoration.
%install
%kf5_makeinstall -C build
%icon_theme_cache_create_ghost breeze
%icon_theme_cache_create_ghost breeze-dark
%post -n breeze5-icons
%icon_theme_cache_post breeze
%icon_theme_cache_post breeze-dark
%if %{with lang}
%files -n breeze5-style-lang
%defattr(-,root,root)
@ -134,14 +114,6 @@ This package provides Breeze KWin decoration.
%{_kf5_localedir}/
%endif
%files -n breeze5-icons
%defattr(-,root,root)
%doc COPYING*
%ghost %{_kf5_iconsdir}/breeze/icon-theme.cache
%ghost %{_kf5_iconsdir}/breeze-dark/icon-theme.cache
%{_kf5_iconsdir}/breeze/
%{_kf5_iconsdir}/breeze-dark/
%files -n breeze5-cursors
%defattr(-,root,root)
%doc COPYING*
@ -157,6 +129,9 @@ This package provides Breeze KWin decoration.
%{_kf5_iconsdir}/hicolor/scalable/apps/breeze-settings.*
%{_kf5_sharedir}/QtCurve/
%{_kf5_sharedir}/color-schemes/
%{_kf5_servicesdir}/plasma-lookandfeel-org.kde.breezedark.*
%dir %{_kf5_sharedir}/plasma
%{_kf5_sharedir}/plasma/look-and-feel/
%{_kf5_qmldir}/QtQuick/
%{_kf5_libdir}/kconf_update_bin/
%{_kf5_sharedir}/kconf_update/

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Tue Dec 15 17:49:47 UTC 2015 - hrvoje.senjan@gmail.com
- Update to 5.5.1:
* Bugfix release
* For more details please see:
https://www.kde.org/announcements/plasma-5.5.1.php
-------------------------------------------------------------------
Sat Dec 12 17:31:02 UTC 2015 - hrvoje.senjan@gmail.com
- Update to 5.5.0:
* For more details please see:
https://dot.kde.org/2015/12/08/plasma-55-beautiful-new-artwork
- Move to cmake(...) BuildRequires where possible
-------------------------------------------------------------------
Sun Nov 8 18:09:42 UTC 2015 - hrvoje.senjan@gmail.com

View File

@ -17,7 +17,7 @@
Name: breeze4-style
Version: 5.4.3
Version: 5.5.1
Release: 0
BuildRequires: automoc4
BuildRequires: cmake >= 2.8.12

View File

@ -1,58 +0,0 @@
--- breeze-5.4.2/misc/gtkbreeze/main.cpp 2015-10-01 11:33:03.000000000 +0200
+++ breeze-5.4.2.new/misc/gtkbreeze/main.cpp 2015-10-18 16:45:26.142502413 +0200
@@ -74,7 +74,7 @@ QString isGtkThemeSetToOxygen(QString gt
*/
int setGtk2()
{
- const QString gtk2Theme = QStringLiteral("Orion"); // Orion looks kindae like breeze
+ const QString gtk2Theme = QStringLiteral("BreezyGTK"); // BreezyGTK looks kindae like breeze
const QString gtk2ThemeSettings = QStringLiteral("gtk-2.0/gtkrc"); // system installed file to check for
const QString gtkThemeDirectory = isGtkThemeInstalled(gtk2Theme, gtk2ThemeSettings);
@@ -106,7 +106,7 @@ int setGtk2()
out << QStringLiteral("}\n");
out << QStringLiteral("widget_class \"*\" style \"user-font\"\n");
out << QStringLiteral("gtk-font-name=\"Oxygen-Sans Sans-Book 10\"\n"); // matches plasma-workspace:startkde/startkde.cmake
- out << QStringLiteral("gtk-theme-name=\"Orion\"\n");
+ out << QStringLiteral("gtk-theme-name=\"BreezyGTK\"\n");
out << QStringLiteral("gtk-icon-theme-name=\"breeze\"\n");
out << QStringLiteral("gtk-fallback-icon-theme=\"gnome\"\n");
out << QStringLiteral("gtk-toolbar-style=GTK_TOOLBAR_ICONS\n");
@@ -123,8 +123,8 @@ int setGtk3()
{
qCDebug(GTKBREEZE) << "setGtk3()";
- const QString gtk3Theme = QStringLiteral("Orion"); // Orion looks kindae like breeze
- const QString gtk3ThemeSettings = QStringLiteral("gtk-3.0/settings.ini"); // check for installed /usr/share/themes/Orion/gtk-3.0/settings.ini
+ const QString gtk3Theme = QStringLiteral("BreezyGTK"); // BreezyGTK looks kindae like breeze
+ const QString gtk3ThemeSettings = QStringLiteral("gtk-3.0/settings.ini"); // check for installed /usr/share/themes/BreezyGTK/gtk-3.0/settings.ini
const QString gtkThemeDirectory = isGtkThemeInstalled(gtk3Theme, gtk3ThemeSettings);
if (gtkThemeDirectory == 0) {
@@ -158,26 +158,6 @@ int setGtk3()
out << QStringLiteral("gtk-menu-images=1\n");
out << QStringLiteral("gtk-button-images=1\n");
qCDebug(GTKBREEZE) << "gtk3rc written";
-
- QString cssFile = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).first() +
- QDir::separator() + ".config/gtk-3.0/gtk.css";
- QFile gtkcss3writer(cssFile);
- opened = gtkcss3writer.open(QIODevice::WriteOnly | QIODevice::Text);
- if (!opened) {
- qCWarning(GTKBREEZE) << "failed to open " << cssFile;
- return 1;
- }
- QTextStream outcss(&gtkcss3writer);
- outcss << QStringLiteral(".window-frame, .window-frame:backdrop {\n");
- outcss << QStringLiteral(" box-shadow: 0 0 0 black;\n");
- outcss << QStringLiteral(" border-style: none;\n");
- outcss << QStringLiteral(" margin: 0;\n");
- outcss << QStringLiteral(" border-radius: 0;\n");
- outcss << QStringLiteral("}\n\n");
- outcss << QStringLiteral(".titlebar {\n");
- outcss << QStringLiteral(" border-radius: 0;\n");
- outcss << QStringLiteral("}\n");
- qCDebug(GTKBREEZE) << ".config/gtk-3.0/gtk.css written";
return 0;
}