From ba311dfb6d32b83dc3bc105e9b76a97a8b60566f Mon Sep 17 00:00:00 2001
From: Michael Pyne <mpyne@kde.org>
Date: Sun, 15 Nov 2009 20:28:24 +0000
Subject: [PATCH] - Spell out repository when using git instead of using the
 alias. Using an alias was   required for one of the ways I was doing git
 updates when prototyping the feature but   doesn't appear required the way
 I'm doing it now. - Remove -no-exceptions from default qt-copy args and
 correct spelling of the -dbus   option based on feedback on kde-buildsystem

svn path=/trunk/KDE/kdesdk/scripts/kdesvn-build; revision=1049778
---
 kdesvn-build          | 10 +++++-----
 kdesvn-buildrc-sample |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kdesvn-build b/kdesvn-build
index 2da1b20..1aec9cf 100755
--- a/kdesvn-build
+++ b/kdesvn-build
@@ -1980,14 +1980,14 @@ sub git_update_module
     }
 
     # Download updated objects
-    if (0 != log_command($module, 'git-fetch', ['git', 'fetch', '__kdesvn-build-remote'])) {
+    if (0 != log_command($module, 'git-fetch', ['git', 'fetch', $cur_repo])) {
         return 0;
     }
 
     # If the user doesn't already have this branch, check it out.
     if (not git_has_branch($branch)) {
         $result = log_command($module, 'git-checkout-branch',
-                      ['git', 'checkout', '-b', $branch, "__kdesvn-build-remote/$branch"]);
+                      ['git', 'checkout', '-b', $branch, "$cur_repo/$branch"]);
     }
     else {
         $result = log_command($module, 'git-checkout-update',
@@ -2717,9 +2717,9 @@ sub default_module_options
     if ($module eq 'qt-copy') {
         # Setup default options for qt-copy
         my %qtcopy_opts = (
-            'configure-flags' => '-qt-gif -phonon -qdbus -nomake demos -nomake examples -fast',
-            'repository' => 'git://gitorious.org/qt/qt.git',
-            'branch'     => 'master',
+            'configure-flags' => '-qt-gif -phonon -dbus -nomake demos -nomake examples -fast',
+            'repository' => 'git://gitorious.org/+kde-developers/qt/kde-qt.git',
+            'branch'     => '4.6-stable-patched',
         );
 
         # Merge (uses Perl hash slice)
diff --git a/kdesvn-buildrc-sample b/kdesvn-buildrc-sample
index cd664a2..6c30818 100644
--- a/kdesvn-buildrc-sample
+++ b/kdesvn-buildrc-sample
@@ -126,7 +126,7 @@ module qt-copy
 # Configure flags.  If you compile phonon separately make sure to pass
 # -no-phonon.  Alternatively, if you use Qt's phonon, ensure kdesupport is
 # built without Phonon.
-	configure-flags -qt-gif -no-exceptions -fast -qdbus \
+	configure-flags -qt-gif -fast -dbus \
 	                -nomake examples -nomake demos \
 	                -phonon # Phonon built as part of Qt now