summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Hüttel <dilfridge@gentoo.org>2011-12-25 22:34:59 +0000
committerAndreas Hüttel <dilfridge@gentoo.org>2011-12-25 22:34:59 +0000
commitf95b8d4a8f023795ab54a8f4c4b5316bf9e6ba34 (patch)
tree268e058d10008659ecab6d21bc3707703b9eab78 /media-gfx/digikam/files
parentdev-java/ant-testutil: removed old version (diff)
downloadhistorical-f95b8d4a8f023795ab54a8f4c4b5316bf9e6ba34.tar.gz
historical-f95b8d4a8f023795ab54a8f4c4b5316bf9e6ba34.tar.bz2
historical-f95b8d4a8f023795ab54a8f4c4b5316bf9e6ba34.zip
Remove old
Package-Manager: portage-2.1.10.41/cvs/Linux x86_64
Diffstat (limited to 'media-gfx/digikam/files')
-rw-r--r--media-gfx/digikam/files/digikam-1.8.0-tests.patch15
-rw-r--r--media-gfx/digikam/files/digikam-1.9.0-docs.patch50
-rw-r--r--media-gfx/digikam/files/digikam-1.9.0-newpgf.patch92
-rw-r--r--media-gfx/digikam/files/digikam-1.9.0-nomysql.patch60
-rw-r--r--media-gfx/digikam/files/digikam-1.9.0-turbo.patch56
5 files changed, 0 insertions, 273 deletions
diff --git a/media-gfx/digikam/files/digikam-1.8.0-tests.patch b/media-gfx/digikam/files/digikam-1.8.0-tests.patch
deleted file mode 100644
index ce03d2e5887d..000000000000
--- a/media-gfx/digikam/files/digikam-1.8.0-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ruN digikam-1.8.0.orig/tests/CMakeLists.txt digikam-1.8.0/tests/CMakeLists.txt
---- digikam-1.8.0.orig/tests/CMakeLists.txt 2011-01-23 20:24:49.000000000 +0100
-+++ digikam-1.8.0/tests/CMakeLists.txt 2011-01-28 19:56:04.000000000 +0100
-@@ -176,9 +176,9 @@
-
- SET(qtpgftest_SRCS qtpgftest.cpp ${libpgf_SRCS} ${pgfutils_SRCS})
- KDE4_ADD_EXECUTABLE(qtpgftest NOGUI ${qtpgftest_SRCS})
--TARGET_LINK_LIBRARIES(qtpgftest ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+TARGET_LINK_LIBRARIES(qtpgftest ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PGF_LIBRARIES})
-
- SET(pgfscaled_SRCS pgfscaled.cpp ${libpgf_SRCS} ${pgfutils_SRCS})
- KDE4_ADD_EXECUTABLE(pgfscaled NOGUI ${pgfscaled_SRCS})
--TARGET_LINK_LIBRARIES(pgfscaled ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+TARGET_LINK_LIBRARIES(pgfscaled ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PGF_LIBRARIES})
-
diff --git a/media-gfx/digikam/files/digikam-1.9.0-docs.patch b/media-gfx/digikam/files/digikam-1.9.0-docs.patch
deleted file mode 100644
index 588cfb907031..000000000000
--- a/media-gfx/digikam/files/digikam-1.9.0-docs.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ruN digikam-1.9.0-vanilla/CMakeLists.txt digikam-1.9.0/CMakeLists.txt
---- digikam-1.9.0-vanilla/CMakeLists.txt 2011-02-27 21:16:18.000000000 +0100
-+++ digikam-1.9.0/CMakeLists.txt 2011-02-28 18:56:39.000000000 +0100
-@@ -1421,8 +1421,15 @@
- # ==================================================================================================
- # API documentation generation
-
-+# Checks if user ask to build documentation.
-+IF(BUILD_DOC)
-+
- IF(DOXYGEN_FOUND)
-
-+ MESSAGE(STATUS "")
-+ MESSAGE(STATUS "API documentation will be installed")
-+ MESSAGE(STATUS "")
-+
- SET(API_DIR ${CMAKE_BINARY_DIR}/api)
- SET(SOURCE_DIR ${CMAKE_SOURCE_DIR})
- SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile)
-@@ -1430,10 +1437,29 @@
-
- CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE})
-
-- ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
-+ ADD_CUSTOM_TARGET(doc ALL ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-+
-+ELSE(DOXYGEN_FOUND)
-+
-+ MESSAGE(FATAL_ERROR "API documentation requested but doxygen not found")
-+
- ENDIF(DOXYGEN_FOUND)
-+
-+ELSE(BUILD_DOC)
-+
-+ MESSAGE(STATUS "")
-+ MESSAGE(STATUS "Documentation will NOT be installed")
-+ MESSAGE(STATUS "Because the option -DBUILD_DOC=ON wasn't passed to cmake")
-+ MESSAGE(STATUS "")
-+
-+ENDIF(BUILD_DOC)
-+
- find_package(Msgfmt REQUIRED)
- find_package(Gettext REQUIRED)
- add_subdirectory( po )
-
-+# Build the handbook
-+add_subdirectory( doc )
-+
-+
diff --git a/media-gfx/digikam/files/digikam-1.9.0-newpgf.patch b/media-gfx/digikam/files/digikam-1.9.0-newpgf.patch
deleted file mode 100644
index ed5c1bd64c34..000000000000
--- a/media-gfx/digikam/files/digikam-1.9.0-newpgf.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -ruN digikam-1.9.0.prepared/cmake/modules/FindPGF.cmake digikam-1.9.0/cmake/modules/FindPGF.cmake
---- digikam-1.9.0.prepared/cmake/modules/FindPGF.cmake 2011-02-27 19:58:23.000000000 +0100
-+++ digikam-1.9.0/cmake/modules/FindPGF.cmake 2011-07-05 12:03:41.000000000 +0200
-@@ -1,9 +1,10 @@
- # - Try to find libpgf
- # Once done this will define
- #
--# PGF_FOUND - system has libgf
--# PGF_INCLUDE_DIRS - the libpgf include directory
--# PGF_LIBRARIES - Link these to use libpgf
-+# PGF_FOUND - system has libgf
-+# PGF_INCLUDE_DIRS - the libpgf include directory
-+# PGF_LIBRARIES - Link these to use libpgf
-+# PGF_CODEC_VERSION_ID - PGF codec version ID.
-
- # PKG-CONFIG is required.
- INCLUDE(FindPkgConfig REQUIRED)
-@@ -12,4 +13,15 @@
- INCLUDE(FindPkgConfig)
-
- PKG_CHECK_MODULES(PGF libpgf)
-+
-+ MESSAGE(STATUS "PGF_INCLUDE_DIRS = ${PGF_INCLUDE_DIRS}")
-+ MESSAGE(STATUS "PGF_INCLUDEDIR = ${PGF_INCLUDEDIR}")
-+ MESSAGE(STATUS "PGF_LIBRARIES = ${PGF_LIBRARIES}")
-+ MESSAGE(STATUS "PGF_LDFLAGS = ${PGF_LDFLAGS}")
-+ MESSAGE(STATUS "PGF_CFLAGS = ${PGF_CFLAGS}")
-+ MESSAGE(STATUS "PGF_VERSION = ${PGF_VERSION}")
-+
-+ STRING(REPLACE "." "" PGF_CODEC_VERSION_ID "${PGF_VERSION}")
-+ MESSAGE(STATUS "PGF_CODEC_VERSION_ID = ${PGF_CODEC_VERSION_ID}")
-+
- ENDIF(PKG_CONFIG_FOUND)
-diff -ruN digikam-1.9.0.prepared/config-digikam.h.cmake digikam-1.9.0/config-digikam.h.cmake
---- digikam-1.9.0.prepared/config-digikam.h.cmake 2011-02-27 19:58:07.000000000 +0100
-+++ digikam-1.9.0/config-digikam.h.cmake 2011-07-05 12:05:59.000000000 +0200
-@@ -54,6 +54,8 @@
- /* Define to 1 if you have Nepomuk shared libraries installed */
- #cmakedefine HAVE_NEPOMUK 1
-
-+#define PGFCodecVersionID 0x${PGF_CODEC_VERSION_ID}
-+
- #define LIBEXEC_INSTALL_DIR "${LIBEXEC_INSTALL_DIR}"
-
- #endif /* CONFIG_DIGIKAM_H */
-diff -ruN digikam-1.9.0.prepared/libs/dimg/loaders/pgfloader.cpp digikam-1.9.0/libs/dimg/loaders/pgfloader.cpp
---- digikam-1.9.0.prepared/libs/dimg/loaders/pgfloader.cpp 2011-02-27 19:58:08.000000000 +0100
-+++ digikam-1.9.0/libs/dimg/loaders/pgfloader.cpp 2011-07-05 12:22:56.000000000 +0200
-@@ -29,6 +29,7 @@
- //#define ENABLE_DEBUG_MESSAGES
-
- #include "pgfloader.h"
-+#include "config-digikam.h"
-
- // C Ansi includes
-
-@@ -435,7 +436,11 @@
- CallbackForLibPGF, this);
-
- UINT32 nWrittenBytes = 0;
-+#if PGFCodecVersionID >= 0x061124
-+ pgf.Write(&stream, &nWrittenBytes, CallbackForLibPGF, this);
-+#else
- pgf.Write(&stream, 0, CallbackForLibPGF, &nWrittenBytes, this);
-+#endif
-
- #ifdef ENABLE_DEBUG_MESSAGES
- kDebug() << "PGF width = " << header.width;
-diff -ruN digikam-1.9.0.prepared/libs/threadimageio/pgfutils.cpp digikam-1.9.0/libs/threadimageio/pgfutils.cpp
---- digikam-1.9.0.prepared/libs/threadimageio/pgfutils.cpp 2011-02-27 19:58:07.000000000 +0100
-+++ digikam-1.9.0/libs/threadimageio/pgfutils.cpp 2011-07-05 12:19:15.000000000 +0200
-@@ -46,6 +46,7 @@
- // LibPGF includes
-
- #include "PGFimage.h"
-+#include "config-digikam.h"
-
- namespace Digikam
- {
-@@ -136,7 +137,12 @@
- // TODO : optimize memory allocation...
- CPGFMemoryStream stream(256000);
- UINT32 nWrittenBytes = 0;
-+
-+#if PGFCodecVersionID >= 0x061124
-+ pgfImg.Write(&stream, &nWrittenBytes);
-+#else
- pgfImg.Write(&stream, 0, NULL, &nWrittenBytes);
-+#endif
-
- data = QByteArray((const char*)stream.GetBuffer(), nWrittenBytes);
- }
diff --git a/media-gfx/digikam/files/digikam-1.9.0-nomysql.patch b/media-gfx/digikam/files/digikam-1.9.0-nomysql.patch
deleted file mode 100644
index 50dec5480869..000000000000
--- a/media-gfx/digikam/files/digikam-1.9.0-nomysql.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- digikam-1.9.0-vanilla/CMakeLists.txt 2011-02-28 02:16:18.000000000 +0600
-+++ digikam-1.9.0-vanilla/CMakeLists.txt 2011-05-09 19:45:02.000000000 +0700
-@@ -2,6 +2,7 @@
-
- OPTION(ENABLE_THEMEDESIGNER "Build digiKam theme designer (default=OFF)" OFF)
- OPTION(ENABLE_THUMBS_DB "Build digiKam with thumbnails database support (default=ON)" ON)
-+OPTION(ENABLE_MYSQL "Build digiKam with MySQL database support (default=ON)" ON)
-
- # ==================================================================================================
- # Information to update before to release this package.
-@@ -189,20 +190,22 @@
- SET(KEXIV2_FOR_DIGIKAM TRUE)
- ENDIF(NOT WIN32)
-
-+IF (ENABLE_MYSQL)
- # Check MySQL executables
--FIND_PROGRAM( SERVERCMD_MYSQL mysqld
-- PATHS /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec /opt/local/libexec
-- /opt/mysql/libexec /usr/mysql/bin /opt/mysql/sbin ${MYSQLD_PATH}
-- ENV MYSQLD_PATH )
--MESSAGE(STATUS "Found MySQL server executable at: ${SERVERCMD_MYSQL}")
-+ FIND_PROGRAM( SERVERCMD_MYSQL mysqld
-+ PATHS /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec /opt/local/libexec
-+ /opt/mysql/libexec /usr/mysql/bin /opt/mysql/sbin ${MYSQLD_PATH}
-+ ENV MYSQLD_PATH )
-+ MESSAGE(STATUS "Found MySQL server executable at: ${SERVERCMD_MYSQL}")
-
- # NOTE: under windows, mysql_install_db PERL script is named "mysql_install_db.pl"
- # under MACOS-X, through macports project, mysql_install_db PERL script is named "mysql_install_db5"
--FIND_PROGRAM( INITCMD_MYSQL mysql_install_db mysql_install_db5 mysql_install_db.pl
-- PATHS /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec
-- /opt/mysql/libexec /usr/mysql/bin /opt/mysql/bin ${MYSQL_TOOLS_PATH}
-- ENV MYSQL_TOOLS_PATH )
--MESSAGE(STATUS "Found MySQL install_db executable at: ${INITCMD_MYSQL}")
-+ FIND_PROGRAM( INITCMD_MYSQL mysql_install_db mysql_install_db5 mysql_install_db.pl
-+ PATHS /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec
-+ /opt/mysql/libexec /usr/mysql/bin /opt/mysql/bin ${MYSQL_TOOLS_PATH}
-+ ENV MYSQL_TOOLS_PATH )
-+ MESSAGE(STATUS "Found MySQL install_db executable at: ${INITCMD_MYSQL}")
-+ENDIF (ENABLE_MYSQL)
-
- # ==================================================================================================
- # Optional dependencies
-@@ -274,10 +277,12 @@
- MESSAGE(STATUS "")
-
- PRINT_QTMODULE_STATUS("Qt4 SQL" QT_QTSQL_FOUND)
--PRINT_EXECUTABLE_STATUS("MySQL Server" mysqld MYSQLD_PATH SERVERCMD_MYSQL)
--IF (NOT WIN32)
-- PRINT_EXECUTABLE_STATUS("MySQL install_db tool" mysql_install_db MYSQL_TOOLS_PATH INITCMD_MYSQL)
--ENDIF (NOT WIN32)
-+IF (ENABLE_MYSQL)
-+ PRINT_EXECUTABLE_STATUS("MySQL Server" mysqld MYSQLD_PATH SERVERCMD_MYSQL)
-+ IF (NOT WIN32)
-+ PRINT_EXECUTABLE_STATUS("MySQL install_db tool" mysql_install_db MYSQL_TOOLS_PATH INITCMD_MYSQL)
-+ ENDIF (NOT WIN32)
-+ENDIF (ENABLE_MYSQL)
- PRINT_LIBRARY_STATUS("libtiff" "http://www.remotesensing.org/libtiff" "" TIFF_FOUND)
- PRINT_LIBRARY_STATUS("libpng" "http://www.libpng.org/pub/png/libpng.html" " (version >= 1.2.7)" PNG_FOUND)
- PRINT_LIBRARY_STATUS("libjasper" "http://www.ece.uvic.ca/~mdadams/jasper" "" JASPER_FOUND)
diff --git a/media-gfx/digikam/files/digikam-1.9.0-turbo.patch b/media-gfx/digikam/files/digikam-1.9.0-turbo.patch
deleted file mode 100644
index bd105529b0bd..000000000000
--- a/media-gfx/digikam/files/digikam-1.9.0-turbo.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 1ad9ae102ea1a82a72e31401fe840954a791219f Mon Sep 17 00:00:00 2001
-From: Riccardo Iaconelli <riccardo@kde.org>
-Date: Sun, 15 May 2011 16:18:44 +0200
-Subject: [PATCH] Don't fail CMake check: compile with libjpeg-turbo
-
-Patch by Rex Dieter
-
-BUG: 265431
-
-Signed-off-by: Riccardo Iaconelli <riccardo@kde.org>
----
- CMakeLists.txt | 28 +++++++++++++++++-----------
- 1 files changed, 17 insertions(+), 11 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 43293ef..63402e9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -166,17 +166,23 @@ ELSE(NOT APPLE)
- SET(CLAPACK_FOUND FALSE)
- ENDIF(NOT APPLE)
-
--# Extract version of libjpeg so that we can use the appropriate dir
--# See bug #227313, #228483
--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 "Identified libjpeg version: ${jpeglib_version}")
--
--IF ("${jpeglib_version}" LESS 80)
-- SET(DIGIKAM_LIBJPEG_DIR libjpeg-62)
--ELSE ("${jpeglib_version}" LESS 80)
-- SET(DIGIKAM_LIBJPEG_DIR libjpeg-80)
--ENDIF ("${jpeglib_version}" LESS 80)
-+# check version of libjpeg so that we can use the appropriate dir
-+# See bug #227313
-+set(_jpeglib_version_source "#include <stddef.h>\n#include<stdio.h>\n#include <jpeglib.h>\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(DIGIKAM_LIBJPEG_DIR libjpeg-62)
-+else(_jpeglib_version_compile_result)
-+MESSAGE(STATUS "Identified libjpeg version: 80+")
-+set(DIGIKAM_LIBJPEG_DIR libjpeg-80)
-+endif(_jpeglib_version_compile_result)
-+
-
- IF (ENABLE_INTERNALMYSQL)
- # Check MySQL executables
---
-1.7.3.4
-