summaryrefslogtreecommitdiff
path: root/x11/gnome-shell/files
diff options
context:
space:
mode:
Diffstat (limited to 'x11/gnome-shell/files')
-rw-r--r--x11/gnome-shell/files/patch-src_Makefile.in18
-rw-r--r--x11/gnome-shell/files/patch-src_gnome-shell-plugin.c26
2 files changed, 26 insertions, 18 deletions
diff --git a/x11/gnome-shell/files/patch-src_Makefile.in b/x11/gnome-shell/files/patch-src_Makefile.in
deleted file mode 100644
index 592ea873a8f7..000000000000
--- a/x11/gnome-shell/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/Makefile.in.orig 2009-08-29 12:13:13.000000000 +0200
-+++ src/Makefile.in 2009-08-29 12:13:25.000000000 +0200
-@@ -492,7 +492,6 @@ libtray_la_CPPFLAGS = $(tray_cflags)
- libtray_la_LDFLAGS = $(LDADD)
- gnome_shell_cflags = \
- $(MUTTER_PLUGIN_CFLAGS) \
-- $(LIBGNOMEUI_CFLAGS) \
- -I$(srcdir)/tray \
- -DGETTEXT_PACKAGE=\"gnome-shell\" \
- -DLOCALEDIR=\"$(datadir)/locale\" \
-@@ -548,7 +547,6 @@ libgnome_shell_la_gir_sources = \
- libgnome_shell_la_LDFLAGS = -avoid-version -module
- libgnome_shell_la_LIBADD = \
- $(MUTTER_PLUGIN_LIBS) \
-- $(LIBGNOMEUI_LIBS) \
- libbig-1.0.la \
- libgdmuser-1.0.la \
- libtray.la
diff --git a/x11/gnome-shell/files/patch-src_gnome-shell-plugin.c b/x11/gnome-shell/files/patch-src_gnome-shell-plugin.c
new file mode 100644
index 000000000000..90359fa33e6d
--- /dev/null
+++ b/x11/gnome-shell/files/patch-src_gnome-shell-plugin.c
@@ -0,0 +1,26 @@
+--- src/gnome-shell-plugin.c.orig 2010-06-06 22:53:13.000000000 +0200
++++ src/gnome-shell-plugin.c 2010-06-06 22:56:03.000000000 +0200
+@@ -38,7 +38,6 @@
+ #include <gjs/gjs.h>
+ #include <girepository.h>
+ #include <gmodule.h>
+-#include <malloc.h>
+ #include <stdlib.h>
+ #include <string.h>
+
+@@ -238,6 +237,7 @@
+ malloc_statistics_callback (ShellPerfLog *perf_log,
+ gpointer data)
+ {
++#if defined(__linux__)
+ struct mallinfo info = mallinfo ();
+
+ shell_perf_log_update_statistic_i (perf_log,
+@@ -249,6 +249,7 @@
+ shell_perf_log_update_statistic_i (perf_log,
+ "malloc.usedSize",
+ info.uordblks);
++#endif
+ }
+
+ static void