* [gentoo-commits] proj/kde:master commit in: kde-base/korundum/files/
@ 2013-12-14 21:20 Johannes Huber
0 siblings, 0 replies; only message in thread
From: Johannes Huber @ 2013-12-14 21:20 UTC (permalink / raw
To: gentoo-commits
commit: 77626da4106222adca757951291b47fabec1a001
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 14 21:19:48 2013 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Dec 14 21:20:02 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=77626da4
[kde-base/korundum] Remove unused patches
Package-Manager: portage-2.2.7
---
...undum-4.10.80-1-Fix-compile-with-Ruby-1.9.patch | 45 -----------
...pile-to-link-against-all-needed-libraries.patch | 36 ---------
.../korundum-4.10.80-3-kate-not-required.patch | 24 ------
...optional-build-of-akonadi-okular-and-kate.patch | 89 ----------------------
4 files changed, 194 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
deleted file mode 100644
index 1c1e322..0000000
--- a/kde-base/korundum/files/korundum-4.10.80-1-Fix-compile-with-Ruby-1.9.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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
deleted file mode 100644
index c943cbb..0000000
--- a/kde-base/korundum/files/korundum-4.10.80-2-Fix-compile-to-link-against-all-needed-libraries.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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
deleted file mode 100644
index f25dc83..0000000
--- a/kde-base/korundum/files/korundum-4.10.80-3-kate-not-required.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index c5e2200..0000000
--- a/kde-base/korundum/files/korundum-4.10.80-4-fix-optional-build-of-akonadi-okular-and-kate.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-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
-
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2013-12-14 21:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-14 21:20 [gentoo-commits] proj/kde:master commit in: kde-base/korundum/files/ Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox