r54566 - in /desktop/experimental/gtk+4.0/debian: changelog patches/disable-return-type-error.patch patches/git_add-a-return-value.patch patches/git_add-default-return-values.patch patches/git_fix-build.patch patches/series

jbicha at users.alioth.debian.org jbicha at users.alioth.debian.org
Thu Oct 26 22:00:10 UTC 2017 

Author: jbicha
Date: Thu Oct 26 22:00:10 2017
New Revision: 54566

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54566
Log:
Cherry-pick 3 patches so we can drop disable-return-type-error.patch

- git_add-a-return-value.patch
- git_add-default-return-values.patch
- git_fix-build.patch

Added:
    desktop/experimental/gtk+4.0/debian/patches/git_add-a-return-value.patch
    desktop/experimental/gtk+4.0/debian/patches/git_add-default-return-values.patch
    desktop/experimental/gtk+4.0/debian/patches/git_fix-build.patch
Removed:
    desktop/experimental/gtk+4.0/debian/patches/disable-return-type-error.patch
Modified:
    desktop/experimental/gtk+4.0/debian/changelog
    desktop/experimental/gtk+4.0/debian/patches/series

Modified: desktop/experimental/gtk+4.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B4.0/debian/changelog?rev=54566&op=diff
==============================================================================
--- desktop/experimental/gtk+4.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gtk+4.0/debian/changelog	[utf-8] Thu Oct 26 22:00:10 2017
@@ -1,4 +1,4 @@
-gtk+4.0 (3.92.1-1) UNRELEASED; urgency=medium
+gtk+4.0 (3.92.1-0~1) UNRELEASED; urgency=medium
 
   * New upstream release
   * Switch to meson
@@ -7,8 +7,10 @@
   * debian/libgtk-4-common.install.in: themes are bundled in the gtkresources
   * Refresh no-accessibility-dump.patch
   * Disable 018_gdkenumtypes.c_location.patch: might not be needed any more
-  * Add disable-return-type-error.patch to work around GNOME bug #789180
   * Cherry-pick patches:
+    - git_add-a-return-value.patch
+    - git_add-default-return-values.patch
+    - git_fix-build.patch
     - git_install-printbackends.patch
 
  -- Jeremy Bicha <jbicha at debian.org>  Wed, 18 Oct 2017 18:07:11 -0400

Added: desktop/experimental/gtk+4.0/debian/patches/git_add-a-return-value.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B4.0/debian/patches/git_add-a-return-value.patch?rev=54566&op=file
==============================================================================
--- desktop/experimental/gtk+4.0/debian/patches/git_add-a-return-value.patch	(added)
+++ desktop/experimental/gtk+4.0/debian/patches/git_add-a-return-value.patch	[utf-8] Thu Oct 26 22:00:10 2017
@@ -0,0 +1,38 @@
+From 46f475664d66e25f0cc4212786c441f929a91d05 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi at gnome.org>
+Date: Tue, 24 Oct 2017 16:58:06 +0100
+Subject: Add a return value
+
+When building with G_DISABLE_ASSERT, the g_assert_not_reached()
+statement won't do anything, and we're going to fall through, and the
+compiler will emit a warning that we're not returning anything from a
+function with a return value.
+---
+ gdk/wayland/gdkwindow-wayland.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
+index bb15eb1..2d738a6 100644
+--- a/gdk/wayland/gdkwindow-wayland.c
++++ b/gdk/wayland/gdkwindow-wayland.c
+@@ -1617,6 +1617,9 @@ rect_anchor_to_anchor (GdkGravity rect_anchor)
+     default:
+       g_assert_not_reached ();
+     }
++
++  return (ZXDG_POSITIONER_V6_ANCHOR_TOP |
++          ZXDG_POSITIONER_V6_ANCHOR_LEFT);
+ }
+ 
+ static enum zxdg_positioner_v6_gravity
+@@ -1650,6 +1653,9 @@ window_anchor_to_gravity (GdkGravity rect_anchor)
+     default:
+       g_assert_not_reached ();
+     }
++
++  return (ZXDG_POSITIONER_V6_GRAVITY_BOTTOM |
++          ZXDG_POSITIONER_V6_GRAVITY_RIGHT);
+ }
+ 
+ static GdkWindow *
+

