vte 0.64.0

9 files changed, 48 insertions, 58 deletions

diff --git a/gnome2-libs/vte/BUILD b/gnome2-libs/vte/BUILD
deleted file mode 100755
index 53aa54b0a3..0000000000
--- a/gnome2-libs/vte/BUILD
+++ /dev/null
@@ -1,10 +0,0 @@
-OPTS="$VTE_XFT2 \
-      $VTE_PANGOX \
-      $VTE_DEPRECATED \
-      $OPTS" &&
-
-LDFLAGS="$LDFLAGS -L/usr/X11R6/lib" &&
-
-make_single &&
-default_build &&
-make_normal
diff --git a/gnome2-libs/vte/CONFIGURE b/gnome2-libs/vte/CONFIGURE
index e6c1bb1d67..d1cc655820 100755
--- a/gnome2-libs/vte/CONFIGURE
+++ b/gnome2-libs/vte/CONFIGURE
@@ -1,8 +1 @@
-config_query_option VTE_XFT2 "Enable drawing using XFT2?" y \
-                    "--with-xft2" "--without-xft2" &&
-
-config_query_option VTE_PANGOX "Enable X fonts with Pango?" y \
-                    "--with-pangox" "--without-pangox"  &&
-
-config_query_option VTE_DEPRECATED "Use deprecated GLib/Pango/ATK/GDK/GTK+ features" n \
-                    "--enable-deprecation" "--disable-deprecation"
+. "$GRIMOIRE"/MESON_CONFIGURE
diff --git a/gnome2-libs/vte/DEPENDS b/gnome2-libs/vte/DEPENDS
index 674767c9c7..4c2d31a135 100755
--- a/gnome2-libs/vte/DEPENDS
+++ b/gnome2-libs/vte/DEPENDS
@@ -1,31 +1,15 @@
-depends intltool    &&
-depends libx11      &&
-depends fontconfig  &&
-depends freetype2   &&
-depends glib2       &&
-depends gtk+2       &&
-depends atk         &&
-depends pango       &&
-
-optional_depends OPENGL                                  \
-                 "--with-glX" "--without-glX"            \
-                 "Enable drawing with glX?"              &&
-
-optional_depends pygtk2                                  \
-                 "--enable-python" "--disable-python"    \
-                 "to build python bindings for vte"      &&
-
-if is_depends_enabled $SPELL pygtk2; then
-  depends python
-fi &&
-
-optional_depends gtk-doc                                 \
-                 "--enable-gtk-doc" "--disable-gtk-doc"  \
-                 "build documentation with gtk-doc"      &&
-
+depends atk &&
 depends cairo &&
 depends gdk-pixbuf2 &&
-depends harfbuzz &&
-depends libpng &&
-depends libxext &&
-depends pixman
+depends glib2 &&
+depends intltool &&
+depends pango &&
+optional_depends fribidi fribidi={true,false} 'for FriBidi support' &&
+optional_depends glade3 glade={true,false} 'for glade catalogue file' &&
+optional_depends gnutls gnutls={true,false} 'for GNUTLS support' &&
+optional_depends gobject-introspection gir={true,false} 'for introspection' &&
+optional_depends gtk+3 gtk3={true,false} 'for GTK+ 3.x support' &&
+optional_depends gtk+4 gtk4={true,false} 'for GTK+ 4.x support' &&
+optional_depends gtk-doc docs={true,false} 'to build documentation' &&
+optional_depends icu icu={true,false} 'for legacy charset support' &&
+optional_depends systemd _systemd={true,false} 'for systemd support'
diff --git a/gnome2-libs/vte/DETAILS b/gnome2-libs/vte/DETAILS
index d5b17eede8..ebb829344e 100755
--- a/gnome2-libs/vte/DETAILS
+++ b/gnome2-libs/vte/DETAILS
@@ -1,11 +1,11 @@
+. "$GRIMOIRE"/MESON_FUNCTIONS
            SPELL=vte
