From 9109cc6e4fd97929e3b04cd5a3dd18bbccc0b464 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Wed, 31 Jul 2013 20:46:56 +0000
Subject: [PATCH] removed one patch which seems to be upstream now

---
 .../kdebindings/qtruby-include-smokeqt.patch        | 13 -------------
 pkgs/desktops/kde-4.10/kdebindings/qtruby.nix       |  4 +---
 2 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.10/kdebindings/qtruby-include-smokeqt.patch

diff --git a/pkgs/desktops/kde-4.10/kdebindings/qtruby-include-smokeqt.patch b/pkgs/desktops/kde-4.10/kdebindings/qtruby-include-smokeqt.patch
deleted file mode 100644
index 7d20a3c1c0bc..000000000000
--- a/pkgs/desktops/kde-4.10/kdebindings/qtruby-include-smokeqt.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 33078b4..1a6ad2e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -5,7 +5,7 @@ set(COMPILE_RUBY FALSE CACHE INTERNAL "")
- find_package(Ruby REQUIRED)
- find_package(Qt4 REQUIRED)
- find_package(Smoke COMPONENTS QtCore QtGui QtXml QtOpenGl QtSql QtNetwork QtDbus QtSvg Phonon QSci QtDeclarative QtScript QtWebkit QtUiTools QtTest Qwt)
--include_directories(${SMOKE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src ${QT_INCLUDES})
-+include_directories(${SMOKE_INCLUDE_DIR} ${SMOKE_QTCORE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src ${QT_INCLUDES})
- 
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${SMOKE_CMAKE_MODULE_DIR})
- include(MacroOptionalFindPackage)
diff --git a/pkgs/desktops/kde-4.10/kdebindings/qtruby.nix b/pkgs/desktops/kde-4.10/kdebindings/qtruby.nix
index 29faf2af15c2..18a3703426c9 100644
--- a/pkgs/desktops/kde-4.10/kdebindings/qtruby.nix
+++ b/pkgs/desktops/kde-4.10/kdebindings/qtruby.nix
@@ -5,9 +5,7 @@ kde {
   buildInputs = [ smokeqt ruby ];
   nativeBuildInputs = [ cmake ];
 
-  # The second patch is not ready for upstream submmission. I should add an
-  # option() instead.
-  patches = [ ./qtruby-include-smokeqt.patch ./qtruby-install-prefix.patch ];
+  patches = [ ./qtruby-install-prefix.patch ];
 
   cmakeFlags="-DRUBY_ROOT_DIR=${ruby}";