diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-03 17:45:52 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-03 17:45:52 +0200 |
commit | 513c776d74c56a49781a09a5a772f4ea6d6bb401 (patch) | |
tree | 161509e3271db459f14f8c69de7c52d4902ba107 /extra/gnome-shell | |
parent | 8183144fe6e064d80985ac810f6178a3cf289d0d (diff) | |
parent | e191a289464c21aafe7478065ea7ed3ddda0766f (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/arm-elf-binutils/PKGBUILD
community/bird/PKGBUILD
community/cantata/PKGBUILD
community/dbmail/PKGBUILD
community/ekg2/PKGBUILD
community/ffmpeg-compat/PKGBUILD
community/gigedit/PKGBUILD
community/gimp-refocus/PKGBUILD
community/gmime24/PKGBUILD
community/gmpc/PKGBUILD
community/gnash/PKGBUILD
community/id3lib-rcc/PKGBUILD
community/linuxsampler/PKGBUILD
community/lwm/PKGBUILD
community/midori/PKGBUILD
community/mplayer2/PKGBUILD
community/mtpaint/PKGBUILD
community/nestopia/PKGBUILD
community/preload/PKGBUILD
community/projectm/PKGBUILD
community/rusxmms/PKGBUILD
community/taglib-rcc/PKGBUILD
community/the_silver_searcher/PKGBUILD
community/xnee/PKGBUILD
core/libgcrypt/PKGBUILD
core/libusbx/PKGBUILD
core/mkinitcpio-busybox/PKGBUILD
extra/a2ps/PKGBUILD
extra/a52dec/PKGBUILD
extra/abook/PKGBUILD
extra/avidemux/PKGBUILD
extra/bzflag/PKGBUILD
extra/cln/PKGBUILD
extra/exempi/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/fluxter/PKGBUILD
extra/fontforge/PKGBUILD
extra/glib/PKGBUILD
extra/gnet/PKGBUILD
extra/gnome-vfs/PKGBUILD
extra/gnutls/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/gtk/PKGBUILD
extra/idnkit/PKGBUILD
extra/ilmbase/PKGBUILD
extra/imake/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/libdatrie/PKGBUILD
extra/libmbim/PKGBUILD
extra/libmp3splt/PKGBUILD
extra/libqmi/PKGBUILD
extra/libtxc_dxtn/PKGBUILD
extra/libxfont/PKGBUILD
extra/mesa/PKGBUILD
extra/modemmanager/PKGBUILD
extra/nedit/PKGBUILD
extra/nmap/PKGBUILD
extra/openexr/PKGBUILD
extra/purple-plugin-pack/PKGBUILD
extra/qemu/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/subversion/PKGBUILD
extra/transmission/PKGBUILD
extra/truecrypt/PKGBUILD
extra/vigra/PKGBUILD
extra/virtuoso/PKGBUILD
extra/vlc/PKGBUILD
extra/wireshark/PKGBUILD
extra/wxmaxima/PKGBUILD
extra/x264/PKGBUILD
extra/xorg-iceauth/PKGBUILD
extra/xorg-mkfontscale/PKGBUILD
extra/xorg-xfd/PKGBUILD
libre/abuse-libre/PKGBUILD
libre/clementine-libre/PKGBUILD
libre/linux-libre/PKGBUILD
Diffstat (limited to 'extra/gnome-shell')
-rw-r--r-- | extra/gnome-shell/PKGBUILD | 17 | ||||
-rw-r--r-- | extra/gnome-shell/git-fixes.patch | 125 |
2 files changed, 6 insertions, 136 deletions
diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index a9d5b9820..2653f103e 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 189242 2013-07-01 09:11:00Z jgc $ +# $Id: PKGBUILD 191829 2013-07-31 09:01:10Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell -pkgver=3.8.3 -pkgrel=3 +pkgver=3.8.4 +pkgrel=1 pkgdesc="The next generation GNOME Shell" arch=(i686 x86_64 mips64el) url="http://live.gnome.org/GnomeShell" @@ -19,20 +19,15 @@ options=('!libtool' '!emptydirs') install=gnome-shell.install groups=(gnome) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz - nm-libexecdir.patch - git-fixes.patch) -sha256sums=('145724f21ead9dbe0c39d3ab468b39264c7aaf3f0fa5d152b295d905d8339c22' - 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607' - '3e08176d55c000eb88660349a4325e8134f4def66ef83efc7f45f0fb34a06e1c') + nm-libexecdir.patch) +sha256sums=('547e571c67b1436a32715b016ee63c666afcafed9c5a2f76dc4ad3bcaebffa47' + 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607') prepare() { cd $pkgname-$pkgver # FS#30747 FS#32730 Problems due to libexecdir different from NM patch -Np1 -i ../nm-libexecdir.patch - - # Git fixes - up to 60225ef86d070a7999bd6cded43837ca87d3f24f - patch -Np1 -i ../git-fixes.patch } build() { diff --git a/extra/gnome-shell/git-fixes.patch b/extra/gnome-shell/git-fixes.patch deleted file mode 100644 index 989c881f0..000000000 --- a/extra/gnome-shell/git-fixes.patch +++ /dev/null @@ -1,125 +0,0 @@ -diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css -index 775b687..f4ea781 100644 ---- a/data/theme/gnome-shell.css -+++ b/data/theme/gnome-shell.css -@@ -2312,6 +2312,7 @@ StScrollBar StButton#vhandle:active { - font-weight: bold; - color: #666666; - padding-top: 1em; -+ padding-left: 2px; - } - - .login-dialog-not-listed-button:focus .login-dialog-not-listed-label, -diff --git a/js/gdm/util.js b/js/gdm/util.js -index 6075e66..cae3e1b 100644 ---- a/js/gdm/util.js -+++ b/js/gdm/util.js -@@ -164,6 +164,7 @@ const ShellUserVerifier = new Lang.Class({ - - answerQuery: function(serviceName, answer) { - if (!this._userVerifier.hasPendingMessages) { -+ this._clearMessageQueue(); - this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null); - } else { - let signalId = this._userVerifier.connect('no-more-messages', -diff --git a/js/ui/components/telepathyClient.js b/js/ui/components/telepathyClient.js -index b07ea95..72bc010 100644 ---- a/js/ui/components/telepathyClient.js -+++ b/js/ui/components/telepathyClient.js -@@ -18,7 +18,7 @@ const Params = imports.misc.params; - const PopupMenu = imports.ui.popupMenu; - - // See Notification.appendMessage --const SCROLLBACK_IMMEDIATE_TIME = 60; // 1 minute -+const SCROLLBACK_IMMEDIATE_TIME = 3 * 60; // 3 minutes - const SCROLLBACK_RECENT_TIME = 15 * 60; // 15 minutes - const SCROLLBACK_RECENT_LENGTH = 20; - const SCROLLBACK_IDLE_LENGTH = 5; -@@ -967,7 +967,8 @@ const ChatNotification = new Lang.Class({ - let timeLabel = this._append({ body: this._formatTimestamp(lastMessageDate), - group: 'meta', - styles: ['chat-meta-message'], -- childProps: { expand: true, x_fill: false }, -+ childProps: { expand: true, x_fill: false, -+ x_align: St.Align.END }, - noTimestamp: true, - timestamp: lastMessageTime }); - -diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js -index d322581..ed61bf7 100644 ---- a/js/ui/endSessionDialog.js -+++ b/js/ui/endSessionDialog.js -@@ -420,6 +420,7 @@ const EndSessionDialog = new Lang.Class({ - _startTimer: function() { - let startTime = GLib.get_monotonic_time(); - this._secondsLeft = this._totalSecondsToStayOpen; -+ this._updateDescription(); - - this._timerId = Mainloop.timeout_add_seconds(1, Lang.bind(this, - function() { -diff --git a/js/ui/layout.js b/js/ui/layout.js -index 0bb887e..e25b3bd 100644 ---- a/js/ui/layout.js -+++ b/js/ui/layout.js -@@ -728,6 +728,8 @@ const LayoutManager = new Lang.Class({ - // and shown otherwise) - addChrome: function(actor, params) { - this.uiGroup.add_actor(actor); -+ if (this.uiGroup.contains(global.top_window_group)) -+ this.uiGroup.set_child_below_sibling(actor, global.top_window_group); - this._trackActor(actor, params); - }, - -diff --git a/js/ui/osdWindow.js b/js/ui/osdWindow.js -index 7e7b536..7fa052e 100644 ---- a/js/ui/osdWindow.js -+++ b/js/ui/osdWindow.js -@@ -167,14 +167,17 @@ const OsdWindow = new Lang.Class({ - { opacity: 0, - time: FADE_TIME, - transition: 'easeOutQuad', -- onComplete: Lang.bind(this, this._reset) }); -+ onComplete: Lang.bind(this, function() { -+ this._reset(); -+ Meta.enable_unredirect_for_screen(global.screen); -+ }) -+ }); - }, - - _reset: function() { - this.actor.hide(); - this.setLabel(null); - this.setLevel(null); -- Meta.enable_unredirect_for_screen(global.screen); - }, - - _monitorsChanged: function() { -diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js -index fe9cd31..4264f01 100644 ---- a/js/ui/screenShield.js -+++ b/js/ui/screenShield.js -@@ -709,6 +709,8 @@ const ScreenShield = new Lang.Class({ - }, - - _onDragEnd: function(action, actor, eventX, eventY, modifiers) { -+ if (this._lockScreenState != MessageTray.State.HIDING) -+ return; - if (this._lockScreenGroup.y < -(ARROW_DRAG_THRESHOLD * global.stage.height)) { - // Complete motion automatically - let [velocity, velocityX, velocityY] = this._dragAction.get_velocity(0); -diff --git a/src/st/st-widget.c b/src/st/st-widget.c -index 42992ec..4875acc 100644 ---- a/src/st/st-widget.c -+++ b/src/st/st-widget.c -@@ -608,8 +608,9 @@ st_widget_get_theme_node (StWidget *widget) - - if (stage == NULL) - { -- g_error ("st_widget_get_theme_node called on the widget %s which is not in the stage.", -- st_describe_actor (CLUTTER_ACTOR (widget))); -+ g_critical ("st_widget_get_theme_node called on the widget %s which is not in the stage.", -+ st_describe_actor (CLUTTER_ACTOR (widget))); -+ return g_object_new (ST_TYPE_THEME_NODE, NULL); - } - - if (parent_node == NULL) |