and the 3 patches I forgot to add.

This commit is contained in:
espie 2004-10-19 00:26:45 +00:00
parent b1fb66143a
commit 7411283b94
3 changed files with 53 additions and 0 deletions

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-kpdf_splash_Makefile_in,v 1.1 2004/10/19 00:26:45 espie Exp $
--- kpdf/splash/Makefile.in.orig Thu Oct 14 10:53:47 2004
+++ kpdf/splash/Makefile.in Thu Oct 14 10:54:29 2004
@@ -411,7 +411,7 @@ x_libraries = @x_libraries@
xdg_appsdir = @xdg_appsdir@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
-INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../fofi -I$(srcdir)/../goo $(LIBFREETYPE_CFLAGS)
+INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../fofi -I$(srcdir)/../goo $(LIBFREETYPE_CFLAGS) $(USER_INCLUDES)
libsplash_la_SOURCES = Splash.cc SplashBitmap.cc SplashClip.cc SplashFTFont.cc SplashFTFontEngine.cc \
SplashFTFontFile.cc SplashFont.cc SplashFontEngine.cc SplashFontFile.cc SplashFontFileID.cc \
SplashPath.cc SplashPattern.cc SplashScreen.cc SplashState.cc SplashT1Font.cc \

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-kdecore_network_kresolver_cpp,v 1.1 2004/10/19 00:26:46 espie Exp $
--- kdecore/network/kresolver.cpp.orig Wed Oct 13 15:35:31 2004
+++ kdecore/network/kresolver.cpp Wed Oct 13 15:47:46 2004
@@ -838,7 +838,7 @@ QStrList KResolver::serviceName(const ch
QStrList KResolver::serviceName(int port, const char *protoname)
{
struct servent *se;
-#ifndef HAVE_GETSERVBYNAME_R
+#ifndef HAVE_GETSERVBYPORT_R
QMutexLocker locker(&getXXbyYYmutex);
se = getservbyport(port, protoname);

View File

@ -0,0 +1,29 @@
$OpenBSD: patch-kresources_slox_webdavhandler_cpp,v 1.1 2004/10/19 00:26:46 espie Exp $
--- kresources/slox/webdavhandler.cpp.orig Fri Oct 15 09:34:09 2004
+++ kresources/slox/webdavhandler.cpp Fri Oct 15 09:35:55 2004
@@ -20,10 +20,10 @@
#include "webdavhandler.h"
-#include <values.h>
-
#include <libkdepim/kpimprefs.h>
+#include <limits.h>
+
#include <kdebug.h>
#include <kconfig.h>
@@ -150,9 +150,9 @@ QDateTime WebdavHandler::sloxToQDateTime
if (preEpoch) {
dt.setTime_t( 0, Qt::UTC );
- if (ticks > MAXINT) {
- dt = dt.addSecs(-MAXINT);
- ticks -= MAXINT;
+ if (ticks > INT_MAX) {
+ dt = dt.addSecs(-INT_MAX);
+ ticks -= INT_MAX;
}
dt = dt.addSecs(-((long) ticks));
}