diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-08-21 02:42:39 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-08-21 02:42:39 +0800 |
| commit | 4e444f829203a69f38e5b55d7de7d853cdfdbe6b (patch) | |
| tree | a98cd14fb05ad6ca9954fd986f8066bf979e66c4 | |
| parent | 34f931028f57de1ee91616d3fa1726a167c0fbd8 (diff) | |
| download | marcuscom-ports-4e444f829203a69f38e5b55d7de7d853cdfdbe6b.tar marcuscom-ports-4e444f829203a69f38e5b55d7de7d853cdfdbe6b.tar.gz marcuscom-ports-4e444f829203a69f38e5b55d7de7d853cdfdbe6b.tar.bz2 marcuscom-ports-4e444f829203a69f38e5b55d7de7d853cdfdbe6b.tar.lz marcuscom-ports-4e444f829203a69f38e5b55d7de7d853cdfdbe6b.tar.xz marcuscom-ports-4e444f829203a69f38e5b55d7de7d853cdfdbe6b.tar.zst marcuscom-ports-4e444f829203a69f38e5b55d7de7d853cdfdbe6b.zip | |
Allow backtraces to work by linking to libexecinfo.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11354 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | x11/gdm/Makefile | 7 | ||||
| -rw-r--r-- | x11/gdm/files/patch-common_Makefile.in | 20 | ||||
| -rw-r--r-- | x11/gdm/files/patch-common_gdm-signal-handler.c | 35 |
3 files changed, 24 insertions, 38 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 7bf435c23..de484438d 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gdm/Makefile,v 1.127 2008/08/03 06:11:37 marcus Exp $ +# $MCom: ports/x11/gdm/Makefile,v 1.128 2008/08/17 17:31:43 marcus Exp $ # PORTNAME= gdm PORTVERSION= 2.23.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -18,7 +18,8 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 version of xdm display manager BUILD_DEPENDS= zenity:${PORTSDIR}/x11/zenity -LIB_DEPENDS= ck-connector.0:${PORTSDIR}/sysutils/consolekit +LIB_DEPENDS= ck-connector.0:${PORTSDIR}/sysutils/consolekit \ + execinfo:${PORTSDIR}/devel/libexecinfo RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity \ ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon diff --git a/x11/gdm/files/patch-common_Makefile.in b/x11/gdm/files/patch-common_Makefile.in new file mode 100644 index 000000000..2ab0a5001 --- /dev/null +++ b/x11/gdm/files/patch-common_Makefile.in @@ -0,0 +1,20 @@ +--- common/Makefile.in.orig 2008-08-20 14:34:16.000000000 -0400 ++++ common/Makefile.in 2008-08-20 14:36:50.000000000 -0400 +@@ -428,7 +428,8 @@ gdm_crash_logger_CPPFLAGS = \ + -DLOCALSTATEDIR=\"$(localstatedir)\" \ + $(NULL) + +-gdm_crash_logger_LDADD = $(GTHREAD_LIBS) ++gdm_crash_logger_LDADD = $(GTHREAD_LIBS) \ ++ -lexecinfo + @MKDTEMP_MISSING_FALSE@MKDTEMP_FILES = + @MKDTEMP_MISSING_TRUE@MKDTEMP_FILES = mkdtemp.c mkdtemp.h + libgdmcommon_la_SOURCES = \ +@@ -473,6 +474,7 @@ libgdmcommon_la_CFLAGS = \ + $(NULL) + + libgdmcommon_la_LIBADD = \ ++ -lexecinfo \ + $(NULL) + + libgdmcommon_la_LDFLAGS = \ diff --git a/x11/gdm/files/patch-common_gdm-signal-handler.c b/x11/gdm/files/patch-common_gdm-signal-handler.c deleted file mode 100644 index d2a71ddb2..000000000 --- a/x11/gdm/files/patch-common_gdm-signal-handler.c +++ /dev/null @@ -1,35 +0,0 @@ ---- common/gdm-signal-handler.c.orig 2007-10-30 11:41:48.000000000 -0400 -+++ common/gdm-signal-handler.c 2007-11-02 15:07:28.000000000 -0400 -@@ -27,7 +27,6 @@ - #include <unistd.h> - #include <string.h> - #include <signal.h> --#include <execinfo.h> - #include <syslog.h> - #include <sys/wait.h> - #include <sys/stat.h> -@@ -151,6 +150,7 @@ signal_io_watch (GIOChannel *ioc, - static void - fallback_get_backtrace (void) - { -+/* - void * frames[64]; - size_t size; - char ** strings; -@@ -167,13 +167,14 @@ fallback_get_backtrace (void) - } else { - g_warning ("GDM crashed, but symbols couldn't be retrieved."); - } -+*/ - } - - - static gboolean - crashlogger_get_backtrace (void) --{ -- gboolean success = FALSE; -+{ -+ gboolean success = FALSE; - int pid; - - pid = fork(); |