fix kdelibs-3.5.6-utempter.patch

2007-02-05 22:30:07 +00:00 · 2007-02-05 22:30:07 +00:00 · a63528a334
commit a63528a334
parent 106c6fd588
1 changed files with 54 additions and 46 deletions
--- a/kdelibs-3.5.6-utempter.patch
+++ b/kdelibs-3.5.6-utempter.patch
@ -1,27 +1,30 @@
--- kdelibs-3.5.6/kdecore/Makefile.am.utempter	2007-01-25 17:38:24.000000000 +0100
-+++ kdelibs-3.5.6/kdecore/Makefile.am	2007-01-25 17:53:21.000000000 +0100
-@@ -115,7 +115,7 @@
- 	kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp \
- 	kqiodevicegzip_p.cpp ktimezones.cpp
- 
-libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
-+libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(LIBUTEMPTER) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
- libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la
- libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck
- libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \
--- kdelibs-3.5.6/kdecore/Makefile.in.utempter	2007-01-25 17:38:03.000000000 +0100
-+++ kdelibs-3.5.6/kdecore/Makefile.in	2007-01-25 17:53:21.000000000 +0100
-@@ -783,7 +783,7 @@
- 
- #>- libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
- #>+ 1
-libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED)
-+libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(LIBUTEMPTER) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED)
- libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la
- libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck
- libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \
--- kdelibs-3.5.6/kdecore/kpty.cpp.utempter	2007-01-25 17:37:50.000000000 +0100
-+++ kdelibs-3.5.6/kdecore/kpty.cpp	2007-01-25 17:53:21.000000000 +0100
+diff -Nur kdelibs-3.5.6.orig/configure.in kdelibs-3.5.6/configure.in
+--- kdelibs-3.5.6.orig/configure.in	2007-01-24 09:52:48.000000000 +0100
+++ kdelibs-3.5.6/configure.in	2007-02-05 23:01:44.000000000 +0100
+@@ -399,7 +399,7 @@
+ [], with_utempter=check)
+ if test "x$with_utempter" != xno; then
+   kde_have_utempter=yes
+-  AC_CHECK_LIB(utempter, addToUtmp, [LIBUTEMPTER=-lutempter], kde_have_utempter=no)
+  AC_CHECK_LIB(utempter, utempter_add_record, [LIBUTEMPTER=-lutempter], kde_have_utempter=no)
+   AC_SUBST(LIBUTEMPTER)
+   if test "$kde_have_utempter" = "yes"; then
+     AC_DEFINE_UNQUOTED(HAVE_UTEMPTER, 1, [Define if you have the utempter helper for utmp managment])
+diff -Nur kdelibs-3.5.6.orig/configure.in.in kdelibs-3.5.6/configure.in.in
+--- kdelibs-3.5.6.orig/configure.in.in	2006-05-22 20:14:23.000000000 +0200
+++ kdelibs-3.5.6/configure.in.in	2007-02-05 23:01:44.000000000 +0100
+@@ -395,7 +395,7 @@
+ [], with_utempter=check)
+ if test "x$with_utempter" != xno; then
+   kde_have_utempter=yes
+-  AC_CHECK_LIB(utempter, addToUtmp, [LIBUTEMPTER=-lutempter], kde_have_utempter=no)
+  AC_CHECK_LIB(utempter, utempter_add_record, [LIBUTEMPTER=-lutempter], kde_have_utempter=no)
+   AC_SUBST(LIBUTEMPTER)
+   if test "$kde_have_utempter" = "yes"; then
+     AC_DEFINE_UNQUOTED(HAVE_UTEMPTER, 1, [Define if you have the utempter helper for utmp managment])
+diff -Nur kdelibs-3.5.6.orig/kdecore/kpty.cpp kdelibs-3.5.6/kdecore/kpty.cpp
+--- kdelibs-3.5.6.orig/kdecore/kpty.cpp	2006-05-22 20:14:21.000000000 +0200
+++ kdelibs-3.5.6/kdecore/kpty.cpp	2007-02-05 23:01:44.000000000 +0100
@@ -80,6 +80,10 @@
 # include <utmp.h>
 #endif
@ -81,25 +84,30 @@
 #elif defined(USE_LOGIN)
     const char *str_ptr = d->ttyName.data();
     if (!memcmp(str_ptr, "/dev/", 5))
--- kdelibs-3.5.6/configure.in.in.utempter	2006-05-22 20:14:23.000000000 +0200
-+++ kdelibs-3.5.6/configure.in.in	2007-01-25 18:15:25.000000000 +0100
-@@ -395,7 +395,7 @@
- [], with_utempter=check)
- if test "x$with_utempter" != xno; then
-   kde_have_utempter=yes
-  AC_CHECK_LIB(utempter, addToUtmp, [LIBUTEMPTER=-lutempter], kde_have_utempter=no)
-+  AC_CHECK_LIB(utempter, utempter_add_record, [LIBUTEMPTER=-lutempter], kde_have_utempter=no)
-   AC_SUBST(LIBUTEMPTER)
-   if test "$kde_have_utempter" = "yes"; then
-     AC_DEFINE_UNQUOTED(HAVE_UTEMPTER, 1, [Define if you have the utempter helper for utmp managment])
--- kdelibs-3.5.6/configure.in.utempter	2007-01-25 18:15:52.000000000 +0100
-+++ kdelibs-3.5.6/configure.in	2007-01-25 18:15:39.000000000 +0100
-@@ -399,7 +399,7 @@
- [], with_utempter=check)
- if test "x$with_utempter" != xno; then
-   kde_have_utempter=yes
-  AC_CHECK_LIB(utempter, addToUtmp, [LIBUTEMPTER=-lutempter], kde_have_utempter=no)
-+  AC_CHECK_LIB(utempter, utempter_add_record, [LIBUTEMPTER=-lutempter], kde_have_utempter=no)
-   AC_SUBST(LIBUTEMPTER)
-   if test "$kde_have_utempter" = "yes"; then
-     AC_DEFINE_UNQUOTED(HAVE_UTEMPTER, 1, [Define if you have the utempter helper for utmp managment])
+diff -Nur kdelibs-3.5.6.orig/kdecore/Makefile.am kdelibs-3.5.6/kdecore/Makefile.am
+--- kdelibs-3.5.6.orig/kdecore/Makefile.am	2006-10-01 19:33:38.000000000 +0200
+++ kdelibs-3.5.6/kdecore/Makefile.am	2007-02-05 23:01:44.000000000 +0100
+@@ -115,7 +115,7 @@
+ 	kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp \
+ 	kqiodevicegzip_p.cpp ktimezones.cpp
+ 
+-libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
+libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(LIBUTEMPTER) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
+ libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la
+ libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck
+ libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \
+diff -Nur kdelibs-3.5.6.orig/kdecore/Makefile.in kdelibs-3.5.6/kdecore/Makefile.in
+--- kdelibs-3.5.6.orig/kdecore/Makefile.in	2007-01-24 09:54:07.000000000 +0100
+++ kdelibs-3.5.6/kdecore/Makefile.in	2007-02-05 23:04:12.000000000 +0100
+@@ -787,9 +787,9 @@
+ 	kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp \
+ 	kqiodevicegzip_p.cpp ktimezones.cpp ksycoca_skel.cpp kappdcopiface_skel.cpp kdebugdcopiface_skel.cpp
+ 
+-#>- libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
+#>- libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(LIBUTEMPTER) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
+ #>+ 1
+-libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED)
+libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(LIBUTEMPTER) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED)
+ libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la
+ libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck
+ libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \