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

Correct build of kde3 base on NetBSD 8.99.1

Browse source 
Address <sys/user.h> removal fallout.
This commit is contained in:
kamil 2017-06-24 02:00:53 +00:00
parent 28097d6971
commit 5abe25a1f3
3 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
x11/kdebase3/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.121 2016/03/17 14:15:39 jperkin Exp $
$NetBSD: distinfo,v 1.122 2017/06/24 02:00:53 kamil Exp $
SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
@ -43,7 +43,7 @@ SHA1 (patch-cb) = d13c59029ef13c89d565431244128044735ddaef
SHA1 (patch-cc) = ed95490558d4de4a04aa0f45634e44ed0b78fdd8
SHA1 (patch-dd) = 4c98e62275ce9a632f79f99110e8fb4995e3f017
SHA1 (patch-ep) = 745f03daf088afdef4d5eff486311a49291eb947
SHA1 (patch-er) = 04f3746034225a1861e5bcb9d1efd9a6f428f4bc
SHA1 (patch-er) = 3ea0fa2a64cc4a29558b98c5f03f165b475ed728
SHA1 (patch-ev) = 551dc4d79b637e15a580eb1dcd2f0930ff1e3dbc
SHA1 (patch-ew) = f8f95cf602a9d88f620d5546ad58b87d5e6be2a5
SHA1 (patch-fa) = 1ea4390477d7f68283b68e695bcb2e4b7c18aecc
@ -68,7 +68,7 @@ SHA1 (patch-kcontrol_access_kcmaccess.cpp) = f7eaec78fa13f2cfb5b97ca84c10f3e403b
SHA1 (patch-kcontrol_arts_hardwaretab.ui) = 794be317ba42a3660b9f2b6d24565cdc681592fa
SHA1 (patch-kcontrol_ebrowsing_plugins_ikws_ikwsopts_ui.ui) = 7df8baced10a7c57caa2bc744e17e60b642ef2b0
SHA1 (patch-kcontrol_info_info__osx.cpp) = 29a2de37107069fa719bd41e019ed3ded4be6537
SHA1 (patch-kcontrol_kfontinst_kfontinst_GetPid.c) = b56389ec10d4388ba10f01798b0119efbbb72c4c
SHA1 (patch-kcontrol_kfontinst_kfontinst_GetPid.c) = 4204568b646d840e6a90581983e8d5820214b512
SHA1 (patch-kcontrol_kio_cache_ui.ui) = 7ff30b98aa9be5b386c8e983bcf54666846e9205
SHA1 (patch-kcontrol_kio_envvarproxy_ui.ui) = 0d5d6c19fcce2a97c5c96d5d3152fb1591800e0e
SHA1 (patch-kcontrol_kio_kcookiesmanagementdlg_ui.ui) = 03c28df1e5da70edd97ece70d0fe20b66606cd11

22
x11/kdebase3/patches/patch-er
View file

