kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove some patches only required for gcc2 on Solaris and add a couple

Browse source 
that fix build with later gcc's.
This commit is contained in:
markd 2005-04-14 20:53:30 +00:00
parent e5e737f767
commit 06795166ef
16 changed files with 40 additions and 162 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
x11/kdebase3/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.75 2005/04/11 21:48:11 tv Exp $
# $NetBSD: Makefile,v 1.76 2005/04/14 20:53:30 markd Exp $
DISTNAME= kdebase-${_KDE_VERSION}
PKGREVISION= 2
@ -103,6 +103,12 @@ pre-configure:
${MV} -f $${file}.new $${file}; \
done
.if ${OPSYS} == "SunOS"
post-configure:
# will be done with a proper configure check in 3.4.1
${ECHO} "#define HAVE_SYS_LOADAVG_H 1" >> ${WRKSRC}/config.h
.endif
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/kde/templates/.source/emptydir
${INSTALL_DATA} ${DISTDIR}/NetBSD-flag.png ${PREFIX}/${ICONDIR}

11
x11/kdebase3/patches/patch-ae
View file

@ -1,16 +1,7 @@
$NetBSD: patch-ae,v 1.7 2004/11/01 16:39:06 gavan Exp $
$NetBSD: patch-ae,v 1.8 2005/04/14 20:53:30 markd Exp $
--- kcontrol/krdb/krdb.cpp.orig 2004-07-17 18:52:04.000000000 +0100
+++ kcontrol/krdb/krdb.cpp
@@ -42,6 +42,8 @@
#include <X11/Xlib.h>
+#undef truncate
+
inline const char * gtkEnvVar(int version)
{
return 2==version ? "GTK2_RC_FILES" : "GTK_RC_FILES";
@@ -384,7 +386,14 @@ static void createGtkrc( bool exportColo
// not every button, checkbox, etc.
t << "style \"MenuItem\"" << endl;

16
x11/kdebase3/patches/patch-am Normal file
View file

@ -0,0 +1,16 @@
$NetBSD: patch-am,v 1.12 2005/04/14 20:53:30 markd Exp $
--- kicker/extensions/kasbar/kasloaditem.cpp.orig Sun Dec 5 14:22:53 2004
+++ kicker/extensions/kasbar/kasloaditem.cpp
@@ -1,6 +1,11 @@
#include <math.h>
#include <stdlib.h>
+#include <config.h>
+#ifdef HAVE_SYS_LOADAVG_H
+#include <sys/loadavg.h> // e.g. Solaris
+#endif
+
#include <qpainter.h>
#include <qbitmap.h>
#include <qdatetime.h>

15
x11/kdebase3/patches/patch-an Normal file
View file

@ -0,0 +1,15 @@
$NetBSD: patch-an,v 1.5 2005/04/14 20:53:30 markd Exp $
--- kcontrol/kfontinst/kfontinst/GetPid.c.orig 2005-04-13 01:05:50.467823000 +1200
+++ kcontrol/kfontinst/kfontinst/GetPid.c
@@ -243,6 +243,10 @@ unsigned int kfi_getPid(const char *proc
#include <pwd.h>
#include <sys/resource.h>
#ifdef OS_Solaris
+#if !defined(_LP64) && _FILE_OFFSET_BITS == 64
+# undef _FILE_OFFSET_BITS
+# define _FILE_OFFSET_BITS 32
+#endif
#include <procfs.h>
#else
#include <sys/procfs.h>

11
x11/kdebase3/patches/patch-fg
View file

@ -1,16 +1,7 @@
$NetBSD: patch-fg,v 1.3 2004/11/01 16:39:06 gavan Exp $
$NetBSD: patch-fg,v 1.4 2005/04/14 20:53:30 markd Exp $
--- ksysguard/gui/ksysguard.cc.orig 2004-08-05 19:57:19.000000000 +0100
+++ ksysguard/gui/ksysguard.cc
@@ -34,6 +34,8 @@
#include <stdlib.h>
#include <unistd.h>
+#undef open
+
#include <kaboutdata.h>
#include <kaction.h>
#include <kcmdlineargs.h>
@@ -145,7 +147,7 @@ void TopLevel::resetWorkSheets()
mWorkSpace->removeAllWorkSheets();

13
x11/kdebase3/patches/patch-fh
View file

@ -1,13 +0,0 @@
$NetBSD: patch-fh,v 1.3 2004/11/01 16:39:06 gavan Exp $
--- kate/app/kategrepdialog.cpp.orig 2004-10-03 08:10:53.000000000 +0100
+++ kate/app/kategrepdialog.cpp
@@ -48,6 +48,8 @@
#include <kcombobox.h>
#include <klineedit.h>
+#undef truncate
+
const char *template_desc[] = {
"normal",
"assignment",

13
x11/kdebase3/patches/patch-fl
View file

@ -1,13 +0,0 @@
$NetBSD: patch-fl,v 1.1 2004/11/01 16:39:06 gavan Exp $
--- kdeprint/slave/kio_print.cpp.orig 2004-05-22 21:26:46.000000000 +0100
+++ kdeprint/slave/kio_print.cpp
@@ -46,6 +46,8 @@
#include <stdlib.h>
#include <sys/stat.h>
+#undef stat
+
#define PRINT_DEBUG kdDebug(7019) << "kio_print: "
extern "C"

13
x11/kdebase3/patches/patch-fm
View file

@ -1,13 +0,0 @@
$NetBSD: patch-fm,v 1.1 2004/11/01 16:39:06 gavan Exp $
--- khotkeys/shared/actions.cpp.orig 2004-07-17 18:52:06.000000000 +0100
+++ khotkeys/shared/actions.cpp
@@ -35,6 +35,8 @@
#include <X11/X.h>
+#undef truncate
+
namespace KHotKeys
{

13
x11/kdebase3/patches/patch-fn
View file

@ -1,13 +0,0 @@
$NetBSD: patch-fn,v 1.1 2004/11/01 16:39:06 gavan Exp $
--- libkonq/konq_operations.cc.orig 2004-10-03 08:11:27.000000000 +0100
+++ libkonq/konq_operations.cc
@@ -33,6 +33,8 @@
#include "konq_defaults.h"
#include "konqbookmarkmanager.h"
+#undef stat
+
// For doDrop
#include <qdir.h>//first
#include <assert.h>

13
x11/kdebase3/patches/patch-fo
View file

@ -1,13 +0,0 @@
$NetBSD: patch-fo,v 1.1 2004/11/01 16:39:06 gavan Exp $
--- kioslave/man/kio_man.cpp.orig 2004-08-05 19:57:13.000000000 +0100
+++ kioslave/man/kio_man.cpp
@@ -46,6 +46,8 @@
#include <kfilterbase.h>
#include <kfilterdev.h>
+#undef truncate
+
using namespace KIO;
MANProtocol *MANProtocol::_self = 0;

13
x11/kdebase3/patches/patch-fp
View file

@ -1,13 +0,0 @@
$NetBSD: patch-fp,v 1.2 2005/03/23 21:44:37 markd Exp $
--- kioslave/pop3/pop3.cc.orig 2005-01-04 03:50:57.000000000 +1300
+++ kioslave/pop3/pop3.cc
@@ -63,6 +63,8 @@ extern "C" {
#include <kio/passdlg.h>
#include "pop3.h"
+#undef truncate
+
#define GREETING_BUF_LEN 1024
#define MAX_RESPONSE_LEN 512
#define MAX_COMMANDS 10

12
x11/kdebase3/patches/patch-fr
View file

@ -1,12 +0,0 @@
$NetBSD: patch-fr,v 1.1 2004/11/01 16:39:06 gavan Exp $
--- kmenuedit/menufile.cpp.orig 2004-07-17 18:52:07.000000000 +0100
+++ kmenuedit/menufile.cpp
@@ -27,6 +27,7 @@
#include "menufile.h"
+#undef truncate
#define MF_MENU "Menu"
#define MF_PUBLIC_ID "-//freedesktop//DTD Menu 1.0//EN"

13
x11/kdebase3/patches/patch-fs
View file

@ -1,13 +0,0 @@
$NetBSD: patch-fs,v 1.1 2004/11/01 16:39:06 gavan Exp $
--- kmenuedit/treeview.cpp.orig 2004-07-17 18:52:07.000000000 +0100
+++ kmenuedit/treeview.cpp
@@ -21,6 +21,8 @@
#include <unistd.h>
+#undef truncate
+
#include <qcstring.h>
#include <qcursor.h>
#include <qdatastream.h>

13
x11/kdebase3/patches/patch-ft
View file

@ -1,13 +0,0 @@
$NetBSD: patch-ft,v 1.1 2004/11/01 16:39:06 gavan Exp $
--- konsole/konsole/session.cpp.orig 2004-05-22 21:26:55.000000000 +0100
+++ konsole/konsole/session.cpp
@@ -14,6 +14,8 @@
#include <qregexp.h>
#include <qtextedit.h>
+#undef truncate
+
#ifndef HERE
#define HERE fprintf(stderr,"%s(%d): here\n",__FILE__,__LINE__)
#endif

13
x11/kdebase3/patches/patch-fv
View file

@ -1,13 +0,0 @@
$NetBSD: patch-fv,v 1.1 2004/11/01 16:39:06 gavan Exp $
--- kpersonalizer/kcountrypage.cpp.orig 2004-07-17 18:52:08.000000000 +0100
+++ kpersonalizer/kcountrypage.cpp
@@ -33,6 +33,8 @@
#include "kcountrypage.h"
+#undef truncate
+
KCountryPage::KCountryPage(QWidget *parent, const char *name ) : KCountryPageDlg(parent,name) {
px_introSidebar->setPixmap(UserIcon("step1.png"));

12
x11/kdebase3/patches/patch-fz
View file

@ -1,12 +0,0 @@
$NetBSD: patch-fz,v 1.1 2004/11/01 16:39:06 gavan Exp $
--- konqueror/sidebar/trees/konq_sidebartree.cpp.orig 2004-10-08 14:57:27.000000000 +0100
+++ konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -49,6 +49,7 @@
#include <stdlib.h>
#include <assert.h>
+#undef truncate
static const int autoOpenTimeout = 750;