From 2f7e6872317ecd50e9317f61ee8a18f42f84d792008b5e429dcc26b17839141e Mon Sep 17 00:00:00 2001
From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
Date: Wed, 24 Sep 2014 20:25:35 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/KDE:Frameworks5/oxygen5?expand=0&rev=17

---
 crasher.diff                     | 42 --------------------------------
 oxygen-5.0.1.tar.xz              |  3 ---
 oxygen-5.0.95~git20140924.tar.xz |  3 +++
 oxygen5.changes                  | 10 ++++++++
 oxygen5.spec                     |  9 ++++---
 5 files changed, 18 insertions(+), 49 deletions(-)
 delete mode 100644 crasher.diff
 delete mode 100644 oxygen-5.0.1.tar.xz
 create mode 100644 oxygen-5.0.95~git20140924.tar.xz

diff --git a/crasher.diff b/crasher.diff
deleted file mode 100644
index 8c560dd..0000000
--- a/crasher.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/kstyle/oxygenshadowhelper.cpp b/kstyle/oxygenshadowhelper.cpp
-index b15ebcb..0821625 100644
---- a/kstyle/oxygenshadowhelper.cpp
-+++ b/kstyle/oxygenshadowhelper.cpp
-@@ -63,14 +63,6 @@ namespace Oxygen
-     ShadowHelper::~ShadowHelper( void )
-     {
- 
--        #if HAVE_X11
--        if( _helper.isX11() )
--        {
--            foreach( const uint32_t& value, _pixmaps  ) xcb_free_pixmap( _helper.xcbConnection(), value );
--            foreach( const uint32_t& value, _dockPixmaps  ) xcb_free_pixmap( _helper.xcbConnection(), value );
--        }
--        #endif
--
-         delete _shadowCache;
- 
-     }
-@@ -78,14 +70,6 @@ namespace Oxygen
-     //______________________________________________
-     void ShadowHelper::reset( void )
-     {
--        #if HAVE_X11
--        if( _helper.isX11() )
--        {
--            // round pixmaps
--            foreach( const uint32_t& value, _pixmaps  ) xcb_free_pixmap( _helper.xcbConnection(), value );
--            foreach( const uint32_t& value, _dockPixmaps  ) xcb_free_pixmap( _helper.xcbConnection(), value );
--        }
--        #endif
- 
-         _pixmaps.clear();
-         _dockPixmaps.clear();
-@@ -321,6 +305,7 @@ namespace Oxygen
-         // create X11 pixmap
-         xcb_pixmap_t pixmap = xcb_generate_id( _helper.xcbConnection() );
-         xcb_create_pixmap( _helper.xcbConnection(), 32, pixmap, QX11Info::appRootWindow(), width, height );
-+        //xcb_free_pixmap( _helper.xcbConnection(), pixmap );
- 
-         // create gc
-         if( !_gc )
diff --git a/oxygen-5.0.1.tar.xz b/oxygen-5.0.1.tar.xz
deleted file mode 100644
index 9ad0cf8..0000000
--- a/oxygen-5.0.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:16e1c724b29f32e931cfecdc4844743f2c939b0d11385c39e088599a96d2622a
-size 3015404
diff --git a/oxygen-5.0.95~git20140924.tar.xz b/oxygen-5.0.95~git20140924.tar.xz
new file mode 100644
index 0000000..256b1f3
--- /dev/null
+++ b/oxygen-5.0.95~git20140924.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0c960e02b3509c46cb2fe892ba92cc4c4a9acd2a171abf502012a94e1c37002e
+size 4225760
diff --git a/oxygen5.changes b/oxygen5.changes
index a143fc6..ab5d7bf 100644
--- a/oxygen5.changes
+++ b/oxygen5.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Sep 24 20:20:57 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Update to 5.0.95~git20140924 (rbc60753):
+   * Streamline of the style
+   * New Oxygen Look-and-feel package
+- Drop crasher.diff, obsoleted by the update
+- Swap libxcb-devel BuildRequires with pkgconfig(x11-xcb) and
+  pkgconfig(xcb)
+
 -------------------------------------------------------------------
 Sun Aug 10 21:41:30 UTC 2014 - hrvoje.senjan@gmail.com
 
diff --git a/oxygen5.spec b/oxygen5.spec
index 06e706c..acbcde3 100644
--- a/oxygen5.spec
+++ b/oxygen5.spec
@@ -19,15 +19,15 @@
 %define kwin_deco 1
 
 Name:           oxygen5
-Version:        5.0.1
+Version:        5.0.95~git20140924
 Release:        0
 Summary:        Oxygen style, KWin decoration, cursors and sounds
 License:        GPL-2.0+
 Group:          System/GUI/KDE
 Url:            http://www.kde.org
 Source:         http://download.kde.org/stable/plasma/%{version}/oxygen-%{version}.tar.xz
+Source:         oxygen-%{version}.tar.xz
 Source1:        baselibs.conf
-Patch1:         crasher.diff
 BuildRequires:  frameworkintegration-devel
 BuildRequires:  gcc-c++
 BuildRequires:  kcompletion-devel
@@ -41,7 +41,6 @@ BuildRequires:  kwindowsystem-devel
 %if %kwin_deco
 BuildRequires:  libkdecorations-devel
 %endif
-BuildRequires:  libxcb-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  xz
 BuildRequires:  pkgconfig(Qt5Core) >= 5.3.0
@@ -49,6 +48,8 @@ BuildRequires:  pkgconfig(Qt5DBus) >= 5.3.0
 BuildRequires:  pkgconfig(Qt5Test) >= 5.3.0
 BuildRequires:  pkgconfig(Qt5Widgets) >= 5.3.0
 BuildRequires:  pkgconfig(Qt5X11Extras) >= 5.3.0
+BuildRequires:  pkgconfig(x11-xcb)
+BuildRequires:  pkgconfig(xcb)
 Requires:       oxygen5-decoration
 Requires:       oxygen5-style
 Recommends:     oxygen5-sounds
@@ -117,7 +118,6 @@ This package contains the libraries Oxygen's KWin decoration.
 
 %prep
 %setup -q -n oxygen-%{version}
-%patch1 -p1
 sed -i '/^ecm_optional_add_subdirectory(po)/d' CMakeLists.txt
 
 %build
@@ -151,6 +151,7 @@ sed -i '/^ecm_optional_add_subdirectory(po)/d' CMakeLists.txt
 %{_kf5_plugindir}/kstyle_oxygen_config.so
 %{_kf5_plugindir}/styles/
 %{_kf5_sharedir}/kstyle/
+%{_kf5_plasmadir}/
 
 %if %kwin_deco
 %files decoration