Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (9c068e0a83987ae0e92aeb70335f98b873b109e3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Juuso Alasuutari <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (9c068e0a83987ae0e92aeb70335f98b873b109e3)
  • Date: Sun, 6 Jul 2008 21:31:56 -0500

GIT changes to master grimoire by Juuso Alasuutari <iuso AT sourcemage.org>:

ChangeLog | 5 +++++
audio-creation/ardour2/DEPENDS | 9 ++++-----
audio-creation/ardour2/DETAILS | 2 +-
audio-creation/ardour2/HISTORY | 5 +++++
audio-creation/ardour2/PRE_BUILD | 6 +++---
audio-drivers/jack2/BUILD | 5 +++++
audio-drivers/jack2/CONFLICTS | 3 +++
audio-drivers/jack2/DEPENDS | 15 +++++++++++++++
audio-drivers/jack2/DETAILS | 21 +++++++++++++++++++++
audio-drivers/jack2/HISTORY | 5 +++++
audio-drivers/jack2/INSTALL | 1 +
audio-drivers/jack2/PREPARE | 2 ++
audio-drivers/jack2/PRE_SUB_DEPENDS | 5 +++++
audio-drivers/jack2/PROVIDES | 1 +
audio-drivers/jack2/SUB_DEPENDS | 6 ++++++
audio-libs/raul/DETAILS | 2 +-
audio-libs/raul/HISTORY | 3 +++
audio-libs/slv2/DETAILS | 2 +-
audio-libs/slv2/HISTORY | 3 +++
audio-soft/patchage/DEPENDS | 22 ++++++++++++----------
audio-soft/patchage/DETAILS | 2 +-
audio-soft/patchage/HISTORY | 3 +++
graphics-libs/flowcanvas/DEPENDS | 4 ++--
graphics-libs/flowcanvas/DETAILS | 2 +-
graphics-libs/flowcanvas/HISTORY | 4 ++++
http/qtwebkit/BUILD | 8 ++++++++
http/qtwebkit/DEPENDS | 6 ++++++
http/qtwebkit/DETAILS | 24 ++++++++++++++++++++++++
http/qtwebkit/HISTORY | 3 +++
kde4/kdebase-workspace4/CONFIGURE | 13 ++++++++++++-
kde4/kdebase-workspace4/HISTORY | 4 ++++
kde4/kdebase-workspace4/INSTALL | 2 +-
kde4/kdebase4-runtime/DEPENDS | 1 -
kde4/kdebase4-runtime/HISTORY | 4 ++++
kde4/kdebase4/DEPENDS | 1 -
kde4/kdebase4/HISTORY | 4 ++++
x11-toolkits/qt4/HISTORY | 4 ++++
x11-toolkits/qt4/PRE_SUB_DEPENDS | 1 +
x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS | 1 +
x11-toolkits/qt4/SUB_DEPENDS | 15 ++++++++++-----
40 files changed, 195 insertions(+), 34 deletions(-)

New commits:
commit 221ee17397cba0d7a4d93d98dcb0d5de64febd03
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

ardour2: Added quotes around directory variables, changed SPELL_DIRECTORY
to SCRIPT_DIRECTORY.

commit 14a732b5aa049c3c866c5bf571b97da20d026600
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

ardour2: Enabled optional_depends slv2 now that slv2 0.6.0 is out.

commit 013dc2f890ef3212e966b3a33e2f08e33ee43f88
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

patchage 0.4.1

commit cde0e78102b1a3312710762253430a74054abe1c
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

slv2 0.6.0

commit d0952c6d00128dfe968fa677e9ccd64260d06d4a
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

raul 0.5.0

commit 36daa3b6883a126d6955d89fc2626680324586b2
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

flowcanvas 0.5.0

commit f99a4ee3292b866a0b6cccd671966534fe38e31e
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

audio-drivers/jack2: New spell, devel version of the JACK 2.0 audio
server. (Although jack2 is
still in development it's very stable and a drop-in replacement for jack.)

commit d1e98eab851661629bbfa9c7a67510c2921b6aa9
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

http/qtwebkit: New spell, a Qt backport of WebKit.

commit 53e9a2f17e9b97f27edd5156db77c3959e73c6c7
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

kdebase4: Removed unnecessary dependency on kdepimlibs4 (thanks Jucato)

commit d69da31ccef6f87d30bc5d48f3ac8b66b3e9e08a
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

kdebase4-runtime: Removed unnecessary dependency on kdepimlibs4 (thanks
Jucato)

commit 14df202df49f98d2a639c28ca90be491b5c4adb4
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

qt4: Added sub-dependency target for WebKit.

commit 8a8447c4d984873122a7134c7b66b9e5f60e01cd
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

kdebase-workspace4: Added an option to enable/disable importing of KDM 3
configs (disabled for now, doesn't work).

diff --git a/ChangeLog b/ChangeLog
index e18921a..43681f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-07 Juuso Alasuutari <iuso AT sourcemage.org>
+ * http/qtwebkit: New spell, a Qt backport of WebKit.
+ * audio-drivers/jack2: New spell, devel version of
+ the JACK 2.0 audio server.
+
2008-07-06 Treeve Jelbert <treeve AT sourcemage.org>
* graphics-libs/libungif: spell deprecated [replaced by giflib]

diff --git a/audio-creation/ardour2/DEPENDS b/audio-creation/ardour2/DEPENDS
index 25a7460..4baf501 100755
--- a/audio-creation/ardour2/DEPENDS
+++ b/audio-creation/ardour2/DEPENDS
@@ -26,11 +26,10 @@ then
depends soundtouch
fi &&

-# slv2 >= 0.6.0 (SVN version) required
-#optional_depends slv2 \
-# "LV2=1" \
-# "LV2=0" \
-# "for LV2 plugin support" &&
+optional_depends slv2 \
+ "LV2=1" \
+ "LV2=0" \
+ "for LV2 plugin support" &&

optional_depends libusb \
"TRANZPORT=1" \
diff --git a/audio-creation/ardour2/DETAILS b/audio-creation/ardour2/DETAILS
index 9a5e0a0..497a57e 100755
--- a/audio-creation/ardour2/DETAILS
+++ b/audio-creation/ardour2/DETAILS
@@ -2,7 +2,7 @@
VERSION=2.4.1

SOURCE_HASH=sha512:451eb32efb9aa1c08842524f037b183ae8a36d8fab0b555bd0d84e3a8e4d2d9a177035b718c79d472fa481d4cfac4286426d3da2433c2766fb88698a595dcdc5
SOURCE=ardour-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/ardour-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/ardour-$VERSION"
SOURCE_URL[0]=http://ardour.org/files/releases/$SOURCE
WEB_SITE=http://ardour.org/
ENTERED=20070829
diff --git a/audio-creation/ardour2/HISTORY b/audio-creation/ardour2/HISTORY
index c3c3400..d7a0bd2 100644
--- a/audio-creation/ardour2/HISTORY
+++ b/audio-creation/ardour2/HISTORY
@@ -1,3 +1,8 @@
+2008-07-07 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DEPENDS: Uncommented optional_depends slv2 now that slv2 0.6.0 is
out.
+ * DETAILS, PRE_BUILD: Added quotes around directory variables, changed
+ SPELL_DIRECTORY to SCRIPT_DIRECTORY.
+
2008-04-11 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.4.1
* PRE_BUILD: added gcc 4.3 patch
diff --git a/audio-creation/ardour2/PRE_BUILD
b/audio-creation/ardour2/PRE_BUILD
index 1941454..88d2e29 100755
--- a/audio-creation/ardour2/PRE_BUILD
+++ b/audio-creation/ardour2/PRE_BUILD
@@ -1,6 +1,6 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&

-patch -p1 < $SPELL_DIRECTORY/gcc43.patch &&
+patch -p1 < "$SCRIPT_DIRECTORY/gcc43.patch" &&

sed -i "s:libSoundTouch:soundtouch-1.0:" SConstruct
diff --git a/audio-drivers/jack2/BUILD b/audio-drivers/jack2/BUILD
new file mode 100755
index 0000000..9f62c16
--- /dev/null
+++ b/audio-drivers/jack2/BUILD
@@ -0,0 +1,5 @@
+cd "$SOURCE_DIRECTORY" &&
+
+./waf configure --prefix=/usr --destdir="$INSTALL_ROOT" \
+ --enable-pkg-config-dbus-service-dir $OPTS &&
+./waf build
diff --git a/audio-drivers/jack2/CONFLICTS b/audio-drivers/jack2/CONFLICTS
new file mode 100755
index 0000000..717ff96
--- /dev/null
+++ b/audio-drivers/jack2/CONFLICTS
@@ -0,0 +1,3 @@
+conflicts jack-cvs y &&
+conflicts jackdmp &&
+conflicts jack
diff --git a/audio-drivers/jack2/DEPENDS b/audio-drivers/jack2/DEPENDS
new file mode 100755
index 0000000..d7d46f6
--- /dev/null
+++ b/audio-drivers/jack2/DEPENDS
@@ -0,0 +1,15 @@
+depends pkgconfig &&
+depends expat &&
+depends g++ &&
+depends python &&
+depends alsa-lib &&
+
+optional_depends doxygen \
+ "--doxygen" \
+ "" \
+ "to build documentation" &&
+
+optional_depends dbus \
+ "--dbus" \
+ "" \
+ "to enable the D-Bus control interface"
diff --git a/audio-drivers/jack2/DETAILS b/audio-drivers/jack2/DETAILS
new file mode 100755
index 0000000..676325f
--- /dev/null
+++ b/audio-drivers/jack2/DETAILS
@@ -0,0 +1,21 @@
+ SPELL=jack2
+if [[ $JACK2_VCS_AUTOUPDATE == y ]]
+then
+ VERSION=$(date +%Y%m%d)
+else
+ VERSION=svn
+fi
+ SOURCE=$SPELL-svn.tar.bz2
+
SOURCE_URL[0]=svn_http://subversion.jackaudio.org/jack/jack2/trunk/jackmp:jackdmp
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=1
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
+ WEB_SITE=http://jackaudio.org/
+ ENTERED=20080707
+ LICENSE[0]=GPL
+ KEYWORDS="drivers audio"
+ SHORT="Development version of the JACK 2.0 audio server"
+cat << EOF
+JACK Audio Connection Kit
+A development version of the JACK 2.0 audio server.
+EOF
diff --git a/audio-drivers/jack2/HISTORY b/audio-drivers/jack2/HISTORY
new file mode 100644
index 0000000..0437174
--- /dev/null
+++ b/audio-drivers/jack2/HISTORY
@@ -0,0 +1,5 @@
+2008-07-07 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS, PREPARE, DEPENDS, PRE_BUILD, BUILD, INSTALL,
+ CONFLICTS, PROVIDES, PRE_SUB_DEPENDS, SUB_DEPENDS:
+ Created spell.
+
diff --git a/audio-drivers/jack2/INSTALL b/audio-drivers/jack2/INSTALL
new file mode 100755
index 0000000..6d035e0
--- /dev/null
+++ b/audio-drivers/jack2/INSTALL
@@ -0,0 +1 @@
+./waf install
diff --git a/audio-drivers/jack2/PREPARE b/audio-drivers/jack2/PREPARE
new file mode 100755
index 0000000..1a262c1
--- /dev/null
+++ b/audio-drivers/jack2/PREPARE
@@ -0,0 +1,2 @@
+config_query JACK2_VCS_AUTOUPDATE \
+ "Automatically update on every system update?" n
diff --git a/audio-drivers/jack2/PRE_SUB_DEPENDS
b/audio-drivers/jack2/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..f8c673b
--- /dev/null
+++ b/audio-drivers/jack2/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ DBUS) is_depends_enabled $SPELL dbus && return 0 ;;
+ *) echo "Unknown sub-dependency $THIS_SUB_DEPENDS" ;;
+esac
+return 1
diff --git a/audio-drivers/jack2/PROVIDES b/audio-drivers/jack2/PROVIDES
new file mode 100755
index 0000000..9873a4b
--- /dev/null
+++ b/audio-drivers/jack2/PROVIDES
@@ -0,0 +1 @@
+JACK-DRIVER
diff --git a/audio-drivers/jack2/SUB_DEPENDS b/audio-drivers/jack2/SUB_DEPENDS
new file mode 100755
index 0000000..b77c781
--- /dev/null
+++ b/audio-drivers/jack2/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ DBUS) echo "DBUS support requested, forcing dbus dependency." &&
+ depends dbus
+ ;;
+ *) echo "Unknown sub-dependency $THIS_SUB_DEPENDS" ; return 1 ;;
+esac
diff --git a/audio-libs/raul/DETAILS b/audio-libs/raul/DETAILS
index 8bd6744..f1bb081 100755
--- a/audio-libs/raul/DETAILS
+++ b/audio-libs/raul/DETAILS
@@ -13,7 +13,7 @@ then
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY="$BUILD_DIRECTORY/drobilla_lad-$VERSION"
else
- VERSION=0.4.0
+ VERSION=0.5.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=http://download.drobilla.net/$SOURCE
diff --git a/audio-libs/raul/HISTORY b/audio-libs/raul/HISTORY
index ea501e9..e8fc845 100644
--- a/audio-libs/raul/HISTORY
+++ b/audio-libs/raul/HISTORY
@@ -1,2 +1,5 @@
+2008-07-07 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Updated to 0.5.0.
+
2008-03-19 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS, PREPARE, DEPENDS, PRE_BUILD, BUILD, INSTALL: Created spell.
diff --git a/audio-libs/slv2/DETAILS b/audio-libs/slv2/DETAILS
index b9427bf..866405a 100755
--- a/audio-libs/slv2/DETAILS
+++ b/audio-libs/slv2/DETAILS
@@ -1,5 +1,5 @@
SPELL=slv2
- VERSION=0.5.0
+ VERSION=0.6.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/audio-libs/slv2/HISTORY b/audio-libs/slv2/HISTORY
index 49109e4..7f04931 100644
--- a/audio-libs/slv2/HISTORY
+++ b/audio-libs/slv2/HISTORY
@@ -1,3 +1,6 @@
+2008-07-07 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Updated to 0.6.0.
+
2008-02-25 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Updated to 0.5.0.

