Fix build with glib 2.31 (forwarded request 110499 from dimstar) OBS-URL: https://build.opensuse.org/request/show/110541 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/scmon?expand=0&rev=12
70 lines
1.7 KiB
Diff
70 lines
1.7 KiB
Diff
Index: scmon-0.3/monitor/sclog.h
|
|
===================================================================
|
|
--- scmon-0.3.orig/monitor/sclog.h
|
|
+++ scmon-0.3/monitor/sclog.h
|
|
@@ -28,8 +28,7 @@
|
|
#define SC_LOG_H
|
|
|
|
#include <stdio.h>
|
|
-#include <glib/gmessages.h>
|
|
-#include <glib/gerror.h>
|
|
+#include <glib.h>
|
|
|
|
#define SC_LOG_ERROR (sc_log_error_quark ())
|
|
GQuark sc_log_error_quark (void);
|
|
Index: scmon-0.3/monitor/scerror.c
|
|
===================================================================
|
|
--- scmon-0.3.orig/monitor/scerror.c
|
|
+++ scmon-0.3/monitor/scerror.c
|
|
@@ -26,9 +26,7 @@
|
|
|
|
#include "scerror.h"
|
|
|
|
-#include <glib/gmem.h>
|
|
-#include <glib/gstrfuncs.h>
|
|
-#include <glib/gutils.h>
|
|
+#include <glib.h>
|
|
#include <string.h>
|
|
|
|
void
|
|
Index: scmon-0.3/monitor/scerror.h
|
|
===================================================================
|
|
--- scmon-0.3.orig/monitor/scerror.h
|
|
+++ scmon-0.3/monitor/scerror.h
|
|
@@ -26,7 +26,7 @@
|
|
#define SC_ERROR_H
|
|
|
|
#include <stdarg.h>
|
|
-#include <glib/gerror.h>
|
|
+#include <glib.h>
|
|
|
|
#include "sclog.h"
|
|
|
|
Index: scmon-0.3/monitor/sclog.c
|
|
===================================================================
|
|
--- scmon-0.3.orig/monitor/sclog.c
|
|
+++ scmon-0.3/monitor/sclog.c
|
|
@@ -31,8 +31,7 @@
|
|
#include "scerror.h"
|
|
|
|
#include <glib/gi18n.h>
|
|
-#include <glib/gmem.h>
|
|
-#include <glib/gutils.h>
|
|
+#include <glib.h>
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
Index: scmon-0.3/monitor/scmon.c
|
|
===================================================================
|
|
--- scmon-0.3.orig/monitor/scmon.c
|
|
+++ scmon-0.3/monitor/scmon.c
|
|
@@ -31,7 +31,7 @@
|
|
#include "sclog.h"
|
|
|
|
#include <glib/gi18n.h>
|
|
-#include <glib/gthread.h>
|
|
+#include <glib.h>
|
|
|
|
#include <stdlib.h>
|
|
#include <string.h>
|