Add missing patch.

Package-Manager: portage-2.1.4.4

4 files changed, 153 insertions, 8 deletions

diff --git a/kde-base/okular/ChangeLog b/kde-base/okular/ChangeLog
index c9a08c5c7877..544996f4c96b 100644
--- a/kde-base/okular/ChangeLog
+++ b/kde-base/okular/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/okular
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/ChangeLog,v 1.6 2008/03/20 18:22:30 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/ChangeLog,v 1.7 2008/03/22 13:42:01 ingmar Exp $
+
+  22 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  +files/kdegraphics-4.0.2-system-libspectre.patch, okular-4.0.2.ebuild:
+  Add missing patch.
 
   20 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
   -files/kdegraphics-4.0.1-system-libspectre.patch, -okular-4.0.1.ebuild:
diff --git a/kde-base/okular/Manifest b/kde-base/okular/Manifest
index 5dd3cb96f319..236439fe2109 100644
--- a/kde-base/okular/Manifest
+++ b/kde-base/okular/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX kdegraphics-4.0.2-system-libspectre.patch 5515 RMD160 b0397226100d37d21bb3ed3d8e3e8aa274ef82d9 SHA1 1fccfb4e8896a488cd53fc3157165b319fc46ada SHA256 f134f4ca24f29635c7059162cc42a02d76a1405442240cc92db0a823ba68a9d9
 DIST kdegraphics-4.0.2.tar.bz2 2405154 RMD160 e2e34e3c093354a5e0de6945f903b24c57c85f11 SHA1 3befafd967c7782d02f9047f0287c0912d3503a6 SHA256 3f038bf7e99a51e4afaae3e4028e5c31697d63d260ddc72b64fb5710bc040fb7
-EBUILD okular-4.0.2.ebuild 1389 RMD160 4296161ca93bf60f0e432f44586750ac32827b75 SHA1 eb331c3c290a9ce9c4105769b3cf58eaad183171 SHA256 a00fdd2c8d29a105aeb8727a94cbd69578ff2bc6d433330c985854b293da3c1a
-MISC ChangeLog 959 RMD160 ece5231db5b893e7205dc68c262be14b28f1ae7e SHA1 a267b8c5a3ed896ee9dfe34ffe35d065cb455f24 SHA256 a2cf7f0ed0aa59ffd32f9023afb08cfb6f3cacd4bdb4de69efb65162ff24d542
+EBUILD okular-4.0.2.ebuild 1385 RMD160 6af490127b1b39c55cce58fa06d0b77917a0da41 SHA1 2a612d223c617aa1f9246592f58c1356543ad1a8 SHA256 0c03af81d2a3e2ebeed8e8093178af43e611744d70dc1a84d1d944a5d3828cf7
+MISC ChangeLog 1106 RMD160 a3d7cdc54281c5da875c149659efefa3dee4b1db SHA1 6054ef6bd019e931fbbe4dd608524e8d17d28de4 SHA256 6ef672c51f2624b46e3f882ce910546fe0d2f8416ade0b20657e686e6ddbbbb9
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH4qtOB18eXLOpYdkRAoqUAKCXrsS6uS6pAVeqXCOQazoQvfww2QCbBoxy
-o2jSLjjFCvAUMztaVSlw+D0=
-=xA7x
+iD8DBQFH5QyUB18eXLOpYdkRAvvqAJ9s9V45mu5pw1LJmQCBlm0+qxdnZwCggBtb
+2lTcQnxzabemUW7I7yvN87I=
+=or6j
 -----END PGP SIGNATURE-----
diff --git a/kde-base/okular/files/kdegraphics-4.0.2-system-libspectre.patch b/kde-base/okular/files/kdegraphics-4.0.2-system-libspectre.patch
new file mode 100644
index 000000000000..cc6ac55636a5
--- /dev/null
+++ b/kde-base/okular/files/kdegraphics-4.0.2-system-libspectre.patch
@@ -0,0 +1,140 @@
+I got this patch from Fedora.
+
+References:
+
+http://tsdgeos.blogspot.com/2008/02/okular-and-libspectre.html
+http://cvs.fedoraproject.org/viewcvs/rpms/kdegraphics/devel/
+https://bugs.gentoo.org/show_bug.cgi?id=208617
+
+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, <pino@kde.org>
++# Copyright (c) 2008, Albert Astals Cid, <aacid@kde.org>
++#
++# 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 )
+ 
+--- okular/generators/spectre/CMakeLists.txt
++++ okular/generators/spectre/CMakeLists.txt
+@@ -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/kde-base/okular/okular-4.0.2.ebuild b/kde-base/okular/okular-4.0.2.ebuild
index 4787c5f81540..078238ea39e2 100644
--- a/kde-base/okular/okular-4.0.2.ebuild
+++ b/kde-base/okular/okular-4.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/okular-4.0.2.ebuild,v 1.1 2008/03/11 00:03:07 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/okular-4.0.2.ebuild,v 1.2 2008/03/22 13:42:01 ingmar Exp $
 
 EAPI="1"
 
@@ -24,7 +24,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-PATCHES="${FILESDIR}/${KMNAME}-4.0.1-system-libspectre.patch"
+PATCHES="${FILESDIR}/${KMNAME}-${PV}-system-libspectre.patch"
 
 pkg_setup() {
 	if use pdf; then