diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-08-02 14:42:10 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-08-02 14:42:10 +0800 |
commit | e17667ab1c2496863d6000f66c6471efa6f9f08b (patch) | |
tree | 2b17dfc2b6e92d0a275cafa4f0affb858e247af2 /devel/bug-buddy/files | |
parent | fd1e4311886be516a7d743b096fbfd31c20bdd69 (diff) | |
download | marcuscom-ports-e17667ab1c2496863d6000f66c6471efa6f9f08b.tar marcuscom-ports-e17667ab1c2496863d6000f66c6471efa6f9f08b.tar.gz marcuscom-ports-e17667ab1c2496863d6000f66c6471efa6f9f08b.tar.bz2 marcuscom-ports-e17667ab1c2496863d6000f66c6471efa6f9f08b.tar.lz marcuscom-ports-e17667ab1c2496863d6000f66c6471efa6f9f08b.tar.xz marcuscom-ports-e17667ab1c2496863d6000f66c6471efa6f9f08b.tar.zst marcuscom-ports-e17667ab1c2496863d6000f66c6471efa6f9f08b.zip |
Update to 2.19.0, and attempt to hack the new breakpad code for FreeBSD.
Basically, everything but the exception handler is disabled, so bug-buddy
_should_ work as it did in GNOME 2.18.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9333 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/bug-buddy/files')
3 files changed, 96 insertions, 0 deletions
diff --git a/devel/bug-buddy/files/patch-gnome-breakpad_Makefile.in b/devel/bug-buddy/files/patch-gnome-breakpad_Makefile.in new file mode 100644 index 000000000..57efdea51 --- /dev/null +++ b/devel/bug-buddy/files/patch-gnome-breakpad_Makefile.in @@ -0,0 +1,31 @@ +--- gnome-breakpad/Makefile.in.orig 2007-08-02 02:20:43.000000000 -0400 ++++ gnome-breakpad/Makefile.in 2007-08-02 02:27:50.000000000 -0400 +@@ -58,10 +58,7 @@ am__DEPENDENCIES_1 = + libgnomebreakpad_la_DEPENDENCIES = \ + $(top_builddir)/google-breakpad/src/libbreakpad.la \ + $(am__DEPENDENCIES_1) +-am__objects_1 = gnome-breakpad.lo exception_handler.lo linux_thread.lo \ +- minidump_file_writer.lo minidump_generator.lo \ +- string_conversion.lo convert_UTF.lo guid_creator.lo file_id.lo \ +- md5.lo ++am__objects_1 = gnome-breakpad.lo exception_handler.lo + am_libgnomebreakpad_la_OBJECTS = $(am__objects_1) + libgnomebreakpad_la_OBJECTS = $(am_libgnomebreakpad_la_OBJECTS) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -268,15 +265,7 @@ INCLUDES = -I. -I$(top_srcdir)/google-br + + #cc_sources = exception_handler.cc linux_thread.cc minidump_file_writer.cc minidump_generator.cc gnome-breakpad.cc string_conversion.cc convert_UTF.c + cc_sources = gnome-breakpad.cc \ +- $(top_srcdir)/google-breakpad/src/client/linux/handler/exception_handler.cc \ +- $(top_srcdir)/google-breakpad/src/client/linux/handler/linux_thread.cc \ +- $(top_srcdir)/google-breakpad/src/client/minidump_file_writer.cc \ +- $(top_srcdir)/google-breakpad/src/client/linux/handler/minidump_generator.cc \ +- $(top_srcdir)/google-breakpad/src/common/string_conversion.cc \ +- $(top_srcdir)/google-breakpad/src/common/convert_UTF.c \ +- $(top_srcdir)/google-breakpad/src/common/linux/guid_creator.cc \ +- $(top_srcdir)/google-breakpad/src/common/linux/file_id.cc \ +- $(top_srcdir)/google-breakpad/src/common/linux/md5.c ++ $(top_srcdir)/google-breakpad/src/client/linux/handler/exception_handler.cc \ + + module_LTLIBRARIES = libgnomebreakpad.la + moduledir = $(libdir)/gtk-2.0/modules diff --git a/devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc b/devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc new file mode 100644 index 000000000..43c317821 --- /dev/null +++ b/devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc @@ -0,0 +1,54 @@ +--- gnome-breakpad/gnome-breakpad.cc.orig 2007-08-02 02:21:43.000000000 -0400 ++++ gnome-breakpad/gnome-breakpad.cc 2007-08-02 02:30:01.000000000 -0400 +@@ -6,7 +6,9 @@ + #include <cassert> + #include <cstring> + ++#ifdef __linux__ + #include <libelf.h> ++#endif + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> +@@ -30,6 +32,7 @@ static bool run_bug_buddy (const gc + + static gchar *bugbuddy; + ++#ifdef __linux__ + // Callback when minidump written. + static bool MinidumpCallback(const char *dump_path, + const char *minidump_id, +@@ -80,6 +83,7 @@ elf_has_debug_symbols (char *filename) + /* no symtab */ + return false; + } ++#endif + + + +@@ -182,9 +186,13 @@ check_if_gdb (void *callback_context) + _exit(0); + } + ++#ifdef __linux__ + memset(mypath, 0, sizeof(mypath)); + readlink ("/proc/self/exe", mypath, sizeof(mypath)); + has_debug_symbols = elf_has_debug_symbols (mypath); ++#else ++ has_debug_symbols = true; ++#endif + + + if (bugbuddy && gdb && has_debug_symbols) { +@@ -204,7 +212,11 @@ gtk_module_init (int *argc, char** argv[ + + if (bugbuddy && !g_getenv ("GNOME_DISABLE_CRASH_DIALOG")) { + static ExceptionHandler handler("/tmp", check_if_gdb, ++#ifdef __linux__ + MinidumpCallback, NULL, true); ++#else ++ NULL, NULL, true); ++#endif + } + + } diff --git a/devel/bug-buddy/files/patch-google-breakpad_src_client_linux_handler_exception_handler.cc b/devel/bug-buddy/files/patch-google-breakpad_src_client_linux_handler_exception_handler.cc new file mode 100644 index 000000000..b741aed05 --- /dev/null +++ b/devel/bug-buddy/files/patch-google-breakpad_src_client_linux_handler_exception_handler.cc @@ -0,0 +1,11 @@ +--- google-breakpad/src/client/linux/handler/exception_handler.cc.orig 2007-08-02 01:59:39.000000000 -0400 ++++ google-breakpad/src/client/linux/handler/exception_handler.cc 2007-08-02 02:00:19.000000000 -0400 +@@ -133,7 +133,7 @@ void ExceptionHandler::SetupHandler() { + // Signal on a different stack to avoid using the stack + // of the crashing thread. + struct sigaltstack sig_stack; +- sig_stack.ss_sp = malloc(MINSIGSTKSZ); ++ sig_stack.ss_sp = (char *) malloc(MINSIGSTKSZ); + if (sig_stack.ss_sp == NULL) + return; + sig_stack.ss_size = MINSIGSTKSZ; |