Gentoo Archives: gentoo-commits

From: Jonathan Callen <abcd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/ksnapshot/files/, kde-base/ksnapshot/
Date: Thu, 28 Apr 2011 07:46:21
Message-Id: 259bc55d42c2ef64b93d1c561665c95e15083079.abcd@gentoo
1 commit: 259bc55d42c2ef64b93d1c561665c95e15083079
2 Author: Jonathan Callen <abcd <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 28 07:45:57 2011 +0000
4 Commit: Jonathan Callen <abcd <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 28 07:45:57 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=259bc55d
7
8 [kde-base/ksnapshot] Update patch for current git
9
10 ---
11 kde-base/ksnapshot/files/ksnapshot-4.7-kipi.patch | 19 +++++++++++++++++++
12 kde-base/ksnapshot/ksnapshot-9999.ebuild | 2 +-
13 2 files changed, 20 insertions(+), 1 deletions(-)
14
15 diff --git a/kde-base/ksnapshot/files/ksnapshot-4.7-kipi.patch b/kde-base/ksnapshot/files/ksnapshot-4.7-kipi.patch
16 new file mode 100644
17 index 0000000..43044fe
18 --- /dev/null
19 +++ b/kde-base/ksnapshot/files/ksnapshot-4.7-kipi.patch
20 @@ -0,0 +1,19 @@
21 +diff --git a/CMakeLists.txt b/CMakeLists.txt
22 +index 683c270..25be4b5 100644
23 +--- a/CMakeLists.txt
24 ++++ b/CMakeLists.txt
25 +@@ -1,11 +1,13 @@
26 + project(ksnapshot)
27 +
28 + find_package(KDE4 REQUIRED)
29 +-find_package(Kipi)
30 + include(KDE4Defaults)
31 + include(MacroLibrary)
32 + include(MacroOptionalAddSubdirectory)
33 + include(MacroBoolTo01)
34 ++include(MacroOptionalFindPackage)
35 ++
36 ++macro_optional_find_package(Kipi)
37 +
38 + add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS})
39 + include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
40
41 diff --git a/kde-base/ksnapshot/ksnapshot-9999.ebuild b/kde-base/ksnapshot/ksnapshot-9999.ebuild
42 index db0ff8b..4fd19ec 100644
43 --- a/kde-base/ksnapshot/ksnapshot-9999.ebuild
44 +++ b/kde-base/ksnapshot/ksnapshot-9999.ebuild
45 @@ -23,7 +23,7 @@ DEPEND="
46 "
47 RDEPEND="${DEPEND}"
48
49 -PATCHES=( "${FILESDIR}/${PN}-4.6.2-kipi.patch" )
50 +PATCHES=( "${FILESDIR}/${PN}-4.7-kipi.patch" )
51
52 src_configure() {
53 mycmakeargs=(