diff options
author | Andreas Hüttel <dilfridge@gentoo.org> | 2011-05-14 20:20:15 +0000 |
---|---|---|
committer | Andreas Hüttel <dilfridge@gentoo.org> | 2011-05-14 20:20:15 +0000 |
commit | cd419037e0968dda9f9a9bfaec9029550099fcf8 (patch) | |
tree | b4c209b211166334ed4556404509d03aafd3d518 /media-gfx/digikam | |
parent | whitespace (diff) | |
download | historical-cd419037e0968dda9f9a9bfaec9029550099fcf8.tar.gz historical-cd419037e0968dda9f9a9bfaec9029550099fcf8.tar.bz2 historical-cd419037e0968dda9f9a9bfaec9029550099fcf8.zip |
Remove old
Package-Manager: portage-2.1.9.49/cvs/Linux x86_64
Diffstat (limited to 'media-gfx/digikam')
-rw-r--r-- | media-gfx/digikam/ChangeLog | 8 | ||||
-rw-r--r-- | media-gfx/digikam/Manifest | 26 | ||||
-rw-r--r-- | media-gfx/digikam/digikam-1.2.0-r4.ebuild | 126 | ||||
-rw-r--r-- | media-gfx/digikam/files/digikam-1.2.0-docs-r3.patch | 56 | ||||
-rw-r--r-- | media-gfx/digikam/files/digikam-1.2.0-lapack.patch | 126 | ||||
-rw-r--r-- | media-gfx/digikam/files/digikam-1.2.0-libpgf-r3.patch | 157 | ||||
-rw-r--r-- | media-gfx/digikam/files/digikam-1.2.0-ratingwidget.patch | 11 |
7 files changed, 22 insertions, 488 deletions
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog index 939e1b6e583f..9960590d6fc5 100644 --- a/media-gfx/digikam/ChangeLog +++ b/media-gfx/digikam/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/digikam # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.184 2011/05/11 10:45:31 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.185 2011/05/14 20:20:14 dilfridge Exp $ + + 14 May 2011; Andreas K. Huettel <dilfridge@gentoo.org> + -digikam-1.2.0-r4.ebuild, -files/digikam-1.2.0-docs-r3.patch, + -files/digikam-1.2.0-lapack.patch, -files/digikam-1.2.0-libpgf-r3.patch, + -files/digikam-1.2.0-ratingwidget.patch: + Remove old 11 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> digikam-1.9.0-r1.ebuild: Eapi4, use add_kdebase_dep, use kde_handbook variable. diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index fc9bba025a25..77a4f1c869d2 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,25 +1,29 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 -AUX digikam-1.2.0-docs-r3.patch 1926 RMD160 963f134c1bdb2e6b1a59b82efb7009733294ce6a SHA1 7cf403d5fd8f20142b7c1c6f6de225b5e66c28b9 SHA256 0687cd39780c1e40fec424f6ae5cce851e460681d02088eec763902c170ecb28 -AUX digikam-1.2.0-lapack.patch 6429 RMD160 e42b9600822fbd28b31c751fe6515a691db4cb0b SHA1 a495d7734c355419e4cba629354e4e9077f15782 SHA256 02169ca57f86f3f7d40dced07b7c54f612bd8fe3b03d2a5808184c47b5b360c0 -AUX digikam-1.2.0-libpgf-r3.patch 6824 RMD160 cf771745da65673a6783a3ed9d6d2a0e74c69923 SHA1 857589931a4c2acefcc822b664dd02ce324ea152 SHA256 0424234746611e2b75b74725e53705277308fc3596ac095013de985cc6a01622 -AUX digikam-1.2.0-ratingwidget.patch 413 RMD160 b7e86997019fa16590a565b8e18fb43c287c7e88 SHA1 aa90381903000f28c105677e12f4b6813363659a SHA256 48cf828b847cd4346b9f5512fa1a010565680d31996bf2492c7bf256caf04231 AUX digikam-1.8.0-tests.patch 914 RMD160 520675d0fb1080549a0c3f5c67fc51d36bb19b1d SHA1 1e80a74d91f593939a69a7f77870cbefbbb73235 SHA256 29a7e68abd804019b1ae533a62920e931d5057aaa10bf20cd81358cf8bfcee1c AUX digikam-1.9.0-docs.patch 1466 RMD160 d12a4bd9e825d88863da954763641157a87f11bd SHA1 7496668276f5a54d6ffde0a71ff7dfc6252ff3e3 SHA256 f348ab1a931af78e1aa752676a9515a50183dc07c32a99cdfd59a32dd2ece2af AUX digikam-1.9.0-nomysql.patch 3323 RMD160 9b03cc09f81188a9373212af0bfc079eeced3c37 SHA1 7fe8a51f5d8c5eddfc22f37f6741f0c96ca64f16 SHA256 c3e09ee35172c9e38d13fe20b5e65ae1d53e954e3c50be1fbddd0223990cac5c -DIST digikam-1.2.0.tar.bz2 13970098 RMD160 f8177241536b2f099499977d9c3cbd2dc9880853 SHA1 7f12caf737a05043c7a9a5291a448684e5a4e2e6 SHA256 930539b5bb53af345f4bef3d06c7121c22af3dbd7ae7b338fa3d173a6a631206 DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5 DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467 -EBUILD digikam-1.2.0-r4.ebuild 3241 RMD160 97240d9bf66f91276583380abb44abcca32aef53 SHA1 541cb89174e630ede2a012f75576b1e66a7e5834 SHA256 7b99de04c49c27afc4047b49eb88558d34ab83cdddf272d3a282313f79e88c48 EBUILD digikam-1.9.0-r1.ebuild 3260 RMD160 9a81da4a6a320bc4f86b05665654c4b7e0cbacdf SHA1 5bfc5984b6f9bdc9b724b9a6196123ec812bc703 SHA256 a4b15d1c633ad4f793471d09563a1c4ee14d3889de3cc09afed8df85e83d5a28 EBUILD digikam-1.9.0.ebuild 3242 RMD160 04df3e2432a19d01a07851d8a8a3821279aa4af0 SHA1 c80b1939a52ab7aa7c0032373022f3cb931fee81 SHA256 e5bc2256f812d90206d99b3ec6f6ffbad75e5dd0bbcccaa8e349e894eef73d53 -MISC ChangeLog 30673 RMD160 711e6e4b822ddacf45431c4635ec30d793a60128 SHA1 18f8dff2b1624c4e467d518dcee1510ab46b8832 SHA256 bdea02a6c7b62ab64e4ee1dacb203eb424e939871cc81ddc570029950fca5cba +MISC ChangeLog 30926 RMD160 c8049d36e2aed1efb51e04dc6fe1afa55b6b0d62 SHA1 fb08354e1a87dc0f7d72707b86c160017d789138 SHA256 7eb5d1c88fe1c349e6fa37f7f8d0804e4fd0851ddd92d42a7bec4761447467a7 MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk3KaNEACgkQHB6c3gNBRYeq4gCfQkE0J23mQaSSYmRXlWrm/+iA -WdgAnA6u/ZiEEQDnFhwbCen9yTJStU4m -=MzBK +iQIcBAEBCgAGBQJNzujhAAoJENwGBM22xffeU1YP/A+OAqp4SRb3dw9EWld3xsrL +7nUJCCB7USaI3/ZB8/Kygd4stdrV6lNTccs7C/OdGddhBjKyJb+0acutU49gsYR8 +rS1fkoRXPyyxWHz8eH36CIRk6cWuvX0yFFraV4OPP/ZS4uey86S9xcuJUj7YBB/m +t2LOGQCnFg+5Isc5mTpDOGEIxay/a41NYNrZY8cegIGyLemr44kmuZyemfrzPGc4 +c60mrDMkW7Ib2ZtehDcGFf1kLZVZMsWRhlXwMavXyGASriBIjIcM9T9W8xa7CZqt +aimBOsfCMGJ6hxDZX3cyuVEBfTR1FMg6sNTarbDvuznnI8LHmoNR/HYNZNiKKOtQ +O9QEZMaJarxKDkHofQbnORXvynkx35joQlqD5HP4pzRuj2MIeXtS9Rbw9gFA6Alq +U0vp1ejyKOHW6T1FrUlIOhA2NB72C4y+/BJu9yZaMaGBrQm8pgSjrPeTEHUgnFCo +afxduMxAtFzV6B3fdNYWDwlFVBCbSPTiD6oXcbqXFfBuOR3aScZt6cWfoFaDSGHY ++xiFUzO30iMqw1AzHKV6rikw7ErXZ8IVdXbrEv6PIuhtGfm3b4yDKPmcuTUa7G/6 +hk8VM2CZtUU1J1jFxUbo3SvmWKzHLwEZwsMUEOHz14Q5KYYxjJj7oB7FsqimWHdj +MwDUjODcnVDrTlZWi66I +=4zzC -----END PGP SIGNATURE----- diff --git a/media-gfx/digikam/digikam-1.2.0-r4.ebuild b/media-gfx/digikam/digikam-1.2.0-r4.ebuild deleted file mode 100644 index 29b34e740ec1..000000000000 --- a/media-gfx/digikam/digikam-1.2.0-r4.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.2.0-r4.ebuild,v 1.6 2011/02/27 11:55:04 dilfridge Exp $ - -EAPI=3 - -KDE_LINGUAS="ar be bg ca cs da de el es et eu fa fi fr ga gl he hi is it ja km -ko lt lv lb nds ne nl nn pa pl pt pt_BR ro ru se sk sl sv th tr uk vi zh_CN zh_TW" -KMNAME="extragear/graphics" -inherit kde4-base - -MY_P="${PN}-${PV/_/-}" - -DESCRIPTION="A digital photo management application for KDE." -HOMEPAGE="http://www.digikam.org/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2 - handbook? ( mirror://gentoo/${PN}-doc-1.4.0.tar.bz2 )" - -LICENSE="GPL-2 - handbook? ( FDL-1.2 )" -KEYWORDS="amd64 ~ppc x86" -SLOT="4" -IUSE="addressbook debug doc geolocation gphoto2 handbook lensfun semantic-desktop +thumbnails video" - -CDEPEND=" - >=kde-base/kdelibs-${KDE_MINIMAL}[semantic-desktop?] - >=kde-base/libkdcraw-${KDE_MINIMAL} - >=kde-base/libkexiv2-${KDE_MINIMAL} - >=kde-base/libkipi-${KDE_MINIMAL} - >=kde-base/solid-${KDE_MINIMAL} - media-libs/jasper - virtual/jpeg - media-libs/lcms:0 - media-libs/liblqr - media-libs/libpng - media-libs/tiff - media-libs/libpgf - >=media-plugins/kipi-plugins-1.2.0-r1 - virtual/lapack - x11-libs/qt-gui[qt3support] - x11-libs/qt-sql[sqlite] - addressbook? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} ) - geolocation? ( >=kde-base/marble-${KDE_MINIMAL} ) - gphoto2? ( media-libs/libgphoto2 ) - lensfun? ( media-libs/lensfun ) - <kde-base/kdelibs-4.6 -" -RDEPEND="${CDEPEND} - >=kde-base/kreadconfig-${KDE_MINIMAL} - video? ( - || ( - >=kde-base/mplayerthumbs-${KDE_MINIMAL} - >=kde-base/ffmpegthumbs-${KDE_MINIMAL} - ) - ) -" -# gcc[fortran] is required since we cannot otherwise link to the lapack library -# (the fun of unbundling) -DEPEND="${CDEPEND} - sys-devel/gcc[fortran] - sys-devel/gettext - doc? ( - app-doc/doxygen - virtual/latex-base - ) -" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( "${FILESDIR}/${P}"-{ratingwidget,libpgf-r3,docs-r3,lapack}.patch ) - -src_prepare() { - if use handbook; then - mv "${WORKDIR}/${PN}"-1.4.0/* "${S}/" || die - else - mkdir doc || die - echo > doc/CMakeLists.txt || die - fi - - kde4-base_src_prepare -} - -src_configure() { - local backend - - use semantic-desktop && backend="Nepomuk" || backend="None" - # LQR = only allows to choose between bundled/external - mycmakeargs=( - -DWITH_LQR=ON - -DGWENVIEW_SEMANTICINFO_BACKEND=${backend} - $(cmake-utils_use_with addressbook KdepimLibs) - $(cmake-utils_use_build doc) - $(cmake-utils_use_with geolocation MarbleWidget) - $(cmake-utils_use_enable gphoto2 GPHOTO2) - $(cmake-utils_use_with gphoto2) - $(cmake-utils_use_with lensfun LensFun) - $(cmake-utils_use_with semantic-desktop Soprano) - -DENABLE_THEMEDESIGNER=OFF - $(cmake-utils_use_enable thumbnails THUMBS_DB) - ) - - kde4-base_src_configure -} - -src_install() { - kde4-base_src_install - - if use doc; then - # install the api documentation - dodir /usr/share/doc/${PF}/html || die - insinto /usr/share/doc/${PF}/html - doins -r ${CMAKE_BUILD_DIR}/api/html/* || die - fi - - if use handbook; then - dodoc readme-handbook.txt || die - fi -} - -pkg_postinst() { - kde4-base_pkg_postinst - - if use doc; then - elog The digikam api documentation has been installed at /usr/share/doc/${PF}/html - fi -} diff --git a/media-gfx/digikam/files/digikam-1.2.0-docs-r3.patch b/media-gfx/digikam/files/digikam-1.2.0-docs-r3.patch deleted file mode 100644 index ff9f1a320a19..000000000000 --- a/media-gfx/digikam/files/digikam-1.2.0-docs-r3.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -u -r -N digikam-1.2.0-2/CMakeLists.txt digikam-1.2.0/CMakeLists.txt ---- digikam-1.2.0-2/CMakeLists.txt 2010-09-25 18:01:53.000000000 +0200 -+++ digikam-1.2.0/CMakeLists.txt 2010-09-25 18:05:16.000000000 +0200 -@@ -1260,18 +1260,43 @@ - # ================================================================================================== - # API documentation generation - --IF(DOXYGEN_FOUND) -+# Checks if user ask to build documentation. -+IF(BUILD_DOC) -+ IF(DOXYGEN_FOUND) - -- SET(API_DIR ${CMAKE_BINARY_DIR}/api) -- SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) -- SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) -- SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log) -+ MESSAGE(STATUS "") -+ MESSAGE(STATUS "Documentation will be installed") -+ MESSAGE(STATUS "") - -- CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) -+ SET(API_DIR ${CMAKE_BINARY_DIR}/api) -+ SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) -+ SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) -+ SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log) - -- ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} -- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -+ CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) -+ -+ ADD_CUSTOM_TARGET(doc ALL ${DOXYGEN_EXECUTABLE} ${DOXYFILE} -+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -+ -+ ELSE(DOXYGEN_FOUND) -+ -+ MESSAGE(STATUS "") -+ MESSAGE(STATUS "Documentation will NOT be installed") -+ MESSAGE(STATUS "Doxygen wasn't found on the system") -+ MESSAGE(STATUS "") -+ -+ 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) - --ENDIF(DOXYGEN_FOUND) - include(MacroOptionalAddSubdirectory) - macro_optional_add_subdirectory( po ) -+ -+add_subdirectory( doc ) diff --git a/media-gfx/digikam/files/digikam-1.2.0-lapack.patch b/media-gfx/digikam/files/digikam-1.2.0-lapack.patch deleted file mode 100644 index f7310788bee3..000000000000 --- a/media-gfx/digikam/files/digikam-1.2.0-lapack.patch +++ /dev/null @@ -1,126 +0,0 @@ -diff -r -u digikam-1.2.0.orig/CMakeLists.txt digikam-1.2.0/CMakeLists.txt ---- digikam-1.2.0.orig/CMakeLists.txt 2010-05-30 21:38:14.189946492 +0200 -+++ digikam-1.2.0/CMakeLists.txt 2010-05-30 21:39:46.679946458 +0200 -@@ -3,6 +3,8 @@ - #OPTION(ENABLE_THEMEDESIGNER "Build digiKam theme designer (default=OFF)" OFF) - OPTION(ENABLE_THUMBS_DB "Build digiKam with thumbnails database support (default=ON)" ON) - -+ENABLE_LANGUAGE(Fortran) -+ - # ================================================================================================== - # Information to update before to release this package. - -@@ -123,6 +125,9 @@ - # This function call the script cmake/modules/FindPGF.cmake - FIND_PACKAGE(PGF) - -+# Included to unbundle lapack that is in portage tree. -+FIND_PACKAGE(LAPACK) -+ - FIND_PACKAGE(Jasper) - FIND_PACKAGE(Kdcraw) - FIND_PACKAGE(Kexiv2) -@@ -320,13 +325,13 @@ - MESSAGE(STATUS "") - ENDIF(DOXYGEN_FOUND) - --IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) -+IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND AND LAPACK_FOUND) - MESSAGE(STATUS " digiKam will be compiled................. YES") - SET(DIGIKAM_CAN_BE_COMPILED true) --ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) -+ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND AND LAPACK_FOUND) - MESSAGE(FATAL_ERROR " digiKam will be compiled................. NO (Look README file for more details about dependencies)") - SET(DIGIKAM_CAN_BE_COMPILED false) --ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) -+ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND AND LAPACK_FOUND) - - MESSAGE(STATUS "----------------------------------------------------------------------------------") - MESSAGE(STATUS "") -@@ -484,39 +489,7 @@ - ${CMAKE_CURRENT_SOURCE_DIR}/libs/dimg/loaders/pgfsettings.cpp - ) - -- SET(libclapack_SRCS -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/abort_.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgesv.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dlaswp.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/endfile.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/idamax.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/open.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/sig_die.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/wref.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/close.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgetf2.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dscal.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/err.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/ieeeck.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/s_cmp.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/s_stop.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/wrtfmt.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgemm.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgetrf.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dswap.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/fmt.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/ilaenv.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/s_copy.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/wsfe.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dger.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgetrs.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dtrsm.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/fmtlib.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/lsame.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/sfe.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/util.c -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/xerbla.c -- ) -+ INCLUDE_DIRECTORIES(${LAPACK_INCLUDE_DIRS}) - - SET(libdimgfilters_SRCS - ${libclapack_SRCS} -Nur in digikam-1.2.0: CMakeLists.txt.orig. -diff -r -u digikam-1.2.0.orig/digikam/CMakeLists.txt digikam-1.2.0/digikam/CMakeLists.txt ---- digikam-1.2.0.orig/digikam/CMakeLists.txt 2010-05-30 21:38:14.191892532 +0200 -+++ digikam-1.2.0/digikam/CMakeLists.txt 2010-05-30 21:39:46.680979177 +0200 -@@ -89,6 +89,7 @@ - ${PNG_PNG_INCLUDE_DIR} - ${TIFF_INCLUDE_DIR} - ${PGF_INCLUDE_DIRS} -+ ${LAPACK_INCLUDE_DIRS} - ) - - IF(LENSFUN_LIBRARY) -@@ -172,6 +173,7 @@ - ${PGF_LIBRARIES} - ${LCMS_LIBRARIES} - ${JASPER_LIBRARIES} -+ ${LAPACK_LIBRARIES} - - # Require by CImg library which use pthread internally. - ${CMAKE_THREAD_LIBS_INIT} -@@ -237,6 +239,7 @@ - ${QT_QTGUI_LIBRARY} - ${QT_QTSQL_LIBRARY} - ${PGF_LIBRARIES} -+ ${LAPACK_LIBRARIES} - ) - - SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 ) -Nur in digikam-1.2.0/digikam: CMakeLists.txt.orig. -diff -r -u digikam-1.2.0.orig/libs/CMakeLists.txt digikam-1.2.0/libs/CMakeLists.txt ---- digikam-1.2.0.orig/libs/CMakeLists.txt 2010-05-30 21:38:14.191892532 +0200 -+++ digikam-1.2.0/libs/CMakeLists.txt 2010-05-30 21:41:20.226778777 +0200 -@@ -14,12 +14,12 @@ - imageproperties - dialogs - 3rdparty/cimg -- 3rdparty/clapack - ${JPEG_INCLUDE_DIR} - ${TIFF_INCLUDE_DIR} - ${PNG_INCLUDE_DIR} - ${PGF_INCLUDE_DIRS} - ${JASPER_INCLUDE_DIR} -+ ${LAPACK_INCLUDE_DIRS} - ) - ADD_SUBDIRECTORY( histogram ) - ADD_SUBDIRECTORY( dmetadata ) diff --git a/media-gfx/digikam/files/digikam-1.2.0-libpgf-r3.patch b/media-gfx/digikam/files/digikam-1.2.0-libpgf-r3.patch deleted file mode 100644 index ebfb85d70808..000000000000 --- a/media-gfx/digikam/files/digikam-1.2.0-libpgf-r3.patch +++ /dev/null @@ -1,157 +0,0 @@ -diff -ruN old/cmake/modules/FindPGF.cmake new/cmake/modules/FindPGF.cmake ---- old/cmake/modules/FindPGF.cmake 1969-12-31 21:00:00.000000000 -0300 -+++ new/cmake/modules/FindPGF.cmake 2010-03-30 13:54:13.520854878 -0300 -@@ -0,0 +1,15 @@ -+# - 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 -+ -+# PKG-CONFIG is required. -+INCLUDE(FindPkgConfig REQUIRED) -+ -+IF(PKG_CONFIG_FOUND) -+ INCLUDE(FindPkgConfig) -+ -+ PKG_CHECK_MODULES(PGF libpgf) -+ENDIF(PKG_CONFIG_FOUND) -diff -ruN old/CMakeLists.txt new/CMakeLists.txt ---- old/CMakeLists.txt 2010-03-28 19:26:06.000000000 -0300 -+++ new/CMakeLists.txt 2010-03-30 19:50:55.537108644 -0300 -@@ -34,6 +34,9 @@ - "${DIGIKAM_VERSION_SHORT}${DIGIKAM_SUFFIX_VERSION}" - ) - -+# Path to find FindPGF.cmake script. -+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules") -+ - # ================================================================================================== - # Debug area codes - # These codes will be set for every project specific path automatically, so -@@ -115,6 +118,11 @@ - FIND_PACKAGE(JPEG) - FIND_PACKAGE(PNG) - FIND_PACKAGE(TIFF) -+ -+# Included to unbundle libpgf that is on portage tree. -+# This function call the script cmake/modules/FindPGF.cmake -+FIND_PACKAGE(PGF) -+ - FIND_PACKAGE(Jasper) - FIND_PACKAGE(Kdcraw) - FIND_PACKAGE(Kexiv2) -@@ -210,6 +218,7 @@ - - PRINT_QTMODULE_STATUS("Qt4 SQL" QT_QTSQL_FOUND) - PRINT_LIBRARY_STATUS("libtiff" "http://www.remotesensing.org/libtiff" "" TIFF_FOUND) -+PRINT_LIBRARY_STATUS("libpgf" "http://www.libpgf.org" "" PGF_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) - PRINT_LIBRARY_STATUS("liblcms" "http://www.littlecms.com" "" LCMS_FOUND) -@@ -311,13 +320,13 @@ - MESSAGE(STATUS "") - ENDIF(DOXYGEN_FOUND) - --IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) -+IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) - MESSAGE(STATUS " digiKam will be compiled................. YES") - SET(DIGIKAM_CAN_BE_COMPILED true) --ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) -+ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) - MESSAGE(FATAL_ERROR " digiKam will be compiled................. NO (Look README file for more details about dependencies)") - SET(DIGIKAM_CAN_BE_COMPILED false) --ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) -+ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) - - MESSAGE(STATUS "----------------------------------------------------------------------------------") - MESSAGE(STATUS "") -@@ -952,14 +961,7 @@ - ${CMAKE_CURRENT_SOURCE_DIR}/libs/threadimageio/pgfutils.cpp - ) - -- SET(libpgf_SRCS -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Decoder.cpp -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Encoder.cpp -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/PGFimage.cpp -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Stream.cpp -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Subband.cpp -- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/WaveletTransform.cpp -- ) -+ INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS}) - - SET(libsqlite2_SRCS - ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/attach.c -diff -ruN old/digikam/CMakeLists.txt new/digikam/CMakeLists.txt ---- old/digikam/CMakeLists.txt 2010-03-28 19:19:21.000000000 -0300 -+++ new/digikam/CMakeLists.txt 2010-03-30 19:44:00.296860646 -0300 -@@ -52,7 +52,6 @@ - # specific libs and utilities - ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/lprof - ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/sqlite2 -- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpgf - ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/clapack - ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/cimg - ${CMAKE_CURRENT_SOURCE_DIR}/../libs/themeengine -@@ -89,6 +88,7 @@ - ${JPEG_INCLUDE_DIR} - ${PNG_PNG_INCLUDE_DIR} - ${TIFF_INCLUDE_DIR} -+ ${PGF_INCLUDE_DIRS} - ) - - IF(LENSFUN_LIBRARY) -@@ -100,9 +100,6 @@ - # Disable Clapack C code warnings. - SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS "-w") - --# Disable libpgf warnings. --SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w") -- - # Disable liblqr C code warnings. - SET_SOURCE_FILES_PROPERTIES(${liblqr_SRCS} PROPERTIES COMPILE_FLAGS "-w") - -@@ -121,7 +118,6 @@ - ${libjpegutils_SRCS} - ${libthreadimageio_SRCS} - ${libthemeengine_SRCS} -- ${libpgf_SRCS} - ${pgfutils_SRCS} - ${libdigikamhelpers_SRCS} - -@@ -173,6 +169,7 @@ - ${JPEG_LIBRARIES} - ${TIFF_LIBRARIES} - ${PNG_LIBRARIES} -+ ${PGF_LIBRARIES} - ${LCMS_LIBRARIES} - ${JASPER_LIBRARIES} - -@@ -225,7 +222,6 @@ - ${libhaar_SRCS} - ${libdatabasemodels_SRCS} - ${libsqlite2_SRCS} -- ${libpgf_SRCS} - ${pgfutils_SRCS} - ) - -@@ -240,6 +236,7 @@ - ${QT_QTCORE_LIBRARY} - ${QT_QTGUI_LIBRARY} - ${QT_QTSQL_LIBRARY} -+ ${PGF_LIBRARIES} - ) - - SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 ) -diff -ruN old/libs/CMakeLists.txt new/libs/CMakeLists.txt ---- old/libs/CMakeLists.txt 2010-03-28 19:19:02.000000000 -0300 -+++ new/libs/CMakeLists.txt 2010-03-30 14:03:07.365604017 -0300 -@@ -18,6 +18,7 @@ - ${JPEG_INCLUDE_DIR} - ${TIFF_INCLUDE_DIR} - ${PNG_INCLUDE_DIR} -+ ${PGF_INCLUDE_DIRS} - ${JASPER_INCLUDE_DIR} - ) - ADD_SUBDIRECTORY( histogram ) diff --git a/media-gfx/digikam/files/digikam-1.2.0-ratingwidget.patch b/media-gfx/digikam/files/digikam-1.2.0-ratingwidget.patch deleted file mode 100644 index 02d4cce4d34e..000000000000 --- a/media-gfx/digikam/files/digikam-1.2.0-ratingwidget.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- trunk/extragear/graphics/digikam/digikam/ratingwidget.cpp 2010/03/30 18:15:12 1109176 -+++ trunk/extragear/graphics/digikam/digikam/ratingwidget.cpp 2010/03/30 18:15:25 1109177 -@@ -165,7 +165,7 @@ - void RatingWidget::setFadingValue(int value) - { - d->fadingValue = value; -- if (d->fadingValue >= 255) -+ if (d->fadingValue >= 255 && d->fadingTimeLine) - { - d->fadingTimeLine->stop(); - } |