[packages/suil] - updated to 0.10.16, now uses meson; qt4 support is gone - removed outdated build patch

[qboosh]

commit 818e03bdaf01a203a0c9350d5f45ddcb8c62ec49
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Sep 2 17:27:09 2022 +0200

    - updated to 0.10.16, now uses meson; qt4 support is gone
    - removed outdated build patch

 suil-build.patch | 36 -------------------------------
 suil.spec        | 64 ++++++++++++++++++++++++++------------------------------
 2 files changed, 30 insertions(+), 70 deletions(-)
---
diff --git a/suil.spec b/suil.spec
index 7a6e853..4e8c0bd 100644
--- a/suil.spec
+++ b/suil.spec
@@ -1,27 +1,37 @@
 #
 # Conditional build:
+%bcond_with	apidocs	# API documentation
 %bcond_without	gtk	# GTK+ (2,3) support
-%bcond_without	qt4	# Qt4 support
 %bcond_without	qt5	# Qt5 support
 
 Summary:	Lightweight C library for loading and wrapping LV2 plugin UIs
 Summary(pl.UTF-8):	Lekka biblioteka C do ładowania i obudowywania UI wtyczek LV2
 Name:		suil
-Version:	0.10.10
+Version:	0.10.16
 Release:	1
 License:	ISC
 Group:		Libraries
-Source0:	http://download.drobilla.net/%{name}-%{version}.tar.bz2
-# Source0-md5:	565c25c3b231e050642517a63627e64a
-Patch0:		%{name}-build.patch
+Source0:	http://download.drobilla.net/%{name}-%{version}.tar.xz
+# Source0-md5:	7586eaed15a15b44b42bd55758cb71a4
 URL:		http://drobilla.net/software/suil/
-%{?with_qt4:BuildRequires:	QtGui-devel >= 4.4.0}
 %{?with_qt5:BuildRequires:	Qt5Widgets-devel >= 5.1.0}
+%{?with_qt5:BuildRequires:	Qt5X11Extras-devel >= 5.1.0}
 %{?with_gtk:BuildRequires:	gtk+2-devel >= 2:2.18.0}
 %{?with_gtk:BuildRequires:	gtk+3-devel >= 3.14.0}
-BuildRequires:	libstdc++-devel
-BuildRequires:	lv2-devel >= 1.16.0
-BuildRequires:	python >= 2
+BuildRequires:	libstdc++-devel >= 6:5
+BuildRequires:	lv2-devel >= 1.18.3
+BuildRequires:	meson >= 0.56.0
+BuildRequires:	ninja >= 1.5
+BuildRequires:	pkgconfig
+BuildRequires:	rpmbuild(macros) >= 1.736
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xz
+%if %{with apidocs}
+BuildRequires:	doxygen
+BuildRequires:	sphinx-pdg
+%endif
+Requires:	lv2 >= 1.18.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -56,8 +66,8 @@ Summary:	UI wrapper modules for suil library
 Summary(pl.UTF-8):	Moduły obudowujące UI dla biblioteki suil
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
-%{?with_qt4:Requires:	QtGui >= 4.4.0}
 %{?with_qt5:Requires:	Qt5Widgets >= 5.1.0}
+%{?with_qt5:Requires:	Qt5X11Extras >= 5.1.0}
 %{?with_gtk:Requires:	gtk+2 >= 2:2.18.0}
 %{?with_gtk:Requires:	gtk+3 >= 3.14.0}
 
@@ -75,7 +85,7 @@ Summary:	Header files for suil library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki suil
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	lv2-devel >= 1.16.0
+Requires:	lv2-devel >= 1.18.3
 
 %description devel
 Header files for suil library.
@@ -85,28 +95,21 @@ Pliki nagłówkowe biblioteki suil.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-CC="%{__cc}" \
-CFLAGS="%{rpmcflags}" \
-./waf configure \
-	--prefix=%{_prefix} \
-	--libdir=%{_libdir} \
-	--gtk2-lib-name=libgtk-x11-2.0.so.0 \
-	--gtk3-lib-name=libgtk-3.so.0 \
-	%{!?with_gtk:--no-gtk} \
-	%{!?with_qt4:--no-qt4} \
-	%{!?with_qt4:--no-qt4} \
-	%{!?with_qt5:--no-qt5}
-
-./waf -v
+%meson build \
+	--default-library=shared \
+	%{!?with_apidocs:-Ddocs=disabled} \
+	%{!?with_gtk:-Dgtk2=disabled} \
+	%{!?with_gtk:-Dgtk3=disabled} \
+	%{!?with_qt5:-Dqt5=disabled}
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-./waf install \
-	--destdir=$RPM_BUILD_ROOT
+%ninja_install -C build
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -128,16 +131,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/suil-0/libsuil_x11_in_gtk2.so
 %attr(755,root,root) %{_libdir}/suil-0/libsuil_x11_in_gtk3.so
 %endif
-%if %{with qt4}
-%attr(755,root,root) %{_libdir}/suil-0/libsuil_x11_in_qt4.so
-%endif
 %if %{with qt5}
 %attr(755,root,root) %{_libdir}/suil-0/libsuil_x11_in_qt5.so
 %endif
-%if %{with gtk} && %{with qt4}
-%attr(755,root,root) %{_libdir}/suil-0/libsuil_gtk2_in_qt4.so
-%attr(755,root,root) %{_libdir}/suil-0/libsuil_qt4_in_gtk2.so
-%endif
 %if %{with gtk} && %{with qt5}
 %attr(755,root,root) %{_libdir}/suil-0/libsuil_gtk2_in_qt5.so
 %attr(755,root,root) %{_libdir}/suil-0/libsuil_qt5_in_gtk2.so
diff --git a/suil-build.patch b/suil-build.patch
deleted file mode 100644
index b7ad0da..0000000
--- a/suil-build.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- suil-0.10.10/src/gtk2_in_qt4.cpp.orig	2021-01-02 16:14:16.063443200 +0100
-+++ suil-0.10.10/src/gtk2_in_qt4.cpp	2021-01-10 22:10:07.636286700 +0100
-@@ -27,9 +27,7 @@
- 
- extern "C" {
- 
--using SuilGtk2InQt4Wrapper = _SuilGtk2InQt4Wrapper;
--
--struct _SuilGtk2InQt4Wrapper {
-+struct SuilGtk2InQt4Wrapper {
-   QX11EmbedContainer* host_widget;
-   QWidget*            parent;
-   GtkWidget*          plug;
---- suil-0.10.10/src/qt4_in_gtk2.cpp.orig	2021-01-02 16:14:16.063443200 +0100
-+++ suil-0.10.10/src/qt4_in_gtk2.cpp	2021-01-10 22:10:27.692844711 +0100
-@@ -30,10 +30,7 @@
- #define SUIL_QT_WRAPPER(obj) \
-   (G_TYPE_CHECK_INSTANCE_CAST((obj), SUIL_TYPE_QT_WRAPPER, SuilQtWrapper))
- 
--using SuilQtWrapper      = _SuilQtWrapper;
--using SuilQtWrapperClass = _SuilQtWrapperClass;
--
--struct _SuilQtWrapper {
-+struct SuilQtWrapper {
-   GtkSocket        socket;
-   QApplication*    app;
-   QX11EmbedWidget* qembed;
-@@ -41,7 +38,7 @@
-   SuilInstance*    instance;
- };
- 
--struct _SuilQtWrapperClass {
-+struct SuilQtWrapperClass {
-   GtkSocketClass parent_class;
- };
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/suil.git/commitdiff/818e03bdaf01a203a0c9350d5f45ddcb8c62ec49