Commit f3d0a8e3 authored by Michael Pyne's avatar Michael Pyne
Browse files

Merge branch 'master' into modularize

The merge was mostly straightforward. I ran
git log --oneline $(git merge-base master modularize)..master
to see all changes applied to master while this topic branch was being
worked in order to ensure they weren't accidentally missed:

83bee365 SVN_SILENT made messages (.desktop file)
f2299f1f xsession: Disable session driver installation by default.
05f87453 Remove undefined method for default module handling.

2 were merged correctly, the session driver default had to be
re-committed to the appropriate module.

Conflicts:
	kdesrc-build
parents b5092923 83bee365
......@@ -13,6 +13,7 @@ Name[es]=Constructor del código fuente de KDE
Name[et]=KDE lähtekoodi ehitaja
Name[fi]=KDE-lähdekoodin kääntämisohjelma
Name[fr]=Compilateur de sources KDE
Name[ga]=Tógálaí Foinse KDE
Name[hu]=KDE forrásfordító
Name[it]=Generazione del sorgente di KDE
Name[km]=កម្មវិធី​ស្ថាបនា​ប្រភព​​របស់​ KDE​
......
......@@ -1021,7 +1021,7 @@ sub read_options
# If the user doesn't ask to build any modules, build a default set.
# The good question is what exactly should be built, but oh well.
if ($using_default) {
$ctx->setup_default_modules();
warning (" b[y[*] There do not seem to be any modules to build in your configuration.");
return ();
}
......
......@@ -59,7 +59,7 @@ my %defaultGlobalOptions = (
"git-repository-base" => {}, # Base path template for use multiple times.
"http-proxy" => '', # Proxy server to use for HTTP.
"install-after-build" => 1, # Default to true
"install-session-driver" => 1,# Default to true
"install-session-driver" => 0,# Default to false
"kdedir" => "$ENV{HOME}/kde",
"kde-languages" => "",
"libpath" => "",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment