[arch-commits] Commit in cinnamon/trunk (2 files)
Eli Schwartz
eschwartz at archlinux.org
Tue May 1 16:32:58 UTC 2018
Date: Tuesday, May 1, 2018 @ 16:32:57
Author: eschwartz
Revision: 318596
upgpkg: cinnamon 3.8.1-1
upstream release
FS#58407 should be fixed properly
Modified:
cinnamon/trunk/PKGBUILD
Deleted:
cinnamon/trunk/0001-Revert-shell-embedded-window-change-realize-to-map-6.patch
-----------------------------------------------------------------+
0001-Revert-shell-embedded-window-change-realize-to-map-6.patch | 132 ----------
PKGBUILD | 11
2 files changed, 3 insertions(+), 140 deletions(-)
Deleted: 0001-Revert-shell-embedded-window-change-realize-to-map-6.patch
===================================================================
--- 0001-Revert-shell-embedded-window-change-realize-to-map-6.patch 2018-05-01 15:49:18 UTC (rev 318595)
+++ 0001-Revert-shell-embedded-window-change-realize-to-map-6.patch 2018-05-01 16:32:57 UTC (rev 318596)
@@ -1,132 +0,0 @@
-From 5fed38ca58d7f696c13b67dda5f55f4a825ffcdb Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93 at gmail.com>
-Date: Mon, 30 Apr 2018 09:12:08 -0400
-Subject: [PATCH] Revert "shell-embedded-window: change realize to map (#6965)"
-
-Try to fix crashes reported in https://github.com/linuxmint/Cinnamon/issues/7522
-
-This reverts commit fa9a5c78bfbb6c15b126bf1d79f7d816fecb7b36.
----
- src/cinnamon-embedded-window-private.h | 4 ++--
- src/cinnamon-embedded-window.c | 19 ++++++++++++++-----
- src/cinnamon-gtk-embed.c | 18 +++++++++---------
- 3 files changed, 25 insertions(+), 16 deletions(-)
-
-diff --git a/src/cinnamon-embedded-window-private.h b/src/cinnamon-embedded-window-private.h
-index 7e3bd8c1..754ee313 100644
---- a/src/cinnamon-embedded-window-private.h
-+++ b/src/cinnamon-embedded-window-private.h
-@@ -14,7 +14,7 @@ void _cinnamon_embedded_window_allocate (CinnamonEmbeddedWindow *window,
- int width,
- int height);
-
--void _cinnamon_embedded_window_map (CinnamonEmbeddedWindow *window);
--void _cinnamon_embedded_window_unmap (CinnamonEmbeddedWindow *window);
-+void _cinnamon_embedded_window_realize (CinnamonEmbeddedWindow *window);
-+void _cinnamon_embedded_window_unrealize (CinnamonEmbeddedWindow *window);
-
- #endif /* __CINNAMON_EMBEDDED_WINDOW_PRIVATE_H__ */
-diff --git a/src/cinnamon-embedded-window.c b/src/cinnamon-embedded-window.c
-index 9e3e1316..d2b0512e 100644
---- a/src/cinnamon-embedded-window.c
-+++ b/src/cinnamon-embedded-window.c
-@@ -19,11 +19,20 @@
- * - CinnamonGtkEmbed is created for the CinnamonEmbeddedWindow
- * - actor is added to a stage
- *
-- * The GtkWindow is mapped if and only if both:
-+ * Ideally, the way it would work is that the GtkWindow is mapped
-+ * if and only if both:
- *
-- * - gtk_window_visible (window) [widget has been shown]
-+ * - GTK_WIDGET_VISIBLE (window) [widget has been shown]
- * - Actor is mapped [actor and all parents visible, actor in stage]
- *
-+ * Implementing this perfectly is not currently possible, due to problems
-+ * in Clutter, see:
-+ *
-+ * http://bugzilla.openedhand.com/show_bug.cgi?id=1138
-+ *
-+ * So until that is fixed we use the "realized" state of the ClutterActor
-+ * as a stand-in for the ideal mapped state, this will work as long
-+ * as the ClutterActor and all its parents are in fact visible.
- */
-
- G_DEFINE_TYPE (CinnamonEmbeddedWindow, cinnamon_embedded_window, GTK_TYPE_WINDOW);
-@@ -221,7 +230,7 @@ _cinnamon_embedded_window_set_actor (CinnamonEmbeddedWindow *window,
- window->priv->actor = actor;
-
- if (actor &&
-- clutter_actor_is_mapped (CLUTTER_ACTOR (actor)) &&
-+ clutter_actor_is_realized (CLUTTER_ACTOR (actor)) &&
- gtk_widget_get_visible (GTK_WIDGET (window)))
- gtk_widget_map (GTK_WIDGET (window));
- }
-@@ -261,7 +270,7 @@ _cinnamon_embedded_window_allocate (CinnamonEmbeddedWindow *window,
- }
-
- void
--_cinnamon_embedded_window_map (CinnamonEmbeddedWindow *window)
-+_cinnamon_embedded_window_realize (CinnamonEmbeddedWindow *window)
- {
- g_return_if_fail (CINNAMON_IS_EMBEDDED_WINDOW (window));
-
-@@ -270,7 +279,7 @@ _cinnamon_embedded_window_map (CinnamonEmbeddedWindow *window)
- }
-
- void
--_cinnamon_embedded_window_unmap (CinnamonEmbeddedWindow *window)
-+_cinnamon_embedded_window_unrealize (CinnamonEmbeddedWindow *window)
- {
- g_return_if_fail (CINNAMON_IS_EMBEDDED_WINDOW (window));
-
-diff --git a/src/cinnamon-gtk-embed.c b/src/cinnamon-gtk-embed.c
-index 8879b3f0..4b4a9ded 100644
---- a/src/cinnamon-gtk-embed.c
-+++ b/src/cinnamon-gtk-embed.c
-@@ -199,24 +199,24 @@ cinnamon_gtk_embed_allocate (ClutterActor *actor,
- }
-
- static void
--cinnamon_gtk_embed_map (ClutterActor *actor)
-+cinnamon_gtk_embed_realize (ClutterActor *actor)
- {
- CinnamonGtkEmbed *embed = CINNAMON_GTK_EMBED (actor);
-
-- _cinnamon_embedded_window_map (embed->priv->window);
-+ _cinnamon_embedded_window_realize (embed->priv->window);
-
-- CLUTTER_ACTOR_CLASS (cinnamon_gtk_embed_parent_class)->map (actor);
-+ CLUTTER_ACTOR_CLASS (cinnamon_gtk_embed_parent_class)->realize (actor);
- }
-
- static void
--cinnamon_gtk_embed_unmap (ClutterActor *actor)
-+cinnamon_gtk_embed_unrealize (ClutterActor *actor)
- {
- CinnamonGtkEmbed *embed = CINNAMON_GTK_EMBED (actor);
--
-+
- if (embed->priv->window)
-- _cinnamon_embedded_window_unmap (embed->priv->window);
-+ _cinnamon_embedded_window_unrealize (embed->priv->window);
-
-- CLUTTER_ACTOR_CLASS (cinnamon_gtk_embed_parent_class)->unmap (actor);
-+ CLUTTER_ACTOR_CLASS (cinnamon_gtk_embed_parent_class)->unrealize (actor);
- }
-
- static void
-@@ -244,8 +244,8 @@ cinnamon_gtk_embed_class_init (CinnamonGtkEmbedClass *klass)
- actor_class->get_preferred_width = cinnamon_gtk_embed_get_preferred_width;
- actor_class->get_preferred_height = cinnamon_gtk_embed_get_preferred_height;
- actor_class->allocate = cinnamon_gtk_embed_allocate;
-- actor_class->map = cinnamon_gtk_embed_map;
-- actor_class->unmap = cinnamon_gtk_embed_unmap;
-+ actor_class->realize = cinnamon_gtk_embed_realize;
-+ actor_class->unrealize = cinnamon_gtk_embed_unrealize;
-
- g_object_class_install_property (object_class,
- PROP_WINDOW,
---
-2.17.0
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-05-01 15:49:18 UTC (rev 318595)
+++ PKGBUILD 2018-05-01 16:32:57 UTC (rev 318596)
@@ -6,8 +6,8 @@
# Contributor: CReimer
pkgname=cinnamon
-pkgver=3.8.0
-pkgrel=2
+pkgver=3.8.1
+pkgrel=1
pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
arch=('x86_64')
url="https://github.com/linuxmint/Cinnamon"
@@ -26,12 +26,10 @@
options=('!emptydirs')
source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz"
"0001-cinanmon-settings-don-t-rely-on-the-presence-of-cinn.patch::${url}/pull/7382.patch"
- "0001-Revert-shell-embedded-window-change-realize-to-map-6.patch"
"set_wheel.patch"
"default-theme.patch")
-sha512sums=('5b5129a71e650470935f3bdabf3052a47d4673c31927308d311e638ccff5073e7ab9aee526f66b90b8b77de0a66e91eaaad9033d716379c680cc524851694e82'
+sha512sums=('83932b279318ce5a523e045116aee0d797dc7ca2a07b90e375cb1d093a60bc97cf2765457e249b9816c627fb83a8e89063ca3bdfdb51b59dfe337a77269cdfa2'
'a0a9f4d25053fe96f9b1495394adb829252367099931d3f0e9bdfd2371093b4e86ff13fc945301b3a59691bbb7ee14da89e68c4ef3d8e7a1b5ec6bdedccb9137'
- '331f1a688945c92fb52c492b7d5c8bbf7816076a122b367c65c17e40af678068ed239b6a62d305e018d971c6b746449194181768845f7e438bb0311341b0dead'
'fd7e117054996ed1c3dfd0f968c2bf98ca4fcee9a100221f8839a232147745ec0140e1f68eeffba58a3c44f66f26e05d433648a7a28858ec669524f7266ba04c'
'3c460141b277df61c4546cc311fa5ecc7e7ea19a7d39a92d1d0214c37a91b4e163bc91823df7098bd2cf6fb430361cdb9839ab96abe53fe82f2a735e187de563')
@@ -38,9 +36,6 @@
prepare() {
cd "${srcdir}"/Cinnamon-${pkgver}
- # https://github.com/linuxmint/Cinnamon/issues/7522
- patch -p1 -i ../0001-Revert-shell-embedded-window-change-realize-to-map-6.patch
-
# Check for the cc-panel module path, not for the irrelevant binary
patch -p1 -i ../0001-cinanmon-settings-don-t-rely-on-the-presence-of-cinn.patch
More information about the arch-commits
mailing list