Hello community,
here is the log from the commit of package kdebase4-workspace for
openSUSE:Factory checked in at 2013-09-17 21:56:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old)
and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-workspace"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes
2013-09-11 12:17:25.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes
2013-09-17 21:56:19.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Sep 17 15:04:42 UTC 2013 - [email protected]
+
+- Added kwin-fix-crash.diff:
+ Fixes a crash when trying to use GLX, which happened when starting
+ KDE inside qemu (bnc#840490)
+
+-------------------------------------------------------------------
New:
----
kwin-fix-crash.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.J8mfxj/_old 2013-09-17 21:56:24.000000000 +0200
+++ /var/tmp/diff_new_pack.J8mfxj/_new 2013-09-17 21:56:24.000000000 +0200
@@ -60,9 +60,9 @@
BuildRequires: python-devel
BuildRequires: xcb-util-image-devel
BuildRequires: xcb-util-renderutil-devel
-BuildRequires: pkgconfig(xcb-keysyms)
BuildRequires: pkgconfig(glesv2)
BuildRequires: pkgconfig(udev)
+BuildRequires: pkgconfig(xcb-keysyms)
%if %suse_version > 1220
BuildRequires: pkgconfig(glu)
%endif
@@ -158,6 +158,8 @@
Patch1051: 0002-Add-the-full-name-of-completion-matches-to-history.patch
# PATCH-FIX-UPSTREAM 0003-Delay-KDE-class-initialization-to-main-loop.patch --
kde#324574
Patch2000: 0003-Delay-KDE-class-initialization-to-main-loop.patch
+# PATCH-FIX-UPSTREAM kwin-fix-crash.diff -- Check for null value to fix kwin
crashing under qemu (bnc#840490)
+Patch2001: kwin-fix-crash.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-branding = %{_kde_branding_version}
Requires: %{name}-ksysguardd = %{version}
@@ -379,6 +381,7 @@
%patch1050 -p1
%patch1051 -p1
%patch2000 -p1
+%patch2001 -p1
cp %{SOURCE3} kwin/effects/cube/data/cubecap.png
%build
++++++ kwin-fix-crash.diff ++++++
Index: kde-workspace-4.11.1/kwin/glxbackend.cpp
===================================================================
--- kde-workspace-4.11.1.orig/kwin/glxbackend.cpp
+++ kde-workspace-4.11.1/kwin/glxbackend.cpp
@@ -222,6 +222,10 @@ bool GlxBackend::initBuffer()
if (overlayWindow()->create()) {
// Try to create double-buffered window in the overlay
XVisualInfo* visual = glXGetVisualFromFBConfig(display(), fbconfig);
+ if (!visual) {
+ kError(1212) << "Failed to get visual from fbconfig";
+ return false;
+ }
XSetWindowAttributes attrs;
attrs.colormap = XCreateColormap(display(), rootWindow(),
visual->visual, AllocNone);
window = XCreateWindow(display(), overlayWindow()->window(), 0, 0,
displayWidth(), displayHeight(),
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