Added: desktop/experimental/gtk+4.0/debian/patches/git_add-default-return-values.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B4.0/debian/patches/git_add-default-return-values.patch?rev=54566&op=file
==============================================================================
--- desktop/experimental/gtk+4.0/debian/patches/git_add-default-return-values.patch	(added)
+++ desktop/experimental/gtk+4.0/debian/patches/git_add-default-return-values.patch	[utf-8] Thu Oct 26 22:00:10 2017
@@ -0,0 +1,80 @@
+From 8549e62d8595bb6f94b51f2051f8542e357f236b Mon Sep 17 00:00:00 2001
+From: Benjamin Otte <otte at redhat.com>
+Date: Tue, 24 Oct 2017 18:13:45 +0200
+Subject: Add default return values to switch statements
+
+We are using g_assert_not_reached() without doing anything, assuming it
+aborts the program. In release builds however, it is ignored.
+---
+ gdk/x11/gdkdevicemanager-core-x11.c | 2 ++
+ gdk/x11/gdkdevicemanager-xi2.c      | 2 ++
+ gtk/gtkcssselector.c                | 1 +
+ gtk/inspector/general.c             | 2 +-
+ 4 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/gdk/x11/gdkdevicemanager-core-x11.c b/gdk/x11/gdkdevicemanager-core-x11.c
+index 350a79b..dd8613e 100644
+--- a/gdk/x11/gdkdevicemanager-core-x11.c
++++ b/gdk/x11/gdkdevicemanager-core-x11.c
+@@ -265,6 +265,7 @@ translate_crossing_mode (int mode)
+       return GDK_CROSSING_UNGRAB;
+     default:
+       g_assert_not_reached ();
++      return GDK_CROSSING_NORMAL;
+     }
+ }
+ 
+@@ -285,6 +286,7 @@ translate_notify_type (int detail)
+       return GDK_NOTIFY_NONLINEAR_VIRTUAL;
+     default:
+       g_assert_not_reached ();
++      return GDK_NOTIFY_UNKONWN;
+     }
+ }
+ 
+diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
+index 8779c65..758513e 100644
+--- a/gdk/x11/gdkdevicemanager-xi2.c
++++ b/gdk/x11/gdkdevicemanager-xi2.c
+@@ -1068,6 +1068,7 @@ translate_crossing_mode (gint mode)
+       /* Fall through, unexpected in pointer crossing events */
+     default:
+       g_assert_not_reached ();
++      return GDK_CROSSING_NORMAL;
+     }
+ }
+ 
+@@ -1088,6 +1089,7 @@ translate_notify_type (gint detail)
+       return GDK_NOTIFY_NONLINEAR_VIRTUAL;
+     default:
+       g_assert_not_reached ();
++      return GDK_NOTIFY_UNKONWN;
+     }
+ }
+ 
+diff --git a/gtk/gtkcssselector.c b/gtk/gtkcssselector.c
+index 241a690..961e78e 100644
+--- a/gtk/gtkcssselector.c
++++ b/gtk/gtkcssselector.c
+@@ -876,6 +876,7 @@ change_pseudoclass_position (const GtkCssSelector *selector)
+       return GTK_CSS_CHANGE_FIRST_CHILD | GTK_CSS_CHANGE_LAST_CHILD;
+     default:
+       g_assert_not_reached ();
++      return 0;
+     }
+ }
+ 
+diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c
+index 2e7e212..62404a0 100644
+--- a/gtk/inspector/general.c
++++ b/gtk/inspector/general.c
+@@ -501,7 +501,7 @@ translate_subpixel_layout (GdkSubpixelLayout subpixel)
+     case GDK_SUBPIXEL_LAYOUT_HORIZONTAL_BGR: return "horizontal bgr";
+     case GDK_SUBPIXEL_LAYOUT_VERTICAL_RGB: return "vertical rgb";
+     case GDK_SUBPIXEL_LAYOUT_VERTICAL_BGR: return "vertical bgr";
+-    default: g_assert_not_reached ();
++    default: g_assert_not_reached (); return "none;
+     }
+ }
+ 
+

Added: desktop/experimental/gtk+4.0/debian/patches/git_fix-build.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B4.0/debian/patches/git_fix-build.patch?rev=54566&op=file
==============================================================================
--- desktop/experimental/gtk+4.0/debian/patches/git_fix-build.patch	(added)
+++ desktop/experimental/gtk+4.0/debian/patches/git_fix-build.patch	[utf-8] Thu Oct 26 22:00:10 2017
@@ -0,0 +1,52 @@
+From 373b407bd26a940072173e0a509038185b63e936 Mon Sep 17 00:00:00 2001
+From: Benjamin Otte <otte at redhat.com>
+Date: Tue, 24 Oct 2017 18:26:08 +0200
+Subject: Fix build
+
+Don't do two things at once and forget to run ninja before pushing.
+---
+ gdk/x11/gdkdevicemanager-core-x11.c | 2 +-
+ gdk/x11/gdkdevicemanager-xi2.c      | 2 +-
+ gtk/inspector/general.c             | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/gdk/x11/gdkdevicemanager-core-x11.c b/gdk/x11/gdkdevicemanager-core-x11.c
+index dd8613e..c662d21 100644
+--- a/gdk/x11/gdkdevicemanager-core-x11.c
++++ b/gdk/x11/gdkdevicemanager-core-x11.c
+@@ -286,7 +286,7 @@ translate_notify_type (int detail)
+       return GDK_NOTIFY_NONLINEAR_VIRTUAL;
+     default:
+       g_assert_not_reached ();
+-      return GDK_NOTIFY_UNKONWN;
++      return GDK_NOTIFY_UNKNOWN;
+     }
+ }
+ 
+diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
+index 758513e..56fb2c8 100644
+--- a/gdk/x11/gdkdevicemanager-xi2.c
++++ b/gdk/x11/gdkdevicemanager-xi2.c
+@@ -1089,7 +1089,7 @@ translate_notify_type (gint detail)
+       return GDK_NOTIFY_NONLINEAR_VIRTUAL;
+     default:
+       g_assert_not_reached ();
+-      return GDK_NOTIFY_UNKONWN;
++      return GDK_NOTIFY_UNKNOWN;
+     }
+ }
+ 
+diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c
+index 62404a0..45a386e 100644
+--- a/gtk/inspector/general.c
++++ b/gtk/inspector/general.c
+@@ -501,7 +501,7 @@ translate_subpixel_layout (GdkSubpixelLayout subpixel)
+     case GDK_SUBPIXEL_LAYOUT_HORIZONTAL_BGR: return "horizontal bgr";
+     case GDK_SUBPIXEL_LAYOUT_VERTICAL_RGB: return "vertical rgb";
+     case GDK_SUBPIXEL_LAYOUT_VERTICAL_BGR: return "vertical bgr";
+-    default: g_assert_not_reached (); return "none;
++    default: g_assert_not_reached (); return "none";
+     }
+ }
+ 
+

Modified: desktop/experimental/gtk+4.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B4.0/debian/patches/series?rev=54566&op=diff
==============================================================================
--- desktop/experimental/gtk+4.0/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/gtk+4.0/debian/patches/series	[utf-8] Thu Oct 26 22:00:10 2017
@@ -2,5 +2,7 @@
 no-accessibility-dump.patch
 reftest-known-fail.patch
 gdk-x11-Check-if-we-have-access-to-GL-before-using-G.patch
-disable-return-type-error.patch
+git_add-a-return-value.patch
+git_add-default-return-values.patch
+git_fix-build.patch
 git_install-printbackends.patch

More information about the pkg-gnome-commits mailing list