head 1.4;
access;
symbols
OPENPKG_E1_MP_HEAD:1.4
OPENPKG_E1_MP:1.4
OPENPKG_CW_FP:1.4;
locks; strict;
comment @# @;
1.4
date 2004.08.07.17.56.42; author ms; state Exp;
branches;
next 1.3;
1.3
date 2004.08.06.09.34.43; author tho; state Exp;
branches;
next 1.2;
1.2
date 2003.09.19.11.25.25; author rse; state Exp;
branches;
next 1.1;
1.1
date 2003.08.18.18.23.30; author rse; state Exp;
branches;
next ;
desc
@@
1.4
log
@correct comments, remove outcommented patch logic, replace missing chmod(1) system(3) patch code, and correct Makefile.in datadir substitutions
@
text
@Index: kdesktop/init.cc
diff -Nau kdesktop/init.cc.orig kdesktop/init.cc
--- kdesktop/init.cc.orig 2004-08-04 18:36:42 +0200
+++ kdesktop/init.cc 2004-08-04 18:36:48 +0200
@@@@ -81,6 +81,8 @@@@
cmd += " ";
cmd += KProcess::quote(dir+"/.directory");
system( QFile::encodeName(cmd) );
+ cmd = "chmod 644 " + KProcess::quote(dir+"/.directory");
+ system( QFile::encodeName(cmd) );
}
}
@@@@ -114,6 +116,8 @@@@
cmd += " ";
cmd += QFile::encodeName(KProcess::quote(desktopPath));
system( cmd );
+ cmd = "chmod 644 " + QFile::encodeName(KProcess::quote(desktopPath));
+ system( cmd );
}
}
Index: kdm/backend/xdmcp.c
diff -Nau kdm/backend/xdmcp.c.orig kdm/backend/xdmcp.c
--- kdm/backend/xdmcp.c.orig 2004-08-04 18:40:10 +0200
+++ kdm/backend/xdmcp.c 2004-08-04 18:40:16 +0200
@@@@ -995,7 +995,7 @@@@
sprintf (buf, "Session %ld failed for display %.260s: %s",
(long) sessionID, name, reason);
- Debug ("send_failed(%\"s)\n", buf);
+ Debug ("send_failed(\"%s\")\n", buf);
status.length = strlen (buf);
status.data = (CARD8Ptr) buf;
header.version = XDM_PROTOCOL_VERSION;
Index: kioslave/fish/Makefile.in
--- kioslave/fish/Makefile.in.orig 2004-06-02 09:42:15 +0200
+++ kioslave/fish/Makefile.in 2004-08-06 10:08:17 +0200
@@@@ -851,7 +851,7 @@@@
fishcode.h: fish.pl
if echo | md5sum > /dev/null 2>&1 ; then \
SUM=`md5sum $(srcdir)/fish.pl | cut -d ' ' -f 1`; else \
- SUM=`md5 $(srcdir)/fish.pl | cut -d ' ' -f 4`; fi; \
+ SUM=`md5 $(srcdir)/fish.pl | sed -n -e 's;^.*\([a-fA-F0-9]\{32\}\).*$$;\1;p'`; fi; \
echo '#define CHECKSUM "'$$SUM'"' > $@@; \
echo 'static const char *fishCode(' >> $@@; \
sed -e 's/\\/\\\\/g;s/"/\\"/g;s/^[ ]*/"/;/^"# /d;s/[ ]*$$/\\n"/;/^"\\n"$$/d;s/{CHECKSUM}/'$$SUM'/;' $(srcdir)/fish.pl >> $@@; \
@
1.3
log
@at least it builds now
@
text
@d1 27
a27 25
#--- kdesktop/init.cc.orig Fri Oct 12 15:11:13 2001
#+++ kdesktop/init.cc Thu Jul 18 06:48:59 2002
#@@@@ -80,6 +80,9 @@@@
# QFile::encodeName(locate("data", QString("kdesktop/") + fileName)).data(),
# QFile::encodeName(dir).data() );
# system( cmd );
#+ cmd.sprintf( "chmod 644 %s/.directory",
#+ QFile::encodeName(dir).data() );
#+ system( cmd );
# }
# }
#
#@@@@ -106,6 +109,9 @@@@
# cmd += "' '";
# cmd += QFile::encodeName(desktopPath + desk.readName());
# cmd += "'";
#+ system( cmd );
#+ cmd.sprintf("chmod 644 '%s'",
#+ QFile::encodeName(desktopPath + desk.readName()).data());
# system( cmd );
# }
# }
--- kdm/backend/xdmcp.c.orig Wed May 8 14:21:31 2002
+++ kdm/backend/xdmcp.c Wed Jun 26 20:14:02 2002
@@@@ -1012,7 +1012,7 @@@@
@
1.2
log
@upgrading package: kde-base 3.1.3 -> 3.1.4
@
text
@d1 22
a22 22
--- kdesktop/init.cc.orig Fri Oct 12 15:11:13 2001
+++ kdesktop/init.cc Thu Jul 18 06:48:59 2002
@@@@ -80,6 +80,9 @@@@
QFile::encodeName(locate("data", QString("kdesktop/") + fileName)).data(),
QFile::encodeName(dir).data() );
system( cmd );
+ cmd.sprintf( "chmod 644 %s/.directory",
+ QFile::encodeName(dir).data() );
+ system( cmd );
}
}
@@@@ -106,6 +109,9 @@@@
cmd += "' '";
cmd += QFile::encodeName(desktopPath + desk.readName());
cmd += "'";
+ system( cmd );
+ cmd.sprintf("chmod 644 '%s'",
+ QFile::encodeName(desktopPath + desk.readName()).data());
system( cmd );
}
}
d34 12
@
1.1
log
@new package: kde-base 3.1.3 (K Desktop Environment (Base Components))
@
text
@a33 70
--- kioslave/fish/fish.cpp.orig
+++ kioslave/fish/fish.cpp
@@@@ -302,5 +302,5 @@@@
void fishProtocol::openConnection() {
static int open_pty_pair(int fd[2])
{
-#if defined(HAVE_TERMIOS_H) && defined(HAVE_GRANTPT)
+#if defined(HAVE_TERMIOS_H) && defined(HAVE_GRANTPT) && !defined (HAVE_OPENPTY)
/** with kind regards to The GNU C Library
Reference Manual for Version 2.2.x of the GNU C Library */
--- kcontrol/konqhtml/nsconfigwidget.ui.orig 2003-05-07 13:44:03.000000000 +0200
+++ kcontrol/konqhtml/nsconfigwidget.ui 2003-08-18 15:23:17.000000000 +0200
@@@@ -2,6 +2,8 @@@@
NSConfigWidget
Stefan Schimanski <1Stein@@gmx.de>
klocale.h
+kurlrequester.h
+klistbox.h
QWidget
--- kicker/applets/clock/conf.ui.orig 2002-08-13 10:05:16.000000000 +0200
+++ kicker/applets/clock/conf.ui 2003-08-18 15:24:39.000000000 +0200
@@@@ -1695,6 +1695,9 @@@@
klocale.h
+ kurlrequester.h
+ klistview.h
+ kcolorbutton.h
--- kpersonalizer/keyecandypagedlg.ui.orig 2003-05-07 13:44:16.000000000 +0200
+++ kpersonalizer/keyecandypagedlg.ui 2003-08-18 15:25:27.000000000 +0200
@@@@ -1,5 +1,6 @@@@
KEyeCandyPageDlg
+klistview.h
KEyeCandyPageDlg
--- ksysguard/gui/KSGAppletSettingsWidget.ui.orig 2002-06-23 21:16:24.000000000 +0200
+++ ksysguard/gui/KSGAppletSettingsWidget.ui 2003-08-18 15:26:29.000000000 +0200
@@@@ -1,6 +1,7 @@@@
KSGAppletSettingsWidget
Nadeem Hasan
+knuminput.h
KSGAppletSettingsWidget
--- kxkb/kcmmiscwidget.ui.orig 2003-05-07 13:44:18.000000000 +0200
+++ kxkb/kcmmiscwidget.ui 2003-08-18 15:27:07.000000000 +0200
@@@@ -1,5 +1,6 @@@@
KeyboardConfigWidget
+knuminput.h
KeyboardConfigWidget
--- konqueror/sidebar/trees/history_module/history_dlg.ui.orig 2003-05-07 13:44:16.000000000 +0200
+++ konqueror/sidebar/trees/history_module/history_dlg.ui 2003-08-18 15:27:37.000000000 +0200
@@@@ -1,5 +1,6 @@@@
KonqSidebarHistoryDlg
+knuminput.h
KonqHistoryDlg
@