From 6a597a1ddafcfaafd7ecd0e37bf86ab536f1d5a6 Mon Sep 17 00:00:00 2001 From: arved Date: Mon, 29 Sep 2003 09:39:38 +0000 Subject: From KDE_3_1_BRANCH: Deal with 64-bit time_t With this fix I was able to complete compilation of kdebase on IA64. Submitted by: Adriaan de Groot Thanks to: marcel for prodding and installing kdelibs on pluto2 --- .../files/patch-konsole-konsole-TEPty.cpp | 18 ++++++++++++++++++ x11/kde4-runtime/files/patch-konsole-konsole-TEPty.cpp | 18 ++++++++++++++++++ .../files/patch-konsole-konsole-TEPty.cpp | 18 ++++++++++++++++++ x11/kdebase3/files/patch-konsole-konsole-TEPty.cpp | 18 ++++++++++++++++++ .../files/patch-konsole-konsole-TEPty.cpp | 18 ++++++++++++++++++ .../files/patch-konsole-konsole-TEPty.cpp | 18 ++++++++++++++++++ x11/kdebase4/files/patch-konsole-konsole-TEPty.cpp | 18 ++++++++++++++++++ 7 files changed, 126 insertions(+) create mode 100644 x11/kde4-baseapps/files/patch-konsole-konsole-TEPty.cpp create mode 100644 x11/kde4-runtime/files/patch-konsole-konsole-TEPty.cpp create mode 100644 x11/kde4-workspace/files/patch-konsole-konsole-TEPty.cpp create mode 100644 x11/kdebase3/files/patch-konsole-konsole-TEPty.cpp create mode 100644 x11/kdebase4-runtime/files/patch-konsole-konsole-TEPty.cpp create mode 100644 x11/kdebase4-workspace/files/patch-konsole-konsole-TEPty.cpp create mode 100644 x11/kdebase4/files/patch-konsole-konsole-TEPty.cpp (limited to 'x11') diff --git a/x11/kde4-baseapps/files/patch-konsole-konsole-TEPty.cpp b/x11/kde4-baseapps/files/patch-konsole-konsole-TEPty.cpp new file mode 100644 index 0000000..949bc5b --- /dev/null +++ b/x11/kde4-baseapps/files/patch-konsole-konsole-TEPty.cpp @@ -0,0 +1,18 @@ +--- konsole/konsole/TEPty.cpp.orig Mon Sep 29 11:22:07 2003 ++++ konsole/konsole/TEPty.cpp Mon Sep 29 11:22:12 2003 +@@ -624,7 +624,14 @@ + if (strncmp(str_ptr, "/dev/", 5) == 0) + str_ptr += 5; + strncpy(l_struct.ut_line, str_ptr, UT_LINESIZE); +- time(&l_struct.ut_time); ++ ++ // Handle 64-bit time_t properly, where it may be larger ++ // than the integral type of ut_time. ++ { ++ time_t ut_time_temp; ++ time(&ut_time_temp); ++ l_struct.ut_time=ut_time_temp; ++ } + + login(&l_struct); + #endif diff --git a/x11/kde4-runtime/files/patch-konsole-konsole-TEPty.cpp b/x11/kde4-runtime/files/patch-konsole-konsole-TEPty.cpp new file mode 100644 index 0000000..949bc5b --- /dev/null +++ b/x11/kde4-runtime/files/patch-konsole-konsole-TEPty.cpp @@ -0,0 +1,18 @@ +--- konsole/konsole/TEPty.cpp.orig Mon Sep 29 11:22:07 2003 ++++ konsole/konsole/TEPty.cpp Mon Sep 29 11:22:12 2003 +@@ -624,7 +624,14 @@ + if (strncmp(str_ptr, "/dev/", 5) == 0) + str_ptr += 5; + strncpy(l_struct.ut_line, str_ptr, UT_LINESIZE); +- time(&l_struct.ut_time); ++ ++ // Handle 64-bit time_t properly, where it may be larger ++ // than the integral type of ut_time. ++ { ++ time_t ut_time_temp; ++ time(&ut_time_temp); ++ l_struct.ut_time=ut_time_temp; ++ } + + login(&l_struct); + #endif diff --git a/x11/kde4-workspace/files/patch-konsole-konsole-TEPty.cpp b/x11/kde4-workspace/files/patch-konsole-konsole-TEPty.cpp new file mode 100644 index 0000000..949bc5b --- /dev/null +++ b/x11/kde4-workspace/files/patch-konsole-konsole-TEPty.cpp @@ -0,0 +1,18 @@ +--- konsole/konsole/TEPty.cpp.orig Mon Sep 29 11:22:07 2003 ++++ konsole/konsole/TEPty.cpp Mon Sep 29 11:22:12 2003 +@@ -624,7 +624,14 @@ + if (strncmp(str_ptr, "/dev/", 5) == 0) + str_ptr += 5; + strncpy(l_struct.ut_line, str_ptr, UT_LINESIZE); +- time(&l_struct.ut_time); ++ ++ // Handle 64-bit time_t properly, where it may be larger ++ // than the integral type of ut_time. ++ { ++ time_t ut_time_temp; ++ time(&ut_time_temp); ++ l_struct.ut_time=ut_time_temp; ++ } + + login(&l_struct); + #endif diff --git a/x11/kdebase3/files/patch-konsole-konsole-TEPty.cpp b/x11/kdebase3/files/patch-konsole-konsole-TEPty.cpp new file mode 100644 index 0000000..949bc5b --- /dev/null +++ b/x11/kdebase3/files/patch-konsole-konsole-TEPty.cpp @@ -0,0 +1,18 @@ +--- konsole/konsole/TEPty.cpp.orig Mon Sep 29 11:22:07 2003 ++++ konsole/konsole/TEPty.cpp Mon Sep 29 11:22:12 2003 +@@ -624,7 +624,14 @@ + if (strncmp(str_ptr, "/dev/", 5) == 0) + str_ptr += 5; + strncpy(l_struct.ut_line, str_ptr, UT_LINESIZE); +- time(&l_struct.ut_time); ++ ++ // Handle 64-bit time_t properly, where it may be larger ++ // than the integral type of ut_time. ++ { ++ time_t ut_time_temp; ++ time(&ut_time_temp); ++ l_struct.ut_time=ut_time_temp; ++ } + + login(&l_struct); + #endif diff --git a/x11/kdebase4-runtime/files/patch-konsole-konsole-TEPty.cpp b/x11/kdebase4-runtime/files/patch-konsole-konsole-TEPty.cpp new file mode 100644 index 0000000..949bc5b --- /dev/null +++ b/x11/kdebase4-runtime/files/patch-konsole-konsole-TEPty.cpp @@ -0,0 +1,18 @@ +--- konsole/konsole/TEPty.cpp.orig Mon Sep 29 11:22:07 2003 ++++ konsole/konsole/TEPty.cpp Mon Sep 29 11:22:12 2003 +@@ -624,7 +624,14 @@ + if (strncmp(str_ptr, "/dev/", 5) == 0) + str_ptr += 5; + strncpy(l_struct.ut_line, str_ptr, UT_LINESIZE); +- time(&l_struct.ut_time); ++ ++ // Handle 64-bit time_t properly, where it may be larger ++ // than the integral type of ut_time. ++ { ++ time_t ut_time_temp; ++ time(&ut_time_temp); ++ l_struct.ut_time=ut_time_temp; ++ } + + login(&l_struct); + #endif diff --git a/x11/kdebase4-workspace/files/patch-konsole-konsole-TEPty.cpp b/x11/kdebase4-workspace/files/patch-konsole-konsole-TEPty.cpp new file mode 100644 index 0000000..949bc5b --- /dev/null +++ b/x11/kdebase4-workspace/files/patch-konsole-konsole-TEPty.cpp @@ -0,0 +1,18 @@ +--- konsole/konsole/TEPty.cpp.orig Mon Sep 29 11:22:07 2003 ++++ konsole/konsole/TEPty.cpp Mon Sep 29 11:22:12 2003 +@@ -624,7 +624,14 @@ + if (strncmp(str_ptr, "/dev/", 5) == 0) + str_ptr += 5; + strncpy(l_struct.ut_line, str_ptr, UT_LINESIZE); +- time(&l_struct.ut_time); ++ ++ // Handle 64-bit time_t properly, where it may be larger ++ // than the integral type of ut_time. ++ { ++ time_t ut_time_temp; ++ time(&ut_time_temp); ++ l_struct.ut_time=ut_time_temp; ++ } + + login(&l_struct); + #endif diff --git a/x11/kdebase4/files/patch-konsole-konsole-TEPty.cpp b/x11/kdebase4/files/patch-konsole-konsole-TEPty.cpp new file mode 100644 index 0000000..949bc5b --- /dev/null +++ b/x11/kdebase4/files/patch-konsole-konsole-TEPty.cpp @@ -0,0 +1,18 @@ +--- konsole/konsole/TEPty.cpp.orig Mon Sep 29 11:22:07 2003 ++++ konsole/konsole/TEPty.cpp Mon Sep 29 11:22:12 2003 +@@ -624,7 +624,14 @@ + if (strncmp(str_ptr, "/dev/", 5) == 0) + str_ptr += 5; + strncpy(l_struct.ut_line, str_ptr, UT_LINESIZE); +- time(&l_struct.ut_time); ++ ++ // Handle 64-bit time_t properly, where it may be larger ++ // than the integral type of ut_time. ++ { ++ time_t ut_time_temp; ++ time(&ut_time_temp); ++ l_struct.ut_time=ut_time_temp; ++ } + + login(&l_struct); + #endif -- cgit v1.1