From aa1e37e11fc15af314b6d4dd9ccbb0b68e5b3fae Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Apr 08 2011 14:30:40 +0000 Subject: update libjpeg_version patch --- diff --git a/.gitignore b/.gitignore index 0b0e619..b94f92f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/kdegraphics-4.6.1.tar.bz2 /kdegraphics-4.6.2.tar.bz2 diff --git a/kdegraphics-4.6.0-libjpeg-version.patch b/kdegraphics-4.6.0-libjpeg-version.patch deleted file mode 100644 index c9fedd4..0000000 --- a/kdegraphics-4.6.0-libjpeg-version.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 22:25:18.000000000 +0100 -+++ kdegraphics-4.6.0/gwenview/lib/CMakeLists.txt 2011-01-21 18:36:32.538402437 +0100 -@@ -1,19 +1,8 @@ - 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) --string(REGEX REPLACE ".*#define +JPEG_LIB_VERSION +([0-9]+).*" "\\1" jpeglib_version "${jpeglib_h_content}") --message(STATUS "libjpeg version: ${jpeglib_version}") -- --if ("${jpeglib_version}" LESS 80) -- set(GV_JPEG_DIR libjpeg-62) --else ("${jpeglib_version}" LESS 80) -- set(GV_JPEG_DIR libjpeg-80) --endif ("${jpeglib_version}" LESS 80) -- -+# hardcode libjpeg version to 62 - include_directories( -- ${CMAKE_CURRENT_SOURCE_DIR}/${GV_JPEG_DIR} -+ ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg-62 - ${CMAKE_CURRENT_SOURCE_DIR}/.. - ${CMAKE_CURRENT_BINARY_DIR} - ${SOPRANO_INCLUDE_DIR} -@@ -104,7 +93,7 @@ set(gwenviewlib_SRCS - widgetfloater.cpp - zoomslider.cpp - zoomwidget.cpp -- ${GV_JPEG_DIR}/transupp.c -+ libjpeg-62/transupp.c - ) - - if (NOT GWENVIEW_SEMANTICINFO_BACKEND_NONE) diff --git a/kdegraphics-4.6.0-libjpeg_version-2.patch b/kdegraphics-4.6.0-libjpeg_version-2.patch deleted file mode 100644 index b3ef5dd..0000000 --- a/kdegraphics-4.6.0-libjpeg_version-2.patch +++ /dev/null @@ -1,11 +0,0 @@ -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-4.6.1-libjpeg_version.patch b/kdegraphics-4.6.1-libjpeg_version.patch deleted file mode 100644 index c5aca76..0000000 --- a/kdegraphics-4.6.1-libjpeg_version.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -up kdegraphics-4.6.1/gwenview/lib/CMakeLists.txt.libjpeg_version kdegraphics-4.6.1/gwenview/lib/CMakeLists.txt ---- kdegraphics-4.6.1/gwenview/lib/CMakeLists.txt.libjpeg_version 2011-01-18 15:25:18.000000000 -0600 -+++ kdegraphics-4.6.1/gwenview/lib/CMakeLists.txt 2011-03-03 13:12:43.014238970 -0600 -@@ -1,16 +1,21 @@ - project(gwenviewlib) - --# Extract version of libjpeg so that we can use the appropriate dir -+# check version of libjpeg so that we can use the appropriate dir - # See bug #227313 --file(READ "${JPEG_INCLUDE_DIR}/jpeglib.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}") -- --if ("${jpeglib_version}" LESS 80) -- set(GV_JPEG_DIR libjpeg-62) --else ("${jpeglib_version}" LESS 80) -- set(GV_JPEG_DIR libjpeg-80) --endif ("${jpeglib_version}" LESS 80) -+set(_jpeglib_version_source "#include \n#include\n#include \n int main()\n {\n #if (JPEG_LIB_VERSION >= 80) \n #error JPEG_LIB_VERSION >= 80 found \n #endif \n }\n") -+set(_jpeglib_version_source_file ${CMAKE_BINARY_DIR}/CMakeTmp/cmake_jpeglib_version_check.cpp) -+file(WRITE "${_jpeglib_version_source_file}" "${_jpeglib_version_source}") -+set(_jpeglib_version_include_dirs "-DINCLUDE_DIRECTORIES:STRING=${JPEG_INCLUDE_DIR}") -+ -+try_compile(_jpeglib_version_compile_result ${CMAKE_BINARY_DIR} ${_jpeglib_version_source_file} CMAKE_FLAGS "${_jpeglib_version_include_dirs}" COMPILE_OUTPUT_VARIABLE _jpeglib_version_compile_output_var) -+ -+if(_jpeglib_version_compile_result) -+MESSAGE(STATUS "Identified libjpeg version: 62") -+set(GV_JPEG_DIR libjpeg-62) -+else(_jpeglib_version_compile_result) -+MESSAGE(STATUS "Identified libjpeg version: 80+") -+set(GV_JPEG_DIR libjpeg-80) -+endif(_jpeglib_version_compile_result) - - include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/${GV_JPEG_DIR} diff --git a/kdegraphics-4.6.2-libjpeg_version.patch b/kdegraphics-4.6.2-libjpeg_version.patch new file mode 100644 index 0000000..46cbcde --- /dev/null +++ b/kdegraphics-4.6.2-libjpeg_version.patch @@ -0,0 +1,35 @@ +diff -up kdegraphics-4.6.2/gwenview/lib/CMakeLists.txt.libjpeg_version kdegraphics-4.6.2/gwenview/lib/CMakeLists.txt +--- kdegraphics-4.6.2/gwenview/lib/CMakeLists.txt.libjpeg_version 2011-04-01 14:38:11.000000000 -0500 ++++ kdegraphics-4.6.2/gwenview/lib/CMakeLists.txt 2011-04-08 09:29:08.530982504 -0500 +@@ -1,16 +1,21 @@ + project(gwenviewlib) + +-# Extract version of libjpeg so that we can use the appropriate dir ++# check version of libjpeg so that we can use the appropriate dir + # See bug #227313 +-file(READ "${JPEG_INCLUDE_DIR}/jpeglib.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}") +- +-if ("${jpeglib_version}" LESS 80) +- set(GV_JPEG_DIR libjpeg-62) +-else ("${jpeglib_version}" LESS 80) +- set(GV_JPEG_DIR libjpeg-80) +-endif ("${jpeglib_version}" LESS 80) ++set(_jpeglib_version_source "#include \n#include\n#include \n int main()\n {\n #if (JPEG_LIB_VERSION >= 80) \n #error JPEG_LIB_VERSION >= 80 found \n #endif \n }\n") ++set(_jpeglib_version_source_file ${CMAKE_BINARY_DIR}/CMakeTmp/cmake_jpeglib_version_check.cpp) ++file(WRITE "${_jpeglib_version_source_file}" "${_jpeglib_version_source}") ++set(_jpeglib_version_include_dirs "-DINCLUDE_DIRECTORIES:STRING=${JPEG_INCLUDE_DIR}") ++ ++try_compile(_jpeglib_version_compile_result ${CMAKE_BINARY_DIR} ${_jpeglib_version_source_file} CMAKE_FLAGS "${_jpeglib_version_include_dirs}" COMPILE_OUTPUT_VARIABLE _jpeglib_version_compile_output_var) ++ ++if(_jpeglib_version_compile_result) ++MESSAGE(STATUS "Identified libjpeg version: 62") ++set(GV_JPEG_DIR libjpeg-62) ++else(_jpeglib_version_compile_result) ++MESSAGE(STATUS "Identified libjpeg version: 80+") ++set(GV_JPEG_DIR libjpeg-80) ++endif(_jpeglib_version_compile_result) + + add_definitions(-Dlibjpeg_EXPORTS) + include_directories( diff --git a/kdegraphics.spec b/kdegraphics.spec index 3d46e52..b97a115 100644 --- a/kdegraphics.spec +++ b/kdegraphics.spec @@ -31,10 +31,8 @@ Patch50: kdegraphics-4.5.1-okular_dt.patch # don't hardcode paths in OkularConfig.cmake 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 # use cmake_try_compile to grok version -Patch53: kdegraphics-4.6.1-libjpeg_version.patch +Patch53: kdegraphics-4.6.2-libjpeg_version.patch ## upstream patches