@ -1,8 +1,8 @@
$NetBSD: patch-er,v 1.9 2013/01/15 15:35:25 joerg Exp $
$NetBSD: patch-er,v 1.10 2017/06/24 02:00:53 kamil Exp $
--- ksysguard/ksysguardd/NetBSD/ProcessList.c.orig 2005-10-10 15:04:31.000000000 +0000
+++ ksysguard/ksysguardd/NetBSD/ProcessList.c
@@ -24,15 +24,18 @@
@@ -24,15 +24,17 @@
#include <ctype.h>
#include <dirent.h>
@ -16,12 +16,12 @@ $NetBSD: patch-er,v 1.9 2013/01/15 15:35:25 joerg Exp $
#include <sys/sysctl.h>
#include <sys/time.h>
#include <sys/types.h>
#include <sys/user.h>
-#include <sys/user.h>
+#include <sys/resource.h>
#include <unistd.h>
#include <signal.h>
@@ -46,6 +49,8 @@ CONTAINER ProcessList = 0;
@@ -46,6 +48,8 @@ CONTAINER ProcessList = 0;
#define BUFSIZE 1024
@ -30,7 +30,7 @@ $NetBSD: patch-er,v 1.9 2013/01/15 15:35:25 joerg Exp $
typedef struct
{
/* This flag is set for all found processes at the beginning of the
@@ -157,15 +162,13 @@ findProcessInList(int pid)
@@ -157,15 +161,13 @@ findProcessInList(int pid)
}
static int
@ -49,7 +49,7 @@ $NetBSD: patch-er,v 1.9 2013/01/15 15:35:25 joerg Exp $
if ((ps = findProcessInList(pid)) == 0)
{
@@ -178,26 +181,18 @@ updateProcess(int pid)
@@ -178,26 +180,18 @@ updateProcess(int pid)
ps->alive = 1;
@ -87,7 +87,7 @@ $NetBSD: patch-er,v 1.9 2013/01/15 15:35:25 joerg Exp $
/* memory, process name, process uid */
/* find out user name with process uid */
@@ -205,19 +200,26 @@ updateProcess(int pid)
@@ -205,19 +199,26 @@ updateProcess(int pid)
strlcpy(ps->userName,pwent&&pwent->pw_name? pwent->pw_name:"????",sizeof(ps->userName));
ps->userName[sizeof(ps->userName)-1]='\0';
@ -125,7 +125,7 @@ $NetBSD: patch-er,v 1.9 2013/01/15 15:35:25 joerg Exp $
return (0);
}
@@ -266,6 +268,8 @@ initProcessList(struct SensorModul* sm)
@@ -266,6 +267,8 @@ initProcessList(struct SensorModul* sm)
registerCommand("setpriority", setPriority);
}
@ -134,7 +134,7 @@ $NetBSD: patch-er,v 1.9 2013/01/15 15:35:25 joerg Exp $
updateProcessList();
}
@@ -277,27 +281,22 @@ exitProcessList(void)
@@ -277,27 +280,22 @@ exitProcessList(void)
if (ProcessList)
free (ProcessList);
@ -173,7 +173,7 @@ $NetBSD: patch-er,v 1.9 2013/01/15 15:35:25 joerg Exp $
cleanupProcessList();
return (0);
@@ -306,8 +305,8 @@ updateProcessList(void)
@@ -306,8 +304,8 @@ updateProcessList(void)
void
printProcessListInfo(const char* cmd)
{
@ -184,7 +184,7 @@ $NetBSD: patch-er,v 1.9 2013/01/15 15:35:25 joerg Exp $
}
void
@@ -318,10 +317,10 @@ printProcessList(const char* cmd)
@@ -318,10 +316,10 @@ printProcessList(const char* cmd)
ps = first_ctnr(ProcessList); /* skip 'kernel' entry */
for (ps = next_ctnr(ProcessList); ps; ps = next_ctnr(ProcessList))
{

14
x11/kdebase3/patches/patch-kcontrol_kfontinst_kfontinst_GetPid.c
View file

@ -1,6 +1,6 @@
$NetBSD: patch-kcontrol_kfontinst_kfontinst_GetPid.c,v 1.1 2013/01/15 15:35:25 joerg Exp $
$NetBSD: patch-kcontrol_kfontinst_kfontinst_GetPid.c,v 1.2 2017/06/24 02:00:53 kamil Exp $
--- kcontrol/kfontinst/kfontinst/GetPid.c.orig 2013-01-14 15:01:36.000000000 +0000
--- kcontrol/kfontinst/kfontinst/GetPid.c.orig 2007-05-14 07:55:38.000000000 +0000
+++ kcontrol/kfontinst/kfontinst/GetPid.c
@@ -28,6 +28,10 @@
////////////////////////////////////////////////////////////////////////////////
@ -13,3 +13,13 @@ $NetBSD: patch-kcontrol_kfontinst_kfontinst_GetPid.c,v 1.1 2013/01/15 15:35:25 j
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -172,7 +176,9 @@ unsigned int kfi_getPid(const char *proc
#endif
#include <sys/sysctl.h>
#include <sys/time.h>
+#if defined(__FreeBSD__) || defined(__DragonFly__)
#include <sys/user.h>
+#endif
#include <unistd.h>
unsigned int kfi_getPid(const char *proc, unsigned int ppid)
{