SHA256
1
0
forked from pool/breeze
Hrvoje Senjan 2014-09-24 12:24:42 +00:00 committed by Git OBS Bridge
parent b47e1c6695
commit b35942ae9f
7 changed files with 79 additions and 10 deletions

View File

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

View File

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

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Sep 24 12:15:17 UTC 2014 - hrvoje.senjan@gmail.com
- Update to 5.0.95~git20140924
* Many improvements for the Breeze style
- Added openSUSE_colorscheme.diff: apply openSUSE colorscheme if exists
- Drop pkgconfig(x11) BuildRequires
-------------------------------------------------------------------
Tue Aug 26 08:13:31 UTC 2014 - hrvoje.senjan@gmail.com

View File

@ -17,7 +17,7 @@
Name: breeze
Version: 5.0.95~git20140826
Version: 5.0.95~git20140924
Release: 0
BuildRequires: cmake >= 2.8.12
BuildRequires: extra-cmake-modules >= 0.0.12
@ -31,7 +31,6 @@ BuildRequires: kwindowsystem-devel
BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0
BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0
BuildRequires: pkgconfig(Qt5X11Extras) >= 5.2.0
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(x11-xcb)
BuildRequires: pkgconfig(xcb)
Requires: breeze5-cursors >= %{version}
@ -45,6 +44,8 @@ Group: System/GUI/KDE
Url: http://www.kde.org
#Source: http://download.kde.org/stable/plasma/%{version}/%{name}-%{version}.tar.xz
Source: %{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE openSUSE_colorscheme.diff -- apply openSUSE colorscheme if exists
Patch0: openSUSE_colorscheme.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -99,6 +100,7 @@ This package provides Breeze KWin decoration.
%prep
%setup -q
%patch0 -p1
%build
%cmake_kf5 -d build -- -DBUILD_po=OFF

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Sep 24 12:15:17 UTC 2014 - hrvoje.senjan@gmail.com
- Update to 5.0.95~git20140924
* Many improvements for the Breeze style
- Drop pkgconfig(x11) BuildRequires
-------------------------------------------------------------------
Tue Aug 26 08:13:31 UTC 2014 - hrvoje.senjan@gmail.com

View File

@ -17,7 +17,7 @@
Name: breeze4-style
Version: 5.0.95~git20140826
Version: 5.0.95~git20140924
Release: 0
BuildRequires: automoc4
BuildRequires: cmake >= 2.8.12
@ -25,7 +25,6 @@ BuildRequires: kde4-filesystem
BuildRequires: libkde4-devel
BuildRequires: libqt4-devel
BuildRequires: libxcb-devel
BuildRequires: pkgconfig(x11)
Summary: Plasma Desktop artwork, styles and assets
License: GPL-2.0+
Group: System/GUI/KDE
@ -42,13 +41,11 @@ This package contains kde4 backport of new default Plasma 5 style.
%setup -q -n breeze-%{version}
%build
pushd kstyle
%cmake_kde4 -d build -- -DBUILD_po=OFF -DUSE_KDE4=ON
%make_jobs
popd
%install
%kde4_makeinstall -C kstyle/build
%kde4_makeinstall -C build
%files
%defattr(-,root,root)

55
openSUSE_colorscheme.diff Normal file
View File

@ -0,0 +1,55 @@
diff --git a/misc/kde4breeze/src/main.cpp b/misc/kde4breeze/src/main.cpp
index 3d08694..0062cda 100644
--- a/misc/kde4breeze/src/main.cpp
+++ b/misc/kde4breeze/src/main.cpp
@@ -32,7 +32,11 @@
void applyColorScheme(KConfig *other)
{
- QString src = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "color-schemes/Breeze.colors");
+ QString src;
+ src = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kde4/apps/color-schemes/openSUSE.colors");
+ if (src.isEmpty()) {
+ src = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "color-schemes/Breeze.colors");
+ }
KSharedConfigPtr config = KSharedConfig::openConfig(src);
@@ -64,7 +68,12 @@ void updateKdeGlobals()
//use QtCurve only if installed
const bool hasBreeze = QStyleFactory::keys().contains("Breeze");
KConfigGroup group(&config, "General");
+ QString filekde4 = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kde4/apps/color-schemes/openSUSE.colors");
+ if(!filekde4.isEmpty()){
+ group.writeEntry("ColorScheme", "openSUSE");
+ } else {
group.writeEntry("ColorScheme", "Breeze");
+ }
if (hasBreeze) {
group.writeEntry("widgetStyle", "Breeze");
}
@@ -78,7 +87,12 @@ void updateKdeGlobals()
KSharedConfig::Ptr kf5Config = KSharedConfig::openConfig("kdeglobals");
KConfigGroup kf5Group(kf5Config, "General");
+ QString filekf5 = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "color-schemes/openSUSE.colors");
+ if(!filekf5.isEmpty()){
+ kf5Group.writeEntry("ColorScheme", "openSUSE");
+ } else {
kf5Group.writeEntry("ColorScheme", "Breeze");
+ }
if (hasBreeze) {
kf5Group.writeEntry("widgetStyle", "Breeze");
}
@@ -86,7 +100,11 @@ void updateKdeGlobals()
kf5Group.sync();
KConfigGroup kf52Group(kf5Config, "KDE");
+ if(!filekf5.isEmpty()){
+ kf52Group.writeEntry("ColorScheme", "openSUSE");
+ } else {
kf52Group.writeEntry("ColorScheme", "Breeze");
+ }
if (hasBreeze) {
kf52Group.writeEntry("widgetStyle", "Breeze");
}