Compare commits

..

10 Commits

2 changed files with 78 additions and 24 deletions

View File

@ -0,0 +1,26 @@
--- cairo-1.17.2/util/cairo-trace/lookup-symbol.c.orig 2020-02-29 12:26:11.482000000 +0100
+++ cairo-1.17.2/util/cairo-trace/lookup-symbol.c 2020-02-29 12:27:06.224000000 +0100
@@ -67,6 +67,14 @@
#include <bfd.h>
#include <libiberty.h>
+#ifndef bfd_get_section_flags
+#define bfd_get_section_flags(H, S) bfd_section_flags(S)
+#endif /* bfd_get_section_flags */
+
+#ifndef bfd_get_section_vma
+#define bfd_get_section_vma(H, S) bfd_section_vma(S)
+#endif /* bfd_get_section_vma */
+
struct symtab {
bfd *bfd;
asymbol **syms;
@@ -152,7 +160,7 @@
if (symbol->pc < vma)
return;
- size = bfd_section_size (symtab->bfd, section);
+ size = bfd_section_size (section);
if (symbol->pc >= vma + size)
return;

View File

@ -14,17 +14,19 @@
%define pkgname cairo
Name: libcairo
Version: 1.15.12
Version: 1.18.4
Release: 1mamba
Summary: Cairo provides anti-aliased vector-based rendering for X
Group: System/Libraries
Vendor: openmamba
Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://www.cairographics.org
Source: https://www.cairographics.org/snapshots/cairo-%{version}.tar.xz
URL: https://www.cairographics.org/
Source: https://gitlab.freedesktop.org/cairo/cairo.git/master/cairo-%{version}.tar.bz2
#Source: https://www.cairographics.org/snapshots/cairo-%{version}.tar.xz
#Source: http://cairographics.org/releases/cairo-%{version}.tar.xz
Patch0: libcairo-1.12.4-expose_snapshot.patch
Patch1: libcairo-1.17.2-binutils-2.34.patch
License: LGPL, MPL 1.1
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
@ -51,7 +53,7 @@ BuildRequires: libXext-devel
BuildRequires: libXrender-devel
BuildRequires: libz-devel
## AUTOBUILDREQ-END
BuildRequires: libbinutils-devel >= 2.29.1-1mamba
BuildRequires: libbinutils-devel >= 2.34-1mamba
BuildRequires: pkgconfig
%if %{with_ps}
BuildRequires: libspectre-devel
@ -62,8 +64,8 @@ BuildRequires: libpoppler-devel
%if %{with_svg}
BuildRequires: librsvg-devel
%endif
BuildRequires: python-fonttools-py3
Provides: %{pkgname} = %{?epoch:%epoch:}%{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-root
#checking for GLITZ_AGL... no
#no
#checking for GLITZ_EGL... no
@ -165,8 +167,7 @@ Cairo is a 2D graphics library with support for multiple output devices.
Currently supported output targets include the X Window System, win32, and image buffers.
Experimental backends include OpenGL (through glitz), Quartz, XCB, PostScript and PDF file output.
Cairo is designed to produce consistent output on all output media while taking advantage of display hardware acceleration when available (for example, through the X Render Extension).
This package contains the API documentation need for development.
This package contains the API documentation needed for development.
%package tools
Summary: Development tools for %{name}
@ -178,14 +179,20 @@ Cairo is a 2D graphics library with support for multiple output devices.
Currently supported output targets include the X Window System, win32, and image buffers.
Experimental backends include OpenGL (through glitz), Quartz, XCB, PostScript and PDF file output.
Cairo is designed to produce consistent output on all output media while taking advantage of display hardware acceleration when available (for example, through the X Render Extension).
This package contains development tools for %{name}.
%prep
%setup -q -n %{pkgname}-%{version}
#%patch0 -p1
#./autogen.sh
%build
%meson
%meson_build
:<< __OLD
%configure \
--disable-static \
--enable-shared \
@ -231,9 +238,8 @@ This package contains development tools for %{name}.
%install
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%makeinstall
rm -f %{buildroot}%{_libdir}/*.la
%meson_install
%clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@ -244,7 +250,6 @@ sed -i "s|%{_libdir}/libcairo.la||g" %{_libdir}/*.la 2>/dev/null
sed -i "s|%{_libdir}/libcairo-gobject.la||g" %{_libdir}/*.la 2>/dev/null
:
%postun -p /sbin/ldconfig
%files
%defattr(-, root, root)
@ -252,15 +257,8 @@ sed -i "s|%{_libdir}/libcairo-gobject.la||g" %{_libdir}/*.la 2>/dev/null
%{_libdir}/libcairo-gobject.so.*
%{_libdir}/libcairo-script-interpreter.so.*
%dir %{_libdir}/cairo
%{_libdir}/cairo/cairo-fdr.la
%{_libdir}/cairo/cairo-fdr.so
#%{_libdir}/cairo/cairo-fdr.so.*
%{_libdir}/cairo/cairo-sphinx.la
%{_libdir}/cairo/cairo-sphinx.so
#%{_libdir}/cairo/cairo-sphinx.so.*
%{_libdir}/cairo/libcairo-trace.la
%{_libdir}/cairo/libcairo-fdr.so
%{_libdir}/cairo/libcairo-trace.so
#%{_libdir}/cairo/libcairo-trace.so.*
%doc AUTHORS COPYING*
%files devel
@ -275,14 +273,44 @@ sed -i "s|%{_libdir}/libcairo-gobject.la||g" %{_libdir}/*.la 2>/dev/null
%files tools
%defattr(-, root, root)
%{_bindir}/cairo-sphinx
#%{_bindir}/cairo-sphinx
%{_bindir}/cairo-trace
%files apidocs
%defattr(-,root,root)
%{_datadir}/gtk-doc/html/%{pkgname}
#%files apidocs
#%defattr(-,root,root)
#%{_datadir}/gtk-doc/html/%{pkgname}
%changelog
* Sun Mar 09 2025 Automatic Build System <autodist@openmamba.org> 1.18.4-1mamba
- automatic version update by autodist
* Mon Sep 02 2024 Automatic Build System <autodist@openmamba.org> 1.18.2-1mamba
- automatic version update by autodist
* Sun Oct 08 2023 Automatic Build System <autodist@mambasoft.it> 1.18.0-1mamba
- automatic version update by autodist
* Thu Dec 03 2020 Automatic Build System <autodist@mambasoft.it> 1.17.4-1mamba
- automatic version update by autodist
* Tue Jul 21 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 1.17.2.20200721git-1mamba
- update to 1.17.2.20200721git
* Sun Feb 16 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 1.17.2-3mamba
- rebuilt by autoport with build requirements: libbinutils-devel>=2.34-1mamba
* Sat Nov 23 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 1.17.2-2mamba
- rebuilt by autoport with build requirements: libbinutils-devel>=2.33.1-2mamba
* Fri Mar 01 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 1.17.2-1mamba
- update to 1.17.2
* Fri Feb 15 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 1.15.14-2mamba
- rebuilt by autoport with build requirements: libbinutils-devel>=2.32-1mamba
* Sat Sep 22 2018 Automatic Build System <autodist@mambasoft.it> 1.15.14-1mamba
- automatic version update by autodist
* Sun Sep 09 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 1.15.12-1mamba
- update to 1.15.12