[SCM] KDE Base Workspace module packaging branch, kde4.5, updated. debian/4.4.5-1-18-g14c8396
George Kiagiadakis
gkiagia-guest at alioth.debian.org
Sat Jul 31 15:45:55 UTC 2010
The following commit has been merged in the kde4.5 branch:
commit 14c83965cb9fd9e3031bb0614362b015a698b2c8
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date: Sat Jul 31 17:21:05 2010 +0300
Refresh patches.
---
debian/changelog | 2 +
debian/patches/01_plasma_netbook_no_autostart.diff | 17 ----
debian/patches/06_kdm_does_not_wreak_havoc.diff | 24 +++---
debian/patches/07_kdmrc_defaults.diff | 12 ++--
debian/patches/08_genkdmconf.diff | 68 ++++++++--------
debian/patches/09_genkdm_make.diff | 2 +-
debian/patches/10_kdm_no_custom.diff | 30 ++++----
debian/patches/11_kdm_X_path.diff | 60 +++++++-------
...12_be_better_at_honouring_user_kdm_theming.diff | 2 +-
debian/patches/20_use_dejavu_as_default_font.diff | 2 +-
.../patches/21_kdm_doesnt_use_kstandarddirs.diff | 83 +++++++++-----------
debian/patches/22_kdm_xreset_hook_framework.diff | 2 +-
debian/patches/27_ld_exclude_libs_qtuitools.diff | 8 +-
debian/patches/97_fix_target_link_libraries.diff | 4 +-
debian/patches/series | 1 -
15 files changed, 147 insertions(+), 170 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c8acfa7..7399be6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ kdebase-workspace (4:4.5.0-0r1) UNRELEASED; urgency=low
[ George Kiagiadakis ]
* Change my email address in uploaders.
+ * Refresh patches.
+ * Drop patch 01_plasma_netbook_no_autostart.diff. Fixed upstream.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 31 Jul 2010 16:41:50 +0300
diff --git a/debian/patches/01_plasma_netbook_no_autostart.diff b/debian/patches/01_plasma_netbook_no_autostart.diff
deleted file mode 100644
index bab8e18..0000000
--- a/debian/patches/01_plasma_netbook_no_autostart.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/plasma/netbook/shell/plasma-netbook.desktop
-+++ b/plasma/netbook/shell/plasma-netbook.desktop
-@@ -109,4 +109,4 @@
- X-KDE-StartupNotify=false
- OnlyShowIn=KDE;
- X-KDE-autostart-phase=0
--
-+Hidden=true
---- a/plasma/netbook/shell/CMakeLists.txt
-+++ b/plasma/netbook/shell/CMakeLists.txt
-@@ -22,5 +22,5 @@
- install(TARGETS kdeinit_plasma-netbook DESTINATION ${LIB_INSTALL_DIR})
- install(TARGETS plasma-netbook ${INSTALL_TARGETS_DEFAULT_ARGS})
- install(FILES plasma-default-layoutrc DESTINATION ${DATA_INSTALL_DIR}/plasma-netbook/)
--#install(FILES plasma-netbook.desktop DESTINATION ${AUTOSTART_INSTALL_DIR})
-+install(FILES plasma-netbook.desktop DESTINATION ${AUTOSTART_INSTALL_DIR})
-
diff --git a/debian/patches/06_kdm_does_not_wreak_havoc.diff b/debian/patches/06_kdm_does_not_wreak_havoc.diff
index 1461c68..622944f 100644
--- a/debian/patches/06_kdm_does_not_wreak_havoc.diff
+++ b/debian/patches/06_kdm_does_not_wreak_havoc.diff
@@ -1,14 +1,14 @@
--- a/kdm/kfrontend/genkdmconf.c
+++ b/kdm/kfrontend/genkdmconf.c
-@@ -3018,9 +3018,11 @@
- memcmp( oldkde + olen - sizeof(SHR_CONF) + 1,
- SHR_CONF, sizeof(SHR_CONF) ))
- {
-+ /*
- fprintf( stderr,
- "Warning: --old-kde does not end with " SHR_CONF ". "
- "Might wreak havoc.\n" );
-+ */
- oldkdepfx = oldkde;
- } else
- ASPrintf( (char **)&oldkdepfx,
+@@ -3136,9 +3136,11 @@
+ memcmp(oldkde + olen - sizeof(SHR_CONF) + 1,
+ SHR_CONF, sizeof(SHR_CONF)))
+ {
++ /*
+ fprintf(stderr,
+ "Warning: --old-kde does not end with " SHR_CONF ". "
+ "Might wreak havoc.\n");
++ */
+ oldkdepfx = oldkde;
+ } else
+ ASPrintf((char **)&oldkdepfx,
diff --git a/debian/patches/07_kdmrc_defaults.diff b/debian/patches/07_kdmrc_defaults.diff
index b24372c..08b8435 100644
--- a/debian/patches/07_kdmrc_defaults.diff
+++ b/debian/patches/07_kdmrc_defaults.diff
@@ -16,7 +16,7 @@
#endif
#if 0 /*def HASXDMAUTH*/
-@@ -1355,13 +1355,13 @@
+@@ -1369,13 +1369,13 @@
This string is subject to word splitting.
</para><para>
The default is something reasonable for the system on which &kdm; was built,
@@ -32,7 +32,7 @@
Comment: &
Description:
Additional arguments for the &X-Server;s for local sessions.
-@@ -1930,10 +1930,10 @@
+@@ -1953,10 +1953,10 @@
Key: SessionsDirs
Type: list
@@ -45,7 +45,7 @@
Update: upd_sessionsdirs
Comment:
The directories containing session type definitions in .desktop format,
-@@ -2002,7 +2002,7 @@
+@@ -2025,7 +2025,7 @@
Key: UseSessReg
Type: bool
@@ -54,7 +54,7 @@
User: core
Instance: #*/!
Comment:
-@@ -2093,9 +2093,9 @@
+@@ -2116,9 +2116,9 @@
Key: GreetString
Type: string
@@ -66,7 +66,7 @@
Comment:
The headline in the greeter. The following character pairs are replaced:
- %d -> current display
-@@ -2552,7 +2552,6 @@
+@@ -2577,7 +2577,6 @@
Default: 0
User: greeter
Instance: #*/
@@ -74,7 +74,7 @@
Comment:
Random seed for forging saved session types, etc. of unknown users.
This value should be random but constant across the login domain.
-@@ -2649,7 +2648,7 @@
+@@ -2674,7 +2673,7 @@
Type: bool
Default: true
User: greeter
diff --git a/debian/patches/08_genkdmconf.diff b/debian/patches/08_genkdmconf.diff
index 5ca1315..65aeb08 100644
--- a/debian/patches/08_genkdmconf.diff
+++ b/debian/patches/08_genkdmconf.diff
@@ -1,6 +1,6 @@
--- a/kdm/kfrontend/genkdmconf.c
+++ b/kdm/kfrontend/genkdmconf.c
-@@ -586,7 +586,7 @@
+@@ -613,7 +613,7 @@
"# right hand sides can match.\n"
"#\n"
"\n"
@@ -9,7 +9,7 @@
"\n"
"#\n"
"# To hardwire a specific terminal to a specific host, you can\n"
-@@ -604,7 +604,7 @@
+@@ -631,7 +631,7 @@
"# so this may not work in all environments.\n"
"#\n"
"\n"
@@ -18,7 +18,7 @@
"\n"
"#\n"
"# If you would prefer to configure the set of hosts each terminal sees,\n"
-@@ -640,16 +640,18 @@
+@@ -667,16 +667,18 @@
"#! /bin/sh\n"
"# Xstartup - run as root before session starts\n"
"\n"
@@ -46,7 +46,7 @@
"\n"
"# NOTE: The session is aborted if the last command returns non-zero.\n";
-@@ -695,6 +697,7 @@
+@@ -722,6 +724,7 @@
" [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n"
" [ -f $zdir/zlogin ] && . $zdir/zlogin\n"
" [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n"
@@ -54,7 +54,7 @@
" ;;\n"
" */csh|*/tcsh)\n"
" # [t]cshrc is always sourced automatically.\n"
-@@ -711,28 +714,8 @@
+@@ -738,28 +741,8 @@
" [ -f $HOME/.profile ] && . $HOME/.profile\n"
" ;;\n"
"esac\n"
@@ -85,33 +85,33 @@
static const char def_background[] =
"[Desktop0]\n"
-@@ -1081,29 +1064,6 @@
+@@ -1110,29 +1093,6 @@
- if (maxTTY)
- return;
-- if (readFile( &it, "/etc/inittab" )) {
-- usedFile( "/etc/inittab" );
-- for (p = it.buf; p < it.eof; p = eol + 1) {
-- for (eol = p; eol < it.eof && *eol != '\n'; eol++);
-- if (*p != '#') {
-- if ((ep = memMem( p, eol - p, " tty", 4 )) &&
-- ep < eol && isdigit( *ep ))
-- {
-- if (ep + 1 == eol || isspace( *(ep + 1) ))
-- tty = *ep - '0';
-- else if (isdigit( *(ep + 1) ) &&
-- (ep + 2 == eol || isspace( *(ep + 2) )))
-- tty = (*ep - '0') * 10 + (*(ep + 1) - '0');
-- else
-- continue;
-- TTYmask |= 1 << (tty - 1);
-- if (tty > maxTTY)
-- maxTTY = tty;
-- }
-- }
-- }
-- freeBuf( &it );
-- }
- if (!maxTTY) {
- maxTTY = 6;
- TTYmask = 0x3f;
+ if (maxTTY)
+ return;
+- if (readFile(&it, "/etc/inittab")) {
+- usedFile("/etc/inittab");
+- for (p = it.buf; p < it.eof; p = eol + 1) {
+- for (eol = p; eol < it.eof && *eol != '\n'; eol++);
+- if (*p != '#') {
+- if ((ep = memMem(p, eol - p, " tty", 4)) &&
+- ep < eol && isdigit(*ep))
+- {
+- if (ep + 1 == eol || isspace(*(ep + 1)))
+- tty = *ep - '0';
+- else if (isdigit(*(ep + 1)) &&
+- (ep + 2 == eol || isspace(*(ep + 2))))
+- tty = (*ep - '0') * 10 + (*(ep + 1) - '0');
+- else
+- continue;
+- TTYmask |= 1 << (tty - 1);
+- if (tty > maxTTY)
+- maxTTY = tty;
+- }
+- }
+- }
+- freeBuf(&it);
+- }
+ if (!maxTTY) {
+ maxTTY = 6;
+ TTYmask = 0x3f;
diff --git a/debian/patches/09_genkdm_make.diff b/debian/patches/09_genkdm_make.diff
index ab69c38..af68c54 100644
--- a/debian/patches/09_genkdm_make.diff
+++ b/debian/patches/09_genkdm_make.diff
@@ -6,7 +6,7 @@ Let's hardcode it.
+++ b/kdm/kfrontend/CMakeLists.txt
@@ -114,5 +114,5 @@
- ## use 'GENKDMCONF_FLAGS=... make install' to add flags to the config generation (try genkdmconf -h)
+ # use 'GENKDMCONF_FLAGS=... make install' to add flags to the config generation (try genkdmconf -h)
install(CODE "
-exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --in \\\"\\\$DESTDIR${CONFIG_INSTALL_DIR}/kdm\\\" --no-in-notice --face-src \\\"${CMAKE_CURRENT_SOURCE_DIR}/pics\\\" \\\$GENKDMCONF_FLAGS)
+exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --no-old --in \\\"\\\$DESTDIR/etc/kde4/kdm\\\" --no-in-notice --face-src \\\"${CMAKE_CURRENT_SOURCE_DIR}/pics\\\" \\\$GENKDMCONF_FLAGS)
diff --git a/debian/patches/10_kdm_no_custom.diff b/debian/patches/10_kdm_no_custom.diff
index dc84ee8..0306262 100644
--- a/debian/patches/10_kdm_no_custom.diff
+++ b/debian/patches/10_kdm_no_custom.diff
@@ -1,18 +1,18 @@
--- a/kdm/kfrontend/kgreeter.cpp
+++ b/kdm/kfrontend/kgreeter.cpp
-@@ -445,7 +445,6 @@
- KGreeter::putSession( const QString &type, const QString &name, bool hid, const char *exe )
+@@ -450,7 +450,6 @@
+ KGreeter::putSession(const QString &type, const QString &name, bool hid, const char *exe)
{
- int prio = exe ? (!strcmp( exe, "default" ) ? 0 :
-- !strcmp( exe, "custom" ) ? 1 :
- !strcmp( exe, "failsafe" ) ? 3 : 2) : 2;
- for (int i = 0; i < sessionTypes.size(); i++)
- if (sessionTypes[i].type == type) {
-@@ -474,7 +473,6 @@
- dsk.readEntry( "Exec" ).toLatin1() );
- }
- putSession( "default", i18nc("@item:inlistbox session type", "Default"), false, "default" );
-- putSession( "custom", i18nc("@item:inlistbox session type", "Custom"), false, "custom" );
- putSession( "failsafe", i18nc("@item:inlistbox session type", "Failsafe"), false, "failsafe" );
- qSort( sessionTypes );
- for (int i = 0; i < sessionTypes.size() && !sessionTypes[i].hid; i++) {
+ int prio = exe ? (!strcmp(exe, "default") ? 0 :
+- !strcmp(exe, "custom") ? 1 :
+ !strcmp(exe, "failsafe") ? 3 : 2) : 2;
+ for (int i = 0; i < sessionTypes.size(); i++)
+ if (sessionTypes[i].type == type) {
+@@ -479,7 +478,6 @@
+ dsk.readEntry("Exec").toLatin1());
+ }
+ putSession("default", i18nc("@item:inlistbox session type", "Default"), false, "default");
+- putSession("custom", i18nc("@item:inlistbox session type", "Custom"), false, "custom");
+ putSession("failsafe", i18nc("@item:inlistbox session type", "Failsafe"), false, "failsafe");
+ qSort(sessionTypes);
+ for (int i = 0; i < sessionTypes.size() && !sessionTypes[i].hid; i++) {
diff --git a/debian/patches/11_kdm_X_path.diff b/debian/patches/11_kdm_X_path.diff
index b75d13c..194f4c7 100644
--- a/debian/patches/11_kdm_X_path.diff
+++ b/debian/patches/11_kdm_X_path.diff
@@ -8,23 +8,23 @@
#include <string.h>
#include <unistd.h>
#include <stdarg.h>
-@@ -611,6 +612,16 @@
- debug( "exec %\"[s\n", argv );
- (void)execv( argv[0], argv );
- logError( "X server %\"s cannot be executed\n", argv[0] );
+@@ -609,6 +610,16 @@
+ debug("exec %\"[s\n", argv);
+ (void)execv(argv[0], argv);
+ logError("X server %\"s cannot be executed\n", argv[0]);
+
-+ /* Let's try again with a standard path */
-+ argv[0] = (char *)realloc(argv[0], strlen("/usr/bin/X") + 1);
-+ if (argv[0] != NULL) {
-+ argv[0] = "/usr/bin/X";
-+ debug( "exec %\"[s\n", argv );
-+ (void)execv( argv[0], argv );
-+ logError( "X server %\"s cannot be executed\n", argv[0] );
-+ }
++ /* Let's try again with a standard path */
++ argv[0] = (char *)realloc(argv[0], strlen("/usr/bin/X") + 1);
++ if (argv[0] != NULL) {
++ argv[0] = "/usr/bin/X";
++ debug( "exec %\"[s\n", argv );
++ (void)execv( argv[0], argv );
++ logError( "X server %\"s cannot be executed\n", argv[0] );
++ }
+
- exit( 1 );
- case -1:
- logError( "Forking X server for remote login failed: %m" );
+ exit(1);
+ case -1:
+ logError("Forking X server for remote login failed: %m");
--- a/kdm/backend/server.c
+++ b/kdm/backend/server.c
@@ -41,6 +41,7 @@
@@ -35,20 +35,20 @@
#include <signal.h>
-@@ -92,6 +93,16 @@
- */
- (void)Signal( SIGUSR1, SIG_IGN );
- (void)execv( argv[0], argv );
+@@ -97,6 +98,16 @@
+ */
+ (void)Signal(SIGUSR1, SIG_IGN);
+ (void)execv(argv[0], argv);
+
-+ /* Let's try again with a standard path */
-+ argv[0] = (char *)realloc(argv[0], strlen("/usr/bin/X") + 1);
-+ if (argv[0] != NULL) {
-+ argv[0] = "/usr/bin/X";
-+ debug( "exec %\"[s\n", argv );
-+ (void)execv( argv[0], argv );
-+ logError( "X server %\"s cannot be executed\n", argv[0] );
-+ }
++ /* Let's try again with a standard path */
++ argv[0] = (char *)realloc(argv[0], strlen("/usr/bin/X") + 1);
++ if (argv[0] != NULL) {
++ argv[0] = "/usr/bin/X";
++ debug( "exec %\"[s\n", argv );
++ (void)execv( argv[0], argv );
++ logError( "X server %\"s cannot be executed\n", argv[0] );
++ }
+
- logError( "X server %\"s cannot be executed\n", argv[0] );
- exit( 47 );
- case -1:
+ logError("X server %\"s cannot be executed\n", argv[0]);
+ exit(47);
+ case -1:
diff --git a/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff b/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff
index cc0f411..1a9c5a4 100644
--- a/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff
+++ b/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff
@@ -1,6 +1,6 @@
--- a/kdm/config.def
+++ b/kdm/config.def
-@@ -2678,7 +2678,7 @@
+@@ -2703,7 +2703,7 @@
Type: string
Default: ""
User: greeter
diff --git a/debian/patches/20_use_dejavu_as_default_font.diff b/debian/patches/20_use_dejavu_as_default_font.diff
index b2ec0a8..a19c9fe 100644
--- a/debian/patches/20_use_dejavu_as_default_font.diff
+++ b/debian/patches/20_use_dejavu_as_default_font.diff
@@ -1,6 +1,6 @@
--- a/kcontrol/fonts/fonts.cpp
+++ b/kcontrol/fonts/fonts.cpp
-@@ -511,12 +511,12 @@
+@@ -510,12 +510,12 @@
// NOTE: keep in sync with kdelibs/kdeui/kernel/kglobalsettings.cpp
diff --git a/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff b/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff
index aef3e68..8f4ecca 100644
--- a/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff
+++ b/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff
@@ -14,34 +14,26 @@ Let's hardcode it and introduce KDM_CONFDIR.
/* Define where your java executable is */
#undef PATH_JAVA
---- a/kcontrol/kdm/background.cpp
-+++ b/kcontrol/kdm/background.cpp
-@@ -42,9 +42,9 @@
- " If it is disabled, you have to look after the background yourself."
- " This is done by running some program (possibly xsetroot) in the script"
- " specified in the Setup= option in kdmrc (usually Xsetup).") );
-- m_simpleConf = KSharedConfig::openConfig(
-- config->group( "X-*-Greeter" ).readEntry(
-- "BackgroundCfg", KDE_CONFDIR "/kdm/backgroundrc" ) );
-+ m_simpleConf = KSharedConfig::openConfig(
-+ config->group( "X-*-Greeter" ).readEntry(
-+ "BackgroundCfg", KDM_CONFDIR "/kdm/backgroundrc" ) );
- m_background = new BGDialog( this, m_simpleConf );
-
- connect( m_background, SIGNAL(changed( bool )), SIGNAL(changed()) );
--- a/kcontrol/kdm/main.cpp
+++ b/kcontrol/kdm/main.cpp
-@@ -185,8 +185,8 @@
- for (tgmapci = tgmap.constBegin(); tgmapci != tgmap.constEnd(); ++tgmapci)
- kWarning() << "user(s) '" << tgmapci.value().join( "," )
- << "' have unknown GID " << tgmapci.key() << endl;
--
-- config = new KConfig( QString::fromLatin1(KDE_CONFDIR "/kdm/kdmrc"), KConfig::SimpleConfig );
-+
-+ config = new KConfig( QString::fromLatin1(KDM_CONFDIR "/kdm/kdmrc"), KConfig::SimpleConfig);
+@@ -282,7 +282,7 @@
+ QString tempConfigName = pTempConfigFile->fileName();
+
+ KConfig *pSystemKDMConfig = new KConfig(
+- QString::fromLatin1(KDE_CONFDIR "/kdm/kdmrc"), KConfig::SimpleConfig);
++ QString::fromLatin1(KDM_CONFDIR "/kdm/kdmrc"), KConfig::SimpleConfig);
+
+ KConfig *pTempConfig = pSystemKDMConfig->copyTo(tempConfigName);
+ pTempConfig->sync();
+@@ -301,7 +301,7 @@
- QVBoxLayout *top = new QVBoxLayout( this );
- top->setMargin( 0 );
+ QString systemBackgroundConfigName =
+ config->group("X-*-Greeter").readEntry(
+- "BackgroundCfg", KDE_CONFDIR "/kdm/backgroundrc");
++ "BackgroundCfg", KDM_CONFDIR "/kdm/backgroundrc");
+
+ KConfig systemBackgroundConfig(systemBackgroundConfigName);
+ KSharedConfigPtr pTempConfig = KSharedConfig::openConfig(tempBackgroundConfigName);
--- a/kdm/config.def
+++ b/kdm/config.def
@@ -29,7 +29,7 @@
@@ -57,32 +49,33 @@ Let's hardcode it and introduce KDM_CONFDIR.
+++ b/kdm/kfrontend/kdmctl.c
@@ -150,7 +150,7 @@
{
- char *dpy = getenv( "DISPLAY" );
- const char *ctl = getenv( "DM_CONTROL" );
-- const char *cfg = KDE_CONFDIR "/kdm/kdmrc";
-+ const char *cfg = KDM_CONFDIR "/kdm/kdmrc";
- char *ptr;
- int fd;
+ char *dpy = getenv("DISPLAY");
+ const char *ctl = getenv("DM_CONTROL");
+- const char *cfg = KDE_CONFDIR "/kdm/kdmrc";
++ const char *cfg = KDM_CONFDIR "/kdm/kdmrc";
+ char *ptr;
+ int fd;
--- a/kdm/kfrontend/genkdmconf.c
+++ b/kdm/kfrontend/genkdmconf.c
-@@ -2799,6 +2799,7 @@
+@@ -2917,7 +2917,7 @@
+
+ static const char * const oldkdes[] = {
+- KDE_CONFDIR,
++ KDM_CONFDIR,
+ "/opt/kde4/share/config",
+ "/usr/local/kde4/share/config",
- static const char *oldkdes[] = {
-+ KDM_CONFDIR,
- KDE_CONFDIR,
- "/opt/kde4/share/config",
- "/usr/local/kde4/share/config",
-@@ -2807,6 +2808,7 @@
- "/usr/local/kde/share/config",
- "/usr/local/share/config",
- "/usr/share/config",
-+ "/etc/kde3",
+@@ -2925,6 +2925,7 @@
+ "/usr/local/kde/share/config",
+ "/usr/local/share/config",
+ "/usr/share/config",
++ "/etc/kde3",
- "/opt/kde3/share/config",
- "/usr/local/kde3/share/config",
-@@ -2850,7 +2852,7 @@
+ "/opt/kde3/share/config",
+ "/usr/local/kde3/share/config",
+@@ -2968,7 +2969,7 @@
" Note that you possibly need to use --no-old-kde to make this take effect.\n"
" --old-kde /path/to/old/kde-config-dir\n"
" Where to look for the kdmrc of a previously installed kdm.\n"
diff --git a/debian/patches/22_kdm_xreset_hook_framework.diff b/debian/patches/22_kdm_xreset_hook_framework.diff
index dfa6ab5..9b1d0ab 100644
--- a/debian/patches/22_kdm_xreset_hook_framework.diff
+++ b/debian/patches/22_kdm_xreset_hook_framework.diff
@@ -5,7 +5,7 @@ Author: Fathi Boudra <fabo at debian.org>
--- a/kdm/kfrontend/genkdmconf.c
+++ b/kdm/kfrontend/genkdmconf.c
-@@ -665,7 +665,12 @@
+@@ -692,7 +692,12 @@
"#chown root /dev/console\n"
"#chmod 622 /dev/console\n"
"\n"
diff --git a/debian/patches/27_ld_exclude_libs_qtuitools.diff b/debian/patches/27_ld_exclude_libs_qtuitools.diff
index 00aea05..0faeba2 100644
--- a/debian/patches/27_ld_exclude_libs_qtuitools.diff
+++ b/debian/patches/27_ld_exclude_libs_qtuitools.diff
@@ -6,13 +6,13 @@ Last-Update: 2010-04-30
--- a/libs/ksysguard/processui/CMakeLists.txt
+++ b/libs/ksysguard/processui/CMakeLists.txt
-@@ -23,6 +23,9 @@ kde4_add_ui_files( processui_LIB_SRCS
+@@ -22,6 +22,9 @@
kde4_add_library(processui SHARED ${processui_LIB_SRCS})
+# Do not export QtUiTools internal symbols
+set_target_properties(processui PROPERTIES LINK_FLAGS_DEBIAN "-Wl,--exclude-libs -Wl,libQtUiTools.a")
+
- target_link_libraries(processui ${KDE4_KDEUI_LIBS} ${QT_QTSCRIPT_LIBRARY} ${QT_QTWEBKIT_LIBRARY} ${QT_QTUITOOLS_LIBRARY} processcore)
- target_link_libraries(processui LINK_INTERFACE_LIBRARIES ${KDE4_KDEUI_LIBS} ${QT_QTSCRIPT_LIBRARY} ${QT_QTWEBKIT_LIBRARY} ${QT_QTUITOOLS_LIBRARY} processcore)
-
+ if(X11_XRes_FOUND)
+ target_link_libraries(processui ${X11_XRes_LIB} ${X11_LIBRARIES})
+ include_directories(${X11_XRes_INCLUDE_PATH})
diff --git a/debian/patches/97_fix_target_link_libraries.diff b/debian/patches/97_fix_target_link_libraries.diff
index 5962c84..2189190 100644
--- a/debian/patches/97_fix_target_link_libraries.diff
+++ b/debian/patches/97_fix_target_link_libraries.diff
@@ -1,6 +1,6 @@
--- a/libs/kworkspace/CMakeLists.txt
+++ b/libs/kworkspace/CMakeLists.txt
-@@ -24,6 +24,7 @@
+@@ -71,6 +71,7 @@
kde4_add_library(kworkspace ${LIB_MODE} ${kworkspace_LIB_SRCS})
target_link_libraries(kworkspace ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES} ${KDE4_PLASMA_LIBS} )
@@ -10,7 +10,7 @@
install(TARGETS kworkspace EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
--- a/libs/taskmanager/CMakeLists.txt
+++ b/libs/taskmanager/CMakeLists.txt
-@@ -38,6 +38,7 @@
+@@ -44,6 +44,7 @@
target_link_libraries(taskmanager kephal)
diff --git a/debian/patches/series b/debian/patches/series
index 0e15f15..c9f2a52 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-01_plasma_netbook_no_autostart.diff
06_kdm_does_not_wreak_havoc.diff
07_kdmrc_defaults.diff
08_genkdmconf.diff
--
KDE Base Workspace module packaging
More information about the pkg-kde-commits
mailing list