[Libreoffice-commits] core.git: configure.ac vcl/unx

[Michael Weghorn (via logerrit)]

 configure.ac                     |    2 +-
 vcl/unx/gtk3/a11y/atkwrapper.cxx |   23 +++++------------------
 2 files changed, 6 insertions(+), 19 deletions(-)

New commits:
commit c688fd1393dccfb3df39bd05cceed1cf0c401b02
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Feb 21 15:49:52 2022 +0100
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Feb 22 10:18:46 2022 +0100

    gtk3 a11y: Require atk >= 2.28.1, drop code for < 2.15.2
    
    README.md lists RHEL 7 or CentOS 7 as runtime baseline,
    which has ATK 2.28.1 [1].
    
    Therefore, check for that version in configure.ac
    and drop some code for versions < 2.15.2.
    Requiring 2.28.1 as minimum ATK version will allow for
    further cleanup in follow-up commits.
    
    [1] https://centos.pkgs.org/7/centos-x86_64/atk-2.28.1-2.el7.x86_64.rpm.html
    
    Change-Id: Id7084366d2359deb60948b8969c1d3dcc68ddb47
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130328
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>

diff --git a/configure.ac b/configure.ac
index af1da0103177..b22d8e17c6da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11639,7 +11639,7 @@ if test "$test_gtk3" = yes -a "x$enable_gtk3" = "xyes" 
-o "x$enable_gtk3_kde5" =
         add_warning 'Non-system cairo combined with gtk3 is assumed to cause 
trouble; proceed at your own risk.'
     fi
     : ${with_system_cairo:=yes}
-    PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.20 gtk+-unix-print-3.0 
gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo)
+    PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.20 gtk+-unix-print-3.0 
gmodule-no-export-2.0 glib-2.0 >= 2.38 atk >= 2.28.1 cairo)
     GTK3_CFLAGS=$(printf '%s' "$GTK3_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
     GTK3_CFLAGS="$GTK3_CFLAGS -DGDK_DISABLE_DEPRECATED 
-DGTK_DISABLE_DEPRECATED"
     FilterLibs "${GTK3_LIBS}"
diff --git a/vcl/unx/gtk3/a11y/atkwrapper.cxx b/vcl/unx/gtk3/a11y/atkwrapper.cxx
index 53ac1e79df98..1c3d7f5843de 100644
--- a/vcl/unx/gtk3/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk3/a11y/atkwrapper.cxx
@@ -267,24 +267,11 @@ static AtkRole mapToAtkRole( sal_Int16 nRole )
         ATK_ROLE_UNKNOWN,       // TREE_ITEM - registered below
         ATK_ROLE_TREE_TABLE,
         ATK_ROLE_SCROLL_PANE,   // COMMENT - mapped to atk_role_scroll_pane
-        ATK_ROLE_UNKNOWN        // COMMENT_END - mapped to atk_role_unknown
-#if defined(ATK_CHECK_VERSION)
-        //older ver that doesn't define ATK_CHECK_VERSION doesn't have the 
following
-        , ATK_ROLE_DOCUMENT_PRESENTATION
-        , ATK_ROLE_DOCUMENT_SPREADSHEET
-        , ATK_ROLE_DOCUMENT_TEXT
-#if ATK_CHECK_VERSION(2,15,2)
-        , ATK_ROLE_STATIC
-#else
-        , ATK_ROLE_LABEL
-#endif
-#else
-        //older version should fallback to DOCUMENT_FRAME role
-        , ATK_ROLE_DOCUMENT_FRAME
-        , ATK_ROLE_DOCUMENT_FRAME
-        , ATK_ROLE_DOCUMENT_FRAME
-        , ATK_ROLE_LABEL
-#endif
+        ATK_ROLE_UNKNOWN,        // COMMENT_END - mapped to atk_role_unknown
+        ATK_ROLE_DOCUMENT_PRESENTATION,
+        ATK_ROLE_DOCUMENT_SPREADSHEET,
+        ATK_ROLE_DOCUMENT_TEXT,
+        ATK_ROLE_STATIC
     };
 
     static bool initialized = false;