diff --git a/.cvsignore b/.cvsignore index cd19e97..f324d08 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -kdegraphics-4.0.4.tar.bz2 -kdegraphics-4.0.5.tar.bz2 +kdegraphics-4.0.99.tar.bz2 diff --git a/kdegraphics-4.0.1-system-libspectre-cmake.patch b/kdegraphics-4.0.1-system-libspectre-cmake.patch deleted file mode 100644 index a581cb0..0000000 --- a/kdegraphics-4.0.1-system-libspectre-cmake.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur kdegraphics-4.0.1/okular/generators/spectre/CMakeLists.txt kdegraphics-4.0.1-system-libspectre-cmake/okular/generators/spectre/CMakeLists.txt ---- kdegraphics-4.0.1/okular/generators/spectre/CMakeLists.txt 2008-01-05 00:53:45.000000000 +0100 -+++ kdegraphics-4.0.1-system-libspectre-cmake/okular/generators/spectre/CMakeLists.txt 2008-02-01 21:27:58.000000000 +0100 -@@ -1,6 +1,7 @@ --add_subdirectory( libspectre conf ) -+add_subdirectory( conf ) - - include_directories( -+ ${LIBSPECTRE_INCLUDE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/../.. - ${CMAKE_CURRENT_BINARY_DIR}/../.. - ) -@@ -21,7 +22,7 @@ - - kde4_add_plugin(okularGenerator_ghostview ${okularGenerator_ghostview_SRCS}) - --target_link_libraries(okularGenerator_ghostview okularcore spectreOkular ${KDE4_KDEUI_LIBRARY}) -+target_link_libraries(okularGenerator_ghostview okularcore ${LIBSPECTRE_LIBRARY} ${KDE4_KDEUI_LIBRARY}) - - install(TARGETS okularGenerator_ghostview DESTINATION ${PLUGIN_INSTALL_DIR}) - diff --git a/kdegraphics-4.0.1-system-libspectre.patch b/kdegraphics-4.0.1-system-libspectre.patch deleted file mode 100644 index 4463f08..0000000 --- a/kdegraphics-4.0.1-system-libspectre.patch +++ /dev/null @@ -1,112 +0,0 @@ -Index: cmake/modules/FindLibSpectre.cmake -=================================================================== ---- cmake/modules/FindLibSpectre.cmake (revision 0) -+++ cmake/modules/FindLibSpectre.cmake (revision 768911) -@@ -0,0 +1,62 @@ -+# - Try to find the libspectre PS library -+# Once done this will define -+# -+# LIBSPECTRE_FOUND - system has libspectre -+# LIBSPECTRE_INCLUDE_DIR - the libspectre include directory -+# LIBSPECTRE_LIBRARY - Link this to use libspectre -+# -+ -+# Copyright (c) 2006-2007, Pino Toscano, -+# Copyright (c) 2008, Albert Astals Cid, -+# -+# Redistribution and use is allowed according to the terms of the BSD license. -+# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -+ -+if(LIBSPECTRE_INCLUDE_DIR AND LIBSPECTRE_LIBRARY) -+ -+ # in cache already -+ set(LIBSPECTRE_FOUND TRUE) -+ -+else(LIBSPECTRE_INCLUDE_DIR AND LIBSPECTRE_LIBRARY) -+ -+# use pkg-config to get the directories and then use these values -+# in the FIND_PATH() and FIND_LIBRARY() calls -+INCLUDE(UsePkgConfig) -+ -+PKGCONFIG(libspectre _SpectreIncDir _SpectreLinkDir _SpectreLinkFlags _SpectreCflags) -+ -+if(_SpectreLinkFlags) -+ # find again pkg-config, to query it about libspectre version -+ FIND_PROGRAM(PKGCONFIG_EXECUTABLE NAMES pkg-config PATHS /usr/bin/ /usr/local/bin ) -+ -+ # query pkg-config asking for a libspectre >= LIBSPECTRE_MINIMUM_VERSION -+ EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=${LIBSPECTRE_MINIMUM_VERSION} libspectre RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) -+ if(_return_VALUE STREQUAL "0") -+ set(LIBSPECTRE_FOUND TRUE) -+ endif(_return_VALUE STREQUAL "0") -+endif(_SpectreLinkFlags) -+ -+if (LIBSPECTRE_FOUND) -+ set(LIBSPECTRE_LIBRARY ${_SpectreLinkFlags}) -+ -+ # the cflags for libspectre can contain more than one include path -+ separate_arguments(_SpectreCflags) -+ foreach(_includedir ${_SpectreCflags}) -+ string(REGEX REPLACE "-I(.+)" "\\1" _includedir "${_includedir}") -+ set(LIBSPECTRE_INCLUDE_DIR ${LIBSPECTRE_INCLUDE_DIR} ${_includedir}) -+ endforeach(_includedir) -+ -+ set(CMAKE_REQUIRED_INCLUDES) -+ set(CMAKE_REQUIRED_LIBRARIES) -+else (LIBSPECTRE_FOUND) -+ if (LIBSPECTRE_FIND_REQUIRED) -+ message(FATAL_ERROR "Could NOT find libspectre") -+ endif (LIBSPECTRE_FIND_REQUIRED) -+ message(STATUS "Could not find OPTIONAL package libspectre") -+endif (LIBSPECTRE_FOUND) -+ -+# ensure that they are cached -+set(LIBSPECTRE_INCLUDE_DIR ${LIBSPECTRE_INCLUDE_DIR} CACHE INTERNAL "The libspectre include path") -+set(LIBSPECTRE_LIBRARY ${LIBSPECTRE_LIBRARY} CACHE INTERNAL "The libspectre library") -+ -+endif(LIBSPECTRE_INCLUDE_DIR AND LIBSPECTRE_LIBRARY) -Index: okular/generators/spectre/rendererthread.cpp -=================================================================== ---- okular/generators/spectre/rendererthread.cpp (revision 768910) -+++ okular/generators/spectre/rendererthread.cpp (revision 768911) -@@ -37,7 +37,7 @@ - - void GSRendererThread::setMagnify(double magnify) - { -- spectre_render_context_set_scale(m_renderContext, magnify); -+ spectre_render_context_set_scale(m_renderContext, magnify, magnify); - } - - void GSRendererThread::setPlatformFonts(bool pfonts) -Index: okular/generators/CMakeLists.txt -=================================================================== ---- okular/generators/CMakeLists.txt (revision 768910) -+++ okular/generators/CMakeLists.txt (revision 768911) -@@ -1,12 +1,12 @@ - include (MacroLogFeature) - --set(LIBGS_MINIMUM_VERSION "8.56") -+set(LIBSPECTRE_MINIMUM_VERSION "0.2") - - macro_optional_find_package(Poppler) - macro_log_feature(POPPLER_FOUND "Poppler-Qt4" "A PDF rendering library" "http://poppler.freedesktop.org" FALSE "0.5.4" "Support for PDF files in okular.") - --macro_optional_find_package(LIBGS) --macro_log_feature(LIBGS_FOUND "libgs, Ghostscript libraries" "A PostScript renderining library" "http://www.cs.wisc.edu/~ghost" FALSE "${LIBGS_MINIMUM_VERSION}" "Support for PS files in okular.") -+macro_optional_find_package(LibSpectre) -+macro_log_feature(LIBSPECTRE_FOUND "libspectre" "A PostScript rendering library" "http://libspectre.freedesktop.org/wiki/" FALSE "${LIBSPECTRE_MINIMUM_VERSION}" "Support for PS files in okular.") - - macro_optional_find_package(CHM) - macro_log_feature(CHM_FOUND "CHM" "A library for dealing with Microsoft ITSS/CHM format files" "http://www.jedrea.com/chmlib" FALSE "" "Support CHM files in okular.") -@@ -30,9 +30,9 @@ - add_subdirectory(poppler) - endif(POPPLER_FOUND) - --if(LIBGS_FOUND) -+if(LIBSPECTRE_FOUND) - add_subdirectory(spectre) --endif(LIBGS_FOUND) -+endif(LIBSPECTRE_FOUND) - - add_subdirectory( kimgio ) - diff --git a/kdegraphics-4.0.4-okular-fax.patch b/kdegraphics-4.0.4-okular-fax.patch deleted file mode 100644 index 860f21c..0000000 --- a/kdegraphics-4.0.4-okular-fax.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- kdegraphics/okular/generators/tiff/generator_tiff.cpp 2008/05/31 11:40:49 814835 -+++ kdegraphics/okular/generators/tiff/generator_tiff.cpp 2008/05/31 11:41:15 814836 -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -47,6 +48,28 @@ - return QDateTime::fromString( QString::fromLatin1( tiffdate ), "yyyy:MM:dd HH:mm:ss" ); - } - -+static void adaptSizeToResolution( TIFF *tiff, ttag_t whichres, double dpi, uint32 *size ) -+{ -+ float resvalue = 1.0; -+ uint16 resunit = 0; -+ if ( !TIFFGetField( tiff, whichres, &resvalue ) -+ || !TIFFGetField( tiff, TIFFTAG_RESOLUTIONUNIT, &resunit ) ) -+ return; -+ -+ float newsize = *size / resvalue; -+ switch ( resunit ) -+ { -+ case RESUNIT_INCH: -+ *size = (uint32)( newsize * dpi ); -+ break; -+ case RESUNIT_CENTIMETER: -+ *size = (uint32)( newsize * 10.0 / 25.4 * dpi ); -+ break; -+ case RESUNIT_NONE: -+ break; -+ } -+} -+ - static KAboutData createAboutData() - { - KAboutData aboutData( -@@ -119,8 +142,10 @@ - if ( TIFFSetDirectory( d->tiff, mapPage( request->page()->number() ) ) ) - { - int rotation = request->page()->rotation(); -- uint32 width = (uint32)request->page()->width(); -- uint32 height = (uint32)request->page()->height(); -+ uint32 width = 1; -+ uint32 height = 1; -+ TIFFGetField( d->tiff, TIFFTAG_IMAGEWIDTH, &width ); -+ TIFFGetField( d->tiff, TIFFTAG_IMAGELENGTH, &height ); - if ( rotation % 2 == 1 ) - qSwap( width, height ); - -@@ -215,6 +240,9 @@ - TIFFGetField( d->tiff, TIFFTAG_IMAGELENGTH, &height ) != 1 ) - continue; - -+ adaptSizeToResolution( d->tiff, TIFFTAG_XRESOLUTION, Okular::Utils::dpiX(), &width ); -+ adaptSizeToResolution( d->tiff, TIFFTAG_YRESOLUTION, Okular::Utils::dpiY(), &height ); -+ - Okular::Page * page = new Okular::Page( realdirs, width, height, Okular::Rotation0 ); - pagesVector[ realdirs ] = page; - diff --git a/kdegraphics.spec b/kdegraphics.spec index 06cc6a9..089db36 100644 --- a/kdegraphics.spec +++ b/kdegraphics.spec @@ -1,9 +1,7 @@ -%define _with_libspectre 1 - Summary: K Desktop Environment - Graphics Applications Epoch: 7 -Version: 4.0.5 +Version: 4.0.99 Release: 1%{?dist} Name: kdegraphics @@ -14,12 +12,6 @@ Group: Applications/Multimedia License: GPLv2 URL: http://www.kde.org/ Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdegraphics-%{version}.tar.bz2 -# backported from trunk (KDE 4.1): http://websvn.kde.org/?view=rev&revision=768911 -Patch0: kdegraphics-4.0.1-system-libspectre.patch -# necessary CMakeLists.txt changes missing in the above commit -Patch1: kdegraphics-4.0.1-system-libspectre-cmake.patch -# 49134: Okular is broken for FAX, and KFAX has been removed -Patch2: kdegraphics-4.0.4-okular-fax.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kde-filesystem >= 4 @@ -29,30 +21,35 @@ BuildRequires: chmlib-devel BuildRequires: djvulibre-devel BuildRequires: exiv2-devel BuildRequires: giflib-devel +%if 0%{?fedora} > 9 +BuildRequires: libgphoto2-devel +%else BuildRequires: gphoto2-devel -%{?_with_libspectre:BuildRequires: libspectre-devel} -%{!?_with_libspectre:BuildRequires: ghostscript-devel} +%endif +BuildRequires: libspectre-devel BuildRequires: libtiff-devel BuildRequires: libXxf86vm-devel BuildRequires: pcre-devel BuildRequires: poppler-qt4-devel +BuildRequires: qca2-devel BuildRequires: qimageblitz-devel BuildRequires: sane-backends-devel +BuildRequires: lcms-devel +# TODO (not packaged yet): +# + libepub: A library for reading EPub documents +# Support for EPub documents in Okular. %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} } Requires: kdelibs4 >= %{version} Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: oxygen-icon-theme -# okular requires lpr (?) +# okular requires lpr (provided by cups) Requires: lpr Requires(post): xdg-utils Requires(postun): xdg-utils Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release} - -# include gwenview(2), see also: http://bugzilla.redhat.com/427688 -Obsoletes: gwenview < 2 -Provides: gwenview = 2 +Obsoletes: gwenview < 2 +Provides: gwenview = 2 %description @@ -79,6 +76,9 @@ Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: kdegraphics4-devel < %{version}-%{release} Provides: kdegraphics4-devel = %{version}-%{release} Requires: kdelibs4-devel +Requires: pkgconfig +## FIXME: pkgconfig and lib -devel symlinks -- Rex +Conflicts: libkexiv2-devel libkdcraw-devel libkipi-devel %description devel %{summary}. @@ -86,13 +86,6 @@ Requires: kdelibs4-devel %prep %setup -q -n kdegraphics-%{version} -%if 0%{?_with_libspectre:1} -# use system libspectre -%patch0 -p0 -rm -rf okular/generators/spectre/libspectre -%patch1 -p1 -%endif -%patch2 -p1 -b .okular-fax %build @@ -115,12 +108,10 @@ rm -rf %{buildroot} %post %{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : -%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || : %{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : %postun %{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : -%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || : %{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : %post libs -p /sbin/ldconfig @@ -142,40 +133,70 @@ rm -rf %{buildroot} %{_kde4_docdir}/HTML/en/okular/ %{_kde4_appsdir}/gvpart/ %{_kde4_appsdir}/gwenview/ -%{_kde4_appsdir}/kolourpaint4/ +%{_kde4_appsdir}/kolourpaint/ %{_kde4_appsdir}/kruler/ %{_kde4_appsdir}/svgpart/* %{_datadir}/dbus-1/interfaces/* %{_kde4_docdir}/HTML/en/gwenview/ %{_kde4_docdir}/HTML/en/kamera/ %{_kde4_docdir}/HTML/en/ksnapshot/ -%{_kde4_docdir}/HTML/en/kolourpaint4/ +%{_kde4_docdir}/HTML/en/kolourpaint/ %{_kde4_docdir}/HTML/en/kruler/ %{_kde4_iconsdir}/hicolor/*/*/* -%{_kde4_iconsdir}/oxygen/*/*/* %files libs %defattr(-,root,root,-) +%{_kde4_appsdir}/kipi/ +%{_kde4_appsdir}/libkdcraw/ +%{_kde4_libdir}/libkdcraw5/ %{_kde4_libdir}/lib*.so.* %{_kde4_libdir}/kde4/* %{_kde4_libdir}/strigi/* %files devel %defattr(-,root,root,-) +%{_kde4_includedir}/libkdcraw/ +%{_kde4_includedir}/libkexiv2/ +%{_kde4_includedir}/libkipi/ +%{_kde4_includedir}/libksane/ %{_kde4_includedir}/okular/ %{_kde4_libdir}/lib*.so +%{_kde4_appsdir}/cmake/modules/FindKSane.cmake %{_kde4_appsdir}/cmake/modules/FindOkular.cmake +%{_libdir}/pkgconfig/*.pc %changelog -* Sun Jun 01 2008 Than Ngo 4.0.5-1 -- 4.0.5 +* Fri Jul 18 2008 Rex Dieter 4.0.99-1 +- 4.0.99 + +* Fri Jul 11 2008 Rex Dieter 4.0.98-1 +- 4.0.98 + +* Sun Jul 06 2008 Rex Dieter 4.0.85-1 +- 4.0.85 + +* Fri Jun 27 2008 Rex Dieter 4.0.84-1 +- 4.0.84 + +* Wed Jun 25 2008 Rex Dieter 4.0.83-2 +- respin for exiv2 + +* Thu Jun 19 2008 Than Ngo 4.0.83-1 +- 4.0.83 (beta2) + +* Sun Jun 15 2008 Rex Dieter 4.0.82-1 +- 4.0.82 + +* Mon May 26 2008 Than Ngo 4.0.80-1 +- 4.1 beta1 -* Sat May 31 2008 Lukáš Tinkl 4.0.4-2 -- fix fax (TIFF) printing in okular (#449134) +* Sat May 10 2008 Kevin Kofler 4.0.72-2 +- add BR qca2-devel (for encrypted ODF documents in Okular) -* Tue May 06 2008 Rex Dieter 4.0.4-1 -- kde-4.0.4 +* Sat May 10 2008 Kevin Kofler 4.0.72-1 +- update to 4.0.72 +- drop backported system-libspectre patch * Thu Apr 03 2008 Kevin Kofler 4.0.3-3 - rebuild (again) for the fixed %%{_kde4_buildtype} diff --git a/sources b/sources index aa2283b..3f8c8f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ffc06d78045077c930606840c080d041 kdegraphics-4.0.5.tar.bz2 +1462a278ed3178c5c941f2ad8d3f742b kdegraphics-4.0.99.tar.bz2