Updated to 0.9.14.1

4 files changed, 16 insertions, 280 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0523d4e0d09d..27bfa62cae0d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = compiz
 	pkgdesc = Composite manager for Aiglx and Xgl, with plugins and CCSM
-	pkgver = 0.9.14.0
-	pkgrel = 6
+	pkgver = 0.9.14.1
+	pkgrel = 1
 	url = https://launchpad.net/compiz
 	arch = i686
 	arch = x86_64
@@ -23,13 +23,13 @@ pkgbase = compiz
 	depends = metacity
 	depends = glu
 	optdepends = xorg-xprop: grab various window properties for use in window matching rules
-	provides = compiz-core=0.9.14.0
-	provides = compiz-bcop=0.9.14.0
-	provides = ccsm=0.9.14.0
-	provides = compiz-plugins-main=0.9.14.0
-	provides = compiz-plugins-extra=0.9.14.0
-	provides = compizconfig-python=0.9.14.0
-	provides = libcompizconfig=0.9.14.0
+	provides = compiz-core=0.9.14.1
+	provides = compiz-bcop=0.9.14.1
+	provides = ccsm=0.9.14.1
+	provides = compiz-plugins-main=0.9.14.1
+	provides = compiz-plugins-extra=0.9.14.1
+	provides = compizconfig-python=0.9.14.1
+	provides = libcompizconfig=0.9.14.1
 	conflicts = compiz-core
 	conflicts = compiz-gtk
 	conflicts = compiz-bcop
@@ -40,22 +40,18 @@ pkgbase = compiz
 	conflicts = compizconfig-python
 	conflicts = libcompizconfig
 	conflicts = simple-ccsm
-	source = https://launchpad.net/compiz/0.9.14/0.9.14.0/+download/compiz-0.9.14.0.tar.xz
+	source = https://launchpad.net/compiz/0.9.14/0.9.14.1/+download/compiz-0.9.14.1.tar.xz
 	source = focus-prevention-disable.patch
 	source = gtk-extents.patch
 	source = reverse-unity-config.patch
 	source = screenshot-launch-fix.patch
 	source = no-compile-gschemas.patch
-	source = ccsm-unicode-fix.patch
-	source = ccsm-escape-fix.patch
-	sha256sums = 52cd6a90ffe987bd0415fda23c34e1f3284aa34c4d8b4eefb160fbf4d1f33a2c
+	sha256sums = 2505602b6c93d6565e681473df4157634268533c6874c3cdc9493b73b301ac52
 	sha256sums = f4897590b0f677ba34767a29822f8f922a750daf66e8adf47be89f7c2550cf4b
 	sha256sums = 16ddb6311ce42d958505e21ca28faae5deeddce02cb558d55e648380274ba4d9
 	sha256sums = 6ec9c04540ca1649c687d9ab2c8311caea7075831e2cffe719ec7958c9ebab7b
 	sha256sums = 89ee91a8ea6b1424ef76661ea9a2db43412366aacddc12d24a7adf5e04bfbc61
 	sha256sums = 4ab3277da201314b3f65e30128bc30704ddee584fdbbfc8d0d83c7e0de91fa9a
-	sha256sums = 78ab98cb0904cab84d57028f3c07defc5e3596dcd8c0f691bcb57a85f9e0c06e
-	sha256sums = 033c3be1f54238d07b4ed400d34b2260247ed7269fa281e98eb551b08b9a9188
 
 pkgname = compiz
 
diff --git a/PKGBUILD b/PKGBUILD
index 5f67cc04d1ee..830857746ae4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 # Contributor: Nathan Hulse <nat.hulse@gmail.com>
 
 pkgname=compiz
-pkgver=0.9.14.0
-pkgrel=6
+pkgver=0.9.14.1
+pkgrel=1
 pkgdesc="Composite manager for Aiglx and Xgl, with plugins and CCSM"
 arch=('i686' 'x86_64')
 url="https://launchpad.net/compiz"
@@ -23,17 +23,13 @@ source=("https://launchpad.net/${pkgname}/${pkgver:0:6}/${pkgver}/+download/${pk
         "gtk-extents.patch"
         "reverse-unity-config.patch"
         "screenshot-launch-fix.patch"
-        "no-compile-gschemas.patch"
-        "ccsm-unicode-fix.patch"
-        "ccsm-escape-fix.patch")
-sha256sums=('52cd6a90ffe987bd0415fda23c34e1f3284aa34c4d8b4eefb160fbf4d1f33a2c'
+        "no-compile-gschemas.patch")
+sha256sums=('2505602b6c93d6565e681473df4157634268533c6874c3cdc9493b73b301ac52'
             'f4897590b0f677ba34767a29822f8f922a750daf66e8adf47be89f7c2550cf4b'
             '16ddb6311ce42d958505e21ca28faae5deeddce02cb558d55e648380274ba4d9'
             '6ec9c04540ca1649c687d9ab2c8311caea7075831e2cffe719ec7958c9ebab7b'
             '89ee91a8ea6b1424ef76661ea9a2db43412366aacddc12d24a7adf5e04bfbc61'
-            '4ab3277da201314b3f65e30128bc30704ddee584fdbbfc8d0d83c7e0de91fa9a'
-            '78ab98cb0904cab84d57028f3c07defc5e3596dcd8c0f691bcb57a85f9e0c06e'
-            '033c3be1f54238d07b4ed400d34b2260247ed7269fa281e98eb551b08b9a9188')
+            '4ab3277da201314b3f65e30128bc30704ddee584fdbbfc8d0d83c7e0de91fa9a')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
@@ -52,12 +48,6 @@ prepare() {
 
   # Don't try to compile gschemas during make install
   patch -p1 -i "${srcdir}/no-compile-gschemas.patch"
-
-  # Fix unicode related ccsm crashes #1816629
-  patch -p1 -i "${srcdir}/ccsm-unicode-fix.patch"
-
-  # Fix HTML-escaping related ccsm crashes
-  patch -p1 -i "${srcdir}/ccsm-escape-fix.patch"
 }
 
 build() {
diff --git a/ccsm-escape-fix.patch b/ccsm-escape-fix.patch
deleted file mode 100644
index a1d20492fb7e..000000000000
--- a/ccsm-escape-fix.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff --unified --recursive --text compiz-0.9.14.0/compizconfig/ccsm/ccm/Pages.py compiz-0.9.14.0-new/compizconfig/ccsm/ccm/Pages.py
---- compiz-0.9.14.0/compizconfig/ccsm/ccm/Pages.py	2019-02-16 18:14:41.000000000 +0530
-+++ compiz-0.9.14.0-new/compizconfig/ccsm/ccm/Pages.py	2019-11-17 10:36:48.719451182 +0530
-@@ -33,7 +33,7 @@
- from ccm.Utils import gtk_process_events, getScreens, Image, PrettyButton, Label, NotFoundBox, GlobalUpdater, CategoryKeyFunc, GroupIndexKeyFunc, PluginKeyFunc, GetSettings, GetAcceleratorName
- from ccm.Widgets import ClearEntry, PluginView, GroupView, SelectorButtons, ScrolledList, Popup, KeyGrabber, AboutDialog, PluginWindow
- 
--from cgi import escape as protect_pango_markup
-+from html import escape as protect_pango_markup
- 
- import os
- 
-@@ -397,7 +397,7 @@
-         for index, n in enumerate(context.Plugins):
-             plugin = context.Plugins[n]
-             bar.set_fraction((index+1)/float(length))
--            label.set_markup("<i>%s</i>" %protect_pango_markup(plugin.ShortDesc))
-+            label.set_markup("<i>%s</i>" %protect_pango_markup(plugin.ShortDesc, quote=False))
-             gtk_process_events()
- 
-             groups = []
-@@ -1383,7 +1383,7 @@
-         self.VisibleAreas = self.subGroupAreas = []
-         self.Label = Gtk.Alignment(xalign=0.0, yalign=0.5)
-         self.Label.set_padding(4, 4, 4, 4)
--        label = Gtk.Label(label="<b>%s</b>" % (protect_pango_markup(name or _('General'))))
-+        label = Gtk.Label(label="<b>%s</b>" % (protect_pango_markup(name or _('General'), quote=False)))
-         label.set_use_markup(True)
-         label.set_xalign(0.0)
-         self.Label.add(label)
-diff --unified --recursive --text compiz-0.9.14.0/compizconfig/ccsm/ccm/Settings.py compiz-0.9.14.0-new/compizconfig/ccsm/ccm/Settings.py
---- compiz-0.9.14.0/compizconfig/ccsm/ccm/Settings.py	2019-02-16 18:14:41.000000000 +0530
-+++ compiz-0.9.14.0-new/compizconfig/ccsm/ccm/Settings.py	2019-11-17 10:36:48.719451182 +0530
-@@ -29,7 +29,7 @@
- from ccm.Widgets import CellRendererColor, ModifierSelector, SingleEdgeSelector, KeyGrabber, MatchButton, FileButton, ErrorDialog
- from ccm.Utils import Image, ActionImage, SizedButton, GlobalUpdater, PureVirtualError, SettingKeyFunc, EnumSettingKeyFunc, HasOnlyType, GetSettings, GetAcceleratorName
- 
--from cgi import escape as protect_pango_markup
-+from html import escape as protect_pango_markup
- 
- import locale
- import gettext
-@@ -110,7 +110,7 @@
-             return
- 
-         label = Gtk.Label()
--        desc = protect_pango_markup (self.Setting.ShortDesc)
-+        desc = protect_pango_markup (self.Setting.ShortDesc, quote=False)
-         style = "%s"
-         if self.Setting.Integrated:
-             style = "<i>%s</i>"
-@@ -966,7 +966,7 @@
-     def HandleDialogText (self, accel):
-         name = self.ReorderKeyString (accel)
-         if len (accel) != len (name):
--            accel = protect_pango_markup (accel)
-+            accel = protect_pango_markup (accel, quote=False)
-             ErrorDialog (self.Widget.get_toplevel (),
-                          _("\"%s\" is not a valid shortcut") % accel)
-             return
-@@ -1149,7 +1149,7 @@
- 
-     def HandleDialogText (self, button):
-         def ShowErrorDialog (button):
--            button = protect_pango_markup (button)
-+            button = protect_pango_markup (button, quote=False)
-             ErrorDialog (self.Widget.get_toplevel (),
-                          _("\"%s\" is not a valid button") % button)
-         if button.lower ().strip () in ("", "disabled", "none"):
-@@ -1330,7 +1330,7 @@
-                 valid = False
-                 break
-         if not valid:
--            mask = protect_pango_markup (mask)
-+            mask = protect_pango_markup (mask, quote=False)
-             ErrorDialog (self.Widget.get_toplevel (),
-                          _("\"%s\" is not a valid edge mask") % mask)
-             return
-diff --unified --recursive --text compiz-0.9.14.0/compizconfig/ccsm/ccm/Utils.py compiz-0.9.14.0-new/compizconfig/ccsm/ccm/Utils.py
---- compiz-0.9.14.0/compizconfig/ccsm/ccm/Utils.py	2019-02-16 18:14:41.000000000 +0530
-+++ compiz-0.9.14.0-new/compizconfig/ccsm/ccm/Utils.py	2019-11-17 10:36:48.719451182 +0530
-@@ -27,7 +27,7 @@
- import weakref
- 
- from ccm.Constants import ImageNone, ImagePlugin, ImageCategory, ImageThemed, ImageStock, DataDir, IconDir
--from cgi import escape as protect_pango_markup
-+from html import escape as protect_pango_markup
- import operator
- 
- import locale
-@@ -57,7 +57,7 @@
-     return Gdk.Screen.get_default().get_number()
- 
- def protect_markup_dict (dict_):
--    return dict((k, protect_pango_markup (v)) for (k, v) in dict_.items())
-+    return dict((k, protect_pango_markup (v, quote=False)) for (k, v) in dict_.items())
- 
- class Image (Gtk.Image):
- 
-@@ -187,7 +187,7 @@
-         box = Gtk.HBox()
-         self.Warning = Gtk.Label()
-         self.Markup = _("<span size=\"large\"><b>No matches found.</b> </span><span>\n\n Your filter \"<b>%s</b>\" does not match any items.</span>")
--        value = protect_pango_markup(value)
-+        value = protect_pango_markup(value, quote=False)
-         self.Warning.set_markup(self.Markup % value)
-         image = Image("face-surprise", ImageThemed, 48)
-             
-@@ -196,7 +196,7 @@
-         self.add(box)
- 
-     def update(self, value):
--        value = protect_pango_markup(value)
-+        value = protect_pango_markup(value, quote=False)
-         self.Warning.set_markup(self.Markup % value)
- 
- class IdleSettingsParser:
-diff --unified --recursive --text compiz-0.9.14.0/compizconfig/ccsm/ccm/Widgets.py compiz-0.9.14.0-new/compizconfig/ccsm/ccm/Widgets.py
---- compiz-0.9.14.0/compizconfig/ccsm/ccm/Widgets.py	2019-02-16 18:14:41.000000000 +0530
-+++ compiz-0.9.14.0-new/compizconfig/ccsm/ccm/Widgets.py	2019-11-17 10:36:48.719451182 +0530
-@@ -27,7 +27,7 @@
- from gi.repository import PangoCairo
- from gi.repository import GdkPixbuf
- import cairo
--from cgi import escape as protect_pango_markup
-+from html import escape as protect_pango_markup
- from math import pi, sqrt
- import time
- import os
-@@ -295,7 +295,7 @@
-     def add_item(self, item, callback, markup="%s", image=None, info=None):
-         button = Gtk.Button()
-         label = Label(wrap=170)
--        text = protect_pango_markup(item)
-+        text = protect_pango_markup(item, quote=False)
-         label.set_markup(markup % text or _("General"))
-         labelBox = Gtk.VBox()
-         labelBox.set_spacing(5)
\ No newline at end of file
diff --git a/ccsm-unicode-fix.patch b/ccsm-unicode-fix.patch
deleted file mode 100644
index f1920be20285..000000000000
--- a/ccsm-unicode-fix.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff --git a/compizconfig/compizconfig-python/src/compizconfig.pyx b/compizconfig/compizconfig-python/src/compizconfig.pyx
-index 79d6362..60e5301 100644
---- a/compizconfig/compizconfig-python/src/compizconfig.pyx
-+++ b/compizconfig/compizconfig-python/src/compizconfig.pyx
-@@ -1,4 +1,5 @@
--# cython: c_string_type=str, c_string_encoding=ascii, language_level=3
-+# cython: c_string_type=str, c_string_encoding=utf8, language_level=3
-+
- '''
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public License
-@@ -471,9 +472,9 @@ cdef CCSSettingValue * EncodeValue (object       data,
-     else:
-         t = ccsSettingGetType (setting)
-     if t == TypeString:
--        bv.value.asString = strdup (data)
-+        bv.value.asString = strdup (data.encode ("utf-8"))
-     elif t == TypeMatch:
--        bv.value.asMatch = strdup (data)
-+        bv.value.asMatch = strdup (data.encode ("utf-8"))
-     elif t == TypeInt:
-         bv.value.asInt = data
-     elif t == TypeFloat:
-@@ -489,11 +490,11 @@ cdef CCSSettingValue * EncodeValue (object       data,
-         bv.value.asColor.color.blue = data[2]
-         bv.value.asColor.color.alpha = data[3]
-     elif t == TypeKey:
--        ccsStringToKeyBinding (data, &bv.value.asKey)
-+        ccsStringToKeyBinding (data.encode ("utf-8"), &bv.value.asKey)
-     elif t == TypeButton:
--        ccsStringToButtonBinding (data, &bv.value.asButton)
-+        ccsStringToButtonBinding (data.encode ("utf-8"), &bv.value.asButton)
-     elif t == TypeEdge:
--        bv.value.asEdge = ccsStringToEdges (data)
-+        bv.value.asEdge = ccsStringToEdges (data.encode ("utf-8"))
-     elif t == TypeBell:
-         if (data):
-             bv.value.asBell = 1
-@@ -591,7 +592,7 @@ cdef class Setting:
-         cdef CCSSettingType t
-         cdef CCSSettingInfo * i
- 
--        self.ccsSetting = ccsFindSetting (plugin.ccsPlugin, name)
-+        self.ccsSetting = ccsFindSetting (plugin.ccsPlugin, name.encode ("utf-8"))
-         self.plugin = plugin
- 
-         self.extendedStrRestrictions = None
-@@ -717,7 +718,7 @@ cdef class Plugin:
-     cdef object hasExtendedString
-     
-     def __cinit__ (self, Context context, name):
--        self.ccsPlugin = ccsFindPlugin (context.ccsContext, name)
-+        self.ccsPlugin = ccsFindPlugin (context.ccsContext, name.encode ("utf-8"))
-         self.context = context
-         self.screen = {}
-         self.groups = {}
-@@ -1037,7 +1038,7 @@ cdef class Profile:
- 
-     def __cinit__ (self, Context context, name):
-         self.context = context
--        self.name = strdup (name)
-+        self.name = strdup (name.encode ("utf-8"))
- 
-     def __dealloc__ (self):
-         free (self.name)
-@@ -1059,9 +1060,9 @@ cdef class Backend:
- 
-     def __cinit__ (self, Context context, info):
-         self.context = context
--        self.name = strdup (info[0])
--        self.shortDesc = strdup (info[1])
--        self.longDesc = strdup (info[2])
-+        self.name = strdup (info[0].encode ("utf-8"))
-+        self.shortDesc = strdup (info[1].encode ("utf-8"))
-+        self.longDesc = strdup (info[2].encode ("utf-8"))
-         self.profileSupport = bool (info[3])
-         self.integrationSupport = bool (info[4])
-     
-@@ -1226,13 +1227,13 @@ cdef class Context:
-         ccsReadSettings (self.ccsContext)
- 
-     def Import (self, path, autoSave = True):
--        ret = bool (ccsImportFromFile (self.ccsContext, path, True))
-+        ret = bool (ccsImportFromFile (self.ccsContext, path.encode ("utf-8"), True))
-         if autoSave:
-             ccsWriteSettings (self.ccsContext)
-         return ret
- 
-     def Export (self, path, skipDefaults = False):
--        return bool (ccsExportToFile (self.ccsContext, path, skipDefaults))
-+        return bool (ccsExportToFile (self.ccsContext, path.encode ("utf-8"), skipDefaults))
- 
-     property Plugins:
-         def __get__ (self):
-@@ -1247,7 +1248,7 @@ cdef class Context:
-             return self.currentProfile
-         def __set__ (self, profile):
-             self.currentProfile = profile
--            ccsSetProfile (self.ccsContext, profile.Name)
-+            ccsSetProfile (self.ccsContext, profile.Name.encode ("utf-8"))
-             ccsReadSettings (self.ccsContext)
- 
-     property Profiles:
-@@ -1259,7 +1260,7 @@ cdef class Context:
-             return self.currentBackend
-         def __set__ (self, backend):
-             self.currentBackend = backend
--            ccsSetBackend (self.ccsContext, backend.Name)
-+            ccsSetBackend (self.ccsContext, backend.Name.encode ("utf-8"))
-             ccsReadSettings (self.ccsContext)
- 
-     property Backends: