up to 0.58.0

- project switched to meson
- static lib no longer built
- glade resources no longer provided
- gtk4 build untested

diff --git a/vte-pthread.patch b/vte-pthread.patch
deleted file mode 100644 (file)
index 394ca9d..0000000
--- a/vte-pthread.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN vte-0.56.1.orig/configure.ac vte-0.56.1/configure.ac
---- vte-0.56.1.orig/configure.ac       2019-04-12 18:39:06.398656910 +0200
-+++ vte-0.56.1/configure.ac    2019-04-12 18:39:36.561754726 +0200
-@@ -442,6 +442,8 @@
- AC_SUBST([AM_CXXFLAGS])
- AC_SUBST([AM_LDFLAGS])
- 
-+VTE_LIBS="$VTE_LIBS -lpthread"
-+
- ################################################################################
- 
- AC_CONFIG_FILES([

diff --git a/vte.spec b/vte.spec
index 946547133801c9746874998c3e60cf4aa473eac0..cb56a80e420d35ede71fe5ba956c445cbbbcbc67 100644 (file)
--- a/vte.spec
+++ b/vte.spec
@@ -1,26 +1,21 @@
 #
 # Conditional build:
-%bcond_without glade   # Glade catalog
 %bcond_with    gtk4    # GTK+ 4 based library [doesn't build with 3.90]
 
 Summary:       VTE terminal widget library
 Summary(pl.UTF-8):     Biblioteka z kontrolką terminala VTE
 Name:          vte
-Version:       0.56.3
+Version:       0.58.0
 Release:       1
 License:       LGPL v2.1+
 Group:         X11/Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/vte/0.56/%{name}-%{version}.tar.xz
-# Source0-md5: adf341807861a5dad9f98e5c701c0769
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/vte/0.58/%{name}-%{version}.tar.xz
+# Source0-md5: 36ecd9e0f2d4859bf15af89c3f777561
 Patch0:                %{name}-wordsep.patch
-Patch1:                %{name}-pthread.patch
-BuildRequires: autoconf >= 2.63
-BuildRequires: automake >= 1:1.9
 BuildRequires: cairo-gobject-devel
 BuildRequires: docbook-dtd412-xml
 BuildRequires: gdk-pixbuf2-devel
 BuildRequires: gettext-devel
-%{?with_glade:BuildRequires:   glade-devel >= 3}
 BuildRequires: glib2-devel >= 1:2.40.0
 BuildRequires: gnutls-devel >= 3.2.7
 BuildRequires: gobject-introspection-devel >= 0.10.0
@@ -28,17 +23,19 @@ BuildRequires:      gperf
 BuildRequires: gtk+3-devel >= 3.8.0
 %{?with_gtk4:BuildRequires:    gtk+4-devel >= 3.89}
 BuildRequires: gtk-doc >= 1.13
-BuildRequires: gtk-doc-automake >= 1.13
 BuildRequires: intltool >= 0.40.0
+# C++17 support
+BuildRequires: libstdc++-devel >= 6:7.0
 # -std=c++17, with constexpr lambdas support
 BuildRequires: libstdc++-devel >= 6:7.0
-BuildRequires: libtool >= 2:2.2
 BuildRequires: libxml2-progs >= 2
+BuildRequires: meson >= 0.49.0
 BuildRequires: ncurses-devel
+BuildRequires: ninja >= 1.5
 BuildRequires: pango-devel >= 1:1.22.0
 BuildRequires: pcre2-8-devel >= 10.21
 BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.592
+BuildRequires: rpmbuild(macros) >= 1.736
 BuildRequires: tar >= 1:1.22
 BuildRequires: vala >= 2:0.24
 BuildRequires: xz
@@ -48,6 +45,7 @@ Requires:     gnutls >= 3.2.7
 Requires:      gtk+3 >= 3.8.0
 Requires:      pango >= 1:1.22.0
 Obsoletes:     vte-common < 0.42.0
+Obsoletes:     vte-glade < 0.58.0
 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -93,32 +91,6 @@ This package contains header files for GTK+ 3 based vte library.
 Pliki nagłówkowe potrzebne do kompilowania programów używających
 biblioteki vte opartej na GTK+ 3.
 
-%package static
-Summary:       Static VTE library for GTK+ 3
-Summary(pl.UTF-8):     Statyczna biblioteka VTE dla GTK+ 3
-Group:         X11/Development/Libraries
-Requires:      %{name}-devel = %{version}-%{release}
-Conflicts:     gnome-libs-static < 1.4.1.2
-
-%description static
-Static version of VTE library for GTK+ 3.
-
-%description static -l pl.UTF-8
-Statyczna wersja biblioteki VTE dla GTK+ 3.
-
-%package glade
-Summary:       VTE catalog file for Glade
-Summary(pl.UTF-8):     Plik katalogu VTE dla Glade
-Group:         X11/Development/Libraries
-Requires:      %{name}-devel = %{version}-%{release}
-Requires:      glade >= 3
-
-%description glade
-VTE catalog file for Glade.
-
-%description glade -l pl.UTF-8
-Plik katalogu VTE dla Glade.
-
 %package -n vala-vte
 Summary:       Vala API for VTE library
 Summary(pl.UTF-8):     API języka Vala dla biblioteki VTE
@@ -153,53 +125,19 @@ Dokumentacja API VTE (wersja dla GTK+ 3).
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
-%{__gtkdocize}
-%{__glib_gettextize}
-%{__intltoolize}
-%{__libtoolize}
-%{__aclocal}
-%{__autoheader}
-%{__automake}
-%{__autoconf}
-install -d build-gtk3
-cd build-gtk3
-../%configure \
-       --disable-silent-rules \
-       %{?with_glade:--enable-glade-catalogue} \
-       --enable-gtk-doc \
-       --enable-introspection \
-       --with-html-dir=%{_gtkdocdir}
-%{__make}
-cd ..
-
-%if %{with gtk4}
-install -d build-gtk4
-cd build-gtk4
-# note: "3.902468" is a result of configure.ac bug (unquoted brackets)
-../%configure \
-       --disable-silent-rules \
-       --enable-gtk-doc \
-       --enable-introspection \
-       --with-gtk=3.902468 \
-       --with-html-dir=%{_gtkdocdir}
-%{__make}
-%endif
+%meson build \
+       -Ddocs=true \
+       -Dgtk3=true \
+       -Dgtk4=%{__true_false gtk4}
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%if %{with gtk4}
-%{__make} -C build-gtk4 install \
-       DESTDIR=$RPM_BUILD_ROOT
-%endif
-
-%{__make} -C build-gtk3 install \
-       DESTDIR=$RPM_BUILD_ROOT
-
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+%ninja_install -C build
 
 %find_lang %{name}-2.91
 
@@ -211,7 +149,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f vte-2.91.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS
+%doc AUTHORS NEWS README.md
 %attr(755,root,root) %{_bindir}/vte-2.91
 %attr(755,root,root) %{_libdir}/libvte-2.91.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libvte-2.91.so.0
@@ -225,20 +163,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/vte-2.91.pc
 %{_datadir}/gir-1.0/Vte-2.91.gir
 
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libvte-2.91.a
-
-%if %{with glade}
-%files glade
-%defattr(644,root,root,755)
-%{_datadir}/glade/catalogs/vte-2.91.xml
-%{_datadir}/glade/pixmaps/hicolor/16x16/actions/widget-vte-terminal.png
-%{_datadir}/glade/pixmaps/hicolor/22x22/actions/widget-vte-terminal.png
-%endif
-
 %files -n vala-vte
 %defattr(644,root,root,755)
+%{_datadir}/vala/vapi/vte-2.91.deps
 %{_datadir}/vala/vapi/vte-2.91.vapi
 
 %files apidocs