Hi,
as pinotree said on IRC that the solution I suggested above would not be
accepted, I tried fixing the patch instead. After compiling Amarok with
attached patch, QtScripts work fine for me (I compiled with pbuilder, so
the bindings were definitely not installed while creating the package).
Please let me know if there's anything else I can do get this fix to
unstable.
Kind regards
Ralf
From: Modestas Vainius <modes...@vainius.eu>
Subject: [PATCH] Disable QtScriptBindings check
Forwarded; not-needed
Origin: vendor
Last-Update: 2011-07-06
QtScriptBindings is a runtime dependency which is not needed at build time.
Just make cmake think that QtScriptBindings is available.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,8 +95,6 @@
# QCA2 is required for the Script Updater
find_package( QCA2 )
-find_package( QtScriptQtBindings )
-
macro_optional_find_package( LibLastFm )
set( LIBLASTFM_MIN_VERSION "1.0.0" )
if( LIBLASTFM_FOUND )
@@ -132,8 +130,6 @@
macro_log_feature( QT_QTOPENGL_FOUND "QtOpenGL" "Required for the spectrum analyzer" "http://qt-project.org"; FALSE "" "" )
- macro_log_feature( QTSCRIPTQTBINDINGS_FOUND "qtscript-qt" "QtScript Qt Bindings" "http://code.google.com/p/qtscriptgenerator/"; FALSE "" "" )
-
find_package(MySQLAmarok REQUIRED)
if( WITH_MYSQL_EMBEDDED )
set( BUILD_MYSQLE_COLLECTION TRUE )
--- a/shared/config.h.cmake
+++ b/shared/config.h.cmake
@@ -15,9 +15,6 @@
/* have QtCrypto the Qt crypto architecture */
#cmakedefine QCA2_FOUND 1
-/* have Qt bindings */
-#cmakedefine QTSCRIPTQTBINDINGS_FOUND 1
-
/* have QtOpenGL */
#cmakedefine QT_QTOPENGL_FOUND 1
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -25,9 +25,7 @@
#don't use our own libplasma anymore, but still pick up our applets/engines/containments
add_subdirectory( context )
add_subdirectory( services )
-if( QTSCRIPTQTBINDINGS_FOUND )
- add_subdirectory( scripts )
-endif( QTSCRIPTQTBINDINGS_FOUND )
+add_subdirectory( scripts )
add_subdirectory( aboutdialog/libattica-ocsclient )
add_subdirectory( transcoding )
add_subdirectory( kconf_update )
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -1123,9 +1123,7 @@
m_toolsMenu.data()->addAction( Amarok::actionCollection()->action("bookmark_manager") );
m_toolsMenu.data()->addAction( Amarok::actionCollection()->action("cover_manager") );
m_toolsMenu.data()->addAction( Amarok::actionCollection()->action("equalizer_dialog") );
-#ifdef QTSCRIPTQTBINDINGS_FOUND
m_toolsMenu.data()->addAction( Amarok::actionCollection()->action("script_manager") );
-#endif
#ifdef DEBUG_BUILD_TYPE
m_toolsMenu.data()->addAction( Amarok::actionCollection()->action("network_request_viewer") );
#endif // DEBUG_BUILD_TYPE
--- a/src/scriptengine/ScriptImporter.cpp
+++ b/src/scriptengine/ScriptImporter.cpp
@@ -47,9 +47,7 @@
ScriptImporter::loadQtBinding( const QString& binding )
{
QSet<QString> allowedBindings;
-#ifdef QTSCRIPTQTBINDINGS_FOUND
allowedBindings << "qt.core" << "qt.gui" << "qt.sql" << "qt.webkit" << "qt.xml" << "qt.uitools" << "qt.network";
-#endif
if( allowedBindings.contains( binding ) )
{
if( !m_importedBindings.contains( binding ) )