diff --git a/audio-soft/patchage/DEPENDS b/audio-soft/patchage/DEPENDS
index 507f640..862c86e 100755
--- a/audio-soft/patchage/DEPENDS
+++ b/audio-soft/patchage/DEPENDS
@@ -3,6 +3,7 @@ depends boost &&
depends libglademm &&
depends raul &&
depends flowcanvas &&
+depends alsa-lib &&

if [[ $PATCHAGE_VCS == y ]]
then
@@ -11,18 +12,19 @@ then
depends autoconf
fi &&

-depends alsa-lib &&
-depends JACK-DRIVER &&
+message "${MESSAGE_COLOR}The D-Bus interface requires" \
+ "a development version of JACK.$DEFAULT_COLOR" &&

-if [[ $PATCHAGE_VCS == y ]]
-then
- message "${MESSAGE_COLOR}The D-Bus interface requires" \
- "a development version of JACK.$DEFAULT_COLOR" &&
+optional_depends dbus \
+ "--enable-jack-dbus" \
+ "--disable-jack-dbus" \
+ "to use a D-Bus interface for controlling JACK" &&

- optional_depends dbus \
- "--enable-jack-dbus" \
- "--disable-jack-dbus" \
- "to use a D-Bus interface for controlling JACK"
+if is_depends_enabled $SPELL dbus
+then
+ depends -sub DBUS jack2
+else
+ depends JACK_DRIVER
fi &&

optional_depends lash \
diff --git a/audio-soft/patchage/DETAILS b/audio-soft/patchage/DETAILS
index fe3d700..d4ef47a 100755
--- a/audio-soft/patchage/DETAILS
+++ b/audio-soft/patchage/DETAILS
@@ -13,7 +13,7 @@ then
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY="$BUILD_DIRECTORY/drobilla_lad-$VERSION"
else
- VERSION=0.4.0
+ VERSION=0.4.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=http://download.drobilla.net/$SOURCE
diff --git a/audio-soft/patchage/HISTORY b/audio-soft/patchage/HISTORY
index 5f279b7..27ff33b 100644
--- a/audio-soft/patchage/HISTORY
+++ b/audio-soft/patchage/HISTORY
@@ -1,2 +1,5 @@
+2008-07-07 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Updated to 0.4.1.
+
2008-03-19 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS, PREPARE, DEPENDS, PRE_BUILD, BUILD: Created spell.
diff --git a/graphics-libs/flowcanvas/DEPENDS
b/graphics-libs/flowcanvas/DEPENDS
index e05b962..928ff75 100755
--- a/graphics-libs/flowcanvas/DEPENDS
+++ b/graphics-libs/flowcanvas/DEPENDS
@@ -11,8 +11,8 @@ then
fi &&

optional_depends graphviz \
- "" \
- "" \
+ "--enable-graphviz" \
+ "--disable-graphviz" \
"for auto-layout support" &&

optional_depends doxygen \
diff --git a/graphics-libs/flowcanvas/DETAILS
b/graphics-libs/flowcanvas/DETAILS
index 1febaa1..9bb1b4e 100755
--- a/graphics-libs/flowcanvas/DETAILS
+++ b/graphics-libs/flowcanvas/DETAILS
@@ -13,7 +13,7 @@ then
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY="$BUILD_DIRECTORY/drobilla_lad-$VERSION"
else
- VERSION=0.4.0
+ VERSION=0.5.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=http://download.drobilla.net/$SOURCE
diff --git a/graphics-libs/flowcanvas/HISTORY
b/graphics-libs/flowcanvas/HISTORY
index fe543f1..b92946e 100644
--- a/graphics-libs/flowcanvas/HISTORY
+++ b/graphics-libs/flowcanvas/HISTORY
@@ -1,3 +1,7 @@
+2008-07-07 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Updated to 0.5.0.
+ * DEPENDS: Added missing option flags to optional_depends graphviz.
+
2008-03-19 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS, PREPARE, CONFIGURE, DEPENDS, PRE_BUILD, BUILD, INSTALL:
Created spell.
diff --git a/http/qtwebkit/BUILD b/http/qtwebkit/BUILD
new file mode 100755
index 0000000..88954cd
--- /dev/null
+++ b/http/qtwebkit/BUILD
@@ -0,0 +1,8 @@
+QTDIR="${QTDIR:-$INSTALL_ROOT/usr}" &&
+PATH="$QTDIR/bin/qt4:$PATH" &&
+
+cd "$SOURCE_DIRECTORY" &&
+WebKitTools/Scripts/build-webkit --qt &&
+
+cd WebKitBuild/Release &&
+make
diff --git a/http/qtwebkit/DEPENDS b/http/qtwebkit/DEPENDS
new file mode 100755
index 0000000..629492c
--- /dev/null
+++ b/http/qtwebkit/DEPENDS
@@ -0,0 +1,6 @@
+depends qt4 &&
+depends gperf &&
+depends sqlite &&
+depends bison &&
+depends flex &&
+depends libxslt
diff --git a/http/qtwebkit/DETAILS b/http/qtwebkit/DETAILS
new file mode 100755
index 0000000..58b197d
--- /dev/null
+++ b/http/qtwebkit/DETAILS
@@ -0,0 +1,24 @@
+ SPELL=qtwebkit
+if [[ $WEBKITQT_VCS_AUTOUPDATE == y ]]
+then
+ VERSION=$(date +%Y%m%d)
+else
+ VERSION=svn
+fi
+ SOURCE=$SPELL-svn.tar.bz2
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
+ SOURCE_URL[0]=svn_http://svn.webkit.org/repository/webkit/trunk:$SPELL-svn
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=1
+ WEB_SITE=http://trac.webkit.org/wiki/QtWebKit
+ ENTERED=20080707
+ LICENSE[0]=GPL
+ KEYWORDS="engine http"
+ SHORT="A Qt backport of the WebKit web browser engine"
+cat << EOF
+WebKit is an open source web browser engine. WebKit's HTML and JavaScript
+code began as a branch of the KHTML and KJS libraries from KDE. As part
+of KDE framework KHTML was based on Qt but during their porting efforts
+Apple's engineers made WebKit toolkit independent. WebKit Qt is a project
+aiming at porting this fabulous engine back to Qt.
+EOF
diff --git a/http/qtwebkit/HISTORY b/http/qtwebkit/HISTORY
new file mode 100644
index 0000000..67f2b63
--- /dev/null
+++ b/http/qtwebkit/HISTORY
@@ -0,0 +1,3 @@
+2008-07-07 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS, DEPENDS, BUILD: Created spell.
+
diff --git a/kde4/kdebase-workspace4/CONFIGURE
b/kde4/kdebase-workspace4/CONFIGURE
index 3e2e1ef..6366440 100755
--- a/kde4/kdebase-workspace4/CONFIGURE
+++ b/kde4/kdebase-workspace4/CONFIGURE
@@ -1 +1,12 @@
-source $SECTION_DIRECTORY/KDE_CONFIGURE
+source "$SECTION_DIRECTORY/KDE_CONFIGURE" &&
+
+if spell_ok kdebase
+then
+ # Importing doesn't seem to work right now (svn, 2008-07-07)
+ config_query_option GENKDMCONF_FLAGS \
+ "Import KDE 3 login manager settings?" n \
+ "" "--no-old"
+else
+ persistent_add GENKDMCONF_FLAGS &&
+ local GENKDMCONF_FLAGS=""
+fi
diff --git a/kde4/kdebase-workspace4/HISTORY b/kde4/kdebase-workspace4/HISTORY
index 4099295..c39781c 100644
--- a/kde4/kdebase-workspace4/HISTORY
+++ b/kde4/kdebase-workspace4/HISTORY
@@ -1,3 +1,7 @@
+2008-07-07 Juuso Alasuutari <iuso AT sourcemage.org>
+ * CONFIGURE, INSTALL: Added an option to enable/disable
+ importing of KDM 3 configs (disabled for now, doesn't work).
+
2008-07-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.0.85

diff --git a/kde4/kdebase-workspace4/INSTALL b/kde4/kdebase-workspace4/INSTALL
index 2f4602e..6249fdb 100755
--- a/kde4/kdebase-workspace4/INSTALL
+++ b/kde4/kdebase-workspace4/INSTALL
@@ -1,4 +1,4 @@
-default_install &&
+GENKDMCONF_FLAGS="$GENKDMCONF_FLAGS" default_install &&
mkdir -p $INSTALL_ROOT/usr/share/xsessions &&
install -m 0644 -o root -g root $SCRIPT_DIRECTORY/kde4.desktop \
$INSTALL_ROOT/usr/share/xsessions &&
diff --git a/kde4/kdebase4-runtime/DEPENDS b/kde4/kdebase4-runtime/DEPENDS
index 0b423e2..a584609 100755
--- a/kde4/kdebase4-runtime/DEPENDS
+++ b/kde4/kdebase4-runtime/DEPENDS
@@ -1,7 +1,6 @@
source $SECTION_DIRECTORY/KDE_DEPENDS &&
source $GRIMOIRE/FUNCTIONS &&
depends qimageblitz &&
-depends kdepimlibs4 &&
depends xine-lib &&
if check_if_xorg_modular_libs qt4 ; then
# depends imake &&
diff --git a/kde4/kdebase4-runtime/HISTORY b/kde4/kdebase4-runtime/HISTORY
index b5e4d6a..ac94995 100644
--- a/kde4/kdebase4-runtime/HISTORY
+++ b/kde4/kdebase4-runtime/HISTORY
@@ -1,3 +1,7 @@
+2008-07-07 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DEPENDS: Removed unnecessary dependency on kdepimlibs4
+ (thanks Jucato).
+
2008-07-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.0.85

diff --git a/kde4/kdebase4/DEPENDS b/kde4/kdebase4/DEPENDS
index a271f39..7aa0081 100755
--- a/kde4/kdebase4/DEPENDS
+++ b/kde4/kdebase4/DEPENDS
@@ -1,7 +1,6 @@
source $SECTION_DIRECTORY/KDE_DEPENDS &&
source $GRIMOIRE/FUNCTIONS &&
depends qimageblitz &&
-depends kdepimlibs4 &&
if check_if_xorg_modular_libs qt4 ; then
depends imake &&
depends libxau &&
diff --git a/kde4/kdebase4/HISTORY b/kde4/kdebase4/HISTORY
index 4f4590c..f0b9f28 100644
--- a/kde4/kdebase4/HISTORY
+++ b/kde4/kdebase4/HISTORY
@@ -1,3 +1,7 @@
+2008-07-07 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DEPENDS: Removed unnecessary dependency on kdepimlibs4
+ (thanks Jucato).
+
2008-07-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.0.85

diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index c620bff..85d216b 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,7 @@
+2008-07-07 Juuso Alasuutari <iuso AT sourcemage.org>
+ * PRE_SUB_DEPENDS, SUB_DEPENDS: REPAIR^all^PRE_SUB_DEPENDS:
+ Added WEBKIT.
+
2008-06-11 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.4.2 (snapshot)

diff --git a/x11-toolkits/qt4/PRE_SUB_DEPENDS
b/x11-toolkits/qt4/PRE_SUB_DEPENDS
index c4fe0ef..0e12325 100755
--- a/x11-toolkits/qt4/PRE_SUB_DEPENDS
+++ b/x11-toolkits/qt4/PRE_SUB_DEPENDS
@@ -5,6 +5,7 @@ case $THIS_SUB_DEPENDS in
SSL) is_depends_enabled $SPELL openssl && return 0;;
TOOLS) [[ $QT_TOOLS == "-make" ]] && return 0;;
QT3) [[ $QT_QT3 == "-qt3support" ]] && return 0;;
+ WEBKIT) [[ $QT_WEBKIT == "-webkit" ]] && return 0;;
*) echo "Eek, unknown subdependency requested!"; return 1;;
esac
return 1
diff --git a/x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS
b/x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS
index c4fe0ef..0e12325 100755
--- a/x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS
+++ b/x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS
@@ -5,6 +5,7 @@ case $THIS_SUB_DEPENDS in
SSL) is_depends_enabled $SPELL openssl && return 0;;
TOOLS) [[ $QT_TOOLS == "-make" ]] && return 0;;
QT3) [[ $QT_QT3 == "-qt3support" ]] && return 0;;
+ WEBKIT) [[ $QT_WEBKIT == "-webkit" ]] && return 0;;
*) echo "Eek, unknown subdependency requested!"; return 1;;
esac
return 1
diff --git a/x11-toolkits/qt4/SUB_DEPENDS b/x11-toolkits/qt4/SUB_DEPENDS
index 5d35dc7..022c18e 100755
--- a/x11-toolkits/qt4/SUB_DEPENDS
+++ b/x11-toolkits/qt4/SUB_DEPENDS
@@ -18,11 +18,16 @@ TOOLS) if [[ $QT_TOOLS == "-nomake" ]]; then
echo "Tools requested, forcing build." &&
QT_TOOLS="-make"
fi
+ ;;
+QT3) if [[ $QT_QT3 == "-no-qt3support" ]]; then
+ echo "Qt3 support requested, forcing build." &&
+ QT_QT3="-qt3support"
+ fi
;;
-QT3) if [[ $QT_QT3 == "-no-qt3support" ]];then
- echo "Qt3 support requested, forcing rebuild." &&
- QT_QT3="-qt3support"
- fi
- ;;
+WEBKIT) if [[ $QT_WEBKIT == "-no-webkit" ]]; then
+ echo "WebKit module requested, forcing build." &&
+ QT_WEBKIT="-webkit"
+ fi
+ ;;
*) echo unknown sub-depends!!! ; return 1 ;;
esac



  • [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (9c068e0a83987ae0e92aeb70335f98b873b109e3), Juuso Alasuutari, 07/06/2008

Archive powered by MHonArc 2.6.24.

Top of Page