[Debian-on-mobile-maintainers] [Git][DebianOnMobile-team/libhandy-1][debian/master] 4 commits: d/patches: remove unneeded backported patches
Arnaud Ferraris
gitlab at salsa.debian.org
Sat Oct 31 15:50:56 GMT 2020
Arnaud Ferraris pushed to branch debian/master at Debian On Mobile / libhandy-1
Commits:
50e5b986 by Arnaud Ferraris at 2020-10-31T12:22:09+01:00
d/patches: remove unneeded backported patches
These are now part of the current release
- - - - -
f8b2c478 by Arnaud Ferraris at 2020-10-31T16:18:12+01:00
d/patches: fix combo-row test failure on x86
- - - - -
7e1fcf8b by Arnaud Ferraris at 2020-10-31T16:18:16+01:00
d/changelog: release version 1.0.1-1
- - - - -
8d0c27a9 by Arnaud Ferraris at 2020-10-31T15:50:49+00:00
Merge branch 'update-1.0.1' into 'debian/master'
Release version 1.0.1-1
See merge request DebianOnMobile-team/libhandy-1!9
- - - - -
6 changed files:
- debian/changelog
- − debian/patches/carousel-box-Don-t-invalidate-cache-on-any-allocatio.patch
- − debian/patches/carousel-box-Null-check-child-in-get_page_at_positio.patch
- + debian/patches/combo-row-opacity-should-be-a-floating-point-value.patch
- debian/patches/series
- − debian/patches/swipe-tracker-Special-case-dragging-from-buttons.patch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+libhandy-1 (1.0.1-1) unstable; urgency=medium
+
+ * New upstream version 1.0.1
+ * d/patches: remove unneeded backported patches
+
+ -- Arnaud Ferraris <arnaud.ferraris at gmail.com> Sat, 31 Oct 2020 12:22:19 +0100
+
libhandy-1 (1.0.0-3) unstable; urgency=medium
[ Sebastian Krzyszkowiak ]
=====================================
debian/patches/carousel-box-Don-t-invalidate-cache-on-any-allocatio.patch deleted
=====================================
@@ -1,27 +0,0 @@
-From bdfb9a99e20b5a3139f9828beb95266188af271f Mon Sep 17 00:00:00 2001
-From: Alexander Mikhaylenko <alexm at gnome.org>
-Date: Fri, 9 Oct 2020 13:13:23 +0500
-Subject: [PATCH 2/2] carousel-box: Don't invalidate cache on any allocation
-
-Welp.
-
-Fixes https://gitlab.gnome.org/GNOME/libhandy/-/issues/304
----
- src/hdy-carousel-box.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/hdy-carousel-box.c b/src/hdy-carousel-box.c
-index cf6e6eb..0c4c575 100644
---- a/src/hdy-carousel-box.c
-+++ b/src/hdy-carousel-box.c
-@@ -903,7 +903,6 @@ hdy_carousel_box_size_allocate (GtkWidget *widget,
- gtk_widget_size_allocate (child, &alloc);
- }
-
-- invalidate_drawing_cache (self);
- gtk_widget_set_clip (widget, allocation);
- }
-
---
-2.29.1
-
=====================================
debian/patches/carousel-box-Null-check-child-in-get_page_at_positio.patch deleted
=====================================
@@ -1,36 +0,0 @@
-From ddfd9b75e9db1fae9166debb13dc188f68d0f90e Mon Sep 17 00:00:00 2001
-From: Alexander Mikhaylenko <alexm at gnome.org>
-Date: Thu, 8 Oct 2020 12:18:35 +0500
-Subject: [PATCH 1/2] carousel-box: Null-check child in get_page_at_position()
-
-It can be null when there are no children in the carousel.
----
- src/hdy-carousel-box.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/hdy-carousel-box.c b/src/hdy-carousel-box.c
-index 1e0355f..cf6e6eb 100644
---- a/src/hdy-carousel-box.c
-+++ b/src/hdy-carousel-box.c
-@@ -1723,7 +1723,7 @@ hdy_carousel_box_get_closest_snap_point (HdyCarouselBox *self)
- * the current position, the returned widget will match the currently
- * displayed page.
- *
-- * Returns: the closest page.
-+ * Returns: (nullable): the closest page.
- *
- * Since: 1.0
- */
-@@ -1742,6 +1742,9 @@ hdy_carousel_box_get_page_at_position (HdyCarouselBox *self,
-
- child = get_closest_child_at (self, position, TRUE, FALSE);
-
-+ if (!child)
-+ return NULL;
-+
- return child->widget;
- }
-
---
-2.29.1
-
=====================================
debian/patches/combo-row-opacity-should-be-a-floating-point-value.patch
=====================================
@@ -0,0 +1,26 @@
+From e731d452893cb58a50c219785ddf7bc8269cb20c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?X=E2=84=B9=20Ruoyao?= <xry111 at mengyan1223.wang>
+Date: Sat, 31 Oct 2020 22:52:27 +0800
+Subject: [PATCH] combo-row: opacity should be a floating-point value
+
+Fixes e5f190e3.
+---
+ src/hdy-combo-row.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/hdy-combo-row.c b/src/hdy-combo-row.c
+index d60a7e7f..cd9405f5 100644
+--- a/src/hdy-combo-row.c
++++ b/src/hdy-combo-row.c
+@@ -137,7 +137,7 @@ create_list_widget (gpointer item,
+ GtkWidget *checkmark = g_object_new (GTK_TYPE_IMAGE,
+ "halign", GTK_ALIGN_START,
+ "icon-name", "emblem-ok-symbolic",
+- "opacity", 0,
++ "opacity", 0.0,
+ "valign", GTK_ALIGN_CENTER,
+ "visible", TRUE,
+ NULL);
+--
+GitLab
+
=====================================
debian/patches/series
=====================================
@@ -1,4 +1,2 @@
Disable-atk-during-tests.patch
-swipe-tracker-Special-case-dragging-from-buttons.patch
-carousel-box-Null-check-child-in-get_page_at_positio.patch
-carousel-box-Don-t-invalidate-cache-on-any-allocatio.patch
+combo-row-opacity-should-be-a-floating-point-value.patch
=====================================
debian/patches/swipe-tracker-Special-case-dragging-from-buttons.patch deleted
=====================================
@@ -1,124 +0,0 @@
-From: Alexander Mikhaylenko <alexm at gnome.org>
-Date: Wed, 23 Sep 2020 13:29:02 +0500
-Subject: swipe-tracker: Special case dragging from buttons
-
-Fixes https://source.puri.sm/Librem5/phosh/-/issues/373
-
-(cherry picked from commit 52eabe10f52a53794a90921baa78792f99c304a9)
----
- src/hdy-swipe-tracker.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 64 insertions(+), 2 deletions(-)
-
-diff --git a/src/hdy-swipe-tracker.c b/src/hdy-swipe-tracker.c
-index 0cbf4a4..5b1fc3e 100644
---- a/src/hdy-swipe-tracker.c
-+++ b/src/hdy-swipe-tracker.c
-@@ -59,6 +59,7 @@ struct _HdySwipeTracker
-
- gint start_x;
- gint start_y;
-+ gboolean use_capture_phase;
-
- guint32 prev_time;
- gdouble velocity;
-@@ -113,6 +114,7 @@ reset (HdySwipeTracker *self)
-
- self->start_x = 0;
- self->start_y = 0;
-+ self->use_capture_phase = FALSE;
-
- self->prev_time = 0;
- self->velocity = 0;
-@@ -541,6 +543,27 @@ is_window_handle (GtkWidget *widget)
- return parent == titlebar;
- }
-
-+/* HACK: Since we don't have _gtk_widget_consumes_motion(), we can't do a proper
-+ * check for whether we can drag from a widget or not. So we trust the widgets
-+ * to propagate or stop their events. However, GtkButton stops press events,
-+ * making it impossible to drag from it.
-+ */
-+static gboolean
-+should_force_drag (HdySwipeTracker *self,
-+ GtkWidget *widget)
-+{
-+ GtkWidget *parent;
-+
-+ if (!GTK_IS_BUTTON (widget))
-+ return FALSE;
-+
-+ parent = widget;
-+ while (parent && !HDY_IS_SWIPEABLE (parent))
-+ parent = gtk_widget_get_parent (parent);
-+
-+ return parent == GTK_WIDGET (self->swipeable);
-+}
-+
- static gboolean
- handle_event_cb (HdySwipeTracker *self,
- GdkEvent *event)
-@@ -553,6 +576,9 @@ handle_event_cb (HdySwipeTracker *self,
- if (!self->enabled && self->state != HDY_SWIPE_TRACKER_STATE_SCROLLING)
- return GDK_EVENT_PROPAGATE;
-
-+ if (self->use_capture_phase)
-+ return GDK_EVENT_PROPAGATE;
-+
- if (event->type == GDK_SCROLL)
- return handle_scroll_event (self, event, FALSE);
-
-@@ -592,16 +618,52 @@ captured_event_cb (HdySwipeable *swipeable,
- GdkEvent *event)
- {
- HdySwipeTracker *self = hdy_swipeable_get_swipe_tracker (swipeable);
-+ GtkWidget *widget;
-+ GdkEventSequence *sequence;
-+ gboolean retval;
-+ GtkEventSequenceState state;
-
- g_assert (HDY_IS_SWIPE_TRACKER (self));
-
- if (!self->enabled && self->state != HDY_SWIPE_TRACKER_STATE_SCROLLING)
- return GDK_EVENT_PROPAGATE;
-
-- if (event->type != GDK_SCROLL)
-+ if (event->type == GDK_SCROLL)
-+ return handle_scroll_event (self, event, TRUE);
-+
-+ if (event->type != GDK_BUTTON_PRESS &&
-+ event->type != GDK_BUTTON_RELEASE &&
-+ event->type != GDK_MOTION_NOTIFY &&
-+ event->type != GDK_TOUCH_BEGIN &&
-+ event->type != GDK_TOUCH_END &&
-+ event->type != GDK_TOUCH_UPDATE &&
-+ event->type != GDK_TOUCH_CANCEL)
-+ return GDK_EVENT_PROPAGATE;
-+
-+ widget = gtk_get_event_widget (event);
-+
-+ if (!self->use_capture_phase && !should_force_drag (self, widget))
-+ return GDK_EVENT_PROPAGATE;
-+
-+ self->use_capture_phase = TRUE;
-+
-+ sequence = gdk_event_get_event_sequence (event);
-+ retval = gtk_event_controller_handle_event (GTK_EVENT_CONTROLLER (self->touch_gesture), event);
-+ state = gtk_gesture_get_sequence_state (self->touch_gesture, sequence);
-+
-+ if (state == GTK_EVENT_SEQUENCE_DENIED) {
-+ gtk_event_controller_reset (GTK_EVENT_CONTROLLER (self->touch_gesture));
- return GDK_EVENT_PROPAGATE;
-+ }
-+
-+ if (self->state == HDY_SWIPE_TRACKER_STATE_SCROLLING) {
-+ return GDK_EVENT_STOP;
-+ } else if (self->state == HDY_SWIPE_TRACKER_STATE_FINISHING) {
-+ reset (self);
-+ return GDK_EVENT_STOP;
-+ }
-
-- return handle_scroll_event (self, event, TRUE);
-+ return retval;
- }
-
- static void
View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/libhandy-1/-/compare/010b9b00bb0df0b3c16710a155c32aee65659ae5...8d0c27a96a23c091b680df1a1a8d0e12281a582c
--
View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/libhandy-1/-/compare/010b9b00bb0df0b3c16710a155c32aee65659ae5...8d0c27a96a23c091b680df1a1a8d0e12281a582c
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-on-mobile-maintainers/attachments/20201031/a55fcb78/attachment-0001.html>
More information about the Debian-on-mobile-maintainers
mailing list