diff -pruN 0.6.2-1/debian/changelog 0.6.2-1ubuntu0/debian/changelog --- 0.6.2-1/debian/changelog 2020-08-21 21:10:29.000000000 +0000 +++ 0.6.2-1ubuntu0/debian/changelog 2021-09-01 09:11:10.000000000 +0000 @@ -1,3 +1,12 @@ +brisk-menu (0.6.2-1ubuntu0) impish; urgency=medium + + * debian/patches: + + Add 1000_fixed-sorting-with-accented-chars.patch + + Add 1001_fix-crashes-when-updating-apps.patch + + Add 1002_fix_build_order_bug.patch + + -- Martin Wimpress Wed, 01 Sep 2021 10:11:10 +0100 + brisk-menu (0.6.2-1) unstable; urgency=medium * New upstream release. diff -pruN 0.6.2-1/debian/control 0.6.2-1ubuntu0/debian/control --- 0.6.2-1/debian/control 2020-08-18 09:30:27.000000000 +0000 +++ 0.6.2-1ubuntu0/debian/control 2021-09-01 09:11:10.000000000 +0000 @@ -17,7 +17,7 @@ Build-Depends: debhelper-compat (= 13), meson (>= 0.40.0), ninja-build, pkg-config, -Standards-Version: 4.5.0 +Standards-Version: 4.6.0 Rules-Requires-Root: no Homepage: http://www.mate-desktop.org/ Vcs-Browser: https://salsa.debian.org/debian-mate-team/brisk-menu diff -pruN 0.6.2-1/debian/patches/1000_fixed-sorting-with-accented-chars.patch 0.6.2-1ubuntu0/debian/patches/1000_fixed-sorting-with-accented-chars.patch --- 0.6.2-1/debian/patches/1000_fixed-sorting-with-accented-chars.patch 1970-01-01 00:00:00.000000000 +0000 +++ 0.6.2-1ubuntu0/debian/patches/1000_fixed-sorting-with-accented-chars.patch 2021-09-01 08:58:25.000000000 +0000 @@ -0,0 +1,18 @@ +diff --git a/src/frontend/menu-sort.c b/src/frontend/menu-sort.c +index 155fbf6..69308db 100644 +--- a/src/frontend/menu-sort.c ++++ b/src/frontend/menu-sort.c +@@ -74,10 +74,10 @@ __brisk_pure__ gint brisk_menu_window_sort(BriskMenuWindow *self, BriskItem *ite + + basic_sort: + /* Ensure we compare lower case only */ +- nameA = g_ascii_strdown(brisk_item_get_display_name(itemA), -1); +- nameB = g_ascii_strdown(brisk_item_get_display_name(itemB), -1); ++ nameA = g_utf8_strdown(brisk_item_get_display_name(itemA), -1); ++ nameB = g_utf8_strdown(brisk_item_get_display_name(itemB), -1); + +- return g_strcmp0(nameA, nameB); ++ return g_strcmp0(g_utf8_collate_key(nameA, -1), g_utf8_collate_key(nameB, -1)); + } + + /* diff -pruN 0.6.2-1/debian/patches/1001_fix-crashes-when-updating-apps.patch 0.6.2-1ubuntu0/debian/patches/1001_fix-crashes-when-updating-apps.patch --- 0.6.2-1/debian/patches/1001_fix-crashes-when-updating-apps.patch 1970-01-01 00:00:00.000000000 +0000 +++ 0.6.2-1ubuntu0/debian/patches/1001_fix-crashes-when-updating-apps.patch 2021-09-01 09:09:08.000000000 +0000 @@ -0,0 +1,147 @@ +diff --git a/src/backend/apps/apps-backend.c b/src/backend/apps/apps-backend.c +index a85e307..26578d6 100644 +--- a/src/backend/apps/apps-backend.c ++++ b/src/backend/apps/apps-backend.c +@@ -80,6 +80,8 @@ DEF_AUTOFREE(MateMenuTree, g_object_unref) + DEF_AUTOFREE(GDesktopAppInfo, g_object_unref) + DEF_AUTOFREE(GError, g_error_free) + ++BriskAppsBackend * BriskAppsBackendInstance = NULL; ++ + /** + * Due to a glib weirdness we must fully invalidate the monitor's cache + * to force reload events to work again. +@@ -213,6 +215,7 @@ static void brisk_apps_backend_init(BriskAppsBackend *self) + "changed", + G_CALLBACK(brisk_apps_backend_changed), + self); ++ BriskAppsBackendInstance = self; + } + + /** +@@ -258,6 +261,7 @@ static gint brisk_apps_backend_sort_section(gconstpointer a, gconstpointer b) + */ + static gboolean brisk_apps_backend_init_menus(BriskAppsBackend *self) + { ++ self = BriskAppsBackendInstance; + brisk_apps_backend_reset_pending(self); + + /* Now load them again */ +diff --git a/src/backend/favourites/favourites-backend.c b/src/backend/favourites/favourites-backend.c +index 52cecde..eb36e94 100644 +--- a/src/backend/favourites/favourites-backend.c ++++ b/src/backend/favourites/favourites-backend.c +@@ -37,6 +37,8 @@ static void brisk_favourites_backend_pin_item(GSimpleAction *action, GVariant *p + static void brisk_favourites_backend_unpin_item(GSimpleAction *action, GVariant *parameter, + BriskFavouritesBackend *self); + ++BriskFavouritesBackend * BriskFavouritesBackendInstance = NULL; ++ + /** + * Tell the frontends what we are + */ +@@ -130,6 +132,7 @@ static void brisk_favourites_backend_class_init(BriskFavouritesBackendClass *kla + static void brisk_favourites_backend_changed(GSettings *settings, const gchar *key, + BriskFavouritesBackend *self) + { ++ self = BriskFavouritesBackendInstance; + autofree(gstrv) *favs = g_settings_get_strv(settings, key); + g_hash_table_remove_all(self->favourites); + +@@ -168,6 +171,8 @@ static void brisk_favourites_backend_init(BriskFavouritesBackend *self) + + brisk_favourites_backend_init_desktop(self); + ++ BriskFavouritesBackendInstance = self; ++ + /* Allow O(1) lookup for the "is pinned" logic */ + self->favourites = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); + +@@ -206,6 +211,7 @@ static void brisk_favourites_backend_pin_item(__brisk_unused__ GSimpleAction *ac + __brisk_unused__ GVariant *parameter, + BriskFavouritesBackend *self) + { ++ self = BriskFavouritesBackendInstance; + autofree(gstrv) *old = NULL; + autofree(GArray) *array = NULL; + +@@ -239,6 +245,7 @@ static void brisk_favourites_backend_unpin_item(__brisk_unused__ GSimpleAction * + __brisk_unused__ GVariant *parameter, + BriskFavouritesBackend *self) + { ++ self = BriskFavouritesBackendInstance; + autofree(gstrv) *old = NULL; + autofree(GArray) *array = NULL; + +diff --git a/src/backend/favourites/favourites-desktop.c b/src/backend/favourites/favourites-desktop.c +index b982d28..a123eea 100644 +--- a/src/backend/favourites/favourites-desktop.c ++++ b/src/backend/favourites/favourites-desktop.c +@@ -32,6 +32,8 @@ typedef enum { + PIN_STATUS_UNPINNED = 2, + } DesktopPinStatus; + ++extern BriskFavouritesBackend * BriskFavouritesBackendInstance; ++ + /** + * get_desktop_item_source: + * +@@ -89,6 +91,7 @@ static void brisk_favourites_backend_action_desktop_pin(__brisk_unused__ GSimple + __brisk_unused__ GVariant *parameter, + BriskFavouritesBackend *self) + { ++ self = BriskFavouritesBackendInstance; + autofree(GFile) *source = NULL; + autofree(GFile) *dest = NULL; + autofree(GError) *error = NULL; +@@ -135,6 +138,7 @@ static void brisk_favourites_backend_action_desktop_unpin(__brisk_unused__ GSimp + __brisk_unused__ GVariant *parameter, + BriskFavouritesBackend *self) + { ++ self = BriskFavouritesBackendInstance; + autofree(GFile) *source = NULL; + autofree(GFile) *dest = NULL; + autofree(GError) *error = NULL; +diff --git a/src/frontend/menu-settings.c b/src/frontend/menu-settings.c +index 626ecef..172fcf1 100644 +--- a/src/frontend/menu-settings.c ++++ b/src/frontend/menu-settings.c +@@ -19,6 +19,8 @@ BRISK_END_PEDANTIC + + static void brisk_menu_window_settings_changed(GSettings *settings, const gchar *key, gpointer v); + ++extern BriskMenuWindow * BriskMenuWindowInstance; ++ + void brisk_menu_window_init_settings(BriskMenuWindow *self) + { + GtkSettings *gtk_settings = NULL; +@@ -50,7 +52,7 @@ void brisk_menu_window_pump_settings(BriskMenuWindow *self) + + static void brisk_menu_window_settings_changed(GSettings *settings, const gchar *key, gpointer v) + { +- BriskMenuWindow *self = v; ++ BriskMenuWindow *self = BriskMenuWindowInstance; + autofree(gchar) *value = NULL; + + if (g_str_equal(key, "search-position")) { +diff --git a/src/frontend/menu-window.c b/src/frontend/menu-window.c +index 9dc505f..466f247 100644 +--- a/src/frontend/menu-window.c ++++ b/src/frontend/menu-window.c +@@ -29,6 +29,8 @@ static GParamSpec *obj_properties[N_PROPS] = { + NULL, + }; + ++BriskMenuWindow * BriskMenuWindowInstance = NULL; ++ + /** + * brisk_menu_window_dispose: + * +@@ -98,6 +100,7 @@ static void brisk_menu_window_init(BriskMenuWindow *self) + self->launcher = brisk_menu_launcher_new(); + + brisk_menu_window_init_settings(self); ++ BriskMenuWindowInstance = self; + } + + static void brisk_menu_window_set_property(GObject *object, guint id, const GValue *value, diff -pruN 0.6.2-1/debian/patches/1002_fix_build_order_bug.patch 0.6.2-1ubuntu0/debian/patches/1002_fix_build_order_bug.patch --- 0.6.2-1/debian/patches/1002_fix_build_order_bug.patch 1970-01-01 00:00:00.000000000 +0000 +++ 0.6.2-1ubuntu0/debian/patches/1002_fix_build_order_bug.patch 2021-09-01 09:08:30.000000000 +0000 @@ -0,0 +1,41 @@ +From d3bef9490fb682c6193b1bfb8f4c80ba81f6d72e Mon Sep 17 00:00:00 2001 +From: Tobias Kortkamp +Date: Fri, 9 Apr 2021 06:58:31 +0200 +Subject: [PATCH] Attempt to fix build order bug + +Uncovered while building with samurai [0] but can probably also +happen with ninja eventually. + +In file included from ../src/mate-applet/applet.c:19: +In file included from ../src/frontend/classic/classic-window.h:14: +../src/frontend/classic/../menu-private.h:18:10: fatal error: 'libsaver-glue.h' file not found + #include "libsaver-glue.h" + ^~~~~~~~~~~~~~~~~ +1 error generated. +samu: subcommands failed + +[0] https://github.com/michaelforney/samurai +--- + src/meson.build | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/meson.build b/src/meson.build +index 7d8ca3f..c6750f1 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -13,6 +13,7 @@ libresources = static_library( + + link_libresources = declare_dependency( + link_with: libresources, ++ sources: brisk_resources, + include_directories: [ + data_include, + ], +@@ -38,6 +39,7 @@ libsession_stub = static_library( + # Allow linking to the stub + link_libsession_stub = declare_dependency( + link_with: libsession_stub, ++ sources: [libsaver_glue, libsession_glue], + dependencies: [ + dep_gio_unix, + ], diff -pruN 0.6.2-1/debian/patches/series 0.6.2-1ubuntu0/debian/patches/series --- 0.6.2-1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ 0.6.2-1ubuntu0/debian/patches/series 2021-09-01 09:09:41.000000000 +0000 @@ -0,0 +1,3 @@ +1000_fixed-sorting-with-accented-chars.patch +1001_fix-crashes-when-updating-apps.patch +1002_fix_build_order_bug.patch