From 9f6b83eece60e04d460067c92414a4eabc76d46d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Sun, 1 Mar 2020 02:22:02 +0100 Subject: [PATCH 1/5] Update sass submodule --- data/gnome-shell-sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/gnome-shell-sass b/data/gnome-shell-sass index 8310f494..2b75c649 160000 --- a/data/gnome-shell-sass +++ b/data/gnome-shell-sass @@ -1 +1 @@ -Subproject commit 8310f4948547c503fe1502d8ecb9dff393a24118 +Subproject commit 2b75c649bf5772b326721754af676380dd399415 From 3a3b5bac850bd14934d9a259490ba8b3c2bfb0df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Sun, 1 Mar 2020 02:22:25 +0100 Subject: [PATCH 2/5] Bump version to 3.35.92 --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 24a7ab50..918714fc 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('gnome-shell-extensions', - version: '3.35.91', + version: '3.35.92', meson_version: '>= 0.44.0', license: 'GPL2+' ) From cd169955030deba22f892b8b0dbfb368ef4d411f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Sat, 7 Mar 2020 23:00:47 +0100 Subject: [PATCH 3/5] Update sass submodule --- data/gnome-shell-sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/gnome-shell-sass b/data/gnome-shell-sass index 2b75c649..b0bf06e5 160000 --- a/data/gnome-shell-sass +++ b/data/gnome-shell-sass @@ -1 +1 @@ -Subproject commit 2b75c649bf5772b326721754af676380dd399415 +Subproject commit b0bf06e552d1fd0c014f310078a48dbc7c98dd37 From 7d5c985004e361037870b00b17aad85850baf6fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Sat, 7 Mar 2020 23:06:54 +0100 Subject: [PATCH 4/5] build: Switch to js68 for tests It's what the cool kids use nowadays ... --- extensions/meson.build | 4 ++-- meson.build | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/meson.build b/extensions/meson.build index d1bf92c9..ed7a2edc 100644 --- a/extensions/meson.build +++ b/extensions/meson.build @@ -33,11 +33,11 @@ install_data (extension_schemas, ) foreach js_source : js_sources - if (js60.found()) + if (js68.found()) path_array = '@0@'.format(js_source).split('/') name = join_paths(path_array[-2], path_array[-1]) - test('Checking syntax of ' + name, js60, + test('Checking syntax of ' + name, js68, args: ['-s', '-c', js_source], workdir: meson.current_source_dir() ) diff --git a/meson.build b/meson.build index 918714fc..a59de830 100644 --- a/meson.build +++ b/meson.build @@ -20,7 +20,7 @@ schemadir = join_paths(datadir, 'glib-2.0', 'schemas') sessiondir = join_paths(datadir, 'gnome-session', 'sessions') xsessiondir = join_paths(datadir, 'xsessions') -js60 = find_program('js60', required: false) +js68 = find_program('js68', required: false) ver_arr = meson.project_version().split('.') if ver_arr[1].to_int().is_even() From 961757f7172fa1bd122f4895f5b329c5d874eb6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Sat, 7 Mar 2020 23:01:37 +0100 Subject: [PATCH 5/5] Bump version to 3.36.0 Update NEWS. --- NEWS | 6 ++++++ meson.build | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index dcbdece0..83e6e082 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +3.36.0 +====== + +Contributors: + Florian Müllner + 3.35.91 ======= diff --git a/meson.build b/meson.build index a59de830..e288b878 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('gnome-shell-extensions', - version: '3.35.92', + version: '3.36.0', meson_version: '>= 0.44.0', license: 'GPL2+' )