From 8178b92e68687f4df9dbb82232ebe560a223a9dc Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 3 Jan 2013 15:00:32 -0600 Subject: [PATCH] 4.9.97 --- .gitignore | 4 +- kdelibs-4.9.1-FindKipi-libkipi2.patch | 224 ---------------- ...r.patch => kdelibs-4.9.97-libexecdir.patch | 31 +-- kdelibs-FindKdcraw.patch | 246 ------------------ kdelibs.spec | 16 +- sources | 2 +- 6 files changed, 19 insertions(+), 504 deletions(-) delete mode 100644 kdelibs-4.9.1-FindKipi-libkipi2.patch rename kdelibs-4.8.0-libexecdir.patch => kdelibs-4.9.97-libexecdir.patch (52%) delete mode 100644 kdelibs-FindKdcraw.patch diff --git a/.gitignore b/.gitignore index f06408a..b00b652 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ /kdelibs-4.8.5.tar.xz -/kdelibs-4.9.4.tar.xz -/kdelibs-4.9.95.tar.xz +/kdelibs-4.9.5.tar.xz +/kdelibs-4.9.97.tar.xz diff --git a/kdelibs-4.9.1-FindKipi-libkipi2.patch b/kdelibs-4.9.1-FindKipi-libkipi2.patch deleted file mode 100644 index fcabda3..0000000 --- a/kdelibs-4.9.1-FindKipi-libkipi2.patch +++ /dev/null @@ -1,224 +0,0 @@ -diff -up kdelibs-4.9.1/cmake/modules/FindKipi.cmake.FindKipi-libkipi2 kdelibs-4.9.1/cmake/modules/FindKipi.cmake ---- kdelibs-4.9.1/cmake/modules/FindKipi.cmake.FindKipi-libkipi2 2012-08-13 03:39:41.000000000 -0500 -+++ kdelibs-4.9.1/cmake/modules/FindKipi.cmake 2012-09-26 08:01:10.326462520 -0500 -@@ -1,116 +1,119 @@ --# - Try to find the Kipi library -+# Module that tries to find the Kipi library - # - # If you have put a local version of libkipi into your source tree, - # set KIPI_LOCAL_DIR to the relative path to the local directory. - # - # Once done this will define - # --# KIPI_FOUND - system has libkipi --# KIPI_INCLUDE_DIR - the libkipi include directory --# KIPI_LIBRARIES - Link these to use libkipi -+# KIPI_FOUND - System has libkipi -+# KIPI_INCLUDE_DIR - The libkipi include directory -+# KIPI_LIBRARIES - Link these to use libkipi - # KIPI_DEFINITIONS - Compiler switches required for using libkipi -+# KIPI_VERSION - The release version of the Kipi library -+# KIPI_SO_VERSION - The binary SO version of the Kipi library - # - --# Copyright (c) 2008, Gilles Caulier, -+# Copyright (c) 2012, Victor Dodon -+# Copyright (c) 2012, Gilles Caulier - # - # Redistribution and use is allowed according to the terms of the BSD license. - # For details see the accompanying COPYING-CMAKE-SCRIPTS file. - --if (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES AND KIPI_DEFINITIONS) -+IF(KIPI_INCLUDE_DIR AND KIPI_LIBRARIES AND KIPI_DEFINITIONS AND KIPI_VERSION AND KIPI_SO_VERSION) - -- message(STATUS "Found Kipi library in cache: ${KIPI_LIBRARIES}") -+ IF(NOT Kipi_FIND_QUIETLY) -+ MESSAGE(STATUS "Found kipi library in cache ${KIPI_LIBRARIES}") -+ ENDIF(NOT Kipi_FIND_QUIETLY) -+ # Already in cache -+ SET(KIPI_FOUND TRUE) -+ -+ELSE(KIPI_INCLUDE_DIR AND KIPI_LIBRARIES AND KIPI_DEFINITIONS AND KIPI_VERSION AND KIPI_SO_VERSION) -+ -+ IF(NOT Kipi_FIND_QUIETLY) -+ MESSAGE(STATUS "Check Kipi library in local sub-folder...") -+ ENDIF(NOT Kipi_FIND_QUIETLY) -+ -+ IF(KIPI_LOCAL_DIR) -+ FIND_FILE(KIPI_LOCAL_FOUND libkipi/version.h.cmake ${CMAKE_SOURCE_DIR}/${KIPI_LOCAL_DIR} NO_DEFAULT_PATH) -+ IF(NOT KIPI_LOCAL_FOUND) -+ MESSAGE(WARNING "KIPI_LOCAL_DIR specified as \"${KIPI_LOCAL_DIR}\" but libkipi could not be found there.") -+ ENDIF(NOT KIPI_LOCAL_FOUND) -+ ELSE(KIPI_LOCAL_DIR) -+ FIND_FILE(KIPI_LOCAL_FOUND libkipi/version.h.cmake ${CMAKE_SOURCE_DIR}/libkipi NO_DEFAULT_PATH) -+ IF(KIPI_LOCAL_FOUND) -+ SET(KIPI_LOCAL_DIR libkipi) -+ ENDIF(KIPI_LOCAL_FOUND) -+ -+ FIND_FILE(KIPI_LOCAL_FOUND libkipi/version.h.cmake ${CMAKE_SOURCE_DIR}/libs/libkipi NO_DEFAULT_PATH) -+ IF(KIPI_LOCAL_FOUND) -+ SET(KIPI_LOCAL_DIR libs/libkipi) -+ ENDIF(KIPI_LOCAL_FOUND) -+ ENDIF(KIPI_LOCAL_DIR) -+ -+ IF(KIPI_LOCAL_FOUND) -+ -+ SET(KIPI_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/${KIPI_LOCAL_DIR}" "${CMAKE_BINARY_DIR}/${KIPI_LOCAL_DIR}") -+ SET(KIPI_DEFINITIONS "-I${CMAKE_SOURCE_DIR}/${KIPI_LOCAL_DIR}" "-I${CMAKE_BINARY_DIR}/${KIPI_LOCAL_DIR}") -+ SET(KIPI_LIBRARIES kipi) -+ IF(NOT Kipi_FIND_QUIETLY) -+ MESSAGE(STATUS "Found Kipi library in local sub-folder: ${CMAKE_SOURCE_DIR}/${KIPI_LOCAL_DIR}") -+ ENDIF(NOT Kipi_FIND_QUIETLY) -+ SET(KIPI_FOUND TRUE) -+ SET(KIPI_VERSION_H_FILENAME "${CMAKE_BINARY_DIR}/${KIPI_LOCAL_DIR}/libkipi/version.h") -+ -+ ELSE(KIPI_LOCAL_FOUND) -+ -+ IF(NOT WIN32) -+ IF(NOT Kipi_FIND_QUIETLY) -+ MESSAGE(STATUS "Check Kipi library using pkg-config...") -+ ENDIF(NOT Kipi_FIND_QUIETLY) -+ -+ INCLUDE(FindPkgConfig) -+ PKG_CHECK_MODULES(KIPI libkipi>=1.2.0) -+ ENDIF(NOT WIN32) -+ -+ FIND_LIBRARY(KIPI_LIBRARIES NAMES libkipi PATHS ${KIPI_LIBRARY_DIRS} ${LIB_INSTALL_DIR} ${KDE4_LIB_DIR}) -+ FIND_PATH(KIPI_INCLUDE_DIR NAMES libkipi/version.h PATHS ${KIPI_INCLUDE_DIRS} ${INCLUDE_INSTALL_DIR} ${KDE4_INCLUDE_DIR}) -+ SET(KIPI_VERSION_H_FILENAME "${KIPI_INCLUDE_DIR}/libkipi/version.h") -+ SET(KIPI_DEFINITIONS ${KIPI_CFLAGS} CACHE STRING "Kipi definitions") -+ -+ INCLUDE(FindPackageHandleStandardArgs) -+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(KIPI DEFAULT_MSG KIPI_LIBRARIES KIPI_INCLUDE_DIR) -+ -+ ENDIF(KIPI_LOCAL_FOUND) -+ -+ IF(KIPI_FOUND) -+ -+ IF(NOT KIPI_VERSION) -+ FILE(READ "${KIPI_VERSION_H_FILENAME}" KIPI_VERSION_H_CONTENT) -+ STRING(REGEX REPLACE ".*static +const +char +kipi_version\\[\\] += +\"([^\"]+)\".*" "\\1" KIPI_VERSION "${KIPI_VERSION_H_CONTENT}") -+ MESSAGE(STATUS "Kipi library version: ${KIPI_VERSION}") -+ ENDIF(NOT KIPI_VERSION) -+ -+ IF(NOT KIPI_SO_VERSION) -+ FILE(READ "${KIPI_VERSION_H_FILENAME}" KIPI_VERSION_H_CONTENT) -+ STRING(REGEX REPLACE -+ ".*static +const +int +kipi_binary_version += ([^ ;]+).*" -+ "\\1" -+ KIPI_SO_VERSION_FOUND -+ "${KIPI_VERSION_H_CONTENT}" -+ ) -+ SET(KIPI_SO_VERSION ${KIPI_SO_VERSION_FOUND} CACHE STRING "libkipi so version") -+ MESSAGE(STATUS "Kipi library SO binary version: ${KIPI_SO_VERSION}") -+ ENDIF(NOT KIPI_SO_VERSION) -+ -+ UNSET(KIPI_VERSION_H_CONTENT) -+ UNSET(KIPI_VERSION_H_FILENAME) -+ ENDIF(KIPI_FOUND) -+ -+ IF(KIPI_FOUND) -+ MARK_AS_ADVANCED(KIPI_INCLUDE_DIR KIPI_LIBRARIES KIPI_DEFINITIONS KIPI_VERSION KIPI_SO_VERSION) -+ ELSE(KIPI_FOUND) -+ UNSET(KIPI_INCLUDE_DIR) -+ UNSET(KIPI_LIBRARIES) -+ UNSET(KIPI_DEFINITIONS) -+ UNSET(KIPI_VERSION) -+ UNSET(KIPI_SO_VERSION) -+ ENDIF(KIPI_FOUND) - -- # in cache already -- set(KIPI_FOUND TRUE) -- --else (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES AND KIPI_DEFINITIONS) -- -- message(STATUS "Check Kipi library in local sub-folder...") -- -- # Check if library is not in local sub-folder -- -- if (KIPI_LOCAL_DIR) -- set (KIPI_LOCAL_FOUND TRUE) -- else (KIPI_LOCAL_DIR) -- find_file(KIPI_LOCAL_FOUND libkipi/kipi.h ${CMAKE_SOURCE_DIR}/libkipi ${CMAKE_SOURCE_DIR}/libs/libkipi NO_DEFAULT_PATH) -- -- if (KIPI_LOCAL_FOUND) -- # Was it found in libkdcraw/ or in libs/libkdcraw? -- find_file(KIPI_LOCAL_FOUND_IN_LIBS libkipi/kipi.h ${CMAKE_SOURCE_DIR}/libs/libkipi NO_DEFAULT_PATH) -- if (KIPI_LOCAL_FOUND_IN_LIBS) -- set(KIPI_LOCAL_DIR libs/libkipi) -- else (KIPI_LOCAL_FOUND_IN_LIBS) -- set(KIPI_LOCAL_DIR libkipi) -- endif (KIPI_LOCAL_FOUND_IN_LIBS) -- endif (KIPI_LOCAL_FOUND) -- endif (KIPI_LOCAL_DIR) -- -- if (KIPI_LOCAL_FOUND) -- # we need two include directories: because the version.h file is put into the build directory -- # TODO KIPI_INCLUDE_DIR sounds like it should contain only one directory... -- set(KIPI_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/${KIPI_LOCAL_DIR} ${CMAKE_BINARY_DIR}/${KIPI_LOCAL_DIR}) -- set(KIPI_DEFINITIONS "-I${CMAKE_SOURCE_DIR}/${KIPI_LOCAL_DIR}" "-I${CMAKE_BINARY_DIR}/${KIPI_LOCAL_DIR}") -- set(KIPI_LIBRARIES kipi) -- message(STATUS "Found Kipi library in local sub-folder: ${CMAKE_SOURCE_DIR}/${KIPI_LOCAL_DIR}") -- set(KIPI_FOUND TRUE) -- mark_as_advanced(KIPI_INCLUDE_DIR KIPI_LIBRARIES KIPI_DEFINITIONS) -- -- else (KIPI_LOCAL_FOUND) -- -- if (NOT WIN32) -- message(STATUS "Check Kipi library using pkg-config...") -- -- # use pkg-config to get the directories and then use these values -- # in the FIND_PATH() and FIND_LIBRARY() calls -- include(UsePkgConfig) -- -- PKGCONFIG(libkipi _KIPIIncDir _KIPILinkDir _KIPILinkFlags _KIPICflags) -- -- if (_KIPILinkFlags) -- # query pkg-config asking for a libkipi >= 0.2.0 -- exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkipi RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) -- if (_return_VALUE STREQUAL "0") -- message(STATUS "Found libkipi release >= 0.2.0") -- set(KIPI_VERSION_GOOD_FOUND TRUE) -- else (_return_VALUE STREQUAL "0") -- message(STATUS "Found libkipi release < 0.2.0, too old") -- set(KIPI_VERSION_GOOD_FOUND FALSE) -- set(KIPI_FOUND FALSE) -- endif (_return_VALUE STREQUAL "0") -- else (_KIPILinkFlags) -- set(KIPI_VERSION_GOOD_FOUND FALSE) -- set(KIPI_FOUND FALSE) -- endif (_KIPILinkFlags) -- else (NOT WIN32) -- set(KIPI_VERSION_GOOD_FOUND TRUE) -- endif (NOT WIN32) -- if (KIPI_VERSION_GOOD_FOUND) -- set(KIPI_DEFINITIONS ${_KIPICflags}) -- -- find_path(KIPI_INCLUDE_DIR NAMES libkipi/version.h PATHS ${KDE4_INCLUDE_DIR} ${_KIPIIncDir}) -- find_library(KIPI_LIBRARIES NAMES kipi PATHS ${KDE4_LIB_DIR} ${_KIPILinkDir}) -- -- if (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES) -- set(KIPI_FOUND TRUE) -- endif (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES) -- endif (KIPI_VERSION_GOOD_FOUND) -- if (KIPI_FOUND) -- if (NOT Kipi_FIND_QUIETLY) -- message(STATUS "Found libkipi: ${KIPI_LIBRARIES}") -- endif (NOT Kipi_FIND_QUIETLY) -- else (KIPI_FOUND) -- if (Kipi_FIND_REQUIRED) -- if (NOT KIPI_INCLUDE_DIR) -- message(FATAL_ERROR "Could NOT find libkipi header files") -- endif (NOT KIPI_INCLUDE_DIR) -- if (NOT KIPI_LIBRARIES) -- message(FATAL_ERROR "Could NOT find libkipi library") -- endif (NOT KIPI_LIBRARIES) -- endif (Kipi_FIND_REQUIRED) -- endif (KIPI_FOUND) -- -- mark_as_advanced(KIPI_INCLUDE_DIR KIPI_LIBRARIES KIPI_DEFINITIONS) -- -- endif (KIPI_LOCAL_FOUND) -- --endif (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES AND KIPI_DEFINITIONS) -+ENDIF(KIPI_INCLUDE_DIR AND KIPI_LIBRARIES AND KIPI_DEFINITIONS AND KIPI_VERSION AND KIPI_SO_VERSION) diff --git a/kdelibs-4.8.0-libexecdir.patch b/kdelibs-4.9.97-libexecdir.patch similarity index 52% rename from kdelibs-4.8.0-libexecdir.patch rename to kdelibs-4.9.97-libexecdir.patch index c6073b7..b34b6e8 100644 --- a/kdelibs-4.8.0-libexecdir.patch +++ b/kdelibs-4.9.97-libexecdir.patch @@ -1,6 +1,6 @@ -diff -up kdelibs-4.8.0/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.8.0/kdecore/kernel/kstandarddirs.cpp ---- kdelibs-4.8.0/kdecore/kernel/kstandarddirs.cpp.libexecdir 2012-01-10 15:17:51.000000000 +0100 -+++ kdelibs-4.8.0/kdecore/kernel/kstandarddirs.cpp 2012-01-19 13:38:07.424309462 +0100 +diff -up kdelibs-4.9.97/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.9.97/kdecore/kernel/kstandarddirs.cpp +--- kdelibs-4.9.97/kdecore/kernel/kstandarddirs.cpp.libexecdir 2012-12-17 08:14:17.000000000 -0600 ++++ kdelibs-4.9.97/kdecore/kernel/kstandarddirs.cpp 2013-01-03 14:56:38.768459213 -0600 @@ -1871,7 +1871,7 @@ void KStandardDirs::addKDEDefaults() addResourceType(types_string + types_indices[index], 0, types_string + types_indices[index+1], true); index+=2; @@ -10,9 +10,9 @@ diff -up kdelibs-4.8.0/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.8.0 addResourceDir("home", QDir::homePath(), false); -diff -up kdelibs-4.8.0/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs-4.8.0/kdecore/kernel/kstandarddirs_unix.cpp ---- kdelibs-4.8.0/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir 2011-07-27 20:34:33.000000000 +0200 -+++ kdelibs-4.8.0/kdecore/kernel/kstandarddirs_unix.cpp 2012-01-19 13:38:07.424309462 +0100 +diff -up kdelibs-4.9.97/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs-4.9.97/kdecore/kernel/kstandarddirs_unix.cpp +--- kdelibs-4.9.97/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir 2012-12-17 08:14:16.000000000 -0600 ++++ kdelibs-4.9.97/kdecore/kernel/kstandarddirs_unix.cpp 2013-01-03 14:56:38.768459213 -0600 @@ -63,7 +63,7 @@ QString KStandardDirs::installPath(const if (strcmp("lib", type) == 0) return QFile::decodeName(LIB_INSTALL_DIR "/"); @@ -22,9 +22,9 @@ diff -up kdelibs-4.8.0/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs- if (strcmp("locale", type) == 0) return QFile::decodeName(LOCALE_INSTALL_DIR "/"); break; -diff -up kdelibs-4.8.0/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4.8.0/kdecore/tests/kstandarddirstest.cpp ---- kdelibs-4.8.0/kdecore/tests/kstandarddirstest.cpp.libexecdir 2012-01-18 19:06:22.000000000 +0100 -+++ kdelibs-4.8.0/kdecore/tests/kstandarddirstest.cpp 2012-01-19 13:42:17.955103619 +0100 +diff -up kdelibs-4.9.97/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4.9.97/kdecore/tests/kstandarddirstest.cpp +--- kdelibs-4.9.97/kdecore/tests/kstandarddirstest.cpp.libexecdir 2012-12-17 08:14:17.000000000 -0600 ++++ kdelibs-4.9.97/kdecore/tests/kstandarddirstest.cpp 2013-01-03 14:56:38.769459202 -0600 @@ -96,8 +96,9 @@ void KStandarddirsTest::testFindResource #define KIOSLAVE "bin/kioslave.exe" #else @@ -46,15 +46,4 @@ diff -up kdelibs-4.8.0/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4. #endif #ifndef Q_OS_MAC // kdeinit4 is a bundle on Mac, so the below doesn't work -diff -up kdelibs-4.8.0/kio/tests/krununittest.cpp.libexecdir kdelibs-4.8.0/kio/tests/krununittest.cpp ---- kdelibs-4.8.0/kio/tests/krununittest.cpp.libexecdir 2011-07-27 20:34:37.000000000 +0200 -+++ kdelibs-4.8.0/kio/tests/krununittest.cpp 2012-01-19 13:38:07.427309472 +0100 -@@ -160,7 +160,7 @@ void KRunUnitTest::testProcessDesktopExe - if (kmailservice.isEmpty()) kmailservice = "kmailservice"; - if (!kdeinit.isEmpty()) { - QVERIFY(!kmailservice.isEmpty()); -- QVERIFY(kmailservice.contains("kde4/libexec")); -+ QVERIFY(kmailservice.contains("kde4/libexec") || kmailservice.contains("libexec/kde4")); - } - - QTest::newRow("%U l0") << "kdeinit4 %U" << l0 << false << kdeinit; +diff -up kdelibs-4.9.97/kio/tests/krununittest.cpp.libexecdir kdelibs-4.9.97/kio/tests/krununittest.cpp diff --git a/kdelibs-FindKdcraw.patch b/kdelibs-FindKdcraw.patch deleted file mode 100644 index 9012bb5..0000000 --- a/kdelibs-FindKdcraw.patch +++ /dev/null @@ -1,246 +0,0 @@ -diff --git a/cmake/modules/FindKdcraw.cmake b/cmake/modules/FindKdcraw.cmake -index 518033d..1d1a2ac 100644 ---- a/cmake/modules/FindKdcraw.cmake -+++ b/cmake/modules/FindKdcraw.cmake -@@ -1,124 +1,157 @@ --# - Try to find the Kdcraw library -+# Try to find the Kdcraw library - # --# If you have put a local version of libkdcraw into your source tree, --# set KDCRAW_LOCAL_DIR to the relative path to the local directory. -+# Parameters: -+# KDCRAW_LOCAL_DIR - If you have put a local version of libkdcraw into -+# your source tree, set KDCRAW_LOCAL_DIR to the -+# relative path from the root of your source tree -+# to the libkdcraw local directory. - # - # Once done this will define - # --# KDCRAW_FOUND - system has libkdcraw --# KDCRAW_INCLUDE_DIR - the libkdcraw include directory -+# KDCRAW_FOUND - System has libkdcraw -+# KDCRAW_INCLUDE_DIR - The libkdcraw include directory/directories (for #include style) - # KDCRAW_LIBRARIES - Link these to use libkdcraw - # KDCRAW_DEFINITIONS - Compiler switches required for using libkdcraw -+# KDCRAW_VERSION - Version of libkdcraw which was found - # -- --# Copyright (c) 2008, Gilles Caulier, -+# Copyright (c) 2008-2011, Gilles Caulier, -+# Copyright (c) 2011, Michael G. Hansen, - # - # Redistribution and use is allowed according to the terms of the BSD license. - # For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -+# Kdcraw_FIND_QUIETLY and Kdcraw_FIND_REQUIRED may be defined by CMake. - --if (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES AND KDCRAW_DEFINITIONS) -+if (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES AND KDCRAW_DEFINITIONS AND KDCRAW_VERSION) - -- message(STATUS "Found Kdcraw library in cache: ${KDCRAW_LIBRARIES}") -+ if (NOT Kdcraw_FIND_QUIETLY) -+ message(STATUS "Found Kdcraw library in cache: ${KDCRAW_LIBRARIES}") -+ endif (NOT Kdcraw_FIND_QUIETLY) - - # in cache already - set(KDCRAW_FOUND TRUE) - --else (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES AND KDCRAW_DEFINITIONS) -- -- message(STATUS "Check Kdcraw library in local sub-folder...") -+else (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES AND KDCRAW_DEFINITIONS AND KDCRAW_VERSION) - -- # Check if library is not in local sub-folder -+ if (NOT Kdcraw_FIND_QUIETLY) -+ message(STATUS "Check for Kdcraw library in local sub-folder...") -+ endif (NOT Kdcraw_FIND_QUIETLY) - -+ # Check for a local version of the library. - if (KDCRAW_LOCAL_DIR) -- set (KDCRAW_LOCAL_FOUND TRUE) -+ find_file(KDCRAW_LOCAL_FOUND libkdcraw/version.h.cmake ${CMAKE_SOURCE_DIR}/${KDCRAW_LOCAL_DIR} NO_DEFAULT_PATH) -+ if (NOT KDCRAW_LOCAL_FOUND) -+ message(WARNING "KDCRAW_LOCAL_DIR specified as \"${KDCRAW_LOCAL_DIR}\" but libkdcraw could not be found there.") -+ endif (NOT KDCRAW_LOCAL_FOUND) - else (KDCRAW_LOCAL_DIR) -- find_file(KDCRAW_LOCAL_FOUND libkdcraw/kdcraw.h ${CMAKE_SOURCE_DIR}/libkdcraw ${CMAKE_SOURCE_DIR}/libs/libkdcraw NO_DEFAULT_PATH) -- -+ find_file(KDCRAW_LOCAL_FOUND libkdcraw/version.h.cmake ${CMAKE_SOURCE_DIR}/libkdcraw NO_DEFAULT_PATH) - if (KDCRAW_LOCAL_FOUND) -- # Was it found in libkdcraw/ or in libs/libkdcraw? -- find_file(KDCRAW_LOCAL_FOUND_IN_LIBS libkdcraw/kdcraw.h ${CMAKE_SOURCE_DIR}/libs/libkdcraw NO_DEFAULT_PATH) -- if (KDCRAW_LOCAL_FOUND_IN_LIBS) -- set(KDCRAW_LOCAL_DIR libs/libkdcraw) -- else (KDCRAW_LOCAL_FOUND_IN_LIBS) -- set(KDCRAW_LOCAL_DIR libkdcraw) -- endif (KDCRAW_LOCAL_FOUND_IN_LIBS) -+ set(KDCRAW_LOCAL_DIR libkdcraw) -+ endif (KDCRAW_LOCAL_FOUND) -+ find_file(KDCRAW_LOCAL_FOUND libkdcraw/version.h.cmake ${CMAKE_SOURCE_DIR}/libs/libkdcraw NO_DEFAULT_PATH) -+ if (KDCRAW_LOCAL_FOUND) -+ set(KDCRAW_LOCAL_DIR libs/libkdcraw) - endif (KDCRAW_LOCAL_FOUND) - endif (KDCRAW_LOCAL_DIR) - - if (KDCRAW_LOCAL_FOUND) -- -- # we need two include directories: because the version.h file is put into the build directory -+ # We need two include directories: because the version.h file is put into the build directory - # TODO KDCRAW_INCLUDE_DIR sounds like it should contain only one directory... - set(KDCRAW_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/${KDCRAW_LOCAL_DIR} ${CMAKE_BINARY_DIR}/${KDCRAW_LOCAL_DIR}) - set(KDCRAW_DEFINITIONS "-I${CMAKE_SOURCE_DIR}/${KDCRAW_LOCAL_DIR}" "-I${CMAKE_BINARY_DIR}/${KDCRAW_LOCAL_DIR}") - set(KDCRAW_LIBRARIES kdcraw) -- message(STATUS "Found Kdcraw library in local sub-folder: ${CMAKE_SOURCE_DIR}/${KDCRAW_LOCAL_DIR}") -+ if (NOT Kdcraw_FIND_QUIETLY) -+ message(STATUS "Found Kdcraw library in local sub-folder: ${CMAKE_SOURCE_DIR}/${KDCRAW_LOCAL_DIR}") -+ endif (NOT Kdcraw_FIND_QUIETLY) - set(KDCRAW_FOUND TRUE) -- mark_as_advanced(KDCRAW_INCLUDE_DIR KDCRAW_LIBRARIES KDCRAW_DEFINITIONS) - -- else(KDCRAW_LOCAL_FOUND) -+ set(kdcraw_version_h_filename "${CMAKE_BINARY_DIR}/${KDCRAW_LOCAL_DIR}/libkdcraw/version.h") - -- message(STATUS "Check Kdcraw library using pkg-config...") -+ else (KDCRAW_LOCAL_FOUND) - if (NOT WIN32) -- # use pkg-config to get the directories and then use these values -- # in the FIND_PATH() and FIND_LIBRARY() calls -- include(UsePkgConfig) -- -- PKGCONFIG(libkdcraw _KDCRAWIncDir _KDCRAWLinkDir _KDCRAWLinkFlags _KDCRAWCflags) -- -- if (_KDCRAWLinkFlags) -- # query pkg-config asking for a libkdcraw >= 0.2.0 -- exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkdcraw RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) -- if (_return_VALUE STREQUAL "0") -- message(STATUS "Found libkdcraw release >= 0.2.0") -- set(KDCRAW_VERSION_GOOD_FOUND TRUE) -- else (_return_VALUE STREQUAL "0") -- message(STATUS "Found libkdcaw release < 0.2.0, too old") -- set(KDCRAW_VERSION_GOOD_FOUND FALSE) -- set(KDCRAW_FOUND FALSE) -- endif (_return_VALUE STREQUAL "0") -- else (_KDCRAWLinkFlags) -+ if (NOT Kdcraw_FIND_QUIETLY) -+ message(STATUS "Check Kdcraw library using pkg-config...") -+ endif (NOT Kdcraw_FIND_QUIETLY) -+ -+ # use FindPkgConfig to get the directories and then use these values -+ # in the find_path() and find_library() calls -+ include(FindPkgConfig) -+ -+ pkg_check_modules(PC_KDCRAW libkdcraw) -+ -+ if (PC_KDCRAW_FOUND) -+ # make sure the version is >= 0.2.0 -+ # TODO: WHY? -+ if (PC_KDCRAW_VERSION VERSION_LESS 0.2.0) -+ message(STATUS "Found libkdcraw release < 0.2.0, too old") -+ set(KDCRAW_VERSION_GOOD_FOUND FALSE) -+ set(KDCRAW_FOUND FALSE) -+ else (PC_KDCRAW_VERSION VERSION_LESS 0.2.0) -+ set(KDCRAW_VERSION "${PC_KDCRAW_VERSION}") -+ if (NOT Kdcraw_FIND_QUIETLY) -+ message(STATUS "Found libkdcraw release ${KDCRAW_VERSION}") -+ endif (NOT Kdcraw_FIND_QUIETLY) -+ set(KDCRAW_VERSION_GOOD_FOUND TRUE) -+ endif (PC_KDCRAW_VERSION VERSION_LESS 0.2.0) -+ else (PC_KDCRAW_FOUND) - set(KDCRAW_VERSION_GOOD_FOUND FALSE) -- set(KDCRAW_FOUND FALSE) -- endif (_KDCRAWLinkFlags) -+ endif (PC_KDCRAW_FOUND) - else (NOT WIN32) -+ # TODO: Why do we just assume the version is good? - set(KDCRAW_VERSION_GOOD_FOUND TRUE) - endif (NOT WIN32) - - if (KDCRAW_VERSION_GOOD_FOUND) -- set(KDCRAW_DEFINITIONS "${_KDCRAWCflags}") -- -- find_path(KDCRAW_INCLUDE_DIR libkdcraw/version.h -- ${_KDCRAWIncDir} -- ) -- -- find_library(KDCRAW_LIBRARIES NAMES kdcraw -- PATHS -- ${_KDCRAWLinkDir} -- ) -- -- if (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES) -- set(KDCRAW_FOUND TRUE) -- endif (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES) -- endif (KDCRAW_VERSION_GOOD_FOUND) -- if (KDCRAW_FOUND) -- if (NOT Kdcraw_FIND_QUIETLY) -- message(STATUS "Found libkdcraw: ${KDCRAW_LIBRARIES}") -- endif (NOT Kdcraw_FIND_QUIETLY) -- else (KDCRAW_FOUND) -- if (Kdcraw_FIND_REQUIRED) -- if (NOT KDCRAW_INCLUDE_DIR) -- message(FATAL_ERROR "Could NOT find libkdcraw header files") -- endif (NOT KDCRAW_INCLUDE_DIR) -- if (NOT KDCRAW_LIBRARIES) -- message(FATAL_ERROR "Could NOT find libkdcraw library") -- endif (NOT KDCRAW_LIBRARIES) -- endif (Kdcraw_FIND_REQUIRED) -- endif (KDCRAW_FOUND) -- -- mark_as_advanced(KDCRAW_INCLUDE_DIR KDCRAW_LIBRARIES KDCRAW_DEFINITIONS) -- -- endif(KDCRAW_LOCAL_FOUND) -- --endif (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES AND KDCRAW_DEFINITIONS) -+ set(KDCRAW_DEFINITIONS "${PC_KDCRAW_CFLAGS_OTHER}") -+ -+ find_path(KDCRAW_INCLUDE_DIR libkdcraw/version.h ${PC_KDCRAW_INCLUDE_DIRS}) -+ set(kdcraw_version_h_filename "${KDCRAW_INCLUDE_DIR}/libkdcraw/version.h") -+ -+ find_library(KDCRAW_LIBRARIES NAMES kdcraw HINTS ${PC_KDCRAW_LIBRARY_DIRS}) -+ -+ if (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES) -+ set(KDCRAW_FOUND TRUE) -+ else (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES) -+ set(KDCRAW_FOUND FALSE) -+ endif (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES) -+ endif (KDCRAW_VERSION_GOOD_FOUND) -+ -+ if (KDCRAW_FOUND) -+ if (NOT Kdcraw_FIND_QUIETLY) -+ message(STATUS "Found libkdcraw: ${KDCRAW_LIBRARIES}") -+ endif (NOT Kdcraw_FIND_QUIETLY) -+ else (KDCRAW_FOUND) -+ if (Kdcraw_FIND_REQUIRED) -+ if (NOT KDCRAW_INCLUDE_DIR) -+ message(FATAL_ERROR "Could NOT find libkdcraw header files.") -+ else(NOT KDCRAW_INCLUDE_DIR) -+ message(FATAL_ERROR "Could NOT find libkdcraw library.") -+ endif (NOT KDCRAW_INCLUDE_DIR) -+ endif (Kdcraw_FIND_REQUIRED) -+ endif (KDCRAW_FOUND) -+ -+ endif (KDCRAW_LOCAL_FOUND) -+ -+ if (KDCRAW_FOUND) -+ # Find the version information, unless that was reported by pkg_search_module. -+ if (NOT KDCRAW_VERSION) -+ file(READ "${kdcraw_version_h_filename}" kdcraw_version_h_content) -+ # This is the line we are trying to find: static const char kdcraw_version[] = "1.22.4-beta_5+dfsg"; -+ string(REGEX REPLACE ".*char +kdcraw_version\\[\\] += +\"([^\"]+)\".*" "\\1" KDCRAW_VERSION "${kdcraw_version_h_content}") -+ unset(kdcraw_version_h_content) -+ -+ endif (NOT KDCRAW_VERSION) -+ unset(kdcraw_version_h_filename) -+ endif (KDCRAW_FOUND) -+ -+ if (KDCRAW_FOUND) -+ mark_as_advanced(KDCRAW_INCLUDE_DIR KDCRAW_LIBRARIES KDCRAW_DEFINITIONS KDCRAW_VERSION KDCRAW_FOUND) -+ else (KDCRAW_FOUND) -+ # The library was not found, reset all related variables. -+ unset(KDCRAW_INCLUDE_DIR) -+ unset(KDCRAW_LIBRARIES) -+ unset(KDCRAW_DEFINITIONS) -+ unset(KDCRAW_VERSION) -+ endif (KDCRAW_FOUND) -+ -+endif (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES AND KDCRAW_DEFINITIONS AND KDCRAW_VERSION) diff --git a/kdelibs.spec b/kdelibs.spec index 9fe38f8..934be85 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -22,8 +22,8 @@ %global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver}) Summary: KDE Libraries -Version: 4.9.95 -Release: 3%{?dist} +Version: 4.9.97 +Release: 1%{?dist} Name: kdelibs Epoch: 6 @@ -88,7 +88,7 @@ Patch10: kdelibs-4.1.72-no-cache-kdeglobals-paths.patch Patch12: kdelibs-4.1.0-xdg-menu.patch # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec -Patch14: kdelibs-4.8.0-libexecdir.patch +Patch14: kdelibs-4.9.97-libexecdir.patch # kstandarddirs changes: search /etc/kde, find %{_kde4_libexecdir} Patch18: kdelibs-4.6.90-kstandarddirs.patch @@ -138,15 +138,10 @@ Patch54: kdelibs-4.8.4-kjs-locale.patch # https://git.reviewboard.kde.org/r/106861/ Patch55: kdelibs-4.9.90-FindSamba_samba4.patch -# backport FindKipi.cmake from Digikam SC 3.0.0-beta1 for libkipi 2 (kde#307213) -Patch56: kdelibs-4.9.1-FindKipi-libkipi2.patch - # make filter working, TODO: upstream? -- rex Patch59: kdelibs-4.9.3-kcm_ssl.patch ## upstream -# FindKdcraw.cmake fixes -Patch100: kdelibs-FindKdcraw.patch ## security fix # Not Upstreamed? why not ? -- Rex @@ -313,11 +308,9 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch53 -p1 -b .kjs-s390 %patch54 -p1 -b .kjs-locale %patch55 -p1 -b .FindSamba-samba4 -%patch56 -p1 -b .FindKipi-libkipi2 %patch59 -p1 -b .filter # upstream patches -%patch100 -p1 -b .FindKdcraw # security fixes %patch200 -p1 -b .CVE-2009-2702 @@ -558,6 +551,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %changelog +* Thu Jan 03 2013 Rex Dieter - 6:4.9.97-1 +- 4.9.97 + * Sat Dec 29 2012 Rex Dieter 6:4.9.95-3 - FindKdcraw.cmake fixes(kde#311936) diff --git a/sources b/sources index c9afdcb..728cf7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2d7e329a1f6a110a7ddbc207dc3dc10f kdelibs-4.9.95.tar.xz +1be418c32dddffb2a8835a20657711f2 kdelibs-4.9.97.tar.xz