-         VERSION=0.52.1
+         VERSION=0.64.0
   SECURITY_PATCH=1
-          BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.xz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-   SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
-     SOURCE_HASH=sha256:b0fd4c34905adcb77a1c8a2e4fc1677c79f1115aaea49705b9c8976523386ad3:UPSTREAM_HASH
+   SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/${VERSION%.*}/$SOURCE
+     SOURCE_HASH=sha512:64c329d192ac4d48676d06a256a72f7e723779800e01c3ae81a0791224d4ca2ed967941d31678d6a97cde90493c3d670cd9f310437523be9e06bab3db72c5399
       LICENSE[0]=LGPL
         WEB_SITE=http://www.gnome.org/
          ENTERED=20020314
diff --git a/gnome2-libs/vte/HISTORY b/gnome2-libs/vte/HISTORY
index 3cebae1ce6..27fafd2d7f 100644
--- a/gnome2-libs/vte/HISTORY
+++ b/gnome2-libs/vte/HISTORY
@@ -1,3 +1,11 @@
+2021-04-22 Ismael Luceno <ismael@sourcemage.org>
+	* DETAILS: updated spell to 0.64.0
+	* CONFIGURE, DETAILS: switched to meson build system
+	* BUILD: removed, no longer needed
+	* DEPENDS: updated dependencies
+	* SUB_DEPENDS, PRE_SUB_DEPENDS: remove pygtk2
+	* PRE_BUILD, patches/0001-Fix-build-against-musl.patch: fixed build against musl
+
 2018-04-11 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
 	* DETAILS: version 0.52.1
 
diff --git a/gnome2-libs/vte/PRE_BUILD b/gnome2-libs/vte/PRE_BUILD
new file mode 100755
index 0000000000..c230ad14bf
--- /dev/null
+++ b/gnome2-libs/vte/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git a/gnome2-libs/vte/PRE_SUB_DEPENDS b/gnome2-libs/vte/PRE_SUB_DEPENDS
index b14871bbb7..97998807dd 100755
--- a/gnome2-libs/vte/PRE_SUB_DEPENDS
+++ b/gnome2-libs/vte/PRE_SUB_DEPENDS
@@ -1,6 +1,3 @@
-case $THIS_SUB_DEPENDS in
-  pygtk2) is_depends_enabled $SPELL pygtk2 && return 0
-          ;;
+case "$THIS_SUB_DEPENDS" in
 esac
-
 return 1
diff --git a/gnome2-libs/vte/SUB_DEPENDS b/gnome2-libs/vte/SUB_DEPENDS
index b68f7541be..f632a2c7de 100755
--- a/gnome2-libs/vte/SUB_DEPENDS
+++ b/gnome2-libs/vte/SUB_DEPENDS
@@ -1,7 +1,4 @@
 case $THIS_SUB_DEPENDS in
-  pygtk2) echo "pygtk2 bindings requested, forcing them."
-          depends pygtk2 '--enable-python'
-          ;;
        *) echo "unknown sub-depends!"
           return 1
           ;;
diff --git a/gnome2-libs/vte/patches/0001-Fix-build-against-musl.patch b/gnome2-libs/vte/patches/0001-Fix-build-against-musl.patch
new file mode 100644
index 0000000000..18a0c7d84a
--- /dev/null
+++ b/gnome2-libs/vte/patches/0001-Fix-build-against-musl.patch
@@ -0,0 +1,18 @@
+Fix build against musl
+
+Upstream-Status: Pending
+
+diff --git a/src/widget.cc b/src/widget.cc
+index 25e4b242243a..33bb06d68698 100644
+--- a/src/widget.cc
++++ b/src/widget.cc
+@@ -21,6 +21,9 @@
+ #include "widget.hh"
+ 
+ #include <sys/wait.h> // for W_EXITCODE
++#ifndef W_EXITCODE
++#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig))
++#endif
+ 
+ #include <exception>
+ #include <new>