horizon: add an upstream patch needed for pyscss 1.3.4

Without this patch we will get an error:
Don't know how to merge conflicting combinators: <SimpleSelector: u'+ .btn:not(:first-child)'> and <SimpleSelector: u'> .btn'>

when attempting to connect to the horizon dashboard.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

2 files changed, 69 insertions, 0 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-horizon/Compatibility-fix-for-pyscss-1.3.4.patch b/meta-openstack/recipes-devtools/python/python-horizon/Compatibility-fix-for-pyscss-1.3.4.patch
new file mode 100644
index 0000000..a94d757
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-horizon/Compatibility-fix-for-pyscss-1.3.4.patch
@@ -0,0 +1,68 @@
+From cca93ade7c23c1f2794376161b6660a459292eee Mon Sep 17 00:00:00 2001
+From: Richard Jones <r1chardj0n3s@gmail.com>
+Date: Fri, 1 May 2015 11:39:37 +1000
+Subject: [PATCH] Compatibility fix for pyscss 1.3.4
+
+Commit cca93ade7c23c1f2794376161b6660a459292eee from
+https://github.com/openstack/horizon.git
+
+This commit alters the action-list.scss file so it is compatible
+with the newer version of pyScss (1.3.4+), allowing us to
+upgrade to that version.
+
+This change is a prerequisite for the update to get into the
+global requirements so that that change can pass testing.
+
+Change-Id: Idec7ce039b57476ce20b7b678431459c2ca0bdbf
+Co-Authored-By: Kelly Domico <kelly.domico@hp.com>
+---
+ .../static/angular/action-list/action-list.scss    | 23 +++++++++++++++++++---
+ 1 file changed, 20 insertions(+), 3 deletions(-)
+ mode change 100644 => 100755 horizon/static/angular/action-list/action-list.scss
+
+diff --git a/horizon/static/angular/action-list/action-list.scss b/horizon/static/angular/action-list/action-list.scss
+old mode 100644
+new mode 100755
+index 58092e0..5b3fcc4
+--- a/horizon/static/angular/action-list/action-list.scss
++++ b/horizon/static/angular/action-list/action-list.scss
+@@ -22,16 +22,33 @@ action-list.btn-group {
+     right: -0.35em;
+     z-index: 3;
+ 
+-    & + .btn:not(:first-child) {
++    & + .btn:last-child:not(:first-child):not(.dropdown-toggle),
++    & + .btn:not(:last-child):not(:first-child):not(.dropdown-toggle),
++    & + .btn.single-button:not(:first-child),
++    & + .btn.split-button:not(:first-child):not(:last-child) {
+       border-top-left-radius: 4px;
+       border-bottom-left-radius: 4px;
++    }
++  }
+ 
+-      &.btn-sm {
++  &.btn-group-sm {
++    notifications {
++      & + .btn:last-child:not(:first-child):not(.dropdown-toggle),
++      & + .btn:not(:last-child):not(:first-child):not(.dropdown-toggle),
++      & + .btn.single-button:not(:first-child),
++      & + .btn.split-button:not(:first-child):not(:last-child) {
+         border-top-left-radius: 3px;
+         border-bottom-left-radius: 3px;
+       }
++    }
++  }
+ 
+-      &.btn-lg {
++  &.btn-group-lg {
++    notifications {
++      & + .btn:last-child:not(:first-child):not(.dropdown-toggle),
++      & + .btn:not(:last-child):not(:first-child):not(.dropdown-toggle),
++      & + .btn.single-button:not(:first-child),
++      & + .btn.split-button:not(:first-child):not(:last-child) {
+         border-top-left-radius: 6px;
+         border-bottom-left-radius: 6px;
+       }
+-- 
+2.1.4
+
diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
index f5c6c03..cf62d44 100644
--- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
@@ -70,6 +70,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/kilo \
     file://openstack-dashboard-apache.conf \
     file://local_settings.py \
     file://horizon-use-full-package-path-to-test-directories.patch \
+    file://Compatibility-fix-for-pyscss-1.3.4.patch \
     "
 
 SRCREV = "b99cf48ff346494198fb9740495eacc14fa406bf"