[gnome-builder] flatpak: work around breakage from GtkSourceView/default-enum values



commit 1820245bb8c31afc43f3c856ad0fb9e9251e9fa4
Author: Christian Hergert <chergert redhat com>
Date:   Mon May 22 18:12:37 2017 -0700

    flatpak: work around breakage from GtkSourceView/default-enum values
    
    This changed in glib recently to avoid outputing the /*< private >*/ values
    into the GEnumValues[]. So we can't use that as a default value. But pretty
    much any default value will work for us here.

 build/flatpak/default-enum.patch |   26 ++++++++++++++++++++++++++
 org.gnome.Builder.json           |    6 +++++-
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/build/flatpak/default-enum.patch b/build/flatpak/default-enum.patch
new file mode 100644
index 0000000..f3c3112
--- /dev/null
+++ b/build/flatpak/default-enum.patch
@@ -0,0 +1,26 @@
+diff --git a/gtksourceview/gtksourcegutter.c b/gtksourceview/gtksourcegutter.c
+index 0db2b598..3d59553c 100644
+--- a/gtksourceview/gtksourcegutter.c
++++ b/gtksourceview/gtksourcegutter.c
+@@ -520,7 +520,7 @@ gtk_source_gutter_class_init (GtkSourceGutterClass *klass)
+                                                           "Window Type",
+                                                           "The gutters' text window type",
+                                                           GTK_TYPE_TEXT_WINDOW_TYPE,
+-                                                          0,
++                                                          GTK_TEXT_WINDOW_LEFT,
+                                                           G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+ 
+       /**
+diff --git a/gtksourceview/gtksourcegutterrenderer.c b/gtksourceview/gtksourcegutterrenderer.c
+index 510f8d90..d1781053 100644
+--- a/gtksourceview/gtksourcegutterrenderer.c
++++ b/gtksourceview/gtksourcegutterrenderer.c
+@@ -764,7 +764,7 @@ gtk_source_gutter_renderer_class_init (GtkSourceGutterRendererClass *klass)
+                                                           "Window Type",
+                                                           "The window type",
+                                                           GTK_TYPE_TEXT_WINDOW_TYPE,
+-                                                          GTK_TEXT_WINDOW_PRIVATE,
++                                                          GTK_TEXT_WINDOW_LEFT,
+                                                           G_PARAM_READABLE));
+ 
+       g_object_class_install_property (object_class,
diff --git a/org.gnome.Builder.json b/org.gnome.Builder.json
index ab9a0c8..9729300 100644
--- a/org.gnome.Builder.json
+++ b/org.gnome.Builder.json
@@ -517,7 +517,11 @@
                     "type": "git",
                     "url": "https://git.gnome.org/browse/gtksourceview";,
                     "branch": "gnome-3-24"
-                }
+                },
+               {
+                    "type": "patch",
+                    "path": "build/flatpak/default-enum.patch"
+               }
             ]
         },
         {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]