gnome3.gnome-control-center: 3.28.2 → 3.30.2

This commit is contained in:
Jan Tojnar 2018-09-05 00:46:15 +00:00
parent 21f0b27e4f
commit f5342946c3
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
2 changed files with 30 additions and 34 deletions

View file

@ -1,6 +1,6 @@
{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, ibus, gettext, upower, wrapGAppsHook { fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, ibus, gettext, upower, wrapGAppsHook
, libcanberra-gtk3, accountsservice, libpwquality, libpulseaudio , libcanberra-gtk3, accountsservice, libpwquality, libpulseaudio
, gdk_pixbuf, librsvg, libnotify, libgudev, gnome-color-manager , gdk_pixbuf, librsvg, libnotify, libgudev, libsecret, gnome-color-manager
, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
, cracklib, libkrb5, networkmanagerapplet, networkmanager, glibc , cracklib, libkrb5, networkmanagerapplet, networkmanager, glibc
, libwacom, samba, shared-mime-info, tzdata, libtool, libgnomekbd , libwacom, samba, shared-mime-info, tzdata, libtool, libgnomekbd
@ -9,13 +9,13 @@
let let
pname = "gnome-control-center"; pname = "gnome-control-center";
version = "3.28.2"; version = "3.30.2";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0d6pjdbsra16nav8201kaadja5yma92bhziki9601ilk2ry3v7pz"; sha256 = "0rn4r0ng4pd9smpay4rf4dkcl09b2ipr9srryybhd1srmd02ps51";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
libxml2 gnome-desktop gnome-settings-daemon polkit libgtop libxml2 gnome-desktop gnome-settings-daemon polkit libgtop
gnome-online-accounts libsoup colord libpulseaudio fontconfig colord-gtk gnome-online-accounts libsoup colord libpulseaudio fontconfig colord-gtk
accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify
grilo libpwquality cracklib vino libcanberra-gtk3 libgudev grilo libpwquality cracklib vino libcanberra-gtk3 libgudev libsecret
gdk_pixbuf defaultIconTheme librsvg clutter clutter-gtk cheese gdk_pixbuf defaultIconTheme librsvg clutter clutter-gtk cheese
networkmanager modemmanager gnome-bluetooth tracker networkmanager modemmanager gnome-bluetooth tracker
]; ];
@ -42,8 +42,8 @@ in stdenv.mkDerivation rec {
]; ];
postPatch = '' postPatch = ''
chmod +x meson_post_install.py # patchShebangs requires executable file chmod +x build-aux/meson/meson_post_install.py # patchShebangs requires executable file
patchShebangs meson_post_install.py patchShebangs build-aux/meson/meson_post_install.py
''; '';
preFixup = '' preFixup = ''

View file

@ -1,15 +1,15 @@
--- a/panels/color/cc-color-panel.c --- a/panels/color/cc-color-panel.c
+++ b/panels/color/cc-color-panel.c +++ b/panels/color/cc-color-panel.c
@@ -634,7 +634,7 @@ @@ -599,7 +599,7 @@
/* run with modal set */ /* run with modal set */
argv = g_ptr_array_new_with_free_func (g_free); argv = g_ptr_array_new_with_free_func (g_free);
- g_ptr_array_add (argv, g_build_filename (BINDIR, "gcm-calibrate", NULL)); - g_ptr_array_add (argv, g_build_filename (BINDIR, "gcm-calibrate", NULL));
+ g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-calibrate", NULL)); + g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-calibrate", NULL));
g_ptr_array_add (argv, g_strdup ("--device")); g_ptr_array_add (argv, g_strdup ("--device"));
g_ptr_array_add (argv, g_strdup (cd_device_get_id (priv->current_device))); g_ptr_array_add (argv, g_strdup (cd_device_get_id (prefs->current_device)));
g_ptr_array_add (argv, g_strdup ("--parent-window")); g_ptr_array_add (argv, g_strdup ("--parent-window"));
@@ -1136,7 +1136,7 @@ @@ -1038,7 +1038,7 @@
/* open up gcm-viewer as a info pane */ /* open up gcm-viewer as a info pane */
argv = g_ptr_array_new_with_free_func (g_free); argv = g_ptr_array_new_with_free_func (g_free);
@ -18,38 +18,23 @@
g_ptr_array_add (argv, g_strdup ("--profile")); g_ptr_array_add (argv, g_strdup ("--profile"));
g_ptr_array_add (argv, g_strdup (cd_profile_get_id (profile))); g_ptr_array_add (argv, g_strdup (cd_profile_get_id (profile)));
g_ptr_array_add (argv, g_strdup ("--parent-window")); g_ptr_array_add (argv, g_strdup ("--parent-window"));
@@ -1406,7 +1406,6 @@ @@ -1288,15 +1288,12 @@
static void
gcm_prefs_profile_clicked (CcColorPanel *prefs, CdProfile *profile, CdDevice *device) gcm_prefs_profile_clicked (CcColorPanel *prefs, CdProfile *profile, CdDevice *device)
{ {
GtkWidget *widget; - g_autofree gchar *s = NULL;
- gchar *s; -
CcColorPanelPrivate *priv = prefs->priv;
/* get profile */ /* get profile */
@@ -1416,11 +1415,9 @@ g_debug ("selected profile = %s",
cd_profile_get_filename (profile));
/* allow getting profile info */ /* allow getting profile info */
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
"toolbutton_profile_view"));
- if (cd_profile_get_filename (profile) != NULL && - if (cd_profile_get_filename (profile) != NULL &&
- (s = g_find_program_in_path ("gcm-viewer")) != NULL) - (s = g_find_program_in_path ("gcm-viewer")) != NULL)
+ if (cd_profile_get_filename (profile) != NULL) + if (cd_profile_get_filename (profile) != NULL)
{ gtk_widget_set_sensitive (prefs->toolbutton_profile_view, TRUE);
gtk_widget_set_sensitive (widget, TRUE);
- g_free (s);
}
else else
gtk_widget_set_sensitive (widget, FALSE); gtk_widget_set_sensitive (prefs->toolbutton_profile_view, FALSE);
--- a/panels/datetime/test-endianess.c
+++ b/panels/datetime/test-endianess.c
@@ -26,7 +26,7 @@
GDir *dir;
const char *name;
- dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL);
+ dir = g_dir_open ("@glibc@/share/i18n/locales/", 0, NULL);
if (dir == NULL) {
/* Try with /usr/share/locale/
* https://bugzilla.gnome.org/show_bug.cgi?id=646780 */
--- a/panels/datetime/tz.h --- a/panels/datetime/tz.h
+++ b/panels/datetime/tz.h +++ b/panels/datetime/tz.h
@@ -27,11 +27,7 @@ @@ -27,11 +27,7 @@
@ -67,7 +52,7 @@
typedef struct _TzLocation TzLocation; typedef struct _TzLocation TzLocation;
--- a/panels/region/cc-region-panel.c --- a/panels/region/cc-region-panel.c
+++ b/panels/region/cc-region-panel.c +++ b/panels/region/cc-region-panel.c
@@ -1388,10 +1388,10 @@ @@ -1265,10 +1265,10 @@
} }
if (variant && variant[0]) if (variant && variant[0])
@ -80,3 +65,14 @@
layout); layout);
g_spawn_command_line_async (commandline, NULL); g_spawn_command_line_async (commandline, NULL);
--- a/tests/datetime/test-endianess.c
+++ b/tests/datetime/test-endianess.c
@@ -26,7 +26,7 @@
g_autoptr(GDir) dir = NULL;
const char *name;
- dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL);
+ dir = g_dir_open ("@glibc@/share/i18n/locales/", 0, NULL);
if (dir == NULL) {
/* Try with /usr/share/locale/
* https://bugzilla.gnome.org/show_bug.cgi?id=646780 */