Skip to Content.
Sympa Menu

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

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 (7abe912393181c1de3c858245c6127c177e8f6c0)
  • Date: Fri, 5 Jun 2009 16:51:11 -0500

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

ChangeLog | 4 +++
devel/qtscriptgenerator/BUILD | 12 +++++++++
devel/qtscriptgenerator/DEPENDS | 1
devel/qtscriptgenerator/DETAILS | 15 +++++++++++
devel/qtscriptgenerator/HISTORY | 4 +++
devel/qtscriptgenerator/INSTALL | 2 +
devel/qtscriptgenerator/PRE_BUILD | 3 ++
devel/qtscriptgenerator/disable-phonon.patch | 11 ++++++++
kde4-apps/amarok2/DEPENDS | 7 ++---
kde4-apps/amarok2/DETAILS | 4 +--
kde4-apps/amarok2/HISTORY | 6 ++++
kde4-apps/amarok2/PRE_BUILD | 5 ---
kde4-apps/amarok2/libgpod-0.7.0.patch | 36
---------------------------
13 files changed, 63 insertions(+), 47 deletions(-)

New commits:
commit 7abe912393181c1de3c858245c6127c177e8f6c0
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

amarok2: updated version to 2.1
in DEPENDS, added taglib-extras for both versions, added
qtscriptgenerator, removed libifp and libnjb
removed PRE_BUILD and libgpod-0.7.0.patch, no longer needed

commit e863239337daf8a5bbeeaff8ca664b520c570d5c
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

qtscriptgenerator: new spell, a tool that generates Qt bindings for Qt
Script

diff --git a/ChangeLog b/ChangeLog
index 12623e8..dc9ce07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-05 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * devel/qtscriptgenerator: new spell, a tool that generates Qt
+ bindings for Qt Script
+
2009-06-03 Ladislav Hagara <hgr AT vabo.cz>
* disk/nilfs-utils: new spell, a log-structured file system utils

diff --git a/devel/qtscriptgenerator/BUILD b/devel/qtscriptgenerator/BUILD
new file mode 100755
index 0000000..b18cbe9
--- /dev/null
+++ b/devel/qtscriptgenerator/BUILD
@@ -0,0 +1,12 @@
+QTDIR="${QTDIR:-$INSTALL_ROOT/usr}" &&
+PATH="$QTDIR/bin/qt4:$PATH" &&
+INCLUDE="${INSTALL_ROOT}/usr/include" &&
+
+cd $SOURCE_DIRECTORY/generator &&
+qmake PREFIX=$INSTALL_ROOT/usr &&
+make &&
+$SOURCE_DIRECTORY/generator/generator --include-paths=${INCLUDE} &&
+
+cd $SOURCE_DIRECTORY/qtbindings &&
+qmake PREFIX=$INSTALL_ROOT/usr &&
+make
diff --git a/devel/qtscriptgenerator/DEPENDS b/devel/qtscriptgenerator/DEPENDS
new file mode 100755
index 0000000..2e4e2ef
--- /dev/null
+++ b/devel/qtscriptgenerator/DEPENDS
@@ -0,0 +1 @@
+depends qt4
diff --git a/devel/qtscriptgenerator/DETAILS b/devel/qtscriptgenerator/DETAILS
new file mode 100755
index 0000000..58b1ec0
--- /dev/null
+++ b/devel/qtscriptgenerator/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=qtscriptgenerator
+ VERSION=0.1.0
+ SOURCE="${SPELL}-src-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://${SPELL}.googlecode.com/files/${SOURCE}
+
SOURCE_HASH=sha512:6adcba7c81d108df2316ef0133153bc7540ddf1d6e9628e0c86c55479a677219c05b76ada6d50989cd9e32106da665139f3de36e9d755685b90afa8df0c20b27
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-src-${VERSION}"
+ WEB_SITE="http://code.google.com/p/qtscriptgenerator/";
+ LICENSE[0]=GPL
+ ENTERED=20090605
+ SHORT="a tool that generates Qt bindings for Qt Script"
+cat << EOF
+Qt Script Generator is a tool that generates Qt bindings for Qt Script.
+With the generated bindings you get access to substantial portions of the
+Qt API from within Qt Script.
+EOF
diff --git a/devel/qtscriptgenerator/HISTORY b/devel/qtscriptgenerator/HISTORY
new file mode 100644
index 0000000..41820b4
--- /dev/null
+++ b/devel/qtscriptgenerator/HISTORY
@@ -0,0 +1,4 @@
+2009-06-05 Julien _kaze_ ROZO <julien AT rozo.org>
+ * BUILD, DEPENDS, DETAILS, HISTORY, INSTALL, PRE_BUILD,
disable-phonon.patch:
+ created this spell
+
diff --git a/devel/qtscriptgenerator/INSTALL b/devel/qtscriptgenerator/INSTALL
new file mode 100755
index 0000000..6a6645c
--- /dev/null
+++ b/devel/qtscriptgenerator/INSTALL
@@ -0,0 +1,2 @@
+cd $SOURCE_DIRECTORY &&
+install -m 755 plugins/script/* /usr/lib/qt4/plugins/script/
diff --git a/devel/qtscriptgenerator/PRE_BUILD
b/devel/qtscriptgenerator/PRE_BUILD
new file mode 100755
index 0000000..8ea43f4
--- /dev/null
+++ b/devel/qtscriptgenerator/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/disable-phonon.patch
diff --git a/devel/qtscriptgenerator/disable-phonon.patch
b/devel/qtscriptgenerator/disable-phonon.patch
new file mode 100644
index 0000000..78caead
--- /dev/null
+++ b/devel/qtscriptgenerator/disable-phonon.patch
@@ -0,0 +1,11 @@
+diff -Naur qtscriptgenerator-src-0.1.0.orig/qtbindings/qtbindings.pro
qtscriptgenerator-src-0.1.0/qtbindings/qtbindings.pro
+--- qtscriptgenerator-src-0.1.0.orig/qtbindings/qtbindings.pro 2009-02-20
12:42:24.000000000 +0100
++++ qtscriptgenerator-src-0.1.0/qtbindings/qtbindings.pro 2009-06-05
16:46:29.000000000 +0200
+@@ -6,7 +6,6 @@
+ qtscript_sql \
+ qtscript_svg \
+ qtscript_xml \
+- qtscript_phonon \
+ qtscript_webkit \
+ qtscript_xmlpatterns \
+ qtscript_uitools \
diff --git a/kde4-apps/amarok2/DEPENDS b/kde4-apps/amarok2/DEPENDS
index 7559d9f..25f44dc 100755
--- a/kde4-apps/amarok2/DEPENDS
+++ b/kde4-apps/amarok2/DEPENDS
@@ -1,17 +1,16 @@
source $SECTION_DIRECTORY/KDE_DEPENDS &&
if [[ $AMR_SVN == y ]];then
- depends subversion &&
- depends taglib-extras
+ depends subversion
fi &&
depends taglib &&
+depends taglib-extras &&
depends -sub STL qt4 &&
depends -sub EMBEDDED mysql &&
+depends qtscriptgenerator &&
optional_depends faac '' '' 'for M4A/AAC/MP4 tag support' &&
optional_depends libvisual '' '' 'to use libvisual plugins' &&
optional_depends gstreamer '' '' 'GStreamer support' &&
optional_depends kdemultimedia4 '' '' 'CDDB support' &&
optional_depends loudmouth '' '' 'for mp3tunes support' &&
optional_depends libgpod '' '' 'for Apple iPod support' &&
-optional_depends libnjb '' '' 'for Creative Labs Jukebox support' &&
-optional_depends libifp '' '' 'for iRiver iFP support' &&
optional_depends libmtp '' '' 'for media transfer protocol support'
diff --git a/kde4-apps/amarok2/DETAILS b/kde4-apps/amarok2/DETAILS
index 10f1c5a..56ca43d 100755
--- a/kde4-apps/amarok2/DETAILS
+++ b/kde4-apps/amarok2/DETAILS
@@ -6,8 +6,8 @@ if [[ $AMR_SVN == y ]];then
SOURCE_IGNORE=volatile

SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk/extragear/multimedia/$SPELLX:$SPELLX
else
- VERSION=2.0.2
-
SOURCE_HASH=sha512:d5dacf82be1e1b4e44bdd22adb4af6d622d93004a15a8444dd02cbe4cf8295d0823b545228371f35926ed0c410cdeb88b84b74b5cacd34199eb72a529078b258
+ VERSION=2.1
+
SOURCE_HASH=sha512:e918cd75d88993e93cf736e927e3188d822e99943a49df53406e245e1f1ec321daabaa23db088c770bc6c4dac6df7afbc5e2611bc867c61b24d4a961cb4ce9fc
SOURCE=$SPELLX-$VERSION.tar.bz2
# SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
SOURCE_URL[0]=$KDE_URL/stable/$SPELLX/$VERSION/src/$SOURCE
diff --git a/kde4-apps/amarok2/HISTORY b/kde4-apps/amarok2/HISTORY
index 1c5e935..d401192 100644
--- a/kde4-apps/amarok2/HISTORY
+++ b/kde4-apps/amarok2/HISTORY
@@ -1,3 +1,9 @@
+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,
+ removed libifp and libnjb
+ * PRE_BUILD, libgpod-0.7.0.patch: removed, no longer needed
+
2009-04-24 Julien "_kaze_" ROZO <julien AT rozo.org>
* DEPENDS: taglib is mandatory for both versions,
svn version also needs taglib-extras
diff --git a/kde4-apps/amarok2/PRE_BUILD b/kde4-apps/amarok2/PRE_BUILD
deleted file mode 100755
index d323b71..0000000
--- a/kde4-apps/amarok2/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-if [[ $AMR_SVN == n ]]; then
- patch -p1 < ${SCRIPT_DIRECTORY}/libgpod-0.7.0.patch
-fi
diff --git a/kde4-apps/amarok2/libgpod-0.7.0.patch
b/kde4-apps/amarok2/libgpod-0.7.0.patch
deleted file mode 100644
index bdde4b2..0000000
--- a/kde4-apps/amarok2/libgpod-0.7.0.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur
amarok-2.0.2.orig/src/collection/ipodcollection/handler/IpodHandler.cpp
amarok-2.0.2/src/collection/ipodcollection/handler/IpodHandler.cpp
---- amarok-2.0.2.orig/src/collection/ipodcollection/handler/IpodHandler.cpp
2009-03-01 18:21:38.000000000 +0100
-+++ amarok-2.0.2/src/collection/ipodcollection/handler/IpodHandler.cpp
2009-04-22 21:18:51.000000000 +0200
-@@ -1339,12 +1339,17 @@
- QFileInfo tempImageFileInfo( tempImageFile ); // get info for path
- QString tempImagePath = tempImageFileInfo.absoluteFilePath(); // path
-
-+#ifdef ITDB_THUMB_COVER_SMALL
- Itdb_Thumb *thumb = NULL;
-+#endif
- GdkPixbuf *gpixbuf = NULL;
- QString thumbPath;
-
- // pull image out of ipod
-
-+#ifdef ITDB_THUMB_COVER_SMALL
-+ // we've got libgpod 0.6.0 here
-+
- if( ipodtrack->has_artwork == 0x01 )
- {
- // try small first
-@@ -1406,6 +1411,14 @@
- }
- }
- }
-+#else
-+ // libgpod 0.7.0
-+
-+ if( itdb_track_has_thumbnails ( ipodtrack ) )
-+ {
-+ gpixbuf = (GdkPixbuf*) itdb_track_get_thumbnail (ipodtrack, -1, -1
);
-+ }
-+#endif
-
- if(gpixbuf != NULL)
- {



  • [SM-Commit] GIT changes to master grimoire by Julien ROZO (7abe912393181c1de3c858245c6127c177e8f6c0), Julien ROZO, 06/05/2009

Archive powered by MHonArc 2.6.24.

Top of Page