From 9b2075d9b89fc628c447fbb98f43ef72e4a9c81d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 10 Jul 2011 16:17:43 -0500 Subject: Initial import from old SVN repository Note that only the Debian and Ubuntu folders were preserved --- .../debian/patches/disable_default_kdm_theme.diff | 25 +++++++++ .../debian/patches/disable_startkde_wallpaper.diff | 31 +++++++++++ .../patches/kubuntu_04_hide_menu_entries.diff | 7 +++ .../patches/kubuntu_06_hide_home_menu_entry.diff | 7 +++ .../kubuntu_07_hide_knetattach_menu_entry.diff | 7 +++ .../kubuntu_08_hide_kcmkicker_menu_entry.diff | 7 +++ .../kubuntu_09_hide_kpersonaliser_menu_entry.diff | 7 +++ .../kubuntu_10_hide_kmenuedit_menu_entry.diff | 7 +++ .../kubuntu_11_hide_kappfinder_menu_entry.diff | 7 +++ .../kubuntu_13_hide_konsolesu_menu_entry.diff | 7 +++ .../kubuntu_14_hide_konquerorsu_menu_entry.diff | 7 +++ .../kubuntu_15_hide_kfontview_menu_entry.diff | 7 +++ .../patches/kubuntu_16_hide_kpager_menu_entry.diff | 7 +++ .../kubuntu_35_hide_klipper_menu_entry.diff | 7 +++ .../kubuntu_37_hide_kdeprintfax_menu_entry.diff | 7 +++ .../debian/patches/kubuntu_48_hide_display.diff | 7 +++ .../patches/kubuntu_70_hide_printers_desktop.diff | 9 +++ ...kubuntu_78_kcontrol_hide_component_chooser.diff | 8 +++ .../debian/patches/kubuntu_89_new_logout_ui.diff | 23 ++++++++ .../debian/patches/kubuntu_9904_hide_kfind.diff | 7 +++ .../patches/kubuntu_9921_kdm_bulletproof_x.diff | 64 ++++++++++++++++++++++ 21 files changed, 265 insertions(+) create mode 100644 ubuntu/maverick/kdebase/debian/patches/disable_default_kdm_theme.diff create mode 100644 ubuntu/maverick/kdebase/debian/patches/disable_startkde_wallpaper.diff create mode 100644 ubuntu/maverick/kdebase/debian/patches/kubuntu_04_hide_menu_entries.diff create mode 100644 ubuntu/maverick/kdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff create mode 100644 ubuntu/maverick/kdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff create mode 100644 ubuntu/maverick/kdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff create mode 100644 ubuntu/maverick/kdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff create mode 100644 ubuntu/maverick/kdebase/debian/patches/kubuntu_10_hide_kmenuedit_menu_entry.diff create mode 100644 ubuntu/maverick/kdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff create mode 100644 ubuntu/maverick/kdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff create mode 100644 ubuntu/maverick/kdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff create mode 100644 ubuntu/maverick/kdebase/debian/patches/kubuntu_15_hide_kfontview_menu_entry.diff create mode 100644 ubuntu/maverick/kdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff create mode 100644 ubuntu/maverick/kdebase/debian/patches/kubuntu_35_hide_klipper_menu_entry.diff create mode 100644 ubuntu/maverick/kdebase/debian/patches/kubuntu_37_hide_kdeprintfax_menu_entry.diff create mode 100644 ubuntu/maverick/kdebase/debian/patches/kubuntu_48_hide_display.diff create mode 100644 ubuntu/maverick/kdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff create mode 100644 ubuntu/maverick/kdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff create mode 100644 ubuntu/maverick/kdebase/debian/patches/kubuntu_89_new_logout_ui.diff create mode 100644 ubuntu/maverick/kdebase/debian/patches/kubuntu_9904_hide_kfind.diff create mode 100644 ubuntu/maverick/kdebase/debian/patches/kubuntu_9921_kdm_bulletproof_x.diff (limited to 'ubuntu/maverick/kdebase/debian/patches') diff --git a/ubuntu/maverick/kdebase/debian/patches/disable_default_kdm_theme.diff b/ubuntu/maverick/kdebase/debian/patches/disable_default_kdm_theme.diff new file mode 100644 index 000000000..ad6fa4cf8 --- /dev/null +++ b/ubuntu/maverick/kdebase/debian/patches/disable_default_kdm_theme.diff @@ -0,0 +1,25 @@ +--- kdm/config.def ++++ kdm/config.def +@@ -2614,18 +2614,18 @@ + + Key: UseTheme + Type: bool +-Default: true ++Default: false + User: greeter +-Instance: */true ++Instance: #*/true + Comment: & + Description: + Whether the greeter should be themed. + + Key: Theme + Type: string +-Default: KDMDATA "/themes/o2_enterprise" ++Default: "" + User: greeter +-Instance: */KDMDATA "/themes/o2_enterprise" ++Instance: */ "@@@ToBeReplacedByDesktopBase@@@" + Comment: & + Description: + The theme to use for the greeter. Can point to either a directory or an XML diff --git a/ubuntu/maverick/kdebase/debian/patches/disable_startkde_wallpaper.diff b/ubuntu/maverick/kdebase/debian/patches/disable_startkde_wallpaper.diff new file mode 100644 index 000000000..838bbec11 --- /dev/null +++ b/ubuntu/maverick/kdebase/debian/patches/disable_startkde_wallpaper.diff @@ -0,0 +1,31 @@ +--- startkde ++++ startkde +@@ -184,17 +184,17 @@ + . $kdehome/share/config/startupconfig + fi + +-# Make sure a default wallpaper is set. +-if [ ! -e $kdehome/share/config/kdesktoprc ]; then +- # With Trinity KDE this file should exist, but test first. +- if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then +-cat >$kdehome/share/config/kdesktoprc <$kdehome/share/config/kdesktoprc <serverStatus != ignore) { +- if (d->serverStatus == starting && waitCode( status ) != 47) +- LogError( "X server died during startup\n" ); ++ LogError("X server terminated: [%d, %d, %d]\n", ++ (startingServer == d), ++ (d->serverStatus), ++ (waitCode(status))); ++ ++ if (startingServer == d /*&& d->serverStatus != ignore*/) { ++ if (/*d->serverStatus == starting &&*/ waitCode( status ) != 47) ++ LogError( "X server died during startup\n" ); + StartServerFailed(); + break; + } +--- kdebase-3.5.8/kdm/backend/server.c 2008-02-13 23:59:17.000000000 +0200 ++++ kdebase-3.5.8/kdm/backend/server.c 2008-02-14 11:41:20.000000000 +0200 +@@ -48,6 +48,10 @@ from the copyright holder. + struct display *startingServer; + time_t serverTimeout = TO_INF; + ++#define SERVER_ATTEMPTS 3 ++ ++char* failsafeXServer[] = {"/etc/gdm/failsafeXServer", 0}; ++ + char ** + PrepServerArgv( struct display *d, const char *args ) + { +@@ -128,6 +132,7 @@ StartServer( struct display *d ) + { + startingServer = d; + d->startTries = 0; ++ d->serverAttempts = SERVER_ATTEMPTS; + StartServerOnce(); + } + +@@ -150,6 +155,7 @@ void + StartServerSuccess() + { + struct display *d = startingServer; ++ LogError("StartServerSucces\n"); + d->serverStatus = ignore; + serverTimeout = TO_INF; + Debug( "X server ready, starting session\n" ); +@@ -161,9 +167,14 @@ StartServerFailed() + { + struct display *d = startingServer; + if (!d->serverAttempts || d->startTries < d->serverAttempts) { ++ LogError("Failed to start X server. Starting failsafe X server.\n"); ++ ++ runAndWait(failsafeXServer, 0); ++ + d->serverStatus = pausing; + serverTimeout = d->openDelay + now; + } else { ++ LogError("StartServerFailed\n"); + d->serverStatus = ignore; + serverTimeout = TO_INF; + startingServer = 0; -- cgit v1.2.1