[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/, media-gfx/digikam/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Andreas Hüttel" <dilfridge@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
Date: Fri,  3 Jun 2011 21:18:13 +0000 (UTC)	[thread overview]
Message-ID: <7f92f4775dfd7b7deea8e6a8d2aa9f4de8c57b12.dilfridge@gentoo> (raw)

commit:     7f92f4775dfd7b7deea8e6a8d2aa9f4de8c57b12
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Fri Jun  3 21:17:59 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Jun  3 21:17:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7f92f477

[media-gfx/digikam] Version bump

(Portage version: 2.1.9.50/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 ...0.0_beta5.ebuild => digikam-2.0.0_beta6.ebuild} |   19 ++++---
 media-gfx/digikam/files/digikam-1.9.0-turbo.patch  |   56 --------------------
 .../digikam/files/digikam-2.0.0_beta5-docs.patch   |   42 ---------------
 3 files changed, 11 insertions(+), 106 deletions(-)

diff --git a/media-gfx/digikam/digikam-2.0.0_beta5.ebuild b/media-gfx/digikam/digikam-2.0.0_beta6.ebuild
similarity index 93%
rename from media-gfx/digikam/digikam-2.0.0_beta5.ebuild
rename to media-gfx/digikam/digikam-2.0.0_beta6.ebuild
index 9a8f9e2..8e7c732 100644
--- a/media-gfx/digikam/digikam-2.0.0_beta5.ebuild
+++ b/media-gfx/digikam/digikam-2.0.0_beta6.ebuild
@@ -13,7 +13,9 @@ KDE_HANDBOOK="optional"
 CMAKE_MIN_VERSION=2.8
 
 KDE_MINIMAL="4.6"
-KDEGRAPHICS_MINIMAL="4.6.29"
+
+KDEGRAPHICS_MINIMAL="4.6.30"
+# please leave the weird number here for the moment
 
 inherit kde4-base
 
@@ -25,7 +27,7 @@ HOMEPAGE="http://www.digikam.org/"
 
 LICENSE="GPL-2
 	handbook? ( FDL-1.2 )"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 SLOT="4"
 IUSE="addressbook debug doc gphoto2 semantic-desktop themedesigner +thumbnails video"
 
@@ -68,11 +70,6 @@ DEPEND="${CDEPEND}
 	doc? ( app-doc/doxygen )
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}"-2.0.0_beta5-docs.patch
-	"${FILESDIR}/${PN}"-1.9.0-turbo.patch
-)
-
 S="${WORKDIR}/${MY_P}/core"
 
 src_prepare() {
@@ -101,7 +98,6 @@ src_configure() {
 		-DWITH_LENSFUN=ON
 		-DGWENVIEW_SEMANTICINFO_BACKEND=${backend}
 		$(cmake-utils_use_with addressbook KdepimLibs)
-		$(cmake-utils_use_build doc)
 		-DWITH_MarbleWidget=ON
 		$(cmake-utils_use_enable gphoto2 GPHOTO2)
 		$(cmake-utils_use_with gphoto2)
@@ -113,6 +109,13 @@ src_configure() {
 	kde4-base_src_configure
 }
 
+src_compile() {
+	local mytargets="all"
+	use doc && mytargets+=" doc"
+
+	kde4-base_src_compile ${mytargets}
+}
+
 src_install() {
 	kde4-base_src_install
 

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 bd10552..0000000
--- 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
-

diff --git a/media-gfx/digikam/files/digikam-2.0.0_beta5-docs.patch b/media-gfx/digikam/files/digikam-2.0.0_beta5-docs.patch
deleted file mode 100644
index a5bc184..0000000
--- a/media-gfx/digikam/files/digikam-2.0.0_beta5-docs.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ruN digikam-2.0.0-beta5.orig/core/CMakeLists.txt digikam-2.0.0-beta5/core/CMakeLists.txt
---- digikam-2.0.0-beta5.orig/core/CMakeLists.txt	2011-05-04 10:52:35.000000000 +0200
-+++ digikam-2.0.0-beta5/core/CMakeLists.txt	2011-05-11 22:40:30.000000000 +0200
-@@ -1560,8 +1560,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)
-@@ -1569,7 +1576,21 @@
- 
-     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, because")
-+    MESSAGE(STATUS "the option -DBUILD_DOC=ON wasn't passed to cmake")
-+    MESSAGE(STATUS "")
-+
-+ENDIF(BUILD_DOC)

next             reply	other threads:[~2011-06-03 21:25 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-03 21:18 Andreas Hüttel [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-07-13 21:57 [gentoo-commits] proj/kde:master commit in: media-gfx/digikam/, media-gfx/digikam/files/ Andreas Sturmlechner
2024-03-25 14:43 Andreas Sturmlechner
2023-12-25 21:53 Andreas Sturmlechner
2023-07-08 14:54 Andreas Sturmlechner
2022-01-18 16:01 Andreas Sturmlechner
2020-05-26 15:12 Andreas Sturmlechner
2020-04-19  7:59 Andreas Sturmlechner
2012-11-10 23:33 Andreas Hüttel
2012-09-19 19:13 Andreas Hüttel
2012-09-19 19:07 Andreas Hüttel
2012-08-11 15:08 Andreas Hüttel
2012-08-10 18:27 Chris Reffett
2011-07-27 20:52 Andreas Hüttel
2011-07-05 12:03 Andreas Hüttel
2011-07-05  7:11 Andreas Hüttel
2011-07-03  9:27 Andreas Hüttel
2011-05-20 22:55 Andreas K. Huettel

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:9a8f9e2 dfblob:8e7c732 dfblob:bd10552 dfblob:a5bc184 )
 OR (
bs:"[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/, media-gfx/digikam/files/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7f92f4775dfd7b7deea8e6a8d2aa9f4de8c57b12.dilfridge@gentoo \
    --to=dilfridge@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox