]> git.pld-linux.org Git - packages/kdebase.git/blame - kdebase-kdmconfig.patch
projects / packages / kdebase.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
drop automake related build artifacts
[packages/kdebase.git] / kdebase-kdmconfig.patch
CommitLineData
77290f8c 1--- kdebase-030317/kcontrol/kdm/background.cpp~ Sun Mar 16 00:35:44 2003
2+++ kdebase-030317/kcontrol/kdm/background.cpp Tue Mar 18 19:31:12 2003
3@@ -53,7 +53,7 @@
87cb9420 4 " This is done by running some program (possibly xsetroot) in the script"
5 " specified in the Setup= option in kdmrc (usually Xsetup).") );
6 config->setGroup( "X-*-Greeter" );
7- m_simpleConf=new KSimpleConfig(config->readEntry( "BackgroundCfg",KDE_CONFDIR "/kdm/backgroundrc" ) );
8+ m_simpleConf=new KSimpleConfig(config->readEntry( "BackgroundCfg","/etc/X11/kdm/backgroundrc" ) );
77290f8c 9 m_background = new BGDialog( this, m_simpleConf, false );
df8f53c7 10
77290f8c 11 connect(m_background, SIGNAL(changed(bool)), SIGNAL(changed(bool)));
438261a1
ER		 12--- kdebase-trinity-3.5.13.2/kcontrol/kdm/kdm-appear.cpp~ 2012-09-16 15:52:02.000000000 +0300
13+++ kdebase-trinity-3.5.13.2/kcontrol/kdm/kdm-appear.cpp 2014-05-27 13:58:32.057608488 +0300
14@@ -355,7 +355,7 @@
15 bool KDMAppearanceWidget::setLogo(TQString logo)
df8f53c7 16 {
438261a1
ER		 17 TQString flogo = logo.isEmpty() ?
18- locate("data", TQString::fromLatin1("kdm/pics/kdelogo.png") ) :
19+ locate("data", TQString::fromLatin1("kdm/pics/pldlogo.png") ) :
df8f53c7 20 logo;
438261a1 21 TQImage p(flogo);
df8f53c7 22 if (p.isNull())
438261a1 23@@ -502,7 +502,7 @@
87cb9420 24 config->setGroup("X-*-Greeter");
25
26 // Read the greeting string
438261a1 27- greetstr_lined->setText(config->readEntry("GreetString", i18n("Welcome to %n")));
87cb9420 28+ greetstr_lined->setText(config->readEntry("GreetString", i18n("Welcome to PLD Linux at %n")));
29
30 // Regular logo or clock
438261a1
ER		 31 TQString logoArea = config->readEntry("LogoArea", "Logo" );
32@@ -556,7 +556,7 @@
df8f53c7
AM		 33
34 void KDMAppearanceWidget::defaults()
35 {
438261a1 36- greetstr_lined->setText( i18n("Welcome to %n") );
df8f53c7 37+ greetstr_lined->setText( i18n("Welcome to PLD Linux at %n") );
77290f8c 38 logoRadio->setChecked( true );
39 slotAreaRadioClicked( KdmLogo );
438261a1 40 setLogo( "" );
77290f8c 41--- kdebase-030924/kcontrol/kdm/kdm-users.cpp~ 2003-09-23 21:46:11.000000000 +0200
42+++ kdebase-030924/kcontrol/kdm/kdm-users.cpp 2003-09-24 16:39:25.000000000 +0200
43@@ -65,7 +65,7 @@
df8f53c7
AM		 44 // We assume that $kde_datadir/kdm exists, but better check for pics/ and pics/users,
45 // and create them if necessary.
77290f8c 46 config->setGroup( "X-*-Greeter" );
47- m_userPixDir = config->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces" ) + '/';
48+ m_userPixDir = config->readEntry( "FaceDir", "/etc/X11/kdm/faces" ) + '/';
df8f53c7
AM		 49 m_notFirst = false;
50 QDir testDir( m_userPixDir );
77290f8c 51 if ( !testDir.exists() && !testDir.mkdir( testDir.absPath() ))
438261a1
ER		 52--- kdebase-trinity-3.5.13.2/kcontrol/kdm/main.cpp~ 2012-09-16 15:52:02.000000000 +0300
53+++ kdebase-trinity-3.5.13.2/kcontrol/kdm/main.cpp 2014-05-27 14:03:23.136893424 +0300
54@@ -174,11 +174,11 @@
55 << "' have unknown GID " << tgmapci.key() << endl;
56
57 struct stat st;
58- if( stat( KDE_CONFDIR "/kdm/kdmdistrc" ,&st ) == 0) {
59- config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmdistrc" ));
60+ if( stat( "/etc/X11/kdm/kdmdistrc" ,&st ) == 0) {
61+ config = new KSimpleConfig( TQString::fromLatin1( "/etc/X11/kdm/kdmdistrc" ));
62 }
63 else {
64- config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" ));
65+ config = new KSimpleConfig( TQString::fromLatin1( "/etc/X11/kdm/kdmrc" ));
66 }
67
68 TQVBoxLayout *top = new TQVBoxLayout(this);
db8a32fb
ER		 69--- kdebase-trinity-3.5.13.2/kcontrol/screensaver/scrnsave.cpp~ 2014-06-03 23:19:33.000000000 +0300
70+++ kdebase-trinity-3.5.13.2/kcontrol/screensaver/scrnsave.cpp 2014-06-04 11:12:35.914596433 +0300
71@@ -51,11 +51,11 @@
72 #include <fixx11h.h>
73
74 #define OPEN_TDMCONFIG_AND_SET_GROUP \
75-if( stat( KDE_CONFDIR "/kdm/kdmdistrc" , &st ) == 0) { \
76- mTDMConfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmdistrc" )); \
77+if( stat( "/etc/X11/kdm/kdmdistrc" , &st ) == 0) { \
78+ mTDMConfig = new KSimpleConfig( TQString::fromLatin1( "/etc/X11/kdm/kdmdistrc" )); \
79 } \
80 else { \
81- mTDMConfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" )); \
82+ mTDMConfig = new KSimpleConfig( TQString::fromLatin1( "/etc/X11/kdm/kdmrc" )); \
83 } \
84 mTDMConfig->setGroup("X-*-Greeter");
85
86--- kdebase-trinity-3.5.13.2/kdesktop/lock/main.cc~ 2013-05-06 11:08:22.000000000 +0300
87+++ kdebase-trinity-3.5.13.2/kdesktop/lock/main.cc 2014-06-04 11:13:06.705992318 +0300
88@@ -52,11 +52,11 @@
89 #endif
90
91 #define OPEN_TDMCONFIG_AND_SET_GROUP \
92-if( stat( KDE_CONFDIR "/kdm/kdmdistrc" , &st ) == 0) { \
93- tdmconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmdistrc" )); \
94+if( stat( "/etc/X11/kdm/kdmdistrc" , &st ) == 0) { \
95+ tdmconfig = new KSimpleConfig( TQString::fromLatin1( "/etc/X11/kdm/kdmdistrc" )); \
96 } \
97 else { \
98- tdmconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" )); \
99+ tdmconfig = new KSimpleConfig( TQString::fromLatin1( "/etc/X11/kdm/kdmrc" )); \
100 } \
101 tdmconfig->setGroup("X-*-Greeter");
102
103--- kdebase-trinity-3.5.13.2/kdm/kfrontend/kdmctl.c~ 2013-03-04 19:36:45.000000000 +0200
104+++ kdebase-trinity-3.5.13.2/kdm/kfrontend/kdmctl.c 2014-06-04 11:13:21.883347041 +0300
105@@ -146,7 +146,7 @@
106 {
107 char *dpy = getenv( "DISPLAY" );
108 const char *ctl = getenv( "DM_CONTROL" );
109- const char *cfg = KDE_CONFDIR "/kdm/kdmrc";
110+ const char *cfg = "/etc/X11/kdm/kdmrc";
111 char *ptr;
112 int fd;
113
3e9bd17a
ER		 114--- kdebase-trinity-3.5.13.2/kdm/kfrontend/CMakeLists.txt~ 2012-09-16 15:52:03.000000000 +0300
115+++ kdebase-trinity-3.5.13.2/kdm/kfrontend/CMakeLists.txt 2014-06-04 11:10:30.672252448 +0300
116@@ -35,7 +35,7 @@
117 set( GENKDMCONF_FLAGS "--no-old" )
118 endif( )
119
120-install( CODE "execute_process( COMMAND ${CMAKE_CURRENT_BINARY_DIR}/genkdmconf --in \$ENV{DESTDIR}${CONFIG_INSTALL_DIR}/kdm --no-in-notice --face-src ${CMAKE_CURRENT_SOURCE_DIR}/pics ${GENKDMCONF_FLAGS} )" )
121+install( CODE "execute_process( COMMAND ${CMAKE_CURRENT_BINARY_DIR}/genkdmconf --in \$ENV{DESTDIR}/etc/X11/kdm --no-in-notice --face-src ${CMAKE_CURRENT_SOURCE_DIR}/pics ${GENKDMCONF_FLAGS} )" )
122
123
124 ##### config.ci (generated) #####################
438261a1
ER		 125--- kdebase-trinity-3.5.13.2/kdm/config.def~ 2014-05-27 13:55:54.000000000 +0300
126+++ kdebase-trinity-3.5.13.2/kdm/config.def 2014-05-27 14:35:25.710243084 +0300
075b4d85 127@@ -29,7 +29,7 @@
128 #define RCVERMAJOR 2
129 #define RCVERMINOR 3
130
131-#define KDMCONF KDE_CONFDIR "/kdm"
132+#define KDMCONF "/etc/X11/kdm"
133 #define KDMDATA KDE_DATADIR "/kdm"
134
135 #ifdef _AIX
136@@ -1164,7 +1164,7 @@
137
138 Key: Willing
139 Type: string
140-Default: ""
141+Default: KDMCONF "/Xwilling"
142 User: core
143 # will be overwritten
144 Instance: #
145@@ -1581,7 +1581,7 @@
146
147 Key: Setup
148 Type: string
149-Default: ""
150+Default: KDMCONF "/Xsetup"
151 User: core
152 # will be overwritten
153 Instance: #*/""
154@@ -1602,7 +1602,7 @@
155
156 Key: Startup
157 Type: string
158-Default: ""
159+Default: KDMCONF "/Xstartup"
160 User: core
161 # will be overwritten
162 Instance: #*/""
163@@ -1620,7 +1620,7 @@
164
165 Key: Reset
166 Type: string
167-Default: ""
168+Default: KDMCONF "/Xreset"
169 User: core
170 # will be overwritten
171 Instance: #*/""
172@@ -1638,7 +1638,7 @@
173
174 Key: Session
175 Type: string
176-Default: XBINDIR "/xterm -ls -T"
177+Default: KDMCONF "/Xsession"
178 #Merge: xdm - incompatible!
179 User: core
180 # will be overwritten
181@@ -1746,10 +1746,10 @@
182
183 Key: AllowRootLogin
184 Type: bool
185-Default: true
186+Default: false
187 User: core
188 User: greeter(showRoot)
189-Instance: */false
190+Instance: #*/true
191 Merge: xdm
192 Comment:
193 Allow root logins?
194@@ -1759,11 +1759,11 @@
195
196 Key: AllowNullPasswd
197 Type: bool
198-Default: true
199+Default: false
200 User: core
201 # sensible?
202-Instance: */false
203-Instance: :*/true
204+Instance: #*/true
205+Instance: #:*/true
206 Merge: xdm
207 Comment:
208 Allow to log in, when user has set an empty password?
438261a1
ER		 209@@ -1931,7 +1931,7 @@
210 Default: "/usr/share/xsessions,/var/lib/menu-xdg/xsessions," KDMDATA "/sessions"
075b4d85 211 User: core
212 User: greeter-c
438261a1
ER		 213-Instance: */"/usr/share/xsessions,/var/lib/menu-xdg/xsessions," KDMDATA "/sessions"
214+Instance: */"/etc/X11/sessions,/usr/share/xsessions,/var/lib/menu-xdg/xsessions," KDMDATA "/sessions"
075b4d85 215 Comment:
216 The directories containing session type definitions in .desktop format.
217 Description:
218@@ -1933,10 +1933,10 @@
219
220 Key: ClientLogFile
221 Type: string
222-Default: ".xsession-errors"
223+Default: ""
224 User: core
225-Instance: */".xsession-errors-%s"
226-Instance: :0/".xsession-errors"
227+Instance: #*/".xsession-errors-%s"
228+Instance: #:0/".xsession-errors"
229 Comment:
230 The file (relative to $HOME) to redirect the session output to. This is
231 a printf format string; one %s will be replaced with the display name.
232@@ -1997,9 +1997,9 @@
233 None/LOGO_NONE: nothing
234 Logo/LOGO_LOGO: the image specified by <option>LogoPixmap</option>
235 Clock/LOGO_CLOCK: a neat analog clock
236-Default: Clock
237+Default: Logo
238 User: greeter
239-Instance: */Logo
240+Instance: #*/Clock
241 Comment:
242 What should be shown in the greeter's logo are:
243 Description:
244@@ -2009,9 +2009,9 @@
245
246 Key: LogoPixmap
247 Type: string
248-Default: ""
249+Default: KDMDATA "/pics/pldlogo.png"
250 User: greeter(logo)
251-Instance: */KDMDATA "/pics/kdelogo.png"
252+Instance: #*/KDMDATA "/pics/kdelogo.png"
253 Comment:
254 The image to show when LogoArea=Logo.
255 Description:
438261a1 256@@ -2092,9 +2092,9 @@
075b4d85 257
258 Key: GreetString
259 Type: string
438261a1 260-Default: "Welcome to Trinity at %n"
075b4d85 261+Default: "Welcome to PLD Linux at %n"
262 User: greeter
438261a1
ER		 263-Instance: #*/"Welcome to Trinity at %n"
264+Instance: #*/"Welcome to PLD Linux at %n"
075b4d85 265 Comment:
438261a1
ER		 266 The headline in the greeter. The following character pairs are replaced:
267 - %d -> current display
075b4d85 268@@ -2227,7 +2227,7 @@
269
270 Key: MinShowUID
271 Type: int
272-Default: 0
273+Default: 500
274 User: greeter(lowUserId)
275 # will be overwritten
276 Instance: #*/
277@@ -2288,7 +2288,7 @@
278
279 Key: FaceDir
280 Type: string
281-Default: *KDMDATA "/faces"
282+Default: *KDMCONF "/faces"
283 User: greeter
284 Instance: #*/"/usr/share/faces"
285 Update: upd_facedir
K Desktop Environment - core files
This page took 0.743143 seconds and 4 git commands to generate.