removed one patch which seems to be upstream now
This commit is contained in:
parent
91ad63716c
commit
9109cc6e4f
@ -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)
|
@ -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}";
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user