fix build with autoconf patch and disabling gegl [release 1.6.1-2mamba;Wed Dec 28 2022]

This commit is contained in:
Silvan Calarco 2024-01-06 05:07:50 +01:00
parent 771a6324b8
commit 6d9e057657
2 changed files with 42 additions and 17 deletions

View File

@ -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

View File

@ -1,28 +1,24 @@
%define majver %(echo %version | cut -d. -f1-2) %define majver %(echo %version | cut -d. -f1-2)
Name: libmypaint Name: libmypaint
Version: 1.6.1 Version: 1.6.1
Release: 1mamba Release: 2mamba
Summary: MyPaint brush engine library Summary: MyPaint brush engine library
Group: System/Libraries Group: System/Libraries
Vendor: openmamba Vendor: openmamba
Distribution: openmamba Distribution: openmamba
Packager: Ercole 'ercolinux' Carpanetto <ercole69@gmail.com> Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://mypaint.org/ URL: http://mypaint.org/
Source: https://github.com/mypaint/libmypaint.git/v%{version}/libmypaint-%{version}.tar.bz2 Source: https://github.com/mypaint/libmypaint.git/v%{version}/libmypaint-%{version}.tar.bz2
Patch0: libmypaint-1.3.0-versioning.patch Patch0: libmypaint-1.3.0-versioning.patch
Patch1: libmypaint-1.3.0-libgegl-0.4.8.patch Patch1: libmypaint-1.3.0-libgegl-0.4.8.patch
Patch2: libmypaint-1.3.0-libgegl-0.4.14.patch Patch2: libmypaint-1.3.0-libgegl-0.4.14.patch
Patch3: libmypaint-1.6.1-autoconf.patch
License: ISC License License: ISC License
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
BuildRequires: ldconfig
BuildRequires: libbabl-devel
BuildRequires: libgegl-devel
BuildRequires: libglib-devel BuildRequires: libglib-devel
BuildRequires: libjson-c-devel BuildRequires: libjson-c-devel
BuildRequires: libjson-glib-devel
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description %description
This is the brush library used by MyPaint. A number of other painting programs use it too. This is the brush library used by MyPaint. A number of other painting programs use it too.
@ -40,10 +36,12 @@ This package contains libraries and header files for developing applications tha
%prep %prep
%setup -q %setup -q
%patch3 -p1 -b .autoconf
./autogen.sh ./autogen.sh
%build %build
%configure --enable-gegl %configure \
--disable-gegl
%make %make
@ -62,9 +60,9 @@ This package contains libraries and header files for developing applications tha
%files -f %{name}.lang %files -f %{name}.lang
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libmypaint.so.* %{_libdir}/libmypaint.so.*
%{_libdir}/libmypaint-gegl.so.* #%{_libdir}/libmypaint-gegl.so.*
%{_libdir}/girepository-1.0/MyPaint-*.typelib %{_libdir}/girepository-1.0/MyPaint-*.typelib
%{_libdir}/girepository-1.0/MyPaintGegl-*.typelib #%{_libdir}/girepository-1.0/MyPaintGegl-*.typelib
%doc COPYING %doc COPYING
%files devel %files devel
@ -75,18 +73,19 @@ This package contains libraries and header files for developing applications tha
%{_includedir}/libmypaint/fastapprox/*.h %{_includedir}/libmypaint/fastapprox/*.h
%dir %{_includedir}/libmypaint/glib %dir %{_includedir}/libmypaint/glib
%{_includedir}/libmypaint/glib/*.h %{_includedir}/libmypaint/glib/*.h
%dir %{_includedir}/libmypaint-gegl #%dir %{_includedir}/libmypaint-gegl
%{_includedir}/libmypaint-gegl/*.h #%{_includedir}/libmypaint-gegl/*.h
%{_libdir}/libmypaint.la
%{_libdir}/libmypaint.so %{_libdir}/libmypaint.so
%{_libdir}/libmypaint-gegl.la #%{_libdir}/libmypaint-gegl.so
%{_libdir}/libmypaint-gegl.so
%{_libdir}/pkgconfig/libmypaint*.pc %{_libdir}/pkgconfig/libmypaint*.pc
%{_datadir}/gir-1.0/MyPaint-*.gir %{_datadir}/gir-1.0/MyPaint-*.gir
%{_datadir}/gir-1.0/MyPaintGegl-*.gir #%{_datadir}/gir-1.0/MyPaintGegl-*.gir
%doc README.md TODO %doc README.md TODO
%changelog %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 * Sun Sep 06 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 1.6.1-1mamba
- update to 1.6.1 - update to 1.6.1