rev 10968 - branches/kde4/packages/kdebase-workspace/debian/patches

Fathi Boudra fabo at alioth.debian.org
Wed Jun 11 13:24:08 UTC 2008


Author: fabo
Date: 2008-06-11 13:24:07 +0000 (Wed, 11 Jun 2008)
New Revision: 10968

Modified:
   branches/kde4/packages/kdebase-workspace/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff
   branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff
Log:
Update kdm patch for kstandardirs usage:
 - add missing bits for kcontrol/kdm
 - introduce KDM_CONFDIR


Modified: branches/kde4/packages/kdebase-workspace/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff	2008-06-11 01:33:25 UTC (rev 10967)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff	2008-06-11 13:24:07 UTC (rev 10968)
@@ -1,5 +1,41 @@
-Index: b/kdm/config.def
-===================================================================
+As we use DEB_CONFIG_INSTALL_DIR ?= /usr/share/kde4/config
+and we want kdm configuration files in /etc/kde4/kdm,
+Let's hardcode it and introduce KDM_CONFDIR.
+
+--- a/config-workspace.h.cmake
++++ b/config-workspace.h.cmake
+@@ -120,6 +120,9 @@
+ /* KDE's static data directory */
+ #define KDE_DATADIR "${DATA_INSTALL_DIR}"
+ 
++/* KDM's configuration directory */
++#define KDM_CONFDIR "/etc/kde4"
++
+ /* Define where your java executable is */
+ #undef PATH_JAVA
+ 
+--- a/kcontrol/kdm/background.cpp
++++ b/kcontrol/kdm/background.cpp
+@@ -43,7 +43,7 @@
+ 		     " 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
+@@ -187,7 +187,7 @@
+ 		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);
+ 
+ 	QVBoxLayout *top = new QVBoxLayout( this );
+         top->setMargin(0);
 --- a/kdm/config.def
 +++ b/kdm/config.def
 @@ -29,7 +29,7 @@
@@ -7,12 +43,10 @@
  #define RCVERMINOR 4
  
 -#define KDMCONF KDE_CONFDIR "/kdm"
-+#define KDMCONF "/etc/kde4/kdm"
++#define KDMCONF KDM_CONFDIR "/kdm"
  #define KDMDATA KDE_DATADIR "/kdm"
  
  #ifdef _AIX
-Index: b/kdm/kfrontend/kdmctl.c
-===================================================================
 --- a/kdm/kfrontend/kdmctl.c
 +++ b/kdm/kfrontend/kdmctl.c
 @@ -150,7 +150,7 @@
@@ -20,19 +54,17 @@
  	char *dpy = getenv( "DISPLAY" );
  	const char *ctl = getenv( "DM_CONTROL" );
 -	const char *cfg = KDE_CONFDIR "/kdm/kdmrc";
-+	const char *cfg = "/etc/kde4/kdmrc";
++	const char *cfg = KDM_CONFDIR "/kdm/kdmrc";
  	char *ptr;
  	int fd;
  
-Index: b/kdm/kfrontend/genkdmconf.c
-===================================================================
 --- a/kdm/kfrontend/genkdmconf.c
 +++ b/kdm/kfrontend/genkdmconf.c
 @@ -2766,6 +2766,7 @@
  
  
  static const char *oldkdes[] = {
-+	"/etc/kde4",
++	KDM_CONFDIR,
  	KDE_CONFDIR,
  	"/opt/kde4/share/config",
  	"/usr/local/kde4/share/config",
@@ -49,7 +81,7 @@
  "  --old-kde /path/to/old/kde-config-dir\n"
  "    Where to look for the kdmrc of a previously installed kdm.\n"
 -"    Default is to scan " KDE_CONFDIR " and\n"
-+"    Default is to scan " "/etc/kde4" " and\n"
++"    Default is to scan " KDM_CONFDIR " and\n"
  "    {/usr,/usr/local,{/opt,/usr/local}/{kde4,kde,kde3}}/share/config.\n"
  "  --no-old\n"
  "    Do not look at older xdm/kdm configurations, just create default config.\n"

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff	2008-06-11 01:33:25 UTC (rev 10967)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff	2008-06-11 13:24:07 UTC (rev 10968)
@@ -95,7 +95,7 @@
  install(TARGETS kworkspace ${INSTALL_TARGETS_DEFAULT_ARGS} )
 --- a/libs/solid/control/CMakeLists.txt
 +++ b/libs/solid/control/CMakeLists.txt
-@@ -28,7 +28,7 @@
+@@ -31,7 +31,7 @@
  
  kde4_add_library(solidcontrol SHARED ${solidcontrol_LIB_SRCS})
  
@@ -478,7 +478,7 @@
 +ENDIF (X11_XTest_FOUND)
  target_link_libraries(khotkeysprivate kworkspace ${KDE4_KDE3SUPPORT_LIBS})
  set_target_properties(khotkeysprivate PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
- install(TARGETS khotkeysprivate DESTINATION ${LIB_INSTALL_DIR})
+ install(TARGETS khotkeysprivate ${INSTALL_TARGETS_DEFAULT_ARGS})
 --- a/kcontrol/kfontinst/kcmfontinst/CMakeLists.txt
 +++ b/kcontrol/kfontinst/kcmfontinst/CMakeLists.txt
 @@ -9,7 +9,7 @@




More information about the pkg-kde-commits mailing list