From 06c0927cb2eea41db603876f6bceeb638dd6c516 Mon Sep 17 00:00:00 2001 From: Dustin Falgout Date: Sat, 18 Feb 2017 07:08:11 -0600 Subject: [PATCH] bump version. update changelog --- NEWS.md | 12 +++++++++++- meson.build | 6 +++--- src/greeter.c | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/NEWS.md b/NEWS.md index 77aec03c..2486a39d 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,16 @@ # Change Log -## [2.2.2](https://github.com/antergos/lightdm-webkit2-greeter/tree/2.2.1) ~ 01-18-2017 +## [2.2.3](https://github.com/antergos/web-greeter/tree/2.2.3) ~ 02-18-2017 + +**Changed:** + + * Revert workaround implemented in v2.2.2 for webkit2gtk 2.14.4+. It remains in place for + versions in the 2.14.0 series older than 2.14.4. + +[Full Changelog](https://github.com/antergos/web-greeter/compare/2.2.2...2.2.3) + + +## [2.2.2](https://github.com/antergos/lightdm-webkit2-greeter/tree/2.2.2) ~ 01-18-2017 **Fixed:** diff --git a/meson.build b/meson.build index 22039257..258368e5 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('lightdm-webkit2-greeter', 'c', version: '2.2.2', license: 'GPL-3') +project('lightdm-webkit2-greeter', 'c', version: '2.2.3', license: 'GPL-3') # ================================== # @@ -60,11 +60,11 @@ conf.set('WEBEXT_DIR', '"@0@"'.format(get_option('with-webext-dir'))) conf.set('GRESOURCE_PATH', '"/com/antergos/lightdm-webkit2-greeter"') if has_webkitgtk_2_14 - conf.set('HAS_WEBKITGTK_2_14', has_webkitgtk_2_14) + conf.set('HAS_WEBKITGTK_2_14', 'TRUE') endif if has_webkitgtk_2_14_4 - conf.set('HAS_WEBKITGTK_2_14_4', has_webkitgtk_2_14_4) + conf.set('HAS_WEBKITGTK_2_14_4', 'TRUE') endif if has_lightdm_1_19_2 diff --git a/src/greeter.c b/src/greeter.c index fae864e1..c94b1a1a 100644 --- a/src/greeter.c +++ b/src/greeter.c @@ -349,7 +349,7 @@ main(int argc, char **argv) { /* https://goo.gl/vDFwFe */ g_setenv ("GDK_CORE_DEVICE_EVENTS", "1", TRUE); - if ( HAS_WEBKITGTK_2_14 && ! HAS_WEBKITGTK_2_14_4 ) { + if (HAS_WEBKITGTK_2_14 && ! HAS_WEBKITGTK_2_14_4) { /* AC mode causes a lot of crashes in webkit2gtk versions 2.14.0 through 2.14.3: */ g_setenv("WEBKIT_DISABLE_COMPOSITING_MODE", "1", TRUE); }