components/desktop/mate/mate-control-center/patches/03-remove-pkexec.patch

   1
   2 Minor alteration to this patch to get it to cleanly apply at 1.26.0,
   3 changed "int pkexec_uid;" to "unsigned int pkexec_uid;" in chunk #2.
   4
   5 --- mate-control-center-1.18.1/capplets/display/xrandr-capplet.c.~1~    2017-04-05 23:22:53.000000000 +0300
   6 +++ mate-control-center-1.18.1/capplets/display/xrandr-capplet.c        2017-05-24 09:08:24.255471398 +0300
   7 @@ -2349,7 +2349,11 @@
   8
   9      source_filename = mate_rr_config_get_intended_filename ();
  10
  11 +#ifdef __sun__
  12 +    command_line = g_strdup_printf ("/usr/bin/gksu -u root %s/mate-display-properties-install-systemwide %s %s",
  13 +#else
  14      command_line = g_strdup_printf ("pkexec %s/mate-display-properties-install-systemwide %s %s",
  15 +#endif
  16                                     SBINDIR,
  17                                     source_filename,
  18                                     dest_basename);
  19 --- mate-control-center-1.14.0/capplets/display/mate-display-properties-install-systemwide.c.~1~        2016-01-30 21:03:48.000000000 +0300
  20 +++ mate-control-center-1.14.0/capplets/display/mate-display-properties-install-systemwide.c    2016-07-28 13:37:44.255108119 +0300
  21 @@ -130,8 +130,10 @@
  22         uid_t uid, euid;
  23         const char *source_filename;
  24         const char *dest_name;
  25 +#ifndef __sun__
  26         const char *pkexec_uid_str;
  27         unsigned int pkexec_uid;
  28 +#endif
  29         struct stat statbuf;
  30         int err;
  31         int source_fd;
  32 @@ -197,6 +199,7 @@
  33                 return EXIT_FAILURE;
  34         }
  35
  36 +#ifndef __sun__
  37         /* We only copy files that are really owned by the calling user */
  38
  39         pkexec_uid_str = g_getenv ("PKEXEC_UID");
  40 @@ -215,6 +218,7 @@
  41                 g_print (_("%s must be owned by you\n"), source_filename);
  42                 return EXIT_FAILURE;
  43         }
  44 +#endif
  45
  46         /* We only accept basenames for the destination */
  47