pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

mate-system-monitor: Fix Darwin build.



Module Name:	pkgsrc-wip
Committed By:	youri <youri%NetBSD.org@localhost>
Pushed By:	youri
Date:		Sat Apr 9 15:13:41 2016 +0200
Changeset:	31b5f3b69844df2289a80b78a02a275b85e4c421

Modified Files:
	mate-system-monitor/Makefile
	mate-system-monitor/distinfo
Added Files:
	mate-system-monitor/patches/patch-src_lsof.cpp
	mate-system-monitor/patches/patch-src_procproperties.cpp
Removed Files:
	mate-system-monitor/patches/patch-src_openfiles.cpp

Log Message:
mate-system-monitor: Fix Darwin build.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=31b5f3b69844df2289a80b78a02a275b85e4c421

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mate-system-monitor/Makefile                       |  1 +
 mate-system-monitor/distinfo                       |  3 ++-
 mate-system-monitor/patches/patch-src_lsof.cpp     | 15 ++++++++++++++
 .../patches/patch-src_openfiles.cpp                | 17 ---------------
 .../patches/patch-src_procproperties.cpp           | 24 ++++++++++++++++++++++
 5 files changed, 42 insertions(+), 18 deletions(-)

diffs:
diff --git a/mate-system-monitor/Makefile b/mate-system-monitor/Makefile
index d823578..3a1c5fc 100644
--- a/mate-system-monitor/Makefile
+++ b/mate-system-monitor/Makefile
@@ -22,6 +22,7 @@ USE_TOOLS+=		gmake intltool msgfmt pkg-config
 
 .include "../../devel/glib2/schemas.mk"
 
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../wip/mate-icon-theme/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/glibmm/buildlink3.mk"
diff --git a/mate-system-monitor/distinfo b/mate-system-monitor/distinfo
index bea1e9e..958c295 100644
--- a/mate-system-monitor/distinfo
+++ b/mate-system-monitor/distinfo
@@ -4,4 +4,5 @@ SHA1 (mate-system-monitor-1.12.1.tar.xz) = 58fd0ab16ff76a1d0871053698c13cb28f407
 RMD160 (mate-system-monitor-1.12.1.tar.xz) = 784de2c54182f26e4b8bfb6d0c2c8d5f4f1adca3
 SHA512 (mate-system-monitor-1.12.1.tar.xz) = 8490d710fe65427c780f0ea5d39f7914dd4d114a6303d33cac64be53492da5a33188731724ca393fd2ece518432770c96bf05dc1524010da1671a1465c6d32a6
 Size (mate-system-monitor-1.12.1.tar.xz) = 2113756 bytes
-#SHA1 (patch-src_openfiles.cpp) = 6ca54d29baeb8acba30aa46fb46c169bf6378e8d
+SHA1 (patch-src_lsof.cpp) = bc4838c7da232854a7053d035f3f10aa49f415f9
+SHA1 (patch-src_procproperties.cpp) = 3b79a721869633a693299bb2db5f7796cee5699e
diff --git a/mate-system-monitor/patches/patch-src_lsof.cpp b/mate-system-monitor/patches/patch-src_lsof.cpp
new file mode 100644
index 0000000..676f151
--- /dev/null
+++ b/mate-system-monitor/patches/patch-src_lsof.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix clang build.
+
+--- src/lsof.cpp.orig	2015-09-25 11:36:19.000000000 +0000
++++ src/lsof.cpp
+@@ -140,7 +140,7 @@ namespace
+ 
+         void update_count(unsigned count)
+         {
+-            string s = static_cast<std::ostringstream&>(std::ostringstream() << count).str();
++            string s = (std::ostringstream() << count).str();
+             gtk_label_set_text(this->count, s.c_str());
+         }
+ 
diff --git a/mate-system-monitor/patches/patch-src_openfiles.cpp b/mate-system-monitor/patches/patch-src_openfiles.cpp
deleted file mode 100644
index 92aaad4..0000000
--- a/mate-system-monitor/patches/patch-src_openfiles.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_openfiles.cpp,v 1.3 2015/04/09 02:52:28 krytarowski Exp $
-
-* workaround for missing NI_IDN support.
-
---- src/openfiles.cpp.orig	2014-01-25 16:04:53.000000000 +0000
-+++ src/openfiles.cpp
-@@ -15,6 +15,10 @@
- #include "util.h"
- #include "settings-keys.h"
- 
-+#ifndef NI_IDN
-+#define NI_IDN 0
-+#endif
-+
- enum
- {
- 	COL_FD,
diff --git a/mate-system-monitor/patches/patch-src_procproperties.cpp b/mate-system-monitor/patches/patch-src_procproperties.cpp
new file mode 100644
index 0000000..f39ff5a
--- /dev/null
+++ b/mate-system-monitor/patches/patch-src_procproperties.cpp
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Fix Darwin build.
+
+--- src/procproperties.cpp.orig	2015-09-25 11:36:19.000000000 +0000
++++ src/procproperties.cpp
+@@ -26,7 +26,7 @@
+ #include <glibtop/procstate.h>
+ #if defined (__linux__)
+ #include <asm/param.h>
+-#elif defined (__NetBSD__) || defined (__OpenBSD__)
++#elif defined (__NetBSD__) || defined (__OpenBSD__) || defined (__APPLE__)
+ #include <sys/param.h>
+ #include <sys/sysctl.h>
+ #endif
+@@ -114,7 +114,7 @@ fill_proc_properties (GtkWidget *tree, P
+ 
+     get_process_memory_info(info);
+ 
+-#if defined (__NetBSD__) || defined (__OpenBSD__)
++#if defined (__NetBSD__) || defined (__OpenBSD__) || defined(__APPLE__)
+     struct clockinfo cinf;
+     size_t size = sizeof (cinf);
+     int HZ;


Home | Main Index | Thread Index | Old Index