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

[Git][debian-mate-team/brisk-menu][master] 4 commits: debian/patches: Add 1000_fixed-sorting-with-accented-chars.patch

Title: GitLab

Martin Wimpress pushed to branch master at Debian and Ubuntu MATE Packaging Team / brisk-menu

Commits:

4 changed files:

Changes:

  • debian/patches/1000_fixed-sorting-with-accented-chars.patch
    1 
    +diff --git a/src/frontend/menu-sort.c b/src/frontend/menu-sort.c
    2 
    +index 155fbf6..69308db 100644
    3 
    +--- a/src/frontend/menu-sort.c
    4 
    ++++ b/src/frontend/menu-sort.c
    5 
    +@@ -74,10 +74,10 @@ __brisk_pure__ gint brisk_menu_window_sort(BriskMenuWindow *self, BriskItem *ite
    6 
    +
    7 
    + basic_sort:
    8 
    +         /* Ensure we compare lower case only */
    9 
    +-        nameA = g_ascii_strdown(brisk_item_get_display_name(itemA), -1);
    10 
    +-        nameB = g_ascii_strdown(brisk_item_get_display_name(itemB), -1);
    11 
    ++        nameA = g_utf8_strdown(brisk_item_get_display_name(itemA), -1);
    12 
    ++        nameB = g_utf8_strdown(brisk_item_get_display_name(itemB), -1);
    13 
    +
    14 
    +-        return g_strcmp0(nameA, nameB);
    15 
    ++        return g_strcmp0(g_utf8_collate_key(nameA, -1), g_utf8_collate_key(nameB, -1));
    16 
    + }
    17 
    +
    18 
    + /*

  • debian/patches/1001_fix-crashes-when-updating-apps.patch
    1 
    +diff --git a/src/backend/apps/apps-backend.c b/src/backend/apps/apps-backend.c
    2 
    +index a85e307..26578d6 100644
    3 
    +--- a/src/backend/apps/apps-backend.c
    4 
    ++++ b/src/backend/apps/apps-backend.c
    5 
    +@@ -80,6 +80,8 @@ DEF_AUTOFREE(MateMenuTree, g_object_unref)
    6 
    + DEF_AUTOFREE(GDesktopAppInfo, g_object_unref)
    7 
    + DEF_AUTOFREE(GError, g_error_free)
    8 
    +
    9 
    ++BriskAppsBackend * BriskAppsBackendInstance = NULL;
    10 
    ++
    11 
    + /**
    12 
    +  * Due to a glib weirdness we must fully invalidate the monitor's cache
    13 
    +  * to force reload events to work again.
    14 
    +@@ -213,6 +215,7 @@ static void brisk_apps_backend_init(BriskAppsBackend *self)
    15 
    +                                  "changed",
    16 
    +                                  G_CALLBACK(brisk_apps_backend_changed),
    17 
    +                                  self);
    18 
    ++        BriskAppsBackendInstance = self;
    19 
    + }
    20 
    +
    21 
    + /**
    22 
    +@@ -258,6 +261,7 @@ static gint brisk_apps_backend_sort_section(gconstpointer a, gconstpointer b)
    23 
    +  */
    24 
    + static gboolean brisk_apps_backend_init_menus(BriskAppsBackend *self)
    25 
    + {
    26 
    ++        self = BriskAppsBackendInstance;
    27 
    +         brisk_apps_backend_reset_pending(self);
    28 
    +
    29 
    +         /* Now load them again */
    30 
    +diff --git a/src/backend/favourites/favourites-backend.c b/src/backend/favourites/favourites-backend.c
    31 
    +index 52cecde..eb36e94 100644
    32 
    +--- a/src/backend/favourites/favourites-backend.c
    33 
    ++++ b/src/backend/favourites/favourites-backend.c
    34 
    +@@ -37,6 +37,8 @@ static void brisk_favourites_backend_pin_item(GSimpleAction *action, GVariant *p
    35 
    + static void brisk_favourites_backend_unpin_item(GSimpleAction *action, GVariant *parameter,
    36 
    +                                                 BriskFavouritesBackend *self);
    37 
    +
    38 
    ++BriskFavouritesBackend * BriskFavouritesBackendInstance = NULL;
    39 
    ++
    40 
    + /**
    41 
    +  * Tell the frontends what we are
    42 
    +  */
    43 
    +@@ -130,6 +132,7 @@ static void brisk_favourites_backend_class_init(BriskFavouritesBackendClass *kla
    44 
    + static void brisk_favourites_backend_changed(GSettings *settings, const gchar *key,
    45 
    +                                              BriskFavouritesBackend *self)
    46 
    + {
    47 
    ++        self = BriskFavouritesBackendInstance;
    48 
    +         autofree(gstrv) *favs = g_settings_get_strv(settings, key);
    49 
    +         g_hash_table_remove_all(self->favourites);
    50 
    +
    51 
    +@@ -168,6 +171,8 @@ static void brisk_favourites_backend_init(BriskFavouritesBackend *self)
    52 
    +
    53 
    +         brisk_favourites_backend_init_desktop(self);
    54 
    +
    55 
    ++        BriskFavouritesBackendInstance = self;
    56 
    ++
    57 
    +         /* Allow O(1) lookup for the "is pinned" logic */
    58 
    +         self->favourites = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
    59 
    +
    60 
    +@@ -206,6 +211,7 @@ static void brisk_favourites_backend_pin_item(__brisk_unused__ GSimpleAction *ac
    61 
    +                                               __brisk_unused__ GVariant *parameter,
    62 
    +                                               BriskFavouritesBackend *self)
    63 
    + {
    64 
    ++        self = BriskFavouritesBackendInstance;
    65 
    +         autofree(gstrv) *old = NULL;
    66 
    +         autofree(GArray) *array = NULL;
    67 
    +
    68 
    +@@ -239,6 +245,7 @@ static void brisk_favourites_backend_unpin_item(__brisk_unused__ GSimpleAction *
    69 
    +                                                 __brisk_unused__ GVariant *parameter,
    70 
    +                                                 BriskFavouritesBackend *self)
    71 
    + {
    72 
    ++        self = BriskFavouritesBackendInstance;
    73 
    +         autofree(gstrv) *old = NULL;
    74 
    +         autofree(GArray) *array = NULL;
    75 
    +
    76 
    +diff --git a/src/backend/favourites/favourites-desktop.c b/src/backend/favourites/favourites-desktop.c
    77 
    +index b982d28..a123eea 100644
    78 
    +--- a/src/backend/favourites/favourites-desktop.c
    79 
    ++++ b/src/backend/favourites/favourites-desktop.c
    80 
    +@@ -32,6 +32,8 @@ typedef enum {
    81 
    +         PIN_STATUS_UNPINNED = 2,
    82 
    + } DesktopPinStatus;
    83 
    +
    84 
    ++extern BriskFavouritesBackend * BriskFavouritesBackendInstance;
    85 
    ++
    86 
    + /**
    87 
    +  * get_desktop_item_source:
    88 
    +  *
    89 
    +@@ -89,6 +91,7 @@ static void brisk_favourites_backend_action_desktop_pin(__brisk_unused__ GSimple
    90 
    +                                                         __brisk_unused__ GVariant *parameter,
    91 
    +                                                         BriskFavouritesBackend *self)
    92 
    + {
    93 
    ++        self = BriskFavouritesBackendInstance;
    94 
    +         autofree(GFile) *source = NULL;
    95 
    +         autofree(GFile) *dest = NULL;
    96 
    +         autofree(GError) *error = NULL;
    97 
    +@@ -135,6 +138,7 @@ static void brisk_favourites_backend_action_desktop_unpin(__brisk_unused__ GSimp
    98 
    +                                                           __brisk_unused__ GVariant *parameter,
    99 
    +                                                           BriskFavouritesBackend *self)
    100 
    + {
    101 
    ++        self = BriskFavouritesBackendInstance;
    102 
    +         autofree(GFile) *source = NULL;
    103 
    +         autofree(GFile) *dest = NULL;
    104 
    +         autofree(GError) *error = NULL;
    105 
    +diff --git a/src/frontend/menu-settings.c b/src/frontend/menu-settings.c
    106 
    +index 626ecef..172fcf1 100644
    107 
    +--- a/src/frontend/menu-settings.c
    108 
    ++++ b/src/frontend/menu-settings.c
    109 
    +@@ -19,6 +19,8 @@ BRISK_END_PEDANTIC
    110 
    +
    111 
    + static void brisk_menu_window_settings_changed(GSettings *settings, const gchar *key, gpointer v);
    112 
    +
    113 
    ++extern BriskMenuWindow * BriskMenuWindowInstance;
    114 
    ++
    115 
    + void brisk_menu_window_init_settings(BriskMenuWindow *self)
    116 
    + {
    117 
    +         GtkSettings *gtk_settings = NULL;
    118 
    +@@ -50,7 +52,7 @@ void brisk_menu_window_pump_settings(BriskMenuWindow *self)
    119 
    +
    120 
    + static void brisk_menu_window_settings_changed(GSettings *settings, const gchar *key, gpointer v)
    121 
    + {
    122 
    +-        BriskMenuWindow *self = v;
    123 
    ++        BriskMenuWindow *self = BriskMenuWindowInstance;
    124 
    +         autofree(gchar) *value = NULL;
    125 
    +
    126 
    +         if (g_str_equal(key, "search-position")) {
    127 
    +diff --git a/src/frontend/menu-window.c b/src/frontend/menu-window.c
    128 
    +index 9dc505f..466f247 100644
    129 
    +--- a/src/frontend/menu-window.c
    130 
    ++++ b/src/frontend/menu-window.c
    131 
    +@@ -29,6 +29,8 @@ static GParamSpec *obj_properties[N_PROPS] = {
    132 
    +         NULL,
    133 
    + };
    134 
    +
    135 
    ++BriskMenuWindow * BriskMenuWindowInstance = NULL;
    136 
    ++
    137 
    + /**
    138 
    +  * brisk_menu_window_dispose:
    139 
    +  *
    140 
    +@@ -98,6 +100,7 @@ static void brisk_menu_window_init(BriskMenuWindow *self)
    141 
    +         self->launcher = brisk_menu_launcher_new();
    142 
    +
    143 
    +         brisk_menu_window_init_settings(self);
    144 
    ++        BriskMenuWindowInstance = self;
    145 
    + }
    146 
    +
    147 
    + static void brisk_menu_window_set_property(GObject *object, guint id, const GValue *value,

  • debian/patches/1002_fix_build_order_bug.patch
    1 
    +From d3bef9490fb682c6193b1bfb8f4c80ba81f6d72e Mon Sep 17 00:00:00 2001
    2 
    +From: Tobias Kortkamp <t@tobik.me>
    3 
    +Date: Fri, 9 Apr 2021 06:58:31 +0200
    4 
    +Subject: [PATCH] Attempt to fix build order bug
    5 
    +
    6 
    +Uncovered while building with samurai [0] but can probably also
    7 
    +happen with ninja eventually.
    8 
    +
    9 
    +In file included from ../src/mate-applet/applet.c:19:
    10 
    +In file included from ../src/frontend/classic/classic-window.h:14:
    11 
    +../src/frontend/classic/../menu-private.h:18:10: fatal error: 'libsaver-glue.h' file not found
    12 
    + #include "libsaver-glue.h"
    13 
    +         ^~~~~~~~~~~~~~~~~
    14 
    +1 error generated.
    15 
    +samu: subcommands failed
    16 
    +
    17 
    +[0] https://github.com/michaelforney/samurai
    18 
    +---
    19 
    + src/meson.build | 2 ++
    20 
    + 1 file changed, 2 insertions(+)
    21 
    +
    22 
    +diff --git a/src/meson.build b/src/meson.build
    23 
    +index 7d8ca3f..c6750f1 100644
    24 
    +--- a/src/meson.build
    25 
    ++++ b/src/meson.build
    26 
    +@@ -13,6 +13,7 @@ libresources = static_library(
    27 
    +
    28 
    + link_libresources = declare_dependency(
    29 
    +     link_with: libresources,
    30 
    ++    sources: brisk_resources,
    31 
    +     include_directories: [
    32 
    +         data_include,
    33 
    +     ],
    34 
    +@@ -38,6 +39,7 @@ libsession_stub = static_library(
    35 
    + # Allow linking to the stub
    36 
    + link_libsession_stub = declare_dependency(
    37 
    +     link_with: libsession_stub,
    38 
    ++    sources: [libsaver_glue, libsession_glue],
    39 
    +     dependencies: [
    40 
    +         dep_gio_unix,
    41 
    +     ],

  • debian/patches/series
    1 
    +1000_fixed-sorting-with-accented-chars.patch
    2 
    +1001_fix-crashes-when-updating-apps.patch
    3 
    +1002_fix_build_order_bug.patch

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.

    Reply to: