From 0e5d08967ec73514f3cbe89eaa6f45c3bf53f5b9 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Feb 04 2011 18:39:49 +0000
Subject: minimal/upstreamable libjpeg_version patch


---

diff --git a/kdegraphics-4.6.0-libjpeg_version-2.patch b/kdegraphics-4.6.0-libjpeg_version-2.patch
new file mode 100644
index 0000000..b3ef5dd
--- /dev/null
+++ b/kdegraphics-4.6.0-libjpeg_version-2.patch
@@ -0,0 +1,11 @@
+diff -up kdegraphics-4.6.0/gwenview/lib/CMakeLists.txt.libjpeg-version kdegraphics-4.6.0/gwenview/lib/CMakeLists.txt
+--- kdegraphics-4.6.0/gwenview/lib/CMakeLists.txt.libjpeg-version	2011-01-18 15:25:18.000000000 -0600
++++ kdegraphics-4.6.0/gwenview/lib/CMakeLists.txt	2011-02-04 12:36:44.272486038 -0600
+@@ -3,6 +3,7 @@ project(gwenviewlib)
+ # Extract version of libjpeg so that we can use the appropriate dir
+ # See bug #227313
+ file(READ "${JPEG_INCLUDE_DIR}/jpeglib.h" jpeglib_h_content)
++FILE(READ "${JPEG_INCLUDE_DIR}/jconfig.h" jpeglib_h_content)
+ string(REGEX REPLACE ".*#define +JPEG_LIB_VERSION +([0-9]+).*" "\\1" jpeglib_version "${jpeglib_h_content}")
+ message(STATUS "libjpeg version: ${jpeglib_version}")
+ 
diff --git a/kdegraphics.spec b/kdegraphics.spec
index 603e422..4f13ebd 100644
--- a/kdegraphics.spec
+++ b/kdegraphics.spec
@@ -27,16 +27,16 @@ URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdegraphics-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# libjpeg-turbo splits version definition to jconfig.h, hardcode 62 for now
-Patch1:  kdegraphics-4.6.0-libjpeg-version.patch
-
 ## upstreamable patches
 # okular.desktop : Categories=-Office,+VectorGraphics (http://bugzilla.redhat.com/591089)
 Patch50: kdegraphics-4.5.1-okular_dt.patch
-
 # don't hardcode paths in OkularConfig.cmake
-# TODO: upstreamable?
 Patch51: kdegraphics-4.5.80-OkularConfig-dont-hardcode-paths.patch
+# fix libjpeg-turbo detection, see also https://bugs.kde.org/show_bug.cgi?id=265431
+# hardcode 62 for now
+Patch52: kdegraphics-4.6.0-libjpeg-version.patch
+# upstreamable, minimalistic version 
+Patch53: kdegraphics-4.6.0-libjpeg_version-2.patch
 
 ## upstream patches
 
@@ -130,10 +130,9 @@ Summary: A kioslave for displaying WinHelp files
 %prep
 %setup -q -n kdegraphics-%{version}%{?alphatag}
 
-%patch1 -p1 -b .libjpeg-version
-
 %patch50 -p1 -b .okular_dt
 %patch51 -p1 -b .OkularConfig
+%patch53 -p1 -b .libjpeg_version
 
 
 %build