aboutsummaryrefslogtreecommitdiffstats
path: root/x11-wm/metacity/files
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2009-01-10 13:22:13 +0800
committermarcus <marcus@FreeBSD.org>2009-01-10 13:22:13 +0800
commit6d8ed8f7c7511223163de715a97ffc04bf6fada9 (patch)
tree40dc015efe383243b0880df377f73ee250da7de7 /x11-wm/metacity/files
parentc7f342a8d7b82e85b9625c4403600fc20ce41da6 (diff)
downloadfreebsd-ports-gnome-6d8ed8f7c7511223163de715a97ffc04bf6fada9.tar.gz
freebsd-ports-gnome-6d8ed8f7c7511223163de715a97ffc04bf6fada9.tar.zst
freebsd-ports-gnome-6d8ed8f7c7511223163de715a97ffc04bf6fada9.zip
Presenting GNOME 2.24 for FreeBSD.
See http://library.gnome.org/misc/release-notes/2.24/ for the general release notes. On the FreeBSD front, this release introduces Fuse support in HAL, adds multi-CPU support to libgtop, WebKit updates, and fixes some long-standing seahorse and gnome-keyring bugs. The documentation updates to the website are forthcoming. This release features commits by adamw, ahze, kwm, mezz, and myself. It would not have been possible without are contributors and testers: Alexander Loginov Craig Butler [1] Dmitry Marakasov [6] Eric L. Chen Joseph S. Atkinson Kris Moore Lapo Luchini [7] Nikos Ntarmos Pawel Worach Romain Tartiere TAOKA Fumiyoshi [3] Yasuda Keisuke Zyl aZ [4] bf [2] [5] Florent Thoumie Peter Wemm pluknet PR: 125857 [1] 126993 [2] 130031 [3] 127399 [4] 127661 [5] 124302 [6] 129570 [7] 129936 123790
Diffstat (limited to 'x11-wm/metacity/files')
-rw-r--r--x11-wm/metacity/files/patch-configure16
-rw-r--r--x11-wm/metacity/files/patch-src_core_main.c51
-rw-r--r--x11-wm/metacity/files/patch-src_core_util.c11
3 files changed, 66 insertions, 12 deletions
diff --git a/x11-wm/metacity/files/patch-configure b/x11-wm/metacity/files/patch-configure
index bbb9c5e9b0a5..155c6ecfc4a7 100644
--- a/x11-wm/metacity/files/patch-configure
+++ b/x11-wm/metacity/files/patch-configure
@@ -1,17 +1,9 @@
---- configure.orig 2008-03-09 19:48:04.000000000 -0400
-+++ configure 2008-03-09 19:48:24.000000000 -0400
-@@ -26539,7 +26539,6 @@ echo "${ECHO_T}$have_xrender" >&6; }
-
- if test x$have_xrender = xyes; then
- echo "Building with Render"
-- METACITY_PC_MODULES="$METACITY_PC_MODULES xrender >= $XRENDER_VERSION"
- fi
- fi ## have_composite
-
-@@ -31011,7 +31010,7 @@ metacity-$VERSION:
+--- configure.orig 2008-09-23 00:55:36.000000000 -0400
++++ configure 2008-09-23 00:55:52.000000000 -0400
+@@ -31530,7 +31530,7 @@ metacity-$VERSION:
"
- METACITY_MINOR_VERSION=22
+ METACITY_MINOR_VERSION=24
-if test $(( $(echo $METACITY_MINOR_VERSION) %2)) == "1"; then
+if test $(( $(echo $METACITY_MINOR_VERSION) %2)) = "1"; then
stable_version=$(( ($METACITY_MINOR_VERSION / 2) * 2))
diff --git a/x11-wm/metacity/files/patch-src_core_main.c b/x11-wm/metacity/files/patch-src_core_main.c
new file mode 100644
index 000000000000..db73c224f1bd
--- /dev/null
+++ b/x11-wm/metacity/files/patch-src_core_main.c
@@ -0,0 +1,51 @@
+--- src/core/main.c.orig 2008-10-08 00:10:39.000000000 -0400
++++ src/core/main.c 2008-10-08 00:18:44.000000000 -0400
+@@ -312,6 +312,23 @@ void meta_select_display (gchar *display
+ /* DO NOT FREE envVar, putenv() sucks */
+ putenv (envVar);
+ }
++
++static
++void meta_finalize (void)
++{
++ meta_display_close (meta_get_display (),
++ CurrentTime); /* I doubt correct timestamps matter here */
++
++ meta_session_shutdown ();
++}
++
++static
++void sigterm_handler (int signum)
++{
++ meta_finalize ();
++
++ exit (meta_exit_code);
++}
+
+ /**
+ * This is where the story begins. It parses commandline options and
+@@ -352,6 +369,11 @@ main (int argc, char **argv)
+ g_strerror (errno));
+ #endif
+
++ act.sa_handler = &sigterm_handler;
++ if (sigaction (SIGTERM, &act, NULL) < 0)
++ g_printerr ("Failed to register SIGTERM handler: %s\n",
++ g_strerror (errno));
++
+ if (g_getenv ("METACITY_VERBOSE"))
+ meta_set_verbose (TRUE);
+ if (g_getenv ("METACITY_DEBUG"))
+@@ -478,11 +500,8 @@ main (int argc, char **argv)
+
+ g_main_loop_run (meta_main_loop);
+
+- meta_display_close (meta_get_display (),
+- CurrentTime); /* I doubt correct timestamps matter here */
++ meta_finalize ();
+
+- meta_session_shutdown ();
+-
+ if (meta_restart_after_quit)
+ {
+ GError *err;
diff --git a/x11-wm/metacity/files/patch-src_core_util.c b/x11-wm/metacity/files/patch-src_core_util.c
new file mode 100644
index 000000000000..b1799e3516d5
--- /dev/null
+++ b/x11-wm/metacity/files/patch-src_core_util.c
@@ -0,0 +1,11 @@
+--- src/core/util.c.orig 2008-02-27 05:42:51.000000000 +0100
++++ src/core/util.c 2008-03-21 21:16:14.000000000 +0100
+@@ -23,7 +23,7 @@
+ */
+
+ #define _GNU_SOURCE
+-#define _POSIX_C_SOURCE /* for fdopen() */
++#define _POSIX_C_SOURCE 1 /* for fdopen() */
+
+ #include <config.h>
+ #include "util.h"