Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Julien ROZO (17a62ca82718c3f3c5120d1514111620bc46f243)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Julien ROZO <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Julien ROZO (17a62ca82718c3f3c5120d1514111620bc46f243)
  • Date: Thu, 11 Jun 2009 13:04:41 -0500

GIT changes to master grimoire by Julien ROZO <julien AT rozo.org>:

kde4-apps/amarok2/DETAILS | 1 +
kde4-apps/amarok2/HISTORY | 5 +++++
kde4-apps/amarok2/PRE_BUILD | 3 +++
kde4-apps/amarok2/qtscriptgenerator.patch | 13 +++++++++++++
4 files changed, 22 insertions(+)

New commits:
commit 154d2bbf10fd3bd192994488990a023d16d334ff
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

amarok2: fixing http://bugs.sourcemage.org/show_bug.cgi?id=15247
applied patch from Bor Kraljic :
- added FORCE_DOWNLOAD for svn version in DETAILS
- added PRE_BUILD and qtscriptgenerator.patch to fix issue with
qtscriptgenerator detection

diff --git a/kde4-apps/amarok2/DETAILS b/kde4-apps/amarok2/DETAILS
index 56ca43d..e971c8a 100755
--- a/kde4-apps/amarok2/DETAILS
+++ b/kde4-apps/amarok2/DETAILS
@@ -5,6 +5,7 @@ if [[ $AMR_SVN == y ]];then
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_IGNORE=volatile

SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk/extragear/multimedia/$SPELLX:$SPELLX
+ FORCE_DOWNLOAD=1
else
VERSION=2.1

SOURCE_HASH=sha512:e918cd75d88993e93cf736e927e3188d822e99943a49df53406e245e1f1ec321daabaa23db088c770bc6c4dac6df7afbc5e2611bc867c61b24d4a961cb4ce9fc
diff --git a/kde4-apps/amarok2/HISTORY b/kde4-apps/amarok2/HISTORY
index d401192..66b52a6 100644
--- a/kde4-apps/amarok2/HISTORY
+++ b/kde4-apps/amarok2/HISTORY
@@ -1,3 +1,8 @@
+2009-06-08 Bor Kraljic <pyrobor AT ver.si>
+ * DETAILS: added FORCE_DOWNLOAD for svn version
+ * PRE_BUILD, qtscriptgenerator.patch: added, fix issue with
qtscriptgenerator
+ detection (fix bug #15247)
+
2009-06-04 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 2.1
* DEPENDS: added taglib-extras for both versions, added
qtscriptgenerator,
diff --git a/kde4-apps/amarok2/PRE_BUILD b/kde4-apps/amarok2/PRE_BUILD
new file mode 100755
index 0000000..6247bac
--- /dev/null
+++ b/kde4-apps/amarok2/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/qtscriptgenerator.patch
diff --git a/kde4-apps/amarok2/qtscriptgenerator.patch
b/kde4-apps/amarok2/qtscriptgenerator.patch
new file mode 100644
index 0000000..5f61f0e
--- /dev/null
+++ b/kde4-apps/amarok2/qtscriptgenerator.patch
@@ -0,0 +1,13 @@
+--- a/CMakeLists.txt 2009-03-24 16:51:54.000000000 +0200
++++ b/CMakeLists.txt 2009-03-24 17:06:57.000000000 +0200
+@@ -38,9 +38,6 @@
+
+ macro_log_feature( KDE4_FOUND "kdelibs" "The toolkit Amarok uses to
build" "http://www.kde.org"; TRUE "4.2.0" "" )
+
+- find_package( QtScriptQtBindings REQUIRED )
+- macro_log_feature( QTSCRIPTQTBINDINGS_FOUND "qtscript-qt" "QtScript Qt
Bindings" "http://code.google.com/p/qtscriptgenerator/"; TRUE "" "" )
+-
+ add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+
+ find_package(MySQLAmarok REQUIRED)
+



  • [SM-Commit] GIT changes to master grimoire by Julien ROZO (17a62ca82718c3f3c5120d1514111620bc46f243), Julien ROZO, 06/11/2009

Archive powered by MHonArc 2.6.24.

Top of Page