* [gentoo-commits] proj/kde:master commit in: kde-base/korganizer/, kde-base/korganizer/files/
@ 2015-07-05 20:43 Johannes Huber
0 siblings, 0 replies; 3+ messages in thread
From: Johannes Huber @ 2015-07-05 20:43 UTC (permalink / raw
To: gentoo-commits
commit: 8c395672e51a03efffe590e330650c9fbdbda5d5
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jul 5 09:56:28 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jul 5 20:44:48 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=8c395672
[kde-base/korganizer] Build handbook
Fixes bug 550500
Package-Manager: portage-2.2.18
.../korganizer/files/korganizer-4.10.0-handbook.patch | 16 ++++++++++++++++
.../files/korganizer-4.4.2015.06-handbook.patch | 18 ++++++++++++++++++
kde-base/korganizer/korganizer-4.14.10.ebuild | 6 ++++++
kde-base/korganizer/korganizer-4.4.2015.06.ebuild | 6 ++++++
kde-base/korganizer/korganizer-4.9999.ebuild | 6 ++++++
5 files changed, 52 insertions(+)
diff --git a/kde-base/korganizer/files/korganizer-4.10.0-handbook.patch b/kde-base/korganizer/files/korganizer-4.10.0-handbook.patch
new file mode 100644
index 0000000..a365d05
--- /dev/null
+++ b/kde-base/korganizer/files/korganizer-4.10.0-handbook.patch
@@ -0,0 +1,16 @@
+--- a/doc/CMakeLists.txt 2015-06-25 19:47:38.000000000 +0200
++++ b/doc/CMakeLists.txt 2015-07-05 11:50:37.584637940 +0200
+@@ -28,9 +28,10 @@
+
+ if(BUILD_kmail)
+ add_subdirectory(kmail)
+- if(BUILD_korganizer)
+- add_subdirectory(korganizer)
+- endif()
++endif()
++
++if(BUILD_korganizer)
++ add_subdirectory(korganizer)
+ endif()
+
+ if(BUILD_knode)
diff --git a/kde-base/korganizer/files/korganizer-4.4.2015.06-handbook.patch b/kde-base/korganizer/files/korganizer-4.4.2015.06-handbook.patch
new file mode 100644
index 0000000..a3050cc
--- /dev/null
+++ b/kde-base/korganizer/files/korganizer-4.4.2015.06-handbook.patch
@@ -0,0 +1,18 @@
+--- a/doc/CMakeLists.txt 2015-06-29 21:11:05.000000000 +0200
++++ b/doc/CMakeLists.txt 2015-07-05 12:29:51.517209734 +0200
+@@ -32,11 +32,12 @@
+
+ if(BUILD_kmail)
+ add_subdirectory(kmail)
+- if(BUILD_korganizer)
+- add_subdirectory(korganizer)
+- endif(BUILD_korganizer)
+ endif(BUILD_kmail)
+
++if(BUILD_korganizer)
++ add_subdirectory(korganizer)
++endif(BUILD_korganizer)
++
+ if(BUILD_knode)
+ add_subdirectory(knode)
+ endif(BUILD_knode)
diff --git a/kde-base/korganizer/korganizer-4.14.10.ebuild b/kde-base/korganizer/korganizer-4.14.10.ebuild
index c769653..8de685e 100644
--- a/kde-base/korganizer/korganizer-4.14.10.ebuild
+++ b/kde-base/korganizer/korganizer-4.14.10.ebuild
@@ -67,6 +67,12 @@ src_unpack() {
kde4-meta_src_unpack
}
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-4.10.0-handbook.patch"
+
+ kde4-meta_src_prepare
+}
+
src_install() {
kde4-meta_src_install
# colliding with kdepim-common-libs
diff --git a/kde-base/korganizer/korganizer-4.4.2015.06.ebuild b/kde-base/korganizer/korganizer-4.4.2015.06.ebuild
index f14b16f..afe5411 100644
--- a/kde-base/korganizer/korganizer-4.4.2015.06.ebuild
+++ b/kde-base/korganizer/korganizer-4.4.2015.06.ebuild
@@ -45,6 +45,12 @@ src_unpack() {
kde4-meta_src_unpack
}
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-4.4.2015.06-handbook.patch"
+
+ kde4-meta_src_prepare
+}
+
pkg_postinst() {
kde4-meta_pkg_postinst
diff --git a/kde-base/korganizer/korganizer-4.9999.ebuild b/kde-base/korganizer/korganizer-4.9999.ebuild
index e637075..9e9a6b7 100644
--- a/kde-base/korganizer/korganizer-4.9999.ebuild
+++ b/kde-base/korganizer/korganizer-4.9999.ebuild
@@ -67,6 +67,12 @@ src_unpack() {
kde4-meta_src_unpack
}
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-4.10.0-handbook.patch"
+
+ kde4-meta_src_prepare
+}
+
src_install() {
kde4-meta_src_install
# colliding with kdepim-common-libs
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-base/korganizer/, kde-base/korganizer/files/
@ 2015-07-07 21:07 Johannes Huber
0 siblings, 0 replies; 3+ messages in thread
From: Johannes Huber @ 2015-07-07 21:07 UTC (permalink / raw
To: gentoo-commits
commit: f6b47611459b1e8ba1e2afe58536f6b3c5853610
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Jul 6 16:14:47 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Jul 7 21:08:38 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f6b47611
[kde-base/korganizer] doc dir not extracted if USE=-handbook
Package-Manager: portage-2.2.18
...rganizer-4.10.0-handbook.patch => korganizer-4.14.10-handbook.patch} | 0
kde-base/korganizer/korganizer-4.14.10.ebuild | 2 +-
kde-base/korganizer/korganizer-4.4.2015.06.ebuild | 2 +-
kde-base/korganizer/korganizer-4.9999.ebuild | 2 +-
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/kde-base/korganizer/files/korganizer-4.10.0-handbook.patch b/kde-base/korganizer/files/korganizer-4.14.10-handbook.patch
similarity index 100%
rename from kde-base/korganizer/files/korganizer-4.10.0-handbook.patch
rename to kde-base/korganizer/files/korganizer-4.14.10-handbook.patch
diff --git a/kde-base/korganizer/korganizer-4.14.10.ebuild b/kde-base/korganizer/korganizer-4.14.10.ebuild
index 8de685e..3e45694 100644
--- a/kde-base/korganizer/korganizer-4.14.10.ebuild
+++ b/kde-base/korganizer/korganizer-4.14.10.ebuild
@@ -68,7 +68,7 @@ src_unpack() {
}
src_prepare() {
- epatch "${FILESDIR}/${PN}-4.10.0-handbook.patch"
+ use handbook && epatch "${FILESDIR}/${PN}-4.14.10-handbook.patch"
kde4-meta_src_prepare
}
diff --git a/kde-base/korganizer/korganizer-4.4.2015.06.ebuild b/kde-base/korganizer/korganizer-4.4.2015.06.ebuild
index afe5411..2d77e48 100644
--- a/kde-base/korganizer/korganizer-4.4.2015.06.ebuild
+++ b/kde-base/korganizer/korganizer-4.4.2015.06.ebuild
@@ -46,7 +46,7 @@ src_unpack() {
}
src_prepare() {
- epatch "${FILESDIR}/${PN}-4.4.2015.06-handbook.patch"
+ use handbook && epatch "${FILESDIR}/${PN}-4.4.2015.06-handbook.patch"
kde4-meta_src_prepare
}
diff --git a/kde-base/korganizer/korganizer-4.9999.ebuild b/kde-base/korganizer/korganizer-4.9999.ebuild
index 9e9a6b7..63da843 100644
--- a/kde-base/korganizer/korganizer-4.9999.ebuild
+++ b/kde-base/korganizer/korganizer-4.9999.ebuild
@@ -68,7 +68,7 @@ src_unpack() {
}
src_prepare() {
- epatch "${FILESDIR}/${PN}-4.10.0-handbook.patch"
+ use handbook && epatch "${FILESDIR}/${PN}-4.14.10-handbook.patch"
kde4-meta_src_prepare
}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-base/korganizer/, kde-base/korganizer/files/
@ 2012-04-23 13:21 Michael Palimaka
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka @ 2012-04-23 13:21 UTC (permalink / raw
To: gentoo-commits
commit: 5d084c57a4a341b4e13fe43371ff8b8e78f6d951
Author: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Mon Apr 23 13:21:02 2012 +0000
Commit: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Mon Apr 23 13:21:02 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5d084c57
[kde-base/korganizer] Patch also appears to be no longer necessary for KDE/4.8 branch.
(Portage version: 2.1.10.57/git/Linux x86_64, unsigned Manifest commit)
---
| 10 ----------
kde-base/korganizer/korganizer-4.8.49.9999.ebuild | 4 ----
2 files changed, 0 insertions(+), 14 deletions(-)
diff --git a/kde-base/korganizer/files/korganizer-4.5.64_missing_header.patch b/kde-base/korganizer/files/korganizer-4.5.64_missing_header.patch
deleted file mode 100644
index bf2cb62..0000000
--- a/kde-base/korganizer/files/korganizer-4.5.64_missing_header.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- korganizer/CMakeLists.txt 2010-05-07 11:14:26.000000000 +0200
-+++ korganizer/CMakeLists.txt 2010-05-07 10:28:38.000000000 +0200
-@@ -167,6 +167,7 @@
- )
-
- kde4_add_kcfg_files(korganizer_core_LIB_SRCS koprefs_base.kcfgc )
-+kde4_add_kcfg_files(korganizer_core_LIB_SRCS ../calendarsupport/kcalprefs_base.kcfgc )
-
- kde4_add_library(korganizer_core SHARED ${korganizer_core_LIB_SRCS})
-
diff --git a/kde-base/korganizer/korganizer-4.8.49.9999.ebuild b/kde-base/korganizer/korganizer-4.8.49.9999.ebuild
index c369bd4..2130da1 100644
--- a/kde-base/korganizer/korganizer-4.8.49.9999.ebuild
+++ b/kde-base/korganizer/korganizer-4.8.49.9999.ebuild
@@ -41,10 +41,6 @@ KMCOMPILEONLY="
calendarsupport/
"
-PATCHES=(
- "${FILESDIR}/${PN}-4.5.64_missing_header.patch"
-)
-
src_unpack() {
if use kontact; then
KMEXTRA="${KMEXTRA}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-07-07 21:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-05 20:43 [gentoo-commits] proj/kde:master commit in: kde-base/korganizer/, kde-base/korganizer/files/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2015-07-07 21:07 Johannes Huber
2012-04-23 13:21 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox