- build cairo library

diff --git a/fltk-as-needed.patch b/fltk-as-needed.patch
index 863080177259bd1339b98247978cfb506322a09c..3b18eb6b500b3c90f3476b57c037adeddf9219f5 100644 (file)
--- a/fltk-as-needed.patch
+++ b/fltk-as-needed.patch
@@ -47,3 +47,14 @@
        echo $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o
        $(RM) $@
        $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o
+--- fltk-1.3.3/cairo/Makefile.orig     2014-10-05 02:03:27.000000000 +0200
++++ fltk-1.3.3/cairo/Makefile  2014-11-19 21:29:49.911031382 +0100
+@@ -39,7 +39,7 @@
+ 
+ libfltk_cairo.so.1.3: $(CAIROOBJECTS) ../src/libfltk.so.1.3
+       echo $(DSOCOMMAND) $@ ...
+-      $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk
++      $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk -lcairo
+       $(RM) libfltk_cairo.so
+       $(LN) $(CAIRODSONAME) libfltk_cairo.so
+ 

diff --git a/fltk.spec b/fltk.spec
index 2ab244e5f0c593b696e115729239f0a8d48c04cb..bc847976325856168b300b060999affc6a2e0e9f 100644 (file)
--- a/fltk.spec
+++ b/fltk.spec
@@ -1,4 +1,3 @@
-# TODO: enable cairo support?
 #
 # Conditional build:
 %bcond_without opengl  # without OpenGL libraries
@@ -21,14 +20,20 @@ Patch3:             %{name}-libjpeg.patch
 Patch4:                %{name}-export.patch
 URL:           http://www.fltk.org/
 %{?with_opengl:BuildRequires:  OpenGL-GLU-devel}
+%{?with_opengl:BuildRequires:  OpenGL-GLX-devel}
 BuildRequires: autoconf >= 2.50
+BuildRequires: cairo-devel
 BuildRequires: doxygen
+%{?with_xft:BuildRequires:     fontconfig-devel}
 BuildRequires: groff
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libstdc++-devel
+BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.315
+BuildRequires: xorg-lib-libXcursor-devel
 BuildRequires: xorg-lib-libXext-devel
+BuildRequires: xorg-lib-libXfixes-devel
 %{?with_xft:BuildRequires:     xorg-lib-libXft-devel}
 BuildRequires: xorg-lib-libXinerama-devel
 BuildRequires: xorg-util-makedepend
@@ -97,6 +102,43 @@ Biblioteka FLTK konsolidowana statycznie.
 %description static -l pt_BR.UTF-8
 Bibliotecas estáticas para o FLTK.
 
+%package cairo
+Summary:       FLTK Cairo library
+Summary(pl.UTF-8):     Biblioteka FLTK Cairo
+Group:         X11/Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description cairo
+FLTK Cairo library.
+
+%description cairo -l pl.UTF-8
+Biblioteka FLTK Cairo.
+
+%package cairo-devel
+Summary:       Header files for FLTK Cairo library
+Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki FLTK Cairo
+Group:         X11/Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+Requires:      %{name}-cairo = %{version}-%{release}
+
+%description cairo-devel
+Header files for FLTK Cairo library.
+
+%description cairo-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki FLTK Cairo.
+
+%package cairo-static
+Summary:       FLTK Cairo static library
+Summary(pl.UTF-8):     Statyczna biblioteka FLTK Cairo
+Group:         X11/Development/Libraries
+Requires:      %{name}-cairo-devel = %{version}-%{release}
+
+%description cairo-static
+FLTK Cairo static library.
+
+%description cairo-static -l pl.UTF-8
+Statyczna biblioteka FLTK Cairo.
+
 %package gl
 Summary:       FLTK GL library
 Summary(pl.UTF-8):     Biblioteka FLTK GL
@@ -165,6 +207,7 @@ if [ -x /usr/bin/ld.bfd ]; then
 fi
 %{__autoconf}
 %configure \
+       --enable-cairo \
        --enable-largefile \
        --enable-shared \
        --enable-threads \
@@ -204,6 +247,12 @@ rm -rf $RPM_BUILD_ROOT
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+%post   cairo -p /sbin/ldconfig
+%postun cairo -p /sbin/ldconfig
+
+%post   gl -p /sbin/ldconfig
+%postun gl -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 # note: COPYING contains amendments to LGPL, so don't remove!
@@ -222,6 +271,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libfltk_forms.so
 %attr(755,root,root) %{_libdir}/libfltk_images.so
 %{_includedir}/FL
+%exclude %{_includedir}/FL/Fl_Cairo*.H
 %exclude %{_includedir}/FL/Fl_Gl_Window.H
 %exclude %{_includedir}/FL/gl*
 %{_iconsdir}/hicolor/*/apps/fluid.png
@@ -238,6 +288,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libfltk_forms.a
 %{_libdir}/libfltk_images.a
 
+%files cairo
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libfltk_cairo.so.*.*
+
+%files cairo-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libfltk_cairo.so
+%{_includedir}/FL/Fl_Cairo*.H
+
+%files cairo-static
+%defattr(644,root,root,755)
+%{_libdir}/libfltk_cairo.a
+
 %if %{with opengl}
 %files gl
 %defattr(644,root,root,755)
@@ -259,9 +322,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/%{name}-blocks
 %attr(755,root,root) %{_bindir}/%{name}-checkers
 %attr(755,root,root) %{_bindir}/%{name}-sudoku
-%{_iconsdir}/*/*/*/blocks.png
-%{_iconsdir}/*/*/*/checkers.png
-%{_iconsdir}/*/*/*/sudoku.png
+%{_iconsdir}/hicolor/*/apps/blocks.png
+%{_iconsdir}/hicolor/*/apps/checkers.png
+%{_iconsdir}/hicolor/*/apps/sudoku.png
 %{_desktopdir}/blocks.desktop
 %{_desktopdir}/checkers.desktop
 %{_desktopdir}/sudoku.desktop