~ubuntu-branches/ubuntu/oneiric/unity/oneiric

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
Description: Upstream changes introduced in version 4.22.0-0ubuntu3
 This patch has been created by dpkg-source during the package build.
 Here's the last changelog entry, hopefully it gives details on why
 those changes were made:
 .
 unity (4.22.0-0ubuntu3) oneiric; urgency=low
 .
   * Cherry-pick upstream:
     - Resize the _gradient_texture (in PanelMenuView::Draw) if needed
       (LP: #863068, #868293, #869028)
 .
 The person named in the Author field signed this changelog entry.
Author: Didier Roche <didrocks@ubuntu.com>
Bug-Ubuntu: https://bugs.launchpad.net/bugs/863068
Bug-Ubuntu: https://bugs.launchpad.net/bugs/868293
Bug-Ubuntu: https://bugs.launchpad.net/bugs/869028

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- unity-4.22.0.orig/services/CMakeLists.txt
+++ unity-4.22.0/services/CMakeLists.txt
@@ -39,7 +39,7 @@ set(CFLAGS
     "-DGETTEXT_PACKAGE=\"unity\""
     "-DINDICATORDIR=\"${_indicatordir}\""
     "-DINDICATORICONDIR=\"${_iconsdir}\""
-    "-Werror -Wall"
+    "-Wall"
     )
 add_definitions(${CFLAGS})
 
--- unity-4.22.0.orig/plugins/unityshell/src/PanelMenuView.cpp
+++ unity-4.22.0/plugins/unityshell/src/PanelMenuView.cpp
@@ -447,7 +447,7 @@ PanelMenuView::Draw(nux::GraphicsEngine&
       lockrect.pBits = 0;
       bool locked = false;
 
-      if (_gradient_texture.IsNull())
+      if (_gradient_texture.IsNull() || (_gradient_texture->GetWidth() != geo.width))
       {
         build_gradient = true;
       }
--- unity-4.22.0.orig/plugins/unityshell/src/unityshell.cpp
+++ unity-4.22.0/plugins/unityshell/src/unityshell.cpp
@@ -1703,7 +1703,7 @@ void UnityWindow::windowNotify(CompWindo
         if (!focusdesktop_handle_)
            focusdesktop_handle_ = g_timeout_add (1000, &UnityWindow::FocusDesktopTimeout, this);
       }
-      break;
+    /* Fall through an re-evaluate wraps on map and unmap too */
     case CompWindowNotifyUnmap:
       if (UnityScreen::get (screen)->optionGetShowMinimizedWindows () &&
           window->mapNum ())