r54947 - in /desktop/unstable/caribou/debian: changelog patches/fix-font-property-in-style.css.patch patches/series

[jbicha at users.alioth.debian.org]

Author: jbicha
Date: Fri Dec  1 20:10:19 2017
New Revision: 54947

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54947
Log:
Cherry-pick patch to fix caribou-antler crash (LP: #1735298)

Added:
    desktop/unstable/caribou/debian/patches/fix-font-property-in-style.css.patch
Modified:
    desktop/unstable/caribou/debian/changelog
    desktop/unstable/caribou/debian/patches/series

Modified: desktop/unstable/caribou/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/caribou/debian/changelog?rev=54947&op=diff
==============================================================================
--- desktop/unstable/caribou/debian/changelog	[utf-8] (original)
+++ desktop/unstable/caribou/debian/changelog	[utf-8] Fri Dec  1 20:10:19 2017
@@ -3,6 +3,8 @@
   * Have caribou-antler depend on libcaribou-gtk3-module
   * Bump debhelper compat to 10
   * Use debian/docs to install NEWS
+  * Cherry-pick fix-font-property-in-style.css.patch:
+    - Fix caribou-antler crash (LP: #1735298)
 
  -- Jeremy Bicha <jbicha at debian.org>  Fri, 01 Dec 2017 12:29:10 -0500
 

Added: desktop/unstable/caribou/debian/patches/fix-font-property-in-style.css.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/caribou/debian/patches/fix-font-property-in-style.css.patch?rev=54947&op=file
==============================================================================
--- desktop/unstable/caribou/debian/patches/fix-font-property-in-style.css.patch	(added)
+++ desktop/unstable/caribou/debian/patches/fix-font-property-in-style.css.patch	[utf-8] Fri Dec  1 20:10:19 2017
@@ -0,0 +1,26 @@
+From 13df8b92ae89c796238e669ee6ef4447a42d6355 Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jbicha at ubuntu.com>
+Date: Fri, 1 Dec 2017 12:11:35 -0500
+Subject: style.css: Fix failure to start in GNOME Flashback
+
+The order for 'font' properties matters
+https://developer.gnome.org/gtk3/stable/chap-css-properties.html
+
+https://bugzilla.gnome.org/show_bug.cgi?id=791001
+---
+ data/antler/style.css | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/antler/style.css b/data/antler/style.css
+index 5ab6f71..4d84904 100644
+--- a/data/antler/style.css
++++ b/data/antler/style.css
+@@ -13,7 +13,7 @@
+   border-width: 0px;
+   border-radius: 2px;
+   border-image: url("dark-key-border.svg") 2 2 2 2 repeat stretch;
+-  font: Sans 14px;
++  font: 14px Sans;
+   background-image: -gtk-gradient (linear,
+ 				     left top,
+ 				     left bottom,

Modified: desktop/unstable/caribou/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/caribou/debian/patches/series?rev=54947&op=diff
==============================================================================
--- desktop/unstable/caribou/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/caribou/debian/patches/series	[utf-8] Fri Dec  1 20:10:19 2017
@@ -1 +1,2 @@
 autostart-set-nodisplay.patch
+fix-font-property-in-style.css.patch