From 6d9e057657ba95cfb55ada45c4c81ce2367816d3 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sat, 6 Jan 2024 05:07:50 +0100
Subject: [PATCH] fix build with autoconf patch and disabling gegl [release
 1.6.1-2mamba;Wed Dec 28 2022]

---
 libmypaint-1.6.1-autoconf.patch | 26 ++++++++++++++++++++++++++
 libmypaint.spec                 | 33 ++++++++++++++++-----------------
 2 files changed, 42 insertions(+), 17 deletions(-)
 create mode 100644 libmypaint-1.6.1-autoconf.patch

diff --git a/libmypaint-1.6.1-autoconf.patch b/libmypaint-1.6.1-autoconf.patch
new file mode 100644
index 0000000..edd76d3
--- /dev/null
+++ b/libmypaint-1.6.1-autoconf.patch
@@ -0,0 +1,26 @@
+From a6bac154db018e1f1cc4dbddc34f6c8422c891fb Mon Sep 17 00:00:00 2001
+From: Jesper Lloyd <jpl.lloyd@gmail.com>
+Date: Wed, 20 Jan 2021 20:21:53 +0100
+Subject: [PATCH] make build compatible w. autoconf 2.7
+
+Workaround for stricter behaviour (due to a bugfix) in 2.7,
+which makes a failing intltoolize macro check fail the build.
+
+Fix provided by hosiet.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1aae7ab2..b6e1e060 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -245,7 +245,7 @@ if test "x$enable_i18n" != "xno"; then
+   AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
+                      [The prefix for our gettext translation domains.])
+   AC_SUBST(GETTEXT_PACKAGE)
+-  IT_PROG_INTLTOOL
++IT_PROG_INTLTOOL
+   AM_GLIB_GNU_GETTEXT
+ 
+   dnl Debian: stdlib
diff --git a/libmypaint.spec b/libmypaint.spec
index 34a2ed4..b0540fa 100644
--- a/libmypaint.spec
+++ b/libmypaint.spec
@@ -1,28 +1,24 @@
 %define majver %(echo %version | cut -d. -f1-2)
 Name:          libmypaint
 Version:       1.6.1
-Release:       1mamba
+Release:       2mamba
 Summary:       MyPaint brush engine library
 Group:         System/Libraries
 Vendor:        openmamba
 Distribution:  openmamba
-Packager:      Ercole 'ercolinux' Carpanetto <ercole69@gmail.com>
+Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://mypaint.org/
 Source:        https://github.com/mypaint/libmypaint.git/v%{version}/libmypaint-%{version}.tar.bz2
 Patch0:        libmypaint-1.3.0-versioning.patch
 Patch1:        libmypaint-1.3.0-libgegl-0.4.8.patch
 Patch2:        libmypaint-1.3.0-libgegl-0.4.14.patch
+Patch3:        libmypaint-1.6.1-autoconf.patch
 License:       ISC License
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
-BuildRequires: ldconfig
-BuildRequires: libbabl-devel
-BuildRequires: libgegl-devel
 BuildRequires: libglib-devel
 BuildRequires: libjson-c-devel
-BuildRequires: libjson-glib-devel
 ## AUTOBUILDREQ-END
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
 This is the brush library used by MyPaint. A number of other painting programs use it too.
@@ -40,11 +36,13 @@ This package contains libraries and header files for developing applications tha
 
 %prep
 %setup -q
+%patch3 -p1 -b .autoconf
 ./autogen.sh
 
 %build
-%configure --enable-gegl
-
+%configure \
+   --disable-gegl
+   
 %make
 
 %install
@@ -62,9 +60,9 @@ This package contains libraries and header files for developing applications tha
 %files -f %{name}.lang
 %defattr(-,root,root)
 %{_libdir}/libmypaint.so.*
-%{_libdir}/libmypaint-gegl.so.*
+#%{_libdir}/libmypaint-gegl.so.*
 %{_libdir}/girepository-1.0/MyPaint-*.typelib
-%{_libdir}/girepository-1.0/MyPaintGegl-*.typelib
+#%{_libdir}/girepository-1.0/MyPaintGegl-*.typelib
 %doc COPYING
 
 %files devel
@@ -75,18 +73,19 @@ This package contains libraries and header files for developing applications tha
 %{_includedir}/libmypaint/fastapprox/*.h
 %dir %{_includedir}/libmypaint/glib
 %{_includedir}/libmypaint/glib/*.h
-%dir %{_includedir}/libmypaint-gegl
-%{_includedir}/libmypaint-gegl/*.h
-%{_libdir}/libmypaint.la
+#%dir %{_includedir}/libmypaint-gegl
+#%{_includedir}/libmypaint-gegl/*.h
 %{_libdir}/libmypaint.so
-%{_libdir}/libmypaint-gegl.la
-%{_libdir}/libmypaint-gegl.so
+#%{_libdir}/libmypaint-gegl.so
 %{_libdir}/pkgconfig/libmypaint*.pc
 %{_datadir}/gir-1.0/MyPaint-*.gir
-%{_datadir}/gir-1.0/MyPaintGegl-*.gir
+#%{_datadir}/gir-1.0/MyPaintGegl-*.gir
 %doc README.md TODO
 
 %changelog
+* Wed Dec 28 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 1.6.1-2mamba
+- fix build with autoconf patch and disabling gegl
+
 * Sun Sep 06 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 1.6.1-1mamba
 - update to 1.6.1