Public Pastes
daily pastebin goal
3%
SHARE
TWEET

Untitled

a guest Jun 17th, 2015 207 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff -Nru gnome-shell-3.16.2/debian/changelog gnome-shell-3.16.2/debian/changelog
  2. --- gnome-shell-3.16.2/debian/changelog 2015-06-03 22:22:24.000000000 +1000
  3. +++ gnome-shell-3.16.2/debian/changelog 2015-06-18 07:02:04.000000000 +1000
  4. @@ -1,7 +1,87 @@
  5. +gnome-shell (3.16.2-4ubuntu1) wily; urgency=low
  6. +
  7. +  * Merge from Debian unstable.  Remaining changes:
  8. +    - debian/control.in:
  9. +      + Recommend gdm instead of gdm3
  10. +      + Add Recommends on network-manager since this
  11. +        is required for network panel to work.
  12. +      + Depend on gnome-session which due to package
  13. +        split now contains only the session files
  14. +      + drop depend on gnome-icon-theme-symoblic
  15. +      + revert bumps on e-d-s and gnome-bluetooth, until these
  16. +        are updated in wily.
  17. +    - debian/rules: switch to adwaita-icon-theme
  18. +    - debian/patches/ubuntu-lightdm-user-switching.patch:
  19. +      + Allow user switching when using LightDM.
  20. +    - debian/patches/ubuntu_lock_on_suspend.patch
  21. +      + Respect Ubuntu's lock-on-suspend setting.
  22. +    - debian/patches/revert_new_bluetooth.patch:
  23. +      + revert changes requiring Bluez5
  24. +    - debian/patches/revert_eds_bump.patch:
  25. +      + e-d-s has not been packaged 3.16 yet
  26. +    - debian/patches/10_background_race.patch:
  27. +      + replaced with 3.15 patches from bugzilla
  28. +    - debian/gnome-shell.gsettings-override:
  29. +      + Replace iceweasel with firefox
  30. +  * Revert Bump gnome-settings-daemon to 3.16.0 till we have it
  31. +
  32. + -- Jackson Doak <noskcaj@ubuntu.com>  Thu, 18 Jun 2015 07:00:31 +1000
  33. +
  34. +gnome-shell (3.16.2-4) unstable; urgency=medium
  35. +
  36. +  * Drop debian/patches/10-make-NetworkManager-optional.patch, merged
  37. +    upstream. Refresh remaining patches.
  38. +  * Strip out mnemonics indicators from labels. Currently GNOME Shell doesn't
  39. +    support mnemonics and prompters may send labels with it. Patch
  40. +    cherry-picked from upstream Git.
  41. +  * Add Provides: notification-daemon. GNOME Shell provides an implementation
  42. +    of org.freedesktop.Notifications which other applications make use of.
  43. +    This dependency is typically expressed by depending on the
  44. +    notification-daemon package.
  45. +  * Update Homepage: URL.
  46. +  * Drop obsolete Breaks/Replaces from pre-wheezy.
  47. +  * Build against libsystemd. Closes: #779743
  48. +
  49. + -- Michael Biebl <biebl@debian.org>  Mon, 15 Jun 2015 21:52:13 +0200
  50. +
  51. +gnome-shell (3.16.2-3) unstable; urgency=medium
  52. +
  53. +  * Upload to unstable.
  54. +
  55. + -- Emilio Pozuelo Monfort <pochu@debian.org>  Sun, 14 Jun 2015 13:44:20 +0200
  56. +
  57. +gnome-shell (3.16.2-2) experimental; urgency=medium
  58. +
  59. +  * debian/control.in: Bump gnome-settings-daemon to 3.16.0, this seems
  60. +    necessary for the media keys to work.
  61. +
  62. + -- Laurent Bigonville <bigon@debian.org>  Thu, 11 Jun 2015 15:00:29 +0200
  63. +
  64.  gnome-shell (3.16.2-1ubuntu1) wily; urgency=medium
  65.  
  66.    * Merge from debian, remaining changes:
  67. -
  68. +    - debian/control.in:
  69. +      + Recommend gdm instead of gdm3
  70. +      + Add Recommends on network-manager since this
  71. +        is required for network panel to work.
  72. +      + Depend on gnome-session which due to package
  73. +        split now contains only the session files
  74. +      + drop depend on gnome-icon-theme-symoblic
  75. +      + revert bumps on e-d-s and gnome-bluetooth, until these
  76. +        are updated in wily.
  77. +    - debian/rules: switch to adwaita-icon-theme
  78. +    - debian/patches/ubuntu-lightdm-user-switching.patch:
  79. +      + Allow user switching when using LightDM.
  80. +    - debian/patches/ubuntu_lock_on_suspend.patch
  81. +      + Respect Ubuntu's lock-on-suspend setting.
  82. +    - debian/patches/revert_new_bluetooth.patch:
  83. +      + revert changes requiring Bluez5
  84. +    - debian/patches/revert_eds_bump.patch:
  85. +      + e-d-s has not been packaged 3.16 yet
  86. +    - debian/patches/10_background_race.patch:
  87. +      + replaced with 3.15 patches from bugzilla
  88. +    - debian/gnome-shell.gsettings-override:
  89. +      + Replace iceweasel with firefox
  90.  
  91.   -- Tim Lunn <tim@feathertop.org>  Wed, 03 Jun 2015 22:21:54 +1000
  92.  
  93. diff -Nru gnome-shell-3.16.2/debian/control gnome-shell-3.16.2/debian/control
  94. --- gnome-shell-3.16.2/debian/control   2015-06-04 09:36:55.000000000 +1000
  95. +++ gnome-shell-3.16.2/debian/control   2015-06-18 07:04:37.000000000 +1000
  96. @@ -7,7 +7,7 @@
  97.  Priority: optional
  98.  Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
  99.  XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
  100. -Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Jordi Mallach <jordi@debian.org>, Josselin Mouette <joss@debian.org>, Laurent Bigonville <bigon@debian.org>
  101. +Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Josselin Mouette <joss@debian.org>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>
  102.  Build-Depends: autotools-dev,
  103.                 cdbs,
  104.                 debhelper (>= 8.1.3~),
  105. @@ -45,16 +45,14 @@
  106.                 libpulse-dev (>= 2.0),
  107.                 libsecret-1-dev,
  108.                 libstartup-notification0-dev (>= 0.11),
  109. -               libsystemd-login-dev [linux-any],
  110. -               libsystemd-daemon-dev [linux-any],
  111. -               libsystemd-journal-dev [linux-any],
  112. +               libsystemd-dev [linux-any],
  113.                 libtelepathy-glib-dev (>= 0.17.5),
  114.                 libx11-dev,
  115.                 libxfixes-dev,
  116.                 libxml2-dev,
  117.                 python3,
  118.  Standards-Version: 3.9.6
  119. -Homepage: http://live.gnome.org/GnomeShell
  120. +Homepage: https://wiki.gnome.org/Projects/GnomeShell
  121.  Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-shell
  122.  Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-shell/
  123.  
  124. @@ -105,13 +103,11 @@
  125.              gnome-user-guide,
  126.              network-manager,
  127.              unzip,
  128. -            gdm (>= 3.5.90)
  129. -Breaks: fglrx-driver (<< 1:11-10),
  130. -        gdm (<< 3.5.90),
  131. -        gnome-control-center (<< 1:3.0),
  132. -        gnome-session (<< 3.0),
  133. +            gdm (>= 3.10.0.1-3~)
  134. +Breaks: gdm (<< 3.10.0.1-3~),
  135.          gnome-tweak-tool (<< 3.5)
  136.  Conflicts: gnome-screensaver (<< 3.6)
  137. +Provides: notification-daemon
  138.  Description: graphical shell for the GNOME desktop
  139.   The GNOME Shell provides core interface functions like switching
  140.   windows, launching applications or see your notifications. It takes
  141. @@ -123,9 +119,6 @@
  142.  Package: gnome-shell-common
  143.  Architecture: all
  144.  Depends: ${misc:Depends}
  145. -Replaces: gnome-shell (<< 3.2.1-6)
  146. -Breaks: gnome-shell (<< 3.2.1-6),
  147. -        gnome-tweak-tool (<< 3.3)
  148.  Description: common files for the GNOME graphical shell
  149.   This package contains translations and data files for the GNOME shell.
  150.  
  151. diff -Nru gnome-shell-3.16.2/debian/control.in gnome-shell-3.16.2/debian/control.in
  152. --- gnome-shell-3.16.2/debian/control.in        2015-06-04 09:30:26.000000000 +1000
  153. +++ gnome-shell-3.16.2/debian/control.in        2015-06-18 06:57:48.000000000 +1000
  154. @@ -41,16 +41,14 @@
  155.                 libpulse-dev (>= 2.0),
  156.                 libsecret-1-dev,
  157.                 libstartup-notification0-dev (>= 0.11),
  158. -               libsystemd-login-dev [linux-any],
  159. -               libsystemd-daemon-dev [linux-any],
  160. -               libsystemd-journal-dev [linux-any],
  161. +               libsystemd-dev [linux-any],
  162.                 libtelepathy-glib-dev (>= 0.17.5),
  163.                 libx11-dev,
  164.                 libxfixes-dev,
  165.                 libxml2-dev,
  166.                 python3,
  167.  Standards-Version: 3.9.6
  168. -Homepage: http://live.gnome.org/GnomeShell
  169. +Homepage: https://wiki.gnome.org/Projects/GnomeShell
  170.  Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-shell
  171.  Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-shell/
  172.  
  173. @@ -101,13 +99,11 @@
  174.              gnome-user-guide,
  175.              network-manager,
  176.              unzip,
  177. -            gdm (>= 3.5.90)
  178. -Breaks: fglrx-driver (<< 1:11-10),
  179. -        gdm (<< 3.5.90),
  180. -        gnome-control-center (<< 1:3.0),
  181. -        gnome-session (<< 3.0),
  182. +            gdm (>= 3.10.0.1-3~)
  183. +Breaks: gdm (<< 3.10.0.1-3~),
  184.          gnome-tweak-tool (<< 3.5)
  185.  Conflicts: gnome-screensaver (<< 3.6)
  186. +Provides: notification-daemon
  187.  Description: graphical shell for the GNOME desktop
  188.   The GNOME Shell provides core interface functions like switching
  189.   windows, launching applications or see your notifications. It takes
  190. @@ -119,9 +115,6 @@
  191.  Package: gnome-shell-common
  192.  Architecture: all
  193.  Depends: ${misc:Depends}
  194. -Replaces: gnome-shell (<< 3.2.1-6)
  195. -Breaks: gnome-shell (<< 3.2.1-6),
  196. -        gnome-tweak-tool (<< 3.3)
  197.  Description: common files for the GNOME graphical shell
  198.   This package contains translations and data files for the GNOME shell.
  199.  
  200. diff -Nru gnome-shell-3.16.2/debian/patches/10-make-NetworkManager-optional.patch gnome-shell-3.16.2/debian/patches/10-make-NetworkManager-optional.patch
  201. --- gnome-shell-3.16.2/debian/patches/10-make-NetworkManager-optional.patch     2014-12-13 14:44:03.000000000 +1100
  202. +++ gnome-shell-3.16.2/debian/patches/10-make-NetworkManager-optional.patch     1970-01-01 10:00:00.000000000 +1000
  203. @@ -1,173 +0,0 @@
  204. -From: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/files/
  205. -
  206. -  * use config.js (and AC_SUBST HAVE_NETWORKMANAGER appropriately);
  207. -  * take care to not import ui.status.network if nm is disabled;
  208. -  * do not try to reassign to const variables;
  209. -  * no point really in fiddling with the list of installed js files;
  210. -  * don't build shell-mobile-providers if nm is disabled;
  211. -  * use "networkmanager" instead of "network_manager" because THE
  212. -    BIKESHED SHOULD BE BLUE, also because the upstream package name is
  213. -    NetworkManager, not Network_Manager.
  214. ---- a/js/Makefile.am
  215. -+++ b/js/Makefile.am
  216. -@@ -8,6 +8,7 @@
  217. -       sed -e "s|[@]PACKAGE_NAME@|$(PACKAGE_NAME)|g" \
  218. -           -e "s|[@]PACKAGE_VERSION@|$(PACKAGE_VERSION)|g" \
  219. -           -e "s|[@]HAVE_BLUETOOTH@|$(HAVE_BLUETOOTH)|g" \
  220. -+          -e "s|[@]HAVE_NETWORKMANAGER@|$(HAVE_NETWORKMANAGER)|g" \
  221. -           -e "s|[@]GETTEXT_PACKAGE@|$(GETTEXT_PACKAGE)|g" \
  222. -           -e "s|[@]datadir@|$(datadir)|g" \
  223. -           -e "s|[@]libexecdir@|$(libexecdir)|g" \
  224. ---- a/js/misc/config.js.in
  225. -+++ b/js/misc/config.js.in
  226. -@@ -6,6 +6,8 @@
  227. - const PACKAGE_VERSION = '@PACKAGE_VERSION@';
  228. - /* 1 if gnome-bluetooth is available, 0 otherwise */
  229. - const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
  230. -+/* 1 if networkmanager is available, 0 otherwise */
  231. -+const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@;
  232. - /* gettext package */
  233. - const GETTEXT_PACKAGE = '@GETTEXT_PACKAGE@';
  234. - /* locale dir */
  235. ---- a/js/ui/panel.js
  236. -+++ b/js/ui/panel.js
  237. -@@ -811,7 +811,9 @@
  238. -         this._indicators = new St.BoxLayout({ style_class: 'panel-status-indicators-box' });
  239. -         this.actor.add_child(this._indicators);
  240. -
  241. --        this._network = new imports.ui.status.network.NMApplet();
  242. -+        if (Config.HAVE_NETWORKMANAGER) {
  243. -+          this._network = new imports.ui.status.network.NMApplet();
  244. -+        }
  245. -         if (Config.HAVE_BLUETOOTH) {
  246. -             this._bluetooth = new imports.ui.status.bluetooth.Indicator();
  247. -         } else {
  248. ---- a/js/ui/sessionMode.js
  249. -+++ b/js/ui/sessionMode.js
  250. -@@ -10,6 +10,8 @@
  251. - const Main = imports.ui.main;
  252. - const Params = imports.misc.params;
  253. -
  254. -+const Config = imports.misc.config;
  255. -+
  256. - const DEFAULT_MODE = 'restrictive';
  257. -
  258. - const _modes = {
  259. -@@ -92,7 +94,10 @@
  260. -         isLocked: false,
  261. -         isPrimary: true,
  262. -         unlockDialog: imports.ui.unlockDialog.UnlockDialog,
  263. --        components: ['networkAgent', 'polkitAgent', 'telepathyClient',
  264. -+        components: Config.HAVE_NETWORKMANAGER ?
  265. -+          ['networkAgent', 'polkitAgent', 'telepathyClient',
  266. -+                     'keyring', 'autorunManager', 'automountManager'] :
  267. -+          ['polkitAgent', 'telepathyClient',
  268. -                      'keyring', 'autorunManager', 'automountManager'],
  269. -         panel: {
  270. -             left: ['activities', 'appMenu'],
  271. ---- a/src/Makefile.am
  272. -+++ b/src/Makefile.am
  273. -@@ -103,7 +103,6 @@
  274. -       shell-invert-lightness-effect.h \
  275. -       shell-keybinding-modes.h        \
  276. -       shell-mount-operation.h         \
  277. --      shell-network-agent.h           \
  278. -       shell-perf-log.h                \
  279. -       shell-screenshot.h              \
  280. -       shell-slicer.h                  \
  281. -@@ -140,7 +139,6 @@
  282. -       shell-menu-tracker.c            \
  283. -       shell-menu-tracker.h            \
  284. -       shell-mount-operation.c         \
  285. --      shell-network-agent.c           \
  286. -       shell-perf-log.c                \
  287. -       shell-polkit-authentication-agent.h     \
  288. -       shell-polkit-authentication-agent.c     \
  289. -@@ -175,6 +173,10 @@
  290. -
  291. - libgnome_shell_la_SOURCES = $(libgnome_shell_sources)
  292. -
  293. -+if HAVE_NETWORKMANAGER
  294. -+libgnome_shell_la_SOURCES +=  shell-network-agent.c
  295. -+endif
  296. -+
  297. - libgnome_shell_la_gir_sources = \
  298. -       $(filter-out %-private.h $(shell_private_sources), $(shell_public_headers_h) $(libgnome_shell_base_la_SOURCES) $(libgnome_shell_sources))
  299. -
  300. -@@ -331,7 +333,10 @@
  301. - CLEANFILES += ShellMenu-0.1.gir
  302. -
  303. - Shell-0.1.gir: gnome-shell St-1.0.gir ShellMenu-0.1.gir
  304. --Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0
  305. -+Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 Soup-2.4 GMenu-3.0
  306. -+if HAVE_NETWORKMANAGER
  307. -+Shell_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0
  308. -+endif
  309. - Shell_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir)
  310. - # Hack! we use PROGRAM instead of LIBS so that the soname is not included
  311. - # in the typelib. This way the symbols will be resolved with the libgnome-shell
  312. ---- a/configure.ac
  313. -+++ b/configure.ac
  314. -@@ -91,8 +91,6 @@
  315. -             libcanberra libcanberra-gtk3
  316. -             telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
  317. -             polkit-agent-1 >= $POLKIT_MIN_VERSION
  318. --            libnm-glib libnm-util >= $NETWORKMANAGER_MIN_VERSION
  319. --            libnm-gtk >= $NETWORKMANAGER_MIN_VERSION
  320. -             libsecret-unstable gcr-base-3 >= $GCR_MIN_VERSION"
  321. -
  322. - PKG_CHECK_MODULES(GNOME_SHELL, $SHARED_PCS)
  323. -@@ -162,6 +160,37 @@
  324. -             [Define if _NL_TIME_FIRST_WEEKDAY is available])
  325. - fi
  326. -
  327. -+AC_ARG_ENABLE(networkmanager,
  328. -+             AS_HELP_STRING([--disable-networkmanager],
  329. -+                            [disable NetworkManager support  @<:@default=auto@:>@]),,
  330. -+              [enable_networkmanager=auto])
  331. -+
  332. -+if test "x$enable_networkmanager" != "xno"; then
  333. -+   PKG_CHECK_MODULES(NETWORKMANAGER,
  334. -+                     [libnm-glib
  335. -+                     libnm-util >= $NETWORKMANAGER_MIN_VERSION
  336. -+                     libnm-gtk >= $NETWORKMANAGER_MIN_VERSION],
  337. -+                     [have_networkmanager=yes],
  338. -+                     [have_networkmanager=no])
  339. -+
  340. -+   GNOME_SHELL_CFLAGS="$GNOME_SHELL_CFLAGS $NETWORKMANAGER_CFLAGS"
  341. -+   GNOME_SHELL_LIBS="$GNOME_SHELL_LIBS $NETWORKMANAGER_LIBS"
  342. -+else
  343. -+   have_networkmanager="no  (disabled)"
  344. -+fi
  345. -+
  346. -+if test "x$have_networkmanager" = "xyes"; then
  347. -+   AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager])
  348. -+   AC_SUBST([HAVE_NETWORKMANAGER], [1])
  349. -+else
  350. -+   if test "x$enable_networkmanager" = "xyes"; then
  351. -+      AC_MSG_ERROR([Couldn't find NetworkManager.])
  352. -+   fi
  353. -+   AC_SUBST([HAVE_NETWORKMANAGER], [0])
  354. -+fi
  355. -+
  356. -+AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes")
  357. -+
  358. - # Sets GLIB_GENMARSHAL and GLIB_MKENUMS
  359. - AM_PATH_GLIB_2_0()
  360. -
  361. -@@ -203,3 +232,15 @@
  362. -   man/Makefile
  363. - ])
  364. - AC_OUTPUT
  365. -+
  366. -+echo "
  367. -+Build configuration:
  368. -+
  369. -+       Prefix:                                 ${prefix}
  370. -+       Source code location:                   ${srcdir}
  371. -+       Compiler:                               ${CC}
  372. -+       Compiler Warnings:                      $enable_compile_warnings
  373. -+
  374. -+       Support for NetworkManager:             $have_networkmanager
  375. -+       Support for GStreamer recording:        $build_recorder
  376. -+"
  377. diff -Nru gnome-shell-3.16.2/debian/patches/27-nm-libexec-path.patch gnome-shell-3.16.2/debian/patches/27-nm-libexec-path.patch
  378. --- gnome-shell-3.16.2/debian/patches/27-nm-libexec-path.patch  2014-12-13 14:44:04.000000000 +1100
  379. +++ gnome-shell-3.16.2/debian/patches/27-nm-libexec-path.patch  2015-06-16 14:40:57.000000000 +1000
  380. @@ -2,9 +2,11 @@
  381.  Author: Laurent Bigonville <bigon@debian.org>
  382.  Forwarded: not-needed
  383.  
  384. ---- a/js/ui/components/networkAgent.js
  385. -+++ b/js/ui/components/networkAgent.js
  386. -@@ -718,7 +718,7 @@ const NetworkAgent = new Lang.Class({
  387. +Index: gnome-shell-3.16.2/js/ui/components/networkAgent.js
  388. +===================================================================
  389. +--- gnome-shell-3.16.2.orig/js/ui/components/networkAgent.js   2015-06-15 20:46:20.285766160 +0200
  390. ++++ gnome-shell-3.16.2/js/ui/components/networkAgent.js        2015-06-15 20:46:20.281766245 +0200
  391. +@@ -793,7 +793,7 @@
  392.  
  393.                       let path = binary;
  394.                       if (!GLib.path_is_absolute(path)) {
  395. diff -Nru gnome-shell-3.16.2/debian/patches/41-handle-logind-fail.patch gnome-shell-3.16.2/debian/patches/41-handle-logind-fail.patch
  396. --- gnome-shell-3.16.2/debian/patches/41-handle-logind-fail.patch       2014-12-13 14:44:04.000000000 +1100
  397. +++ gnome-shell-3.16.2/debian/patches/41-handle-logind-fail.patch       2015-06-16 14:40:57.000000000 +1000
  398. @@ -9,9 +9,11 @@
  399.  
  400.  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=729877
  401.  
  402. ---- a/js/misc/loginManager.js
  403. -+++ b/js/misc/loginManager.js
  404. -@@ -117,7 +117,7 @@
  405. +Index: gnome-shell-3.16.2/js/misc/loginManager.js
  406. +===================================================================
  407. +--- gnome-shell-3.16.2.orig/js/misc/loginManager.js    2015-06-15 20:46:24.805673265 +0200
  408. ++++ gnome-shell-3.16.2/js/misc/loginManager.js 2015-06-15 20:46:24.801673346 +0200
  409. +@@ -90,7 +90,7 @@
  410.    */
  411.   function getLoginManager() {
  412.       if (_loginManager == null) {
  413. diff -Nru gnome-shell-3.16.2/debian/patches/50-ShellKeyringPrompt-Strip-out-mnemonics-indicators-fr.patch gnome-shell-3.16.2/debian/patches/50-ShellKeyringPrompt-Strip-out-mnemonics-indicators-fr.patch
  414. --- gnome-shell-3.16.2/debian/patches/50-ShellKeyringPrompt-Strip-out-mnemonics-indicators-fr.patch     1970-01-01 10:00:00.000000000 +1000
  415. +++ gnome-shell-3.16.2/debian/patches/50-ShellKeyringPrompt-Strip-out-mnemonics-indicators-fr.patch     2015-06-16 04:42:25.000000000 +1000
  416. @@ -0,0 +1,87 @@
  417. +From 97b6f7fbbcdfb7126a1ff95d2f0e95cff4e56305 Mon Sep 17 00:00:00 2001
  418. +From: Watson Yuuma Sato <yuuma.sato@gmail.com>
  419. +Date: Sun, 7 Jun 2015 18:48:51 -0300
  420. +Subject: [PATCH] ShellKeyringPrompt: Strip out mnemonics indicators from
  421. + labels
  422. +
  423. +Currently GNOME Shell doesn't support mnemonics and prompters may
  424. +send labels with it.
  425. +
  426. +Remove the mnemonics indicator for now.
  427. +
  428. +Signed-off-by: Stef Walter <stefw@redhat.com>
  429. + * Fixed style issue
  430. +
  431. +https://bugzilla.gnome.org/show_bug.cgi?id=750465
  432. +
  433. +(cherry-picked from commit 59a18c4eadb3be032208eaeada500eb45a685a12)
  434. +---
  435. + src/shell-keyring-prompt.c | 34 +++++++++++++++++++++++++++++++---
  436. + 1 file changed, 31 insertions(+), 3 deletions(-)
  437. +
  438. +diff --git a/src/shell-keyring-prompt.c b/src/shell-keyring-prompt.c
  439. +index e07cd1e..85b4e00 100644
  440. +--- a/src/shell-keyring-prompt.c
  441. ++++ b/src/shell-keyring-prompt.c
  442. +@@ -111,6 +111,34 @@ shell_keyring_prompt_init (ShellKeyringPrompt *self)
  443. +
  444. + }
  445. +
  446. ++static gchar *
  447. ++remove_mnemonics (const GValue *value)
  448. ++{
  449. ++  const gchar mnemonic = '_';
  450. ++  gchar *stripped_label, *temp;
  451. ++  const gchar *label;
  452. ++
  453. ++  g_return_val_if_fail (value != NULL, NULL);
  454. ++  g_return_val_if_fail (G_VALUE_HOLDS_STRING (value), NULL);
  455. ++
  456. ++  label = g_value_get_string (value);
  457. ++  g_return_val_if_fail (label != NULL, NULL);
  458. ++
  459. ++  /* Stripped label will have the original label lenght at most */
  460. ++  stripped_label = temp = g_new (gchar, strlen(label) + 1);
  461. ++  g_assert (stripped_label != NULL);
  462. ++
  463. ++  while (*label != '\0')
  464. ++    {
  465. ++      if (*label == mnemonic)
  466. ++        label++;
  467. ++      *(temp++) = *(label++);
  468. ++    }
  469. ++  *temp = '\0';
  470. ++
  471. ++  return stripped_label;
  472. ++}
  473. ++
  474. + static void
  475. + shell_keyring_prompt_set_property (GObject      *obj,
  476. +                                    guint         prop_id,
  477. +@@ -145,7 +173,7 @@ shell_keyring_prompt_set_property (GObject      *obj,
  478. +     break;
  479. +   case PROP_CHOICE_LABEL:
  480. +     g_free (self->choice_label);
  481. +-    self->choice_label = g_value_dup_string (value);
  482. ++    self->choice_label = remove_mnemonics (value);
  483. +     if (!self->choice_label)
  484. +         self->choice_label = g_strdup ("");
  485. +     g_object_notify (obj, "choice-label");
  486. +@@ -165,12 +193,12 @@ shell_keyring_prompt_set_property (GObject      *obj,
  487. +     break;
  488. +   case PROP_CONTINUE_LABEL:
  489. +     g_free (self->continue_label);
  490. +-    self->continue_label = g_value_dup_string (value);
  491. ++    self->continue_label = remove_mnemonics (value);
  492. +     g_object_notify (obj, "continue-label");
  493. +     break;
  494. +   case PROP_CANCEL_LABEL:
  495. +     g_free (self->cancel_label);
  496. +-    self->cancel_label = g_value_dup_string (value);
  497. ++    self->cancel_label = remove_mnemonics (value);
  498. +     g_object_notify (obj, "cancel-label");
  499. +     break;
  500. +   case PROP_PASSWORD_ACTOR:
  501. +--
  502. +2.1.4
  503. +
  504. diff -Nru gnome-shell-3.16.2/debian/patches/60-Update-configure.ac-to-check-for-libsystemd.patch gnome-shell-3.16.2/debian/patches/60-Update-configure.ac-to-check-for-libsystemd.patch
  505. --- gnome-shell-3.16.2/debian/patches/60-Update-configure.ac-to-check-for-libsystemd.patch      1970-01-01 10:00:00.000000000 +1000
  506. +++ gnome-shell-3.16.2/debian/patches/60-Update-configure.ac-to-check-for-libsystemd.patch      2015-06-16 05:48:55.000000000 +1000
  507. @@ -0,0 +1,37 @@
  508. +From 9aaf5d5ec6183e0a077a6d83ab1f71d47dd3da0a Mon Sep 17 00:00:00 2001
  509. +From: Michael Biebl <biebl@debian.org>
  510. +Date: Mon, 15 Jun 2015 21:48:00 +0200
  511. +Subject: [PATCH] Update configure.ac to check for libsystemd
  512. +
  513. +https://bugzilla.gnome.org/show_bug.cgi?id=751016
  514. +---
  515. + configure.ac | 6 +++---
  516. + 1 file changed, 3 insertions(+), 3 deletions(-)
  517. +
  518. +diff --git a/configure.ac b/configure.ac
  519. +index d8a2ee7..417e262 100644
  520. +--- a/configure.ac
  521. ++++ b/configure.ac
  522. +@@ -63,8 +63,8 @@ AC_ARG_ENABLE([systemd],
  523. +               [enable_systemd=$enableval],
  524. +               [enable_systemd=auto])
  525. + AS_IF([test x$enable_systemd != xno], [
  526. +-  AC_MSG_CHECKING([for libsystemd-journal])
  527. +-  PKG_CHECK_EXISTS([libsystemd-journal],
  528. ++  AC_MSG_CHECKING([for libsystemd])
  529. ++  PKG_CHECK_EXISTS([libsystemd],
  530. +                    [have_systemd=yes
  531. +                     AC_DEFINE([HAVE_SYSTEMD], [1], [Define if we have systemd])],
  532. +                    [have_systemd=no])
  533. +@@ -106,7 +106,7 @@ SHARED_PCS="gio-unix-2.0 >= $GIO_MIN_VERSION
  534. +             polkit-agent-1 >= $POLKIT_MIN_VERSION
  535. +             gcr-base-3 >= $GCR_MIN_VERSION"
  536. + if test x$have_systemd = xyes; then
  537. +-  SHARED_PCS="${SHARED_PCS} libsystemd-journal"
  538. ++  SHARED_PCS="${SHARED_PCS} libsystemd"
  539. + fi
  540. +
  541. + PKG_CHECK_MODULES(GNOME_SHELL, $SHARED_PCS)
  542. +--
  543. +2.1.4
  544. +
  545. diff -Nru gnome-shell-3.16.2/debian/patches/series gnome-shell-3.16.2/debian/patches/series
  546. --- gnome-shell-3.16.2/debian/patches/series    2015-06-04 08:53:13.000000000 +1000
  547. +++ gnome-shell-3.16.2/debian/patches/series    2015-06-18 07:00:07.000000000 +1000
  548. @@ -1,8 +1,9 @@
  549. -#10-make-NetworkManager-optional.patch
  550.  10_background_race.patch
  551.  27-nm-libexec-path.patch
  552.  #30-remoteMenu-Prevent-the-shell-from-becoming-unrespons.patch
  553.  41-handle-logind-fail.patch
  554. +50-ShellKeyringPrompt-Strip-out-mnemonics-indicators-fr.patch
  555. +60-Update-configure.ac-to-check-for-libsystemd.patch
  556.  ubuntu-lightdm-user-switching.patch
  557.  ubuntu_lock_on_suspend.patch
  558.  revert_new_bluetooth.patch
RAW Paste Data
Top