Hrvoje Senjan
2014-05-18 02:31:20 +00:00
committed by Git OBS Bridge
commit f147a6854a
6 changed files with 228 additions and 0 deletions

23
.gitattributes vendored Normal file
View File

@@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
.osc

42
crasher.diff Normal file
View File

@@ -0,0 +1,42 @@
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 )

3
oxygen-4.96.0.tar.xz Normal file
View File

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

5
oxygen5.changes Normal file
View File

@@ -0,0 +1,5 @@
-------------------------------------------------------------------
Sun May 18 01:33:14 UTC 2014 - hrvoje.senjan@gmail.com
- Activate oxygen5 package

154
oxygen5.spec Normal file
View File

@@ -0,0 +1,154 @@
#
# spec file for package oxygen5
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: oxygen5
Version: 4.96.0
Release: 0
Summary: Provides the interface and basic tools for the KDE workspace
License: LGPL-2.0+
Group: System/GUI/KDE
Url: git://anongit.kde.org/kde-workspace.git
Source0: oxygen-%{version}.tar.xz
Patch1: crasher.diff
BuildRequires: frameworkintegration-devel
BuildRequires: gcc-c++
BuildRequires: kcompletion-devel
BuildRequires: kconfig-devel
BuildRequires: kf5-filesystem
BuildRequires: kguiaddons-devel
BuildRequires: ki18n-devel
BuildRequires: kservice-devel
BuildRequires: kwidgetsaddons-devel
BuildRequires: kwindowsystem-devel
BuildRequires: libkdecorations-devel
BuildRequires: libxcb-devel
BuildRequires: update-desktop-files
BuildRequires: xz
BuildRequires: pkgconfig(Qt5Core) >= 5.2.0
BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0
BuildRequires: pkgconfig(Qt5Test) >= 5.2.0
BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0
BuildRequires: pkgconfig(Qt5X11Extras) >= 5.2.0
Requires: oxygen-style5
Requires: oxygen-decoration5
Recommends: oxygen-sounds5
Recommends: oxygen-cursors
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Provides the interface and basic tools for the KDE workspace.
%package devel
Summary: KDE Base Libraries
Group: System/GUI/KDE
Requires: %{name} = %{version}
%description devel
Provides the interface and basic tools for the KDE workspace.
%package -n oxygen-sounds5
Summary: The KDE Workspace Sounds
Group: System/GUI/KDE
%description -n oxygen-sounds5
This package contains the default sound set for a K Desktop Environment
workspace.
%package -n oxygen-cursors5
Summary: The KDE Workspace Cursors
Group: System/GUI/KDE
Provides: oxygen-cursors = %{version}
Conflicts: oxygen-cursors4
%description -n oxygen-cursors5
This package contains the default cursor set for a K Desktop Environment
workspace.
%package -n oxygen-style5
Summary: Oxygen style
Group: System/GUI/KDE
Requires: %{name} = %{version}
%package -n oxygen-style5
This package contains the libraries of the Oxygen style.
%package -n oxygen-decoration5
Summary: Oxygen's KWin decoration
Group: System/GUI/KDE
Requires: %{name} = %{version}
%package -n oxygen-decoration5
This package contains the libraries Oxygen's KWin decoration.
%prep
%setup -q -n oxygen-%{version}
%patch1 -p1
%build
%cmake_kf5 -d build
%make_jobs
%install
%kf5_makeinstall -C build
%post -n oxygen-style5 -p /sbin/ldconfig
%postun -n oxygen-style5 -p /sbin/ldconfig
%post -n oxygen-decoration5 -p /sbin/ldconfig
%postun -n oxygen-decoration5 -p /sbin/ldconfig
%files
%defattr(-,root,root)
%doc COPYING*
%files -n oxygen-style5
%defattr(-,root,root)
%doc COPYING*
%{_kf5_bindir}/oxygen-demo5
%{_kf5_bindir}/oxygen-settings5
%{_kf5_libdir}/liboxygenstyle5.so.*
%{_kf5_libdir}/liboxygenstyleconfig5.so.*
%{_kf5_plugindir}/kstyle_oxygen_config.so
%{_kf5_plugindir}/styles/
%{_kf5_sharedir}/kstyle/
%files -n oxygen-decoration5
%defattr(-,root,root)
%doc COPYING*
%{_kf5_bindir}/oxygen-shadow-demo5
%{_kf5_plugindir}/kwin/
%files -n oxygen-sounds5
%defattr(-,root,root)
%doc COPYING*
%{_kf5_sharedir}/sounds/
%files -n oxygen-cursors5
%defattr(-,root,root)
%doc COPYING*
%{_kf5_sharedir}/icons/
%files devel
%defattr(-,root,root)
%doc COPYING*
%{_kf5_libdir}/liboxygenstyleconfig5.so
%{_kf5_libdir}/liboxygenstyle5.so
%changelog