Skip to content

Commit

Permalink
gnome3.gnome-control-center: 3.34.4 -> 3.36.0
Browse files Browse the repository at this point in the history 
Now depends on epoxy, not in the NEWS though.
  • Loading branch information
@hedning @jtojnar
hedning authored and jtojnar committed Mar 24, 2020
1 parent 77bdc11 commit fcf2213
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 48 deletions.
8 changes: 4 additions & 4 deletions pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,19 @@
, udisks2
, upower
, vino
, epoxy
, gnome-user-share
, gnome-remote-desktop
, shadow
, wrapGAppsHook
}:

stdenv.mkDerivation rec {
pname = "gnome-control-center";
version = "3.34.4";
version = "3.36.0";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0bi7lsmr5hcf0v17brsa8j33p6i0wnh620bzwycmxryfp6s6vshp";
sha256 = "0gdadbkynldxqffdlw760039ci1vv9wsi5i0mdq4q9dblmb79q1b";
};

nativeBuildInputs = [
Expand Down Expand Up @@ -134,13 +134,13 @@ stdenv.mkDerivation rec {
udisks2
upower
vino
epoxy
];

patches = [
(substituteAll {
src = ./paths.patch;
gcm = gnome-color-manager;
usermod = "${shadow}/bin/usermod";
gnome_desktop = gnome-desktop;
inherit glibc libgnomekbd tzdata;
inherit cups networkmanagerapplet;
Expand Down
100 changes: 56 additions & 44 deletions pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@ index 96b25140c..1ad704d4a 100644

typedef struct _TzDB TzDB;
typedef struct _TzLocation TzLocation;
diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c
index 7fce8691e..b839f8b69 100644
--- a/panels/info/cc-info-overview-panel.c
+++ b/panels/info/cc-info-overview-panel.c
@@ -187,7 +187,7 @@ load_gnome_version (char **version,
diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c
index 4541986db..da7826bfe 100644
--- a/panels/info-overview/cc-info-overview-panel.c
+++ b/panels/info-overview/cc-info-overview-panel.c
@@ -169,7 +169,7 @@ load_gnome_version (char **version,
gsize length;
g_autoptr(VersionData) data = NULL;

- if (!g_file_get_contents (DATADIR "/gnome/gnome-version.xml",
+ if (!g_file_get_contents ("@gnome_desktop@/share/gnome/gnome-version.xml",
&contents,
Expand All @@ -71,44 +71,69 @@ diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/n
index 9390a3308..d30b4a68e 100644
--- a/panels/network/connection-editor/net-connection-editor.c
+++ b/panels/network/connection-editor/net-connection-editor.c
@@ -247,9 +247,9 @@ net_connection_editor_do_fallback (NetConnectionEditor *editor, const gchar *typ
GError *error = NULL;
if (editor->is_new_connection) {
@@ -278,9 +278,9 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type)
g_autoptr(GError) error = NULL;

if (self->is_new_connection) {
- cmdline = g_strdup_printf ("nm-connection-editor --type='%s' --create", type);
+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --type='%s' --create", type);
} else {
- cmdline = g_strdup_printf ("nm-connection-editor --edit='%s'",
+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit='%s'",
nm_connection_get_uuid (editor->connection));
nm_connection_get_uuid (self->connection));
}

diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c
index dd99a7485..4baa88a4e 100644
--- a/panels/network/net-device-wifi.c
+++ b/panels/network/net-device-wifi.c
@@ -1445,7 +1445,7 @@ device_wifi_edit (NetObject *object)
return;
}
uuid = nm_connection_get_uuid (NM_CONNECTION (connection));
diff --git a/panels/network/net-device-bluetooth.c b/panels/network/net-device-bluetooth.c
--- a/panels/network/net-device-bluetooth.c
+++ b/panels/network/net-device-bluetooth.c
@@ -90,7 +90,7 @@ nm_device_bluetooth_refresh_ui (NetDeviceBluetooth *self)
update_off_switch_from_device_state (self->device_off_switch, state, self);

/* set up the Options button */
- path = g_find_program_in_path ("nm-connection-editor");
+ path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor");
gtk_widget_set_visible (GTK_WIDGET (self->options_button), state != NM_DEVICE_STATE_UNMANAGED && path != NULL);
}

@@ -141,7 +141,7 @@ options_button_clicked_cb (NetDeviceBluetooth *self)

connection = net_device_get_find_connection (self->client, self->device);
uuid = nm_connection_get_uuid (connection);
- cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid);
+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit %s", uuid);
g_debug ("Launching '%s'\n", cmdline);
if (!g_spawn_command_line_async (cmdline, &error)) {
if (!g_spawn_command_line_async (cmdline, &error))
g_warning ("Failed to launch nm-connection-editor: %s", error->message);
diff --git a/panels/network/net-device.c b/panels/network/net-device.c
index d73b537b9..e2ee54294 100644
--- a/panels/network/net-device.c
+++ b/panels/network/net-device.c
@@ -197,7 +197,7 @@ net_device_edit (NetObject *object)

connection = net_device_get_find_connection (device);
@@ -185,7 +185,7 @@ net_device_bluetooth_init (NetDeviceBluetooth *self)

gtk_widget_init_template (GTK_WIDGET (self));

- path = g_find_program_in_path ("nm-connection-editor");
+ path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor");
gtk_widget_set_visible (GTK_WIDGET (self->options_button), path != NULL);
}

diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobile.c
--- a/panels/network/net-device-mobile.c
+++ b/panels/network/net-device-mobile.c
@@ -484,7 +484,7 @@ options_button_clicked_cb (NetDeviceMobile *self)

connection = net_device_get_find_connection (self->client, self->device);
uuid = nm_connection_get_uuid (connection);
- cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid);
+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit %s", uuid);
g_debug ("Launching '%s'\n", cmdline);
if (!g_spawn_command_line_async (cmdline, &error)) {
if (!g_spawn_command_line_async (cmdline, &error))
g_warning ("Failed to launch nm-connection-editor: %s", error->message);
@@ -776,7 +776,7 @@ net_device_mobile_init (NetDeviceMobile *self)

self->cancellable = g_cancellable_new ();

- path = g_find_program_in_path ("nm-connection-editor");
+ path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor");
gtk_widget_set_visible (GTK_WIDGET (self->options_button), path != NULL);
}

diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c
index f53ba217e..d24bcaeb9 100644
--- a/panels/printers/pp-host.c
Expand All @@ -123,10 +148,10 @@ index f53ba217e..d24bcaeb9 100644

/* Use SNMP to get printer's informations */
diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c
index e0604b8c3..fc323c1b2 100644
index 35859526d..21486c917 100644
--- a/panels/region/cc-region-panel.c
+++ b/panels/region/cc-region-panel.c
@@ -763,10 +763,10 @@ row_layout_cb (CcRegionPanel *self,
@@ -755,10 +755,10 @@ row_layout_cb (CcRegionPanel *self,
layout_variant = cc_input_source_get_layout_variant (source);

if (layout_variant && layout_variant[0])
Expand All @@ -140,7 +165,7 @@ index e0604b8c3..fc323c1b2 100644

g_spawn_command_line_async (commandline, NULL);
diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c
index 19934f186..9f41a9620 100644
index 00239ce0f..617c98870 100644
--- a/panels/user-accounts/run-passwd.c
+++ b/panels/user-accounts/run-passwd.c
@@ -150,7 +150,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error)
Expand All @@ -152,19 +177,6 @@ index 19934f186..9f41a9620 100644
argv[1] = NULL;

envp = g_get_environ ();
diff --git a/panels/user-accounts/user-utils.c b/panels/user-accounts/user-utils.c
index 83d4cd091..e8784c722 100644
--- a/panels/user-accounts/user-utils.c
+++ b/panels/user-accounts/user-utils.c
@@ -486,7 +486,7 @@ is_valid_username_async (const gchar *username,
* future, so it would be nice to have some official way for this
* instead of relying on the current "--login" implementation.
*/
- argv[0] = "/usr/sbin/usermod";
+ argv[0] = "@usermod@";
argv[1] = "--login";
argv[2] = data->username;
argv[3] = "--";
diff --git a/tests/datetime/test-endianess.c b/tests/datetime/test-endianess.c
index 9cb92007a..84d2f0fa3 100644
--- a/tests/datetime/test-endianess.c
Expand Down

0 comments on commit fcf2213

Please sign in to comment.