[kde-base/korundum] make the beta build

Package-Manager: portage-2.2.0_alpha183

5 files changed, 196 insertions, 0 deletions

diff --git a/kde-base/korundum/files/korundum-4.10.80-1-Fix-compile-with-Ruby-1.9.patch b/kde-base/korundum/files/korundum-4.10.80-1-Fix-compile-with-Ruby-1.9.patch
new file mode 100644
index 00000000000..1c1e32218e7
--- /dev/null
+++ b/kde-base/korundum/files/korundum-4.10.80-1-Fix-compile-with-Ruby-1.9.patch
@@ -0,0 +1,45 @@
+From 70114cd9653d430fabd948c0e817075f28db9682 Mon Sep 17 00:00:00 2001
+From: Jonathan Riddell <jr@jriddell.org>
+Date: Wed, 19 Jun 2013 14:09:13 +0100
+Subject: [PATCH 1/4] Fix compile with Ruby 1.9 patch by Hrvoje Senjan for
+ opensuse
+
+---
+ src/krubypluginfactory.cpp | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/krubypluginfactory.cpp b/src/krubypluginfactory.cpp
+index c471b33..7cd43a3 100644
+--- a/src/krubypluginfactory.cpp
++++ b/src/krubypluginfactory.cpp
+@@ -39,7 +39,6 @@
+ extern "C" {
+ extern VALUE rb_load_path;
+ extern VALUE qt_internal_module;
+-void Init_prelude(void);
+ }
+ 
+ //
+@@ -165,7 +164,8 @@ QObject *KRubyPluginFactory::create(const char *iface, QWidget *parentWidget, QO
+ #if RUBY_VERSION >= 0x10900
+     VALUE gem = rb_define_module("Gem");
+     rb_const_set(gem, rb_intern("Enable"), Qtrue);
+-    Init_prelude(); 
++    char *opts[] = { "ruby", "-e;" };
++    ruby_options(2, opts);
+ #endif
+ 
+     ruby_incpush(QFile::encodeName(program.path()));
+@@ -342,7 +342,8 @@ int kdemain(int argc, char **argv)
+ #if RUBY_VERSION >= 0x10900
+     VALUE gem = rb_define_module("Gem");
+     rb_const_set(gem, rb_intern("Enable"), Qtrue);
+-    Init_prelude();                                             
++    char *opts[] = { "ruby", "-e;" };
++    ruby_options(2, opts);
+ #endif
+ 
+     ruby_incpush(QFile::encodeName(program.path()));
+-- 
+1.8.2.1
+
diff --git a/kde-base/korundum/files/korundum-4.10.80-2-Fix-compile-to-link-against-all-needed-libraries.patch b/kde-base/korundum/files/korundum-4.10.80-2-Fix-compile-to-link-against-all-needed-libraries.patch
new file mode 100644
index 00000000000..c943cbbf9d7
--- /dev/null
+++ b/kde-base/korundum/files/korundum-4.10.80-2-Fix-compile-to-link-against-all-needed-libraries.patch
@@ -0,0 +1,36 @@
+From 5fe6f5893b4fb6b2b130ba7f657ff16f9c35862b Mon Sep 17 00:00:00 2001
+From: Jonathan Riddell <jr@jriddell.org>
+Date: Wed, 19 Jun 2013 14:10:39 +0100
+Subject: [PATCH 2/4] Fix compile to link against all needed libraries Patch by
+ Raymond Wooninck for opensuse
+
+---
+ CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 563442d..2484fa6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -6,7 +6,9 @@ find_package(Ruby REQUIRED)
+ find_package(KDE4 REQUIRED)
+ find_package(QtRuby4 REQUIRED)
+ find_package(Smoke REQUIRED 
+-    COMPONENTS KdeCore 
++    COMPONENTS Akonadi
++        Kate
++        KdeCore
+         KdeUi 
+         KFile 
+         KHtml 
+@@ -16,6 +18,7 @@ find_package(Smoke REQUIRED
+         KParts
+         KTextEditor
+         KUtils
++        Okular
+         Phonon
+         Plasma
+         QtCore
+-- 
+1.8.2.1
+
diff --git a/kde-base/korundum/files/korundum-4.10.80-3-kate-not-required.patch b/kde-base/korundum/files/korundum-4.10.80-3-kate-not-required.patch
new file mode 100644
index 00000000000..f25dc83a8fd
--- /dev/null
+++ b/kde-base/korundum/files/korundum-4.10.80-3-kate-not-required.patch
@@ -0,0 +1,24 @@
+From fad8e25b0c7d2e4734726d01aad2b9f93d7b992c Mon Sep 17 00:00:00 2001
+From: Jonathan Riddell <jr@jriddell.org>
+Date: Thu, 20 Jun 2013 16:03:04 +0100
+Subject: [PATCH 3/4] kate not required
+
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2484fa6..f6bf35a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,7 +7,6 @@ find_package(KDE4 REQUIRED)
+ find_package(QtRuby4 REQUIRED)
+ find_package(Smoke REQUIRED 
+     COMPONENTS Akonadi
+-        Kate
+         KdeCore
+         KdeUi 
+         KFile 
+-- 
+1.8.2.1
+
diff --git a/kde-base/korundum/files/korundum-4.10.80-4-fix-optional-build-of-akonadi-okular-and-kate.patch b/kde-base/korundum/files/korundum-4.10.80-4-fix-optional-build-of-akonadi-okular-and-kate.patch
new file mode 100644
index 00000000000..c5e22007434
--- /dev/null
+++ b/kde-base/korundum/files/korundum-4.10.80-4-fix-optional-build-of-akonadi-okular-and-kate.patch
@@ -0,0 +1,89 @@
+From 259e439ad5d20a81d7b437bbcd57003d6fcf7008 Mon Sep 17 00:00:00 2001
+From: Philip Muskovac <yofel@gmx.net>
+Date: Fri, 21 Jun 2013 01:57:27 +0200
+Subject: [PATCH 4/4] fix optional build of akonadi, okular and kate
+
+This reverts the rest of 5fe6f5893b4fb6b2b130ba7f657ff16f9c35862b
+looks for smokeakonadi/okular/kate and only builds them if really
+everything they need is found.
+---
+ CMakeLists.txt         |  5 ++---
+ modules/CMakeLists.txt | 20 +++++++++++++++-----
+ 2 files changed, 17 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f6bf35a..45f32fe 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -6,8 +6,7 @@ find_package(Ruby REQUIRED)
+ find_package(KDE4 REQUIRED)
+ find_package(QtRuby4 REQUIRED)
+ find_package(Smoke REQUIRED 
+-    COMPONENTS Akonadi
+-        KdeCore
++    COMPONENTS KdeCore
+         KdeUi 
+         KFile 
+         KHtml 
+@@ -17,7 +16,6 @@ find_package(Smoke REQUIRED
+         KParts
+         KTextEditor
+         KUtils
+-        Okular
+         Phonon
+         Plasma
+         QtCore
+@@ -26,6 +24,7 @@ find_package(Smoke REQUIRED
+         SopranoClient
+         SopranoServer
+         Nepomuk )
++find_package(Smoke COMPONENTS Akonadi Okular Kate)
+ include(KDE4Defaults)
+ include_directories( ${KDE4_INCLUDES} ${SMOKE_INCLUDE_DIR} ${QTRUBY_INCLUDE_DIR} ${SMOKE_QTCORE_INCLUDE_DIR} ${SMOKE_KDECORE_INCLUDE_DIR} )
+ 
+diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
+index f494818..f53610f 100644
+--- a/modules/CMakeLists.txt
++++ b/modules/CMakeLists.txt
+@@ -17,11 +17,11 @@ macro_log_feature(OKULAR_FOUND "Okular" "Okular libraries" "http://www.kde.org"
+ 
+ macro_optional_add_bindings(Soprano_FOUND "Soprano" soprano)
+ 
+-if(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
++if(KDEPIMLIBS_FOUND AND Akonadi_FOUND AND SMOKE_AKONADI_FOUND)
+     set(BUILD_Akonadi TRUE)
+-else(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
++else(KDEPIMLIBS_FOUND AND Akonadi_FOUND AND SMOKE_AKONADI_FOUND)
+     set(BUILD_Akonadi FALSE)
+-endif(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
++endif(KDEPIMLIBS_FOUND AND Akonadi_FOUND AND SMOKE_AKONADI_FOUND)
+ macro_optional_add_bindings(BUILD_Akonadi "Akonadi" akonadi)
+ 
+ add_subdirectory(kio)
+@@ -38,11 +38,21 @@ else(Soprano_FOUND AND Nepomuk_FOUND AND SMOKE_NEPOMUK_FOUND)
+ endif(Soprano_FOUND AND Nepomuk_FOUND AND SMOKE_NEPOMUK_FOUND)
+ macro_optional_add_bindings(BUILD_Nepomuk "Nepomuk" nepomuk)
+ 
+-macro_optional_add_bindings(OKULAR_FOUND "Okular" okular)
++if(OKULAR_FOUND AND SMOKE_OKULAR_FOUND)
++    set(BUILD_Okular TRUE)
++else(OKULAR_FOUND AND SMOKE_OKULAR_FOUND)
++    set(BUILD_Okular FALSE)
++endif(OKULAR_FOUND AND SMOKE_OKULAR_FOUND)
++macro_optional_add_bindings(BUILD_Okular "Okular" okular)
+ 
+ find_library(KATEINTERFACES_LIBRARY kateinterfaces HINTS ${KDE4_LIB_DIR})
+ find_path(KATE_INCLUDE_DIR kate/plugin.h HINTS ${KDE4_INCLUDE_DIR})
+ 
+-macro_optional_add_bindings(KATE_INCLUDE_DIR "Kate" kate)
++if(KATE_INCLUDE_DIR AND SMOKE_KATE_FOUND)
++    set(BUILD_Kate TRUE)
++else(KATE_INCLUDE_DIR AND SMOKE_KATE_FOUND)
++    set(BUILD_Kate FALSE)
++endif(KATE_INCLUDE_DIR AND SMOKE_KATE_FOUND)
++macro_optional_add_bindings(BUILD_Kate "Kate" kate)
+ 
+ macro_display_bindings_log()
+-- 
+1.8.2.1
+
diff --git a/kde-base/korundum/korundum-4.10.80.ebuild b/kde-base/korundum/korundum-4.10.80.ebuild
index c3fe6f71075..f59cc3eaf53 100644
--- a/kde-base/korundum/korundum-4.10.80.ebuild
+++ b/kde-base/korundum/korundum-4.10.80.ebuild
@@ -33,6 +33,8 @@ RDEPEND="${DEPEND}
 # Split from kdebindings-ruby in 4.7
 add_blocker kdebindings-ruby
 
+PATCHES=( "${FILESDIR}/${P}-"[1-4]-*.patch )
+
 pkg_setup() {
 	ruby-ng_pkg_setup
 	kde4-base_pkg_setup