@pheem49/mint 1.8.1 → 1.9.0

package/shared-modules/gtk2/gtk2-common-themes.json

@@ -0,0 +1,360 @@
+{
+    "name": "gtk2-common-themes",
+    "buildsystem": "simple",
+    "build-commands": [],
+    "modules": [
+        {
+            "name": "sassc",
+            "// NOTE": "This is used by Yaru, Greybird, and Materia",
+            "cleanup": [
+                "*"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://github.com/sass/sassc/archive/3.5.0.tar.gz",
+                    "sha256": "26f54e31924b83dd706bc77df5f8f5553a84d51365f0e3c566df8de027918042"
+                },
+                {
+                    "type": "script",
+                    "commands": [
+                        "autoreconf -si"
+                    ]
+                }
+            ],
+            "modules": [
+                {
+                    "name": "libsass",
+                    "cleanup": [
+                        "*"
+                    ],
+                    "sources": [
+                        {
+                            "type": "archive",
+                            "url": "https://github.com/sass/libsass/archive/3.5.4.tar.gz",
+                            "sha256": "5f61cbcddaf8e6ef7a725fcfa5d05297becd7843960f245197ebb655ff868770"
+                        },
+                        {
+                            "type": "script",
+                            "commands": [
+                                "autoreconf -si"
+                            ]
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "name": "gtk2-murrine-engine",
+            "rm-configure": true,
+            "// NOTE": "Used by Arc and CrosAdapta",
+            "cleanup": [
+                "*.la"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://download.gnome.org/sources/murrine/0.98/murrine-0.98.2.tar.xz",
+                    "sha256": "e9c68ae001b9130d0f9d1b311e8121a94e5c134b82553ba03971088e57d12c89"
+                },
+                {
+                    "type": "patch",
+                    "paths": [
+                        "murrine-engine-fix-crash.patch",
+                        "gtk2-murrine-c99.patch"
+                    ]
+                },
+                {
+                    "type": "script",
+                    "commands": [
+                        "rm config.guess",
+                        "autoreconf -si"
+                    ]
+                }
+            ],
+            "modules": [
+                "../intltool/intltool-0.51.json",
+                "../gtk2/gtk2.json"
+            ]
+        },
+        {
+            "name": "cros-adapta-gtk2-theme",
+            "// NOTE": "This is used by Chrome OS",
+            "buildsystem": "simple",
+            "build-commands": [
+                "install -Dm644 index.theme ${FLATPAK_DEST}/share/themes/CrosAdapta/index.theme",
+                "cp -r gtk-2.0 ${FLATPAK_DEST}/share/themes/CrosAdapta"
+            ],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://chromium.googlesource.com/chromiumos/third_party/cros-adapta",
+                    "commit": "eb6d8c1832b9181926df107faf41a80887fd982c"
+                }
+            ]
+        },
+        {
+            "name": "arc-gtk2-theme",
+            "// NOTE": "This is used by Solus and is popular",
+            "// FIXME": "This has a dependency on inkscape and my patch isn't quite good enough sadly",
+            "disabled": true,
+            "config-opts": [
+                "--disable-gnome-shell",
+                "--disable-cinnamon",
+                "--disable-gtk3",
+                "--disable-metacity",
+                "--disable-xfwm",
+                "--disable-plank",
+                "--disable-openbox",
+                "--disable-unity"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://github.com/jnsh/arc-theme/releases/download/20200513/arc-theme-20200513.tar.xz",
+                    "sha256": "cd268b878d6ad7c81b7acc0f89b66e26ee9a9a92eafb03b792318d51707f1962"
+                },
+                {
+                    "type": "patch",
+                    "path": "arc-gtk2-theme-Replace-Inkscape-dependency-with-rsvg-convert.patch"
+                },
+                {
+                    "type": "shell",
+                    "commands": [
+                        "sed -i 's|\"$srcdir/configure\" $@||' autogen.sh"
+                    ]
+                }
+            ],
+            "modules": [
+                {
+                    "name": "optipng",
+                    "cleanup": [
+                        "*"
+                    ],
+                    "sources": [
+                        {
+                            "type": "archive",
+                            "url": "https://prdownloads.sourceforge.net/optipng/optipng-0.7.7.tar.gz",
+                            "sha256": "4f32f233cef870b3f95d3ad6428bfe4224ef34908f1b42b0badf858216654452"
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "name": "breeze-gtk2-theme",
+            "// NOTE": "This is used by KDE by default.",
+            "buildsystem": "simple",
+            "build-commands": [
+                "find breeze-gtk/src -name '*.scss' -print -execdir sed -i 's#\\.\\./assets/#./assets/#' {} \\;",
+                "cd breeze-gtk/src && sed -i 's/@Python3_EXECUTABLE@/python3/g' build_theme.sh.cmake && ./build_theme.sh.cmake -c BreezeLight -t ${FLATPAK_BUILDER_BUILDDIR}/Breeze -r ${FLATPAK_BUILDER_BUILDDIR}/breeze/colors",
+                "mkdir -p ${FLATPAK_DEST}/share/themes/Breeze/",
+                "cp -rv --no-preserve=ownership ${FLATPAK_BUILDER_BUILDDIR}/Breeze/gtk-2.0 ${FLATPAK_DEST}/share/themes/Breeze/",
+                "cp -rv --no-preserve=ownership ${FLATPAK_BUILDER_BUILDDIR}/Breeze/assets ${FLATPAK_DEST}/share/themes/Breeze/"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://download.kde.org/stable/plasma/6.4.5/breeze-gtk-6.4.5.tar.xz",
+                    "sha256": "771e88ca19421a472f5f4235fb27ba2588b7ea267e8f2647e5e231c351f03a98",
+                    "dest": "breeze-gtk",
+                    "x-checker-data": {
+                        "type": "anitya",
+                        "project-id": 8761,
+                        "stable-only": true,
+                        "url-template": "https://download.kde.org/stable/plasma/$version/breeze-gtk-$version.tar.xz"
+                    }
+                },
+                {
+                    "type": "archive",
+                    "url": "https://download.kde.org/stable/plasma/6.4.5/breeze-6.4.5.tar.xz",
+                    "sha256": "dcb8433d399511546958f4c8c1a8fae5ed22f2a698f053968d410ee75bd6d8b4",
+                    "dest": "breeze",
+                    "x-checker-data": {
+                        "type": "anitya",
+                        "project-id": 8761,
+                        "stable-only": true,
+                        "url-template": "https://download.kde.org/stable/plasma/$version/breeze-$version.tar.xz"
+                    }
+                }
+            ],
+            "modules": [
+                {
+                    "name": "python3-meson-python",
+                    "buildsystem": "simple",
+                    "cleanup": [
+                        "*"
+                    ],
+                    "build-commands": [
+                        "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"meson-python\" --no-build-isolation"
+                    ],
+                    "sources": [
+                        {
+                            "type": "file",
+                            "url": "https://files.pythonhosted.org/packages/28/58/66db620a8a7ccb32633de9f403fe49f1b63c68ca94e5c340ec5cceeb9821/meson_python-0.18.0-py3-none-any.whl",
+                            "sha256": "3b0fe051551cc238f5febb873247c0949cd60ded556efa130aa57021804868e2"
+                        },
+                        {
+                            "type": "file",
+                            "url": "https://files.pythonhosted.org/packages/c0/57/e69a1de45ec7a99a707e9f1a5defa035a48de0cae2d8582451c72d2db456/pyproject_metadata-0.10.0-py3-none-any.whl",
+                            "sha256": "b1e439a9f7560f9792ee5975dcf5e89d2510b1fc84a922d7e5d665aa9102d966"
+                        }
+                    ]
+                },
+                {
+                    "name": "python3-pycairo",
+                    "buildsystem": "simple",
+                    "cleanup": [
+                        "*"
+                    ],
+                    "build-commands": [
+                        "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"pycairo\" --no-build-isolation"
+                    ],
+                    "sources": [
+                        {
+                            "type": "file",
+                            "url": "https://files.pythonhosted.org/packages/22/d9/1728840a22a4ef8a8f479b9156aa2943cd98c3907accd3849fb0d5f82bfd/pycairo-1.29.0.tar.gz",
+                            "sha256": "f3f7fde97325cae80224c09f12564ef58d0d0f655da0e3b040f5807bd5bd3142",
+                            "x-checker-data": {
+                                "type": "pypi",
+                                "name": "pycairo"
+                            }
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "name": "elementary-gtk2-theme",
+            "// NOTE": "This is used by Elementary OS",
+            "buildsystem": "meson",
+            "cleanup": [
+                "/share/themes/elementary/gtk-3.0",
+                "/share/themes/elementary/plank",
+                "/share/plank",
+                "/share/metainfo"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://github.com/elementary/stylesheet/archive/5.4.2.tar.gz",
+                    "sha256": "3bc37723daf4ce0b7c9ce4c125ef0055affe8d6654981388ec87d4a23a1ae0ec"
+                }
+            ]
+        },
+        {
+            "name": "yaru-gtk2-theme",
+            "// NOTE": "This is used by Ubuntu",
+            "buildsystem": "meson",
+            "config-opts": [
+                "-Dicons=false",
+                "-Dsounds=false",
+                "-Dgnome-shell=false",
+                "-Dsessions=false"
+            ],
+            "cleanup": [
+                "/share/themes/Yaru*/gtk-3.0",
+                "/share/themes/Yaru*/gtk-3.20",
+                "/share/themes/Yaru*/unity"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://github.com/ubuntu/yaru/archive/20.10.1.tar.gz",
+                    "sha256": "9da2605088674edf2694a8215b7344fb5209b308dd8220ea21667a914dc8c55d"
+                }
+            ]
+        },
+        {
+            "name": "greybird-gtk2-theme",
+            "// NOTE": "This is used by many XFCE distros",
+            "buildsystem": "meson",
+            "cleanup": [
+                "/share/themes/Greybird*/xfwm4",
+                "/share/themes/Greybird*/gnome-shell",
+                "/share/themes/Greybird*/gtk-3.0",
+                "/share/themes/Greybird*/metacity-1",
+                "/share/themes/Greybird*/xfce-notify-4.0",
+                "/share/themes/Greybird*/plank",
+                "/share/themes/Greybird*/unity",
+                "/share/themes/Greybird*/*.emerald"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://github.com/shimmerproject/Greybird/archive/v3.22.12.tar.gz",
+                    "sha256": "410804cd5daca33cbc5c7c4a179f3a334ced87f408e515fc5d9c083a04bec4bc"
+                }
+            ]
+        },
+        {
+            "name": "materia-gtk2-theme",
+            "// NOTE": "This is used by Ubuntu Studio",
+            "buildsystem": "meson",
+            "cleanup": [
+                "/share/themes/Materia*/xfwm4",
+                "/share/themes/Materia*/gnome-shell",
+                "/share/themes/Materia*/gtk-3.0",
+                "/share/themes/Materia*/metacity-1",
+                "/share/themes/Materia*/cinnamon",
+                "/share/themes/Materia*/chrome",
+                "/share/themes/Materia*/plank",
+                "/share/themes/Materia*/unity"
+            ],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/nana-4/materia-theme.git",
+                    "commit": "b36b379c9256b67e5f63a60c6faf6912f1845b66"
+                }
+            ]
+        },
+        {
+            "name": "mint-gtk2-theme",
+            "buildsystem": "simple",
+            "build-commands": [
+                "./generate-themes.py",
+                "find ./usr/share -type d \\( -name cinnamon -o -name gtk-3.0 -o -name gtk-4.0 -o -name metacity-1 -o -name xfce-\\* -o -name xfwm4 \\) -exec rm -rf {} +",
+                "find ./usr/share -type d -empty -delete",
+                "mkdir -p ${FLATPAK_DEST}/share/themes",
+                "cp -a ./usr/share/themes/. ${FLATPAK_DEST}/share/themes"
+            ],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/linuxmint/mint-themes.git",
+                    "commit": "a5e98184b6b86d469db48f17fad4b845f9eee5d8"
+                }
+            ],
+            "modules": [
+                {
+                    "name": "python3-pysass",
+                    "buildsystem": "simple",
+                    "cleanup": [
+                        "*"
+                    ],
+                    "build-commands": [
+                        "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"pysass\" --no-build-isolation"
+                    ],
+                    "sources": [
+                        {
+                            "type": "file",
+                            "url": "https://files.pythonhosted.org/packages/79/b4/ab091585eaa77299558e3289ca206846aefc123fb320b5656ab2542c20ad/libsass-0.23.0.tar.gz",
+                            "sha256": "6f209955ede26684e76912caf329f4ccb57e4a043fd77fe0e7348dd9574f1880"
+                        },
+                        {
+                            "type": "file",
+                            "url": "https://files.pythonhosted.org/packages/90/06/fafe78968db294d582e4cfb8d4bcdbdaeeb1f6d1f269c25acdceb51ce11c/pysass-0.1.0-py3-none-any.whl",
+                            "sha256": "b473069cd9d8799366505b4586938ebfeb67d9df8b400bae3200297422530aff"
+                        },
+                        {
+                            "type": "file",
+                            "url": "https://files.pythonhosted.org/packages/db/7d/7f3d619e951c88ed75c6037b246ddcf2d322812ee8ea189be89511721d54/watchdog-6.0.0.tar.gz",
+                            "sha256": "9ddf7c82fda3ae8e24decda1338ede66e1c99883db93711d8fb941eaa2d8c282"
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}

package/shared-modules/gtk2/gtk2-fix-crash-in-show-uri.patch

@@ -0,0 +1,30 @@
+From 536da7a15c1737bc63c8ecba5ccac40cc2170860 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Mon, 19 Apr 2021 16:39:53 -0400
+Subject: [PATCH] Fix a possible crash in gtk_show_uri
+
+g_file_get_basename can return NULL.
+Deal with it somehow.
+
+Fixes: #3883
+---
+ gdk/x11/gdkapplaunchcontext-x11.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/gdk/x11/gdkapplaunchcontext-x11.c b/gdk/x11/gdkapplaunchcontext-x11.c
+index 8051229ba5..2341bb2e1f 100644
+--- a/gdk/x11/gdkapplaunchcontext-x11.c
++++ b/gdk/x11/gdkapplaunchcontext-x11.c
+@@ -45,6 +45,9 @@ get_display_name (GFile     *file,
+   if (name == NULL)
+     {
+       name = g_file_get_basename (file);
++      if (name == NULL)
++        name = g_file_get_uri (file);
++
+       if (!g_utf8_validate (name, -1, NULL))
+         {
+           tmp = name;
+-- 
+GitLab
+

package/shared-modules/gtk2/gtk2-gcc14.patch

@@ -0,0 +1,281 @@
+commit 072f06abf713d7536ce2a84a5ac266f585c88d39
+Author: Matthias Clasen <mclasen@redhat.com>
+Date:   Fri Dec 8 17:48:47 2017 -0500
+
+    Fix fallout from g_object_ref change
+
+    g_object_ref now returns the type of the object that was
+    passed. Introduce cast as necessary to avoid warnings due
+    to this.
+
+diff --git a/gtk/gtkcellrendererspin.c b/gtk/gtkcellrendererspin.c
+index 2a3961bf203cbe59..7129d05e3b2c1ae6 100644
+--- a/gtk/gtkcellrendererspin.c
++++ b/gtk/gtkcellrendererspin.c
+@@ -207,7 +207,8 @@ gtk_cell_renderer_spin_set_property (GObject      *object,
+ 	}
+ 
+       if (obj)
+-	priv->adjustment = g_object_ref_sink (obj);
++	priv->adjustment = GTK_ADJUSTMENT (g_object_ref_sink (obj));
++
+       break;
+     case PROP_CLIMB_RATE:
+       priv->climb_rate = g_value_get_double (value);
+diff --git a/gtk/gtkcomboboxtext.c b/gtk/gtkcomboboxtext.c
+index 9ffba687660c1214..5e75323c2c55d491 100644
+--- a/gtk/gtkcomboboxtext.c
++++ b/gtk/gtkcomboboxtext.c
+@@ -275,7 +275,7 @@ gtk_combo_box_text_buildable_custom_tag_start (GtkBuildable     *buildable,
+ 
+       parser_data = g_slice_new0 (ItemParserData);
+       parser_data->builder = g_object_ref (builder);
+-      parser_data->object = g_object_ref (buildable);
++      parser_data->object = (GObject *)g_object_ref (buildable);
+       parser_data->domain = gtk_builder_get_translation_domain (builder);
+       *parser = item_parser;
+       *data = parser_data;
+diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
+index c47de5924f6f0b49..879586b0d9855374 100644
+--- a/gtk/gtklabel.c
++++ b/gtk/gtklabel.c
+@@ -1336,7 +1336,7 @@ gtk_label_buildable_custom_tag_start (GtkBuildable     *buildable,
+ 
+       parser_data = g_slice_new0 (PangoParserData);
+       parser_data->builder = g_object_ref (builder);
+-      parser_data->object = g_object_ref (buildable);
++      parser_data->object = (GObject *) g_object_ref (buildable);
+       *parser = pango_parser;
+       *data = parser_data;
+       return TRUE;
+diff --git a/gtk/gtktoolpalette.c b/gtk/gtktoolpalette.c
+index b984193ca3375223..ba4e472dea4ebd77 100644
+--- a/gtk/gtktoolpalette.c
++++ b/gtk/gtktoolpalette.c
+@@ -734,7 +734,7 @@ gtk_tool_palette_add (GtkContainer *container,
+ 
+   g_ptr_array_add (palette->priv->groups, info);
+   info->pos = palette->priv->groups->len - 1;
+-  info->widget = g_object_ref_sink (child);
++  info->widget = (GtkToolItemGroup *)g_object_ref_sink (child);
+ 
+   gtk_widget_set_parent (child, GTK_WIDGET (palette));
+ }
+diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
+index 89301eb91d21c793..0d2d15b4883a7110 100644
+--- a/gtk/gtktreeview.c
++++ b/gtk/gtktreeview.c
+@@ -14147,7 +14147,7 @@ gtk_tree_view_set_search_entry (GtkTreeView *tree_view,
+ 
+   if (entry)
+     {
+-      tree_view->priv->search_entry = g_object_ref (entry);
++      tree_view->priv->search_entry = GTK_WIDGET (g_object_ref (entry));
+       tree_view->priv->search_custom_entry_set = TRUE;
+ 
+       if (tree_view->priv->search_entry_changed_id == 0)
+diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
+index d8f6023ba3ae164c..b6d7b815505760da 100644
+--- a/gtk/gtkwidget.c
++++ b/gtk/gtkwidget.c
+@@ -10686,7 +10686,7 @@ gtk_widget_buildable_custom_tag_start (GtkBuildable     *buildable,
+       AccelGroupParserData *parser_data;
+ 
+       parser_data = g_slice_new0 (AccelGroupParserData);
+-      parser_data->object = g_object_ref (buildable);
++      parser_data->object = (GObject *)g_object_ref (buildable);
+       *parser = accel_group_parser;
+       *data = parser_data;
+       return TRUE;
+diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c
+index 2a000dc16ff57582..e081a70c45743fd2 100644
+--- a/modules/printbackends/cups/gtkprintbackendcups.c
++++ b/modules/printbackends/cups/gtkprintbackendcups.c
+@@ -3479,7 +3479,7 @@ cups_request_ppd (GtkPrinter *printer)
+   g_io_channel_set_encoding (data->ppd_io, NULL, NULL);
+   g_io_channel_set_close_on_unref (data->ppd_io, TRUE);
+ 
+-  data->printer = g_object_ref (printer);
++  data->printer = (GtkPrinterCups *) g_object_ref (printer);
+ 
+   resource = g_strdup_printf ("/printers/%s.ppd", 
+                               gtk_printer_cups_get_ppd_name (GTK_PRINTER_CUPS (printer)));
+diff --git a/tests/testentrycompletion.c b/tests/testentrycompletion.c
+index 36c41f78a42fb928..c556734b72ef71b0 100644
+--- a/tests/testentrycompletion.c
++++ b/tests/testentrycompletion.c
+@@ -237,7 +237,7 @@ animation_timer (GtkEntryCompletion *completion)
+ 	{
+ 	  g_print ("removing model!\n");
+ 
+-	  old_store = g_object_ref (gtk_entry_completion_get_model (completion));
++	  old_store = GTK_LIST_STORE (g_object_ref (gtk_entry_completion_get_model (completion)));
+ 	  gtk_entry_completion_set_model (completion, NULL);
+ 	}
+       else
+commit 018a4255624928fb7d951f1d1c89196fe77e8267
+Author: Cosimo Cecchi <cosimoc@gnome.org>
+Date:   Mon Feb 18 19:37:20 2013 -0500
+
+    immodule: fix a GCC warning
+
+diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c
+index 1fcb17a7d87f197c..445b2be87f57742f 100644
+--- a/gtk/gtkimmodule.c
++++ b/gtk/gtkimmodule.c
+@@ -662,7 +662,7 @@ lookup_immodule (gchar **immodules_list)
+ 	  gboolean found;
+ 	  gchar *context_id;
+ 	  found = g_hash_table_lookup_extended (contexts_hash, *immodules_list,
+-						&context_id, NULL);
++						(gpointer *) &context_id, NULL);
+ 	  if (found)
+ 	    return context_id;
+ 	}
+Partial backport of:
+
+commit 345d865ac6b2f7760503ab144dd68e6062438b80
+Author: Matthias Clasen <mclasen@redhat.com>
+Date:   Wed Jan 18 00:57:20 2012 -0500
+
+    GtkScale: Fix late setting of marks
+
+diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
+index 4317523fb8f1918a..a573b2f6ba203b92 100644
+--- a/gtk/gtkscale.c
++++ b/gtk/gtkscale.c
+@@ -1471,7 +1471,7 @@ gtk_scale_add_mark (GtkScale        *scale,
+   mark->position = position;
+  
+   priv->marks = g_slist_insert_sorted_with_data (priv->marks, mark,
+-                                                 (GCompareFunc) compare_marks,
++                                                 compare_marks,
+                                                  GINT_TO_POINTER (
+                                                    gtk_range_get_inverted (GTK_RANGE (scale)) 
+                                                    ));
+Return the expected GObject * type.  This was not fixed upstream before
+this file was removed.
+
+diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
+index d004cf1ed3a2be11..8cbeda9e85b8f460 100644
+--- a/gtk/gtkuimanager.c
++++ b/gtk/gtkuimanager.c
+@@ -503,7 +503,7 @@ gtk_ui_manager_buildable_construct_child (GtkBuildable *buildable,
+   g_signal_connect (widget, "hierarchy-changed",
+ 		    G_CALLBACK (child_hierarchy_changed_cb),
+ 		    GTK_UI_MANAGER (buildable));
+-  return g_object_ref (widget);
++  return G_OBJECT (g_object_ref (widget));
+ }
+ 
+ static void
+Part of this commit upstream:
+
+commit ca94ff10ce2ea57bfde7692aaa558b1260c9ff75
+Author: Daniel Boles <dboles.src@gmail.com>
+Date:   Fri Jun 29 20:00:06 2018 +0100
+
+    testsuite/gtk/defaultvalue: Actually build...& fix
+    
+    It looks like this got dropped during the move from autotools and never
+    restored. I can see why, since making it work wasn't a hugely fun task!
+    
+    Notes on some less then obvious details:
+     * PlacesSidebar is private now and didn't seem to be to be particularly
+       easy to adapt to, so this moves to checking for it by name, not TYPE.
+       I couldn't find a (fast) better way; if you know how, please clean up
+     * added 2 casts to avoid warnings from the new type-propagating ref()
+     * GdkClipboard and GdkContentProvider need some properties dodged
+     * GtkToolItemGroup is gone
+     * fixed indentation and used TypeName:property-name syntax in a print()
+
+diff --git a/gtk/tests/defaultvalue.c b/gtk/tests/defaultvalue.c
+index 64a113c955822af0..b78dcd6f59353102 100644
+--- a/gtk/tests/defaultvalue.c
++++ b/gtk/tests/defaultvalue.c
+@@ -91,13 +91,13 @@ test_type (gconstpointer data)
+   klass = g_type_class_ref (type);
+   
+   if (g_type_is_a (type, GTK_TYPE_SETTINGS))
+-    instance = g_object_ref (gtk_settings_get_default ());
++    instance = G_OBJECT (g_object_ref (gtk_settings_get_default ()));
+   else if (g_type_is_a (type, GDK_TYPE_PANGO_RENDERER))
+-    instance = g_object_ref (gdk_pango_renderer_get_default (gdk_screen_get_default ()));
++    instance = G_OBJECT (g_object_ref (gdk_pango_renderer_get_default (gdk_screen_get_default ())));
+   else if (g_type_is_a (type, GDK_TYPE_PIXMAP))
+-    instance = g_object_ref (gdk_pixmap_new (NULL, 1, 1, 1));
++    instance = G_OBJECT (g_object_ref (gdk_pixmap_new (NULL, 1, 1, 1)));
+   else if (g_type_is_a (type, GDK_TYPE_COLORMAP))
+-    instance = g_object_ref (gdk_colormap_new (gdk_visual_get_best (), TRUE));
++    instance = G_OBJECT (g_object_ref (gdk_colormap_new (gdk_visual_get_best (), TRUE)));
+   else if (g_type_is_a (type, GDK_TYPE_WINDOW))
+     {
+       GdkWindowAttr attributes;
+@@ -105,7 +105,7 @@ test_type (gconstpointer data)
+       attributes.event_mask = 0;
+       attributes.width = 100;
+       attributes.height = 100;
+-      instance = g_object_ref (gdk_window_new (NULL, &attributes, 0));
++      instance = G_OBJECT (g_object_ref (gdk_window_new (NULL, &attributes, 0)));
+     }
+   else
+     instance = g_object_new (type, NULL);
+Convert to the expected pointer.  This was not fixed before the file
+was removed upstream.
+
+diff --git a/modules/other/gail/gailtreeview.c b/modules/other/gail/gailtreeview.c
+index 23923c59a16a6efb..ac6ff0a1c4a2fe22 100644
+--- a/modules/other/gail/gailtreeview.c
++++ b/modules/other/gail/gailtreeview.c
+@@ -995,7 +995,7 @@ gail_tree_view_ref_child (AtkObject *obj,
+         gail_cell_add_state (cell, ATK_STATE_FOCUSABLE, FALSE);
+         if (focus_index == i)
+           {
+-            gailview->focus_cell = g_object_ref (cell);
++            gailview->focus_cell = ATK_OBJECT (g_object_ref (cell));
+             gail_cell_add_state (cell, ATK_STATE_FOCUSED, FALSE);
+             g_signal_emit_by_name (gailview,
+                                    "active-descendant-changed",
+commit bcfc53066ae54d0adbf282d5678d9a4a7083b4d3
+Author: Javier Jardón <jjardon@gnome.org>
+Date:   Mon May 3 02:56:29 2010 +0200
+
+    tests: Too many arguments in call to 'create_menu'
+
+diff --git a/tests/testmenubars.c b/tests/testmenubars.c
+index 416a93986121d858..853d822a9b6a7925 100644
+--- a/tests/testmenubars.c
++++ b/tests/testmenubars.c
+@@ -21,7 +21,7 @@
+ #include <gtk/gtk.h>
+ 
+ static GtkWidget *
+-create_menu (depth)
++create_menu (guint depth)
+ {
+     GtkWidget *menu;
+     GtkWidget *menuitem;
+@@ -70,19 +70,19 @@ create_menubar (GtkPackDirection pack_dir,
+   menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_HOME, NULL);
+   gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
+   gtk_label_set_angle (GTK_LABEL (GTK_BIN (menuitem)->child), angle);
+-  menu = create_menu (2, TRUE);
++  menu = create_menu (2);
+   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu);
+ 
+   menuitem = gtk_menu_item_new_with_label ("foo");
+   gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
+   gtk_label_set_angle (GTK_LABEL (GTK_BIN (menuitem)->child), angle);
+-  menu = create_menu (2, TRUE);
++  menu = create_menu (2);
+   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu);
+ 
+   menuitem = gtk_menu_item_new_with_label ("bar");
+   gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
+   gtk_label_set_angle (GTK_LABEL (GTK_BIN (menuitem)->child), angle);
+-  menu = create_menu (2, TRUE);
++  menu = create_menu (2);
+   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu);
+ 
+   return menubar;
+