[Pkg-kde-commits] rev 574 - branches/kde-3.4.0/packages/kdebase/debian/patches
Christopher Martin
chrsmrtn-guest@costa.debian.org
Thu, 03 Mar 2005 02:32:58 +0100
Author: chrsmrtn-guest
Date: 2005-03-03 02:32:57 +0100 (Thu, 03 Mar 2005)
New Revision: 574
Modified:
branches/kde-3.4.0/packages/kdebase/debian/patches/07_xlibs-static-pic.diff
branches/kde-3.4.0/packages/kdebase/debian/patches/10_default_sessionsdirs.diff
branches/kde-3.4.0/packages/kdebase/debian/patches/11_genkdmconf.diff
branches/kde-3.4.0/packages/kdebase/debian/patches/12_genkdm_make.diff
branches/kde-3.4.0/packages/kdebase/debian/patches/14_konsole_README.Linux-font.diff
Log:
Minor patch re-jigging to adapt to KDE 3.4.
Modified: branches/kde-3.4.0/packages/kdebase/debian/patches/07_xlibs-static-pic.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/07_xlibs-static-pic.diff 2005-03-03 00:47:05 UTC (rev 573)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/07_xlibs-static-pic.diff 2005-03-03 01:32:57 UTC (rev 574)
@@ -1,22 +1,22 @@
---- kdebase-orig/kcontrol/kfontinst/configure.in.in
-+++ kdebase-patched/kcontrol/kfontinst/configure.in.in
-@@ -82,9 +82,9 @@
- ld_shared_flag=
- KDE_CHECK_COMPILER_FLAG(shared, [ld_shared_flag="-shared"])
- LDFLAGS="$LDFLAGS $ld_shared_flag $all_libraries -lz"
-- AC_CHECK_LIB(fontenc,FontEncDirectory,ac_font_enc_lib=1,ac_font_enc_lib=0)
-+ AC_CHECK_LIB(fontenc_pic,FontEncDirectory,ac_font_enc_lib=1,ac_font_enc_lib=0)
- if test "$ac_font_enc_lib" = "1"; then
-- LIB_FONT_ENC="-lfontenc"
-+ LIB_FONT_ENC="-lfontenc_pic"
- AC_DEFINE(HAVE_FONT_ENC, 1, [Defines if you have FontEnc])
- fi
- LDFLAGS="$ac_LDFLAGS_save"
---- kdebase-orig/kdesktop/configure.in.in
-+++ kdebase-patched/kdesktop/configure.in.in
-@@ -13,10 +13,10 @@
- [
- ld_shared_flag=
+--- kde.orig/kcontrol/kfontinst/configure.in.in
++++ kde.patched/kcontrol/kfontinst/configure.in.in
+@@ -109,9 +109,9 @@
+ ld_shared_flag=
+ KDE_CHECK_COMPILER_FLAG(shared, [ld_shared_flag="-shared"])
+ LDFLAGS="$LDFLAGS $ld_shared_flag $all_libraries -lz"
+- KDE_CHECK_LIB(fontenc,FontEncDirectory,ac_font_enc_lib=1,ac_font_enc_lib=0)
++ KDE_CHECK_LIB(fontenc_pic,FontEncDirectory,ac_font_enc_lib=1,ac_font_enc_lib=0)
+ if test "$ac_font_enc_lib" = "1"; then
+- LIB_FONT_ENC="-lfontenc"
++ LIB_FONT_ENC="-lfontenc_pic"
+ AC_DEFINE(HAVE_FONT_ENC, 1, [Defines if you have FontEnc])
+ fi
+ LDFLAGS="$ac_LDFLAGS_save"
+--- kde.orig/kdesktop/configure.in.in
++++ kde.patched/kdesktop/configure.in.in
+@@ -15,10 +15,10 @@
+ xss_save_cxxflags="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS $lt_prog_compiler_pic_CXX"
KDE_CHECK_COMPILER_FLAG(shared, [ld_shared_flag="-shared"])
- AC_CHECK_LIB(Xss,XScreenSaverQueryInfo,
+ AC_CHECK_LIB(Xss_pic,XScreenSaverQueryInfo,
@@ -27,8 +27,8 @@
],
[],
[ $ld_shared_flag $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS ])
---- kdebase-orig/kdesktop/lock/configure.in.in
-+++ kdebase-patched/kdesktop/lock/configure.in.in
+--- kde.orig/kdesktop/lock/configure.in.in
++++ kde.patched/kdesktop/lock/configure.in.in
@@ -5,10 +5,10 @@
KDE_CHECK_HEADER(X11/extensions/xf86misc.h,
@@ -51,10 +51,10 @@
[
AC_DEFINE(HAVE_XF86MISCSETGRABKEYSSTATE, 1, [Define if you have XF86MiscSetGrabKeysState()])
],
---- kdebase-orig/kdm/backend/Makefile.am
-+++ kdebase-patched/kdm/backend/Makefile.am
+--- kde.orig/kdm/backend/Makefile.am
++++ kde.patched/kdm/backend/Makefile.am
@@ -4,7 +4,7 @@
- $(XDM_DEFINES) -I../kfrontend
+ $(XDM_DEFINES) -I..
CFLAGS = $(XDM_CFLAGS)
LDFLAGS = $(USER_LDFLAGS) $(X_LDFLAGS) $(X_RPATH) $(KRB4_RPATH) $(KRB5_RPATH)
-LDADD = $(LIB_X11) -lXau $(LIBXDMCP) $(PASSWDLIBS) \
@@ -62,8 +62,8 @@
$(LIB_LIBS) $(KRB4_LIBS) $(KRB5_LIBS) $(LIBSOCKET) $(LIBRESOLV) \
$(LIBUCB) $(LIBUTIL) $(LIBPOSIX4)
---- kdebase-orig/kdm/configure.in.in
-+++ kdebase-patched/kdm/configure.in.in
+--- kde.orig/kdm/configure.in.in
++++ kde.patched/kdm/configure.in.in
@@ -112,7 +112,7 @@
AC_MSG_RESULT([done])
eval "$kde_cv_defines_imake"
@@ -82,8 +82,8 @@
if test -n "$LIBXDMCP"; then
cppflags_safe=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $X_INCLUDES"
---- kdebase-orig/kxkb/Makefile.am
-+++ kdebase-patched/kxkb/Makefile.am
+--- kde.orig/kxkb/Makefile.am
++++ kde.patched/kxkb/Makefile.am
@@ -12,13 +12,13 @@
kcm_keyboard_la_SOURCES = extension.cpp rules.cpp kcmlayout.cpp pixmap.cpp kcmlayoutwidget.ui kcmmisc.cpp kcmmiscwidget.ui
Modified: branches/kde-3.4.0/packages/kdebase/debian/patches/10_default_sessionsdirs.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/10_default_sessionsdirs.diff 2005-03-03 00:47:05 UTC (rev 573)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/10_default_sessionsdirs.diff 2005-03-03 01:32:57 UTC (rev 574)
@@ -1,6 +1,6 @@
---- kdebase-orig/kdm/kfrontend/config.def
-+++ kdebase-patched/kdm/kfrontend/config.def
-@@ -1767,7 +1767,7 @@
+--- kde.orig/kdm/config.def
++++ kde.patched/kdm/config.def
+@@ -1746,7 +1746,7 @@
Default: KDMDATA "/sessions"
User: core
User: greeter-c
Modified: branches/kde-3.4.0/packages/kdebase/debian/patches/11_genkdmconf.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/11_genkdmconf.diff 2005-03-03 00:47:05 UTC (rev 573)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/11_genkdmconf.diff 2005-03-03 01:32:57 UTC (rev 574)
@@ -1,5 +1,5 @@
---- kdebase-orig/kdm/kfrontend/genkdmconf.c
-+++ kdebase-patched/kdm/kfrontend/genkdmconf.c
+--- kde.org/kdm/kfrontend/genkdmconf.c
++++ kde.patched/kdm/kfrontend/genkdmconf.c
@@ -492,7 +492,7 @@
"# right hand sides can match.\n"
"#\n"
@@ -18,7 +18,7 @@
"\n"
"#\n"
"# If you'd prefer to configure the set of hosts each terminal sees,\n"
-@@ -571,46 +571,25 @@
+@@ -546,34 +546,25 @@
"#! /bin/sh\n"
"# Xstartup - run as root before session starts\n"
"\n"
@@ -30,73 +30,65 @@
-"# This is not required if you use PAM with the pam_console module.\n"
-"#\n"
-"#chown $USER /dev/console\n"
--"\n"
++"PATH=\"$PATH:/usr/bin/X11\"\n"
+ "\n"
-#ifdef _AIX
-"# We create a pseudodevice for finger. (host:0 becomes xdm/host_0)\n"
-"# Without it, finger errors out with \"Can't stat /dev/host:0\".\n"
-"#\n"
--"if [ -f /usr/lib/X11/xdm/sessreg ]; then\n"
--" devname=`echo $DISPLAY | /usr/bin/sed -e 's/[:\\.]/_/g' | /usr/bin/cut -c1-8`\n"
--" hostname=`echo $DISPLAY | /usr/bin/cut -d':' -f1`\n"
-+"PATH=\"$PATH:/usr/bin/X11\"\n"
- "\n"
--" if [ -z \"$devname\" ]; then\n"
--" devname=\"unknown\"\n"
+-"#devname=`echo $DISPLAY | cut -c1-8`\n"
+-"#if [ ! -d /dev/xdm ]; then\n"
+-"# mkdir /dev/xdm\n"
+-"# chmod 755 /dev/xdm\n"
+-"#fi\n"
+-"#touch /dev/xdm/$devname\n"
+-"#chmod 644 /dev/xdm/$devname\n"
+-"#exec sessreg -a -l xdm/$devname -h \"`echo $DISPLAY | cut -d: -f1`\""
+-#else
+-"#exec sessreg -a -l $DISPLAY -h \"`echo $DISPLAY | cut -d: -f1`\""
+-# ifdef BSD
+-" -x " KDMCONF "/Xservers"
+-# endif
+-#endif /* _AIX */
+-" $USER\n";
+"if [ -e /etc/nologin ]; then\n"
+" # always display the nologin message, if possible\n"
+" if [ -s /etc/nologin ] && which xmessage > /dev/null 2>&1; then\n"
+" xmessage -file /etc/nologin -geometry 640x480\n"
- " fi\n"
--" if [ ! -d /dev/xdm ]; then\n"
--" /usr/bin/mkdir /dev/xdm\n"
--" /usr/bin/chmod 755 /dev/xdm\n"
++" fi\n"
+" if [ \"$(id -u)\" != \"0\" ] && \\\n"
+" ! grep -qs '^ignore-nologin' /etc/kde3/kdm/kdm.options; then\n"
+" exit 1\n"
- " fi\n"
--" /usr/bin/touch /dev/xdm/$devname\n"
--" /usr/bin/chmod 644 /dev/xdm/$devname\n"
++" fi\n"
+"fi\n"
- "\n"
--" if [ -z \"$hostname\" ]; then\n"
--" exec /usr/lib/X11/xdm/sessreg -a -l xdm/$devname $USER\n"
--" else\n"
--" exec /usr/lib/X11/xdm/sessreg -a -l xdm/$devname -h $hostname $USER\n"
--" fi\n"
++"\n"
+"if grep -qs '^use-sessreg' /etc/kde3/kdm/kdm.options && \\\n"
+" which sessreg > /dev/null 2>&1; then\n"
-+" exec sessreg -a -l \"$DISPLAY\" -u /var/run/utmp \\\n"
-+" -x /etc/kde3/kdm/Xservers \"$USER\"\n"
-+" # NOTREACHED\n"
- "fi\n";
--#else
--"exec sessreg -a -l $DISPLAY"
--# ifdef BSD
--" -x " KDMCONF "/Xservers -u " _PATH_UTMP
--# endif
--" $USER\n";
--#endif /* _AIX */
++" exec sessreg -a -l \"$DISPLAY\" -u /var/run/utmp \\\n"
++" -h \"`echo $DISPLAY | cut -d: -f1`\" \"$USER\"\n"
++" # NOTREACHED\n"
++"fi\n";
- static const char def_reset[] =
+ static const char def_reset[] =
"#! /bin/sh\n"
-@@ -628,74 +607,20 @@
- " exec /usr/lib/X11/xdm/sessreg -d -l xdm/$devname $USER\n"
- "fi\n";
+@@ -589,74 +580,20 @@
+ "#devname=`echo $DISPLAY | cut -c1-8`\n"
+ "#exec sessreg -d -l xdm/$devname -h \"`echo $DISPLAY | cut -d: -f1`\""
#else
--"exec sessreg -d -l $DISPLAY"
+-"#exec sessreg -d -l $DISPLAY -h \"`echo $DISPLAY | cut -d: -f1`\""
-# ifdef BSD
--" -x " KDMCONF "/Xservers -u " _PATH_UTMP
+-" -x " KDMCONF "/Xservers"
-# endif
--" $USER\n";
+"if grep -qs '^use-sessreg' /etc/kde3/kdm/kdm.options && \\\n"
+" which sessreg > /dev/null 2>&1; then\n"
+" exec sessreg -d -l \"$DISPLAY\" -u /var/run/utmp \\\n"
-+" -x /etc/kde3/kdm/Xservers \"$USER\"\n"
++" -h \"`echo $DISPLAY | cut -d: -f1`\" \"$USER\"\n"
+" # NOTREACHED\n"
+"fi\n";
#endif /* _AIX */
+-" $USER\n";
- static const char def_session[] =
+ static const char def_session[] =
"#! /bin/sh\n"
"# Xsession - run as user\n"
"\n"
Modified: branches/kde-3.4.0/packages/kdebase/debian/patches/12_genkdm_make.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/12_genkdm_make.diff 2005-03-03 00:47:05 UTC (rev 573)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/12_genkdm_make.diff 2005-03-03 01:32:57 UTC (rev 574)
@@ -1,9 +1,9 @@
---- kdebase-orig/kdm/kfrontend/Makefile.am
-+++ kdebase-patched/kdm/kfrontend/Makefile.am
+--- kde.orig/kdm/kfrontend/Makefile.am
++++ kde.patched/kdm/kfrontend/Makefile.am
@@ -1,5 +1,5 @@
# use 'make GENKDMCONF_FLAGS=... install' to override
-GENKDMCONF_FLAGS =
+GENKDMCONF_FLAGS = --no-old
- SUBDIRS = pics sessions
+ SUBDIRS = themer themes pics sessions
Modified: branches/kde-3.4.0/packages/kdebase/debian/patches/14_konsole_README.Linux-font.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/14_konsole_README.Linux-font.diff 2005-03-03 00:47:05 UTC (rev 573)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/14_konsole_README.Linux-font.diff 2005-03-03 01:32:57 UTC (rev 574)
@@ -1,6 +1,6 @@
---- kdebase-orig/konsole/konsole/konsole.cpp
-+++ kdebase-patched/konsole/konsole/konsole.cpp
-@@ -1794,7 +1794,7 @@
+--- kde.orig/konsole/konsole/konsole.cpp
++++ kde.patched/konsole/konsole/konsole.cpp
+@@ -1819,7 +1819,7 @@
static bool showMessage = true;
if (!showMessage) return;
showMessage = false;
@@ -9,9 +9,9 @@
KMessageBox::error(this, msg);
}
---- kdebase-orig/konsole/konsole/konsole_part.cpp
-+++ kdebase-patched/konsole/konsole/konsole_part.cpp
-@@ -678,7 +678,7 @@
+--- kde.orig/konsole/konsole/konsole_part.cpp
++++ kde.patched/konsole/konsole/konsole_part.cpp
+@@ -731,7 +731,7 @@
void konsolePart::fontNotFound()
{