Accepting request 531476 from GNOME:Next

- Update to version 3.26.1:
  + Don't detach launched apps to not break pkexec and friends
    (bgo#763531).
  + Allow search providers to not autostart (bgo#785380,
    bgo#787986).
  + Fix crash when tray icons are hidden/shown in quick succession
    (bgo#787361).
  + Make window group switcher more consistent (bgo#786009).
  + Improve legibility of the top bar when translucent
    (bgo#787940).
  + Don't crash when running outside a logind session (bgo#788046).
  + Allow to run headless (bgo#730551).
  + Update calendar on timezone changes (bgo#678507).
  + Improve keyboard navigation of window previews (bgo#786546).
  + Run unit tests on `meson test` (bgo#786497).
  + Misc. bug fixes: bgo#787423, bgo#766368, bgo#787580,
    bgo#787907, bgo#787901, bgo#788039, bgo#788003, bgo#786343,
    bgo#787902, bgo#788265, bgo#788339, bgo#787905, bgo#788282,
    bgo#787676.
  + Updated translations.
- Drop upstream fixed patches:
  + Drop gnome-shell-app-workaround-pkexec.patch.
  + gnome-shell-dateMenu-fixes.patch.
  + gnome-shell-fix-crash-hint-actor-NULL.patch.
  + gnome-shell-only-listen-window-created-events-once.patch.
  + gnome-shell-disable-osk-gesture-on-lock-screen.patch.
- Move all SLE only patches to patch# 1000 and above.

OBS-URL: https://build.opensuse.org/request/show/531476
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=335
This commit is contained in:
Dominique Leuenberger 2017-10-05 10:00:35 +00:00 committed by Git OBS Bridge
parent f7275f45d3
commit 5b1986128a
9 changed files with 64 additions and 359 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9bc35c206435d6e0ee9e8880578716a7d5bd0ebe7d475fa4f0b3010b44eebaed
size 1402896

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:38d98da06eb0118a0226623494b11765b3981414e804e270dc0cf03e37c708b9
size 1407912

View File

@ -1,57 +0,0 @@
From 053b8da89c5260351199d8c51821db1a2f91cdf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Sat, 25 Mar 2017 02:46:25 +0100
Subject: app: Work around pkexec restriction when launching
Unless automatic child reaping is disabled in GSpawnFlags, glib's
g_spawn_* functions will reparent the spawned process to init by
double-forking. Unfortunately pkexec bails out in this case[0],
which means that it no longer works in .desktop files since the
PID tracking removal in commit 01c6392c1373.
Fix this by going back to manual child reaping.
[0] https://cgit.freedesktop.org/polkit/tree/src/programs/pkexec.c#n728
https://bugzilla.gnome.org/show_bug.cgi?id=763531
---
src/shell-app.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/shell-app.c b/src/shell-app.c
index b383d9c..335147c 100644
--- a/src/shell-app.c
+++ b/src/shell-app.c
@@ -1196,6 +1196,14 @@ app_child_setup (gpointer user_data)
}
#endif
+static void
+wait_pid (GDesktopAppInfo *appinfo,
+ GPid pid,
+ gpointer user_data)
+{
+ g_child_watch_add (pid, (GChildWatchFunc) g_spawn_close_pid, NULL);
+}
+
/**
* shell_app_launch:
* @timestamp: Event timestamp, or 0 for current event timestamp
@@ -1234,13 +1242,13 @@ shell_app_launch (ShellApp *app,
ret = g_desktop_app_info_launch_uris_as_manager (app->info, NULL,
context,
- G_SPAWN_SEARCH_PATH,
+ G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
#ifdef HAVE_SYSTEMD
app_child_setup, (gpointer)shell_app_get_id (app),
#else
NULL, NULL,
#endif
- NULL, NULL,
+ wait_pid, NULL,
error);
g_object_unref (context);
--
cgit v0.12

View File

@ -1,147 +0,0 @@
From 56f4ce37cd52817a5fcba360dc5eec23d81656f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Fri, 8 Sep 2017 12:13:48 +0200
Subject: dateMenu: Adjust to GWeather IAPI change
It's not exactly clear what changed - gobject-introspection, gjs - but
the newly added gweather_condition_to_string_full() API no longer works
like it used to. The replacement code does look more idiomatic anyway,
so just fix the code without investigating the reason of the breakage.
https://bugzilla.gnome.org/show_bug.cgi?id=787423
---
js/ui/dateMenu.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/js/ui/dateMenu.js b/js/ui/dateMenu.js
index 18f2f0e..0054f2d 100644
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@@ -237,12 +237,12 @@ var WeatherSection = new Lang.Class({
let options = capitalize ? GWeather.FormatOptions.SENTENCE_CAPITALIZATION
: GWeather.FormatOptions.NO_CAPITALIZATION;
- let [ok, phenom, qualifier] = info.get_value_conditions();
+ let [ok, phenomenon, qualifier] = info.get_value_conditions();
if (ok)
- return GWeather.conditions_to_string_full(phenom, qualifier, options);
+ return new GWeather.Conditions({ phenomenon, qualifier}).to_string_full(options);
let [, sky] = info.get_value_sky();
- return GWeather.sky_to_string_full(sky, options);
+ return GWeather.Sky.to_string_full(sky, options);
},
_sameSummary: function(info1, info2) {
--
cgit v0.12
From bddc2c0016878c8eb629d6d4b7c0f2f38353377a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Tue, 12 Sep 2017 12:33:37 +0200
Subject: dateMenu: Use icon for message indicator
Using a unicode character here means it may look quite different
from the intended style (for instance with emoji fonts). Avoid
this by providing a custom icon and use that instead.
https://bugzilla.gnome.org/show_bug.cgi?id=766368
---
data/gnome-shell-theme.gresource.xml | 1 +
data/theme/message-indicator-symbolic.svg | 40 +++++++++++++++++++++++++++++++
js/ui/dateMenu.js | 6 +++--
js/ui/main.js | 1 +
4 files changed, 46 insertions(+), 2 deletions(-)
create mode 100644 data/theme/message-indicator-symbolic.svg
diff --git a/data/gnome-shell-theme.gresource.xml b/data/gnome-shell-theme.gresource.xml
index 25769a4..896a1e2 100644
--- a/data/gnome-shell-theme.gresource.xml
+++ b/data/gnome-shell-theme.gresource.xml
@@ -18,6 +18,7 @@
<file>gnome-shell.css</file>
<file>gnome-shell-high-contrast.css</file>
<file>logged-in-indicator.svg</file>
+ <file alias="icons/message-indicator-symbolic.svg">message-indicator-symbolic.svg</file>
<file>no-events.svg</file>
<file>no-notifications.svg</file>
<file>noise-texture.png</file>
diff --git a/data/theme/message-indicator-symbolic.svg b/data/theme/message-indicator-symbolic.svg
new file mode 100644
index 0000000..257a984
--- /dev/null
+++ b/data/theme/message-indicator-symbolic.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="16"
+ height="16"
+ viewBox="0 0 4.2333333 4.2333333"
+ version="1.1"
+ id="svg8">
+ <defs
+ id="defs2" />
+ <metadata
+ id="metadata5">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ style="display:inline"
+ transform="translate(0,-292.76667)">
+ <path
+ style="fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:0.17969394"
+ d="m 3.1749998,294.88333 a 1.0583333,1.0583333 0 0 1 -1.0583332,1.05833 1.0583333,1.0583333 0 0 1 -1.0583333,-1.05833 1.0583333,1.0583333 0 0 1 1.0583333,-1.05833 1.0583333,1.0583333 0 0 1 1.0583332,1.05833 z"
+ id="path4485" />
+ </g>
+</svg>
diff --git a/js/ui/dateMenu.js b/js/ui/dateMenu.js
index 0054f2d..0aad37e 100644
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@@ -337,8 +337,10 @@ var MessagesIndicator = new Lang.Class({
Name: 'MessagesIndicator',
_init: function() {
- this.actor = new St.Label({ text: '⚫', visible: false, y_expand: true,
- y_align: Clutter.ActorAlign.CENTER });
+ this.actor = new St.Icon({ icon_name: 'message-indicator-symbolic',
+ icon_size: 16,
+ visible: false, y_expand: true,
+ y_align: Clutter.ActorAlign.CENTER });
this._sources = [];
diff --git a/js/ui/main.js b/js/ui/main.js
index 85dbe1f..e981db9 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -122,6 +122,7 @@ function start() {
sessionMode.connect('updated', _sessionUpdated);
Gtk.Settings.get_default().connect('notify::gtk-theme-name',
_loadDefaultStylesheet);
+ Gtk.IconTheme.get_default().add_resource_path('/org/gnome/shell/theme/icons');
_initializeUI();
shellAccessDialogDBusService = new AccessDialog.AccessDialogDBus();
--
cgit v0.12

View File

@ -1,32 +0,0 @@
From 6321bbb77330120432b7cbc80259883d8d057d7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Mon, 25 Sep 2017 15:26:14 +0200
Subject: windowManager: Disable OSK gesture on lock screen
On the screen shield, the only possible interaction is lifting the
shield. The on-screen-keyboard is not useful for that, and the drag
gesture from the bottom may in fact conflict with dragging up the
shield, so disable it.
https://bugzilla.gnome.org/show_bug.cgi?id=788339
---
js/ui/windowManager.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index dbc2acf..a59b3fd 100644
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -985,7 +985,8 @@ var WindowManager = new Lang.Class({
gesture.connect('activated', Lang.bind(this, this._switchApp));
global.stage.add_action(gesture);
- gesture = new EdgeDragAction.EdgeDragAction(St.Side.BOTTOM, Shell.ActionMode.ALL);
+ let mode = Shell.ActionMode.ALL & ~Shell.ActionMode.LOCK_SCREEN;
+ gesture = new EdgeDragAction.EdgeDragAction(St.Side.BOTTOM, mode);
gesture.connect('activated', Lang.bind(this, function() {
Main.keyboard.show(Main.layoutManager.bottomIndex);
}));
--
cgit v0.12

View File

@ -1,28 +0,0 @@
From 5ec0ad4e9cf8a88e3a715fdef4bf1f227b274d2d Mon Sep 17 00:00:00 2001
From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Date: Tue, 12 Sep 2017 12:23:46 +0200
Subject: StEntry: fix crash when hint actor is NULL
https://bugzilla.gnome.org/show_bug.cgi?id=787580
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
---
src/st/st-entry.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/st/st-entry.c b/src/st/st-entry.c
index fc9ffbf..18e6a25 100644
--- a/src/st/st-entry.c
+++ b/src/st/st-entry.c
@@ -1106,7 +1106,7 @@ st_entry_get_text (StEntry *entry)
g_return_val_if_fail (ST_IS_ENTRY (entry), NULL);
priv = st_entry_get_instance_private (entry);
- if (clutter_actor_is_visible (priv->hint_actor))
+ if (priv->hint_actor != NULL && clutter_actor_is_visible (priv->hint_actor))
return "";
else
return clutter_text_get_text (CLUTTER_TEXT (priv->entry));
--
cgit v0.12

View File

@ -1,47 +0,0 @@
From 90c55e1977fde252b79bcfd9d0ef41144fb21fe2 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Thu, 14 Sep 2017 14:46:13 -0400
Subject: gtk-embed: ensure we only listen for window-created events once
If a tray icon gets a mapped and unmapped and the mapped again
in quick succession, we can end up with multiple handlers
listening for window creation events.
This commit tries to guard against that by only listening for
window-created events when we don't know the actor associated
with the icon.
https://bugzilla.gnome.org/show_bug.cgi?id=787361
---
src/shell-gtk-embed.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/shell-gtk-embed.c b/src/shell-gtk-embed.c
index 176b413..5406104 100644
--- a/src/shell-gtk-embed.c
+++ b/src/shell-gtk-embed.c
@@ -124,13 +124,14 @@ shell_gtk_embed_on_window_mapped (GtkWidget *object,
ShellGtkEmbedPrivate *priv = shell_gtk_embed_get_instance_private (embed);
MetaDisplay *display = shell_global_get_display (shell_global_get ());
- /* Listen for new windows so we can detect when Mutter has
- created a MutterWindow for this window */
- priv->window_created_handler =
- g_signal_connect (display,
- "window-created",
- G_CALLBACK (shell_gtk_embed_window_created_cb),
- embed);
+ if (priv->window_created_handler == 0 && priv->window_actor == NULL)
+ /* Listen for new windows so we can detect when Mutter has
+ created a MutterWindow for this window */
+ priv->window_created_handler =
+ g_signal_connect (display,
+ "window-created",
+ G_CALLBACK (shell_gtk_embed_window_created_cb),
+ embed);
}
static void
--
cgit v0.12

View File

@ -1,3 +1,34 @@
-------------------------------------------------------------------
Wed Oct 4 20:30:04 UTC 2017 - zaitor@opensuse.org
- Update to version 3.26.1:
+ Don't detach launched apps to not break pkexec and friends
(bgo#763531).
+ Allow search providers to not autostart (bgo#785380,
bgo#787986).
+ Fix crash when tray icons are hidden/shown in quick succession
(bgo#787361).
+ Make window group switcher more consistent (bgo#786009).
+ Improve legibility of the top bar when translucent
(bgo#787940).
+ Don't crash when running outside a logind session (bgo#788046).
+ Allow to run headless (bgo#730551).
+ Update calendar on timezone changes (bgo#678507).
+ Improve keyboard navigation of window previews (bgo#786546).
+ Run unit tests on `meson test` (bgo#786497).
+ Misc. bug fixes: bgo#787423, bgo#766368, bgo#787580,
bgo#787907, bgo#787901, bgo#788039, bgo#788003, bgo#786343,
bgo#787902, bgo#788265, bgo#788339, bgo#787905, bgo#788282,
bgo#787676.
+ Updated translations.
- Drop upstream fixed patches:
+ Drop gnome-shell-app-workaround-pkexec.patch.
+ gnome-shell-dateMenu-fixes.patch.
+ gnome-shell-fix-crash-hint-actor-NULL.patch.
+ gnome-shell-only-listen-window-created-events-once.patch.
+ gnome-shell-disable-osk-gesture-on-lock-screen.patch.
- Move all SLE only patches to patch# 1000 and above.
-------------------------------------------------------------------
Tue Oct 3 13:48:54 UTC 2017 - jengelh@inai.de

View File

@ -18,7 +18,7 @@
%global __requires_exclude typelib\\(Meta\\)
Name: gnome-shell
Version: 3.26.0
Version: 3.26.1
Release: 0
Summary: GNOME Shell
License: GPL-2.0+
@ -37,37 +37,29 @@ Patch0: gnome-shell-meson.patch
Patch1: gnome-shell-private-connection.patch
# PATCH-FIX-OPENSUSE gnome-shell-disable-ibus-when-not-installed.patch bsc#987360 qzhao@suse.com -- disable ibus start when outof Chinese, Japanese, Korean area.
Patch2: gnome-shell-disable-ibus-when-not-installed.patch
# PATCH-FEATURE-SLE gnome-shell-gdm-login-applet.patch fate#314545 dliang@suse.com -- Add an applet on login UI to display suse icon, product name, hostname.
Patch3: gnome-shell-gdm-login-applet.patch
# PATCH-FEATURE-SLE gnome-shell-domain.patch fate#307773 dliang@suse.com -- Active Directory Integration
Patch4: gnome-shell-domain.patch
# PATCH-FIX-SLE gnome-shell-screen-disappear.patch bnc#870217 dliang@suse.com -- screen disapper.
Patch6: gnome-shell-screen-disappear.patch
# PATCH-FIX-SLE endSession-dialog-update-time-label-every-sec.patch bnc#886132 cxiong@suse.com -- update time label every second in end session dialog
Patch7: endSession-dialog-update-time-label-every-sec.patch
# PATCH-FEATURE-SLE gnome-shell-864872-unlock-by-mouse-motion.patch bnc#864872 dliang@suse.com -- 10px mouse motion to lift screen shield.
Patch8: gnome-shell-864872-unlock-by-mouse-motion.patch
# PATCH-FIX-SLE gnome-shell-lock-bg-on-primay.patch bnc#894050 dliang@suse.com -- display background of lock dialog on the primary screen.
Patch9: gnome-shell-lock-bg-on-primary.patch
# PATCH-FIX-SLE gs-fate318433-prevent-same-account-multi-logins.patch fate#318433 cxiong@suse.com -- prevent multiple simultaneous login.
Patch11: gs-fate318433-prevent-same-account-multi-logins.patch
# PATCH-FEATURE-SLE gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch xwang@suse.com -- Add SUSE logo on lock screen for GNOME theme.
Patch15: gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch
# PATCH-FIX-UPSTREAM gnome-shell-app-workaround-pkexec.patch bgo#763531 zaitor@opensuse.org -- app: Work around pkexec restriction when launching
Patch16: gnome-shell-app-workaround-pkexec.patch
# PATCH-FIX-UPSTREAM gnome-shell-dateMenu-fixes.patch bgo#787423 bgo#766368 zaitor@opensuse.org -- Fix gnome-weather and notification icon
Patch17: gnome-shell-dateMenu-fixes.patch
# PATCH-FIX-UPSTREAM gnome-shell-fix-crash-hint-actor-NULL.patch bgo#787580 zaitor@opensuse.org -- StEntry: fix crash when hint actor is NULL
Patch18: gnome-shell-fix-crash-hint-actor-NULL.patch
# PATCH-FIX-UPSTREAM gnome-shell-only-listen-window-created-events-once.patch bgo#787361 zaitor@opensuse.org -- gtk-embed: ensure we only listen for window-created events once
Patch19: gnome-shell-only-listen-window-created-events-once.patch
# PATCH-FIX-UPSTREAM gnome-shell-Avoid-loginDialog-grab-focus-when-locked.patch bsc#1058521 bgo#788169 xwang@suse.com -- Avoid login dialog grabs focus when screen locked
Patch20: gnome-shell-Avoid-loginDialog-grab-focus-when-locked.patch
# PATCH-FIX-UPSTREAM gnome-shell-disable-osk-gesture-on-lock-screen.patch bgo#788339 badshah400@gmail.com -- Disable OSK gesture on lock screen
Patch21: gnome-shell-disable-osk-gesture-on-lock-screen.patch
## NOTE: Keep SLE Classic patches at bottom.
Patch3: gnome-shell-Avoid-loginDialog-grab-focus-when-locked.patch
## NOTE: Keep SLE only patches at bottom (starting on 1000).
# PATCH-FEATURE-SLE gs-sle-classic-ext.patch bnc#862615 cxiong@suse.com -- add SLE Classic support
Patch1000: gs-sle-classic-ext.patch
# PATCH-FEATURE-SLE gnome-shell-gdm-login-applet.patch fate#314545 dliang@suse.com -- Add an applet on login UI to display suse icon, product name, hostname.
Patch1001: gnome-shell-gdm-login-applet.patch
# PATCH-FEATURE-SLE gnome-shell-domain.patch fate#307773 dliang@suse.com -- Active Directory Integration
Patch1002: gnome-shell-domain.patch
# PATCH-FIX-SLE gnome-shell-screen-disappear.patch bnc#870217 dliang@suse.com -- screen disapper.
Patch1003: gnome-shell-screen-disappear.patch
# PATCH-FIX-SLE endSession-dialog-update-time-label-every-sec.patch bnc#886132 cxiong@suse.com -- update time label every second in end session dialog
Patch1004: endSession-dialog-update-time-label-every-sec.patch
# PATCH-FEATURE-SLE gnome-shell-864872-unlock-by-mouse-motion.patch bnc#864872 dliang@suse.com -- 10px mouse motion to lift screen shield.
Patch1005: gnome-shell-864872-unlock-by-mouse-motion.patch
# PATCH-FIX-SLE gnome-shell-lock-bg-on-primay.patch bnc#894050 dliang@suse.com -- display background of lock dialog on the primary screen.
Patch1006: gnome-shell-lock-bg-on-primary.patch
# PATCH-FIX-SLE gs-fate318433-prevent-same-account-multi-logins.patch fate#318433 cxiong@suse.com -- prevent multiple simultaneous login.
Patch1007: gs-fate318433-prevent-same-account-multi-logins.patch
# PATCH-FEATURE-SLE gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch xwang@suse.com -- Add SUSE logo on lock screen for GNOME theme.
Patch1008: gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch
# needed for directory ownership
BuildRequires: dbus-1
BuildRequires: docbook-xsl-stylesheets
@ -95,7 +87,7 @@ BuildRequires: pkgconfig(libcanberra-gtk3)
BuildRequires: pkgconfig(libcroco-0.6) >= 0.6.8
BuildRequires: pkgconfig(libedataserver-1.2) >= 3.17.2
BuildRequires: pkgconfig(libgnome-menu-3.0) >= 3.5.3
BuildRequires: pkgconfig(libmutter-1) >= 3.25.91
BuildRequires: pkgconfig(libmutter-1) >= 3.26.1
BuildRequires: pkgconfig(libnm-glib)
BuildRequires: pkgconfig(libnm-gtk) >= 0.9.8
BuildRequires: pkgconfig(libnm-util) >= 0.9.8
@ -194,25 +186,18 @@ into GNOME Shell calendar.
# Needs rebase
#patch1 -p1
%patch2 -p1
%patch20 -p1
%if !0%{?is_opensuse}
%patch3 -p1
%patch4 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch11 -p1
%patch15 -p1
%endif
%patch16 -p1
%patch17 -p1
%patch18 -p1
%patch19 -p1
%patch21 -p1
%if !0%{?is_opensuse}
%patch1000 -p1
%patch1001 -p1
%patch1002 -p1
%patch1003 -p1
%patch1004 -p1
%patch1005 -p1
%patch1006 -p1
%patch1007 -p1
%patch1008 -p1
translation-update-upstream
%endif
cp %{SOURCE1} js/ui/