x11-toolkits/gtk+3: version 3.24.9

5 files changed, 92 insertions, 40 deletions

diff --git a/x11-toolkits/gtk+3/BUILD b/x11-toolkits/gtk+3/BUILD
index 02c1e81e5d..a1d99dc578 100755
--- a/x11-toolkits/gtk+3/BUILD
+++ b/x11-toolkits/gtk+3/BUILD
@@ -1,3 +1,4 @@
 # bug #12668
 export CFLAGS="${CFLAGS/-O3/-Os}"                    &&
+OPTS+=" ${GTK3_OPTS}" &&
 default_build
diff --git a/x11-toolkits/gtk+3/CONFIGURE b/x11-toolkits/gtk+3/CONFIGURE
new file mode 100755
index 0000000000..1a5039fbc9
--- /dev/null
+++ b/x11-toolkits/gtk+3/CONFIGURE
@@ -0,0 +1,18 @@
+. "${GRIMOIRE}/MESON_CONFIGURE" &&
+
+config_query_option GTK3_OPTS "Build the broadway (HTML5) backend?" "n" \
+                              "broadway_backend=true" "broadway_backend=false" &&
+
+config_query_option GTK3_OPTS "Build demos?" "n" \
+                              "demos=true" "demos=false" &&
+
+config_query_option GTK3_OPTS "Build examples?" "n" \
+                              "examples=true" "examples=false" &&
+
+config_query_option GTK3_OPTS "Build tests?" "n" \
+                              "tests=true" "tests=false" &&
+
+if list_find "${GTK3_OPTS}" "tests=true"; then
+  config_query_option GTK3_OPTS "Install tests?" "n" \
+                                "installed_tests=true" "installed_tests=false"
+fi
diff --git a/x11-toolkits/gtk+3/DEPENDS b/x11-toolkits/gtk+3/DEPENDS
index a92b9e6b56..30e29224ce 100755
--- a/x11-toolkits/gtk+3/DEPENDS
+++ b/x11-toolkits/gtk+3/DEPENDS
@@ -1,18 +1,22 @@
 . "$GRIMOIRE/FUNCTIONS" &&
 
+depends meson &&
+depends python3 &&
+depends ninja-build-system &&
+
 if [[ "$GTK_VER" == "devel" ]]; then
   depends -sub GLIB_DEVEL glib2 &&
   depends -sub "CAIRO_DEVEL PDF PS SVG X GOBJ" cairo &&
   optional_depends -sub GOBJ_DEVEL gobject-introspection \
-                                 "--enable-introspection=yes" \
-                                 "--enable-introspection=no" \
+                                 "introspection=true" \
+                                 "introspection=false" \
                                  "to enable introspection support"
 else
   depends glib2 &&
   depends -sub "PDF PS SVG X GOBJ" cairo &&
   optional_depends gobject-introspection \
-                                 "--enable-introspection=yes" \
-                                 "--enable-introspection=no" \
+                                 "introspection=true" \
+                                 "introspection=false" \
                                  "to enable introspection support"
 fi
 
@@ -30,42 +34,66 @@ depends libxcursor &&
 depends libxrender &&
 depends libepoxy   &&
 
-optional_depends gtk+2 \
-                 "--enable-gtk2-dependency" \
-                 "--disable-gtk2-dependency" \
-                 "to rely on an existing gtk-update-icon-cache utility instead of building our own" &&
+optional_depends gtk-doc \
+                 "gtk_doc=true" \
+                 "gtk_doc=false" \
+                 "Build documentation with gtk-doc" &&
 
-optional_depends libxinerama \
-                 "--enable-xinerama" \
-                 "--disable-xinerama" \
-                 "for X11 Xinerama extension support" &&
+optional_depends cups \
+                 "print-backends=cups,file" \
+                 "print-backends=file" \
+                 "Enable CUPS print backend support?" &&
 
-optional_depends libxrandr                            \
-                 ""                                   \
-                 ""                                   \
-                 "for X11 Resize and Rotate support"  &&
+if is_depends_enabled "${SPELL}" "cups"; then
+  optional_depends colord \
+                  "colord=yes" \
+                  "colord=yes" \
+                  "Build colord support for CUPS print backend"
+fi &&
 
-optional_depends libxcomposite                  \
-                 ""                             \
-                 ""                             \
-                 "for X11 Compositing support"  &&
+optional_depends libx11 \
+                 "x11_backend=true" \
+                 "x11_backend=false" \
+                 "to enable X11 backend" &&
 
-optional_depends libxdamage                                  \
-                 ""                                          \
-                 ""                                          \
-                 "for X11 Damaged region extension support"  &&
+if is_depends_enabled "${SPELL}" "libx11"; then
+  depends at-spi2-atk &&
+  depends fontconfig &&
+  depends libxcursor &&
+  depends libxext &&
+  depends libxrender &&
 
-optional_depends libxfixes                                      \
-                 ""                                             \
-                 ""                                             \
-                 "for X11 workarounds for various limitations"  &&
+  optional_depends libxcomposite \
+                   "" \
+                   "" \
+                   "for X11 Compositing support" &&
 
-optional_depends gtk-doc \
-                 "--enable-gtk-doc" \
-                 "--disable-gtk-doc" \
-                 "Build documentation with gtk-doc" &&
+  optional_depends libxdamage \
+                   "" \
+                   "" \
+                   "for X11 Damaged region extension support" &&
 
-optional_depends cups \
-                 "--enable-cups" \
-                 "--disable-cups" \
-                 "Enable CUPS print backend support?"
+  optional_depends libxfixes \
+                   "" \
+                   "" \
+                   "for X11 workarounds for various limitations" &&
+
+  optional_depends libxrandr \
+                   "" \
+                   "" \
+                   "for X11 Resize and Rotate support"
+fi &&
+
+optional_depends libxinerama \
+                 "xinerama=yes" \
+                 "xinerama=no" \
+                 "for X11 Xinerama extension support" &&
+
+optional_depends wayland \
+                 "wayland_backend=true" \
+                 "wayland_backend=false" \
+                 "to enable Wayland backend" &&
+
+if is_depends_enabled "${SPELL}" "wayland"; then
+  depends wayland-protocols
+fi
diff --git a/x11-toolkits/gtk+3/DETAILS b/x11-toolkits/gtk+3/DETAILS
index 0cf005b70b..cff62220f8 100755
--- a/x11-toolkits/gtk+3/DETAILS
+++ b/x11-toolkits/gtk+3/DETAILS
@@ -1,10 +1,11 @@
+. "${GRIMOIRE}/MESON_FUNCTIONS"
            SPELL=gtk+3
 if [[ $GTK_VER == devel ]];then
-         VERSION=3.24.8
-     SOURCE_HASH=sha256:666962de9b9768fe9ca785b0e2f42c8b9db3868a12fa9b356b167238d70ac799:UPSTREAM_HASH
+         VERSION=3.24.9
+     SOURCE_HASH=sha256:577eb0270d9adf2eb2aa4b03f9c7873fadb20cf265194d0139570f738493e635:UPSTREAM_HASH
 else
-         VERSION=3.24.8
-     SOURCE_HASH=sha256:666962de9b9768fe9ca785b0e2f42c8b9db3868a12fa9b356b167238d70ac799:UPSTREAM_HASH
+         VERSION=3.24.9
+     SOURCE_HASH=sha256:577eb0270d9adf2eb2aa4b03f9c7873fadb20cf265194d0139570f738493e635:UPSTREAM_HASH
 fi
           SOURCE=gtk+-$VERSION.tar.xz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/gtk+-$VERSION"
diff --git a/x11-toolkits/gtk+3/HISTORY b/x11-toolkits/gtk+3/HISTORY
index 3df4f629d8..743ad4f408 100644
--- a/x11-toolkits/gtk+3/HISTORY
+++ b/x11-toolkits/gtk+3/HISTORY
@@ -1,3 +1,7 @@
+2019-06-18 Pavel Vinogradov <public@sourcemage.org>
+	* DETAILS, CONFIGURE, BUILD, DEPENDS: version 3.24.9, converted to
+	  meson build system
+
 2019-04-11 Pavel Vinogradov <public@sourcemage.org>
 	* DETAILS: version 3.24.8