From e17667ab1c2496863d6000f66c6471efa6f9f08b Mon Sep 17 00:00:00 2001 From: marcus Date: Thu, 2 Aug 2007 06:42:10 +0000 Subject: 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 --- devel/bug-buddy/Makefile | 5 +- devel/bug-buddy/distinfo | 6 +-- .../files/patch-gnome-breakpad_Makefile.in | 31 +++++++++++++ .../files/patch-gnome-breakpad_gnome-breakpad.cc | 54 ++++++++++++++++++++++ ...d_src_client_linux_handler_exception_handler.cc | 11 +++++ devel/bug-buddy/pkg-plist | 20 ++++++++ 6 files changed, 121 insertions(+), 6 deletions(-) create mode 100644 devel/bug-buddy/files/patch-gnome-breakpad_Makefile.in create mode 100644 devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc create mode 100644 devel/bug-buddy/files/patch-google-breakpad_src_client_linux_handler_exception_handler.cc diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile index 83622f81a..f56dfa2f7 100644 --- a/devel/bug-buddy/Makefile +++ b/devel/bug-buddy/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/devel/bug-buddy/Makefile,v 1.46 2007/04/28 05:16:42 marcus Exp $ +# $MCom: ports/devel/bug-buddy/Makefile,v 1.47 2007/05/19 21:36:04 marcus Exp $ # PORTNAME= bug-buddy -PORTVERSION= 2.18.1 -PORTREVISION= 2 +PORTVERSION= 2.19.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo index fbfff7256..a4c2ac8d0 100644 --- a/devel/bug-buddy/distinfo +++ b/devel/bug-buddy/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/bug-buddy-2.18.1.tar.bz2) = ebeaeee4acc1432b59a4ef242abff620 -SHA256 (gnome2/bug-buddy-2.18.1.tar.bz2) = 99cbdbe16942291f6a02060bf7b0bb7e5a36096379a02e513ad669eec0fdd311 -SIZE (gnome2/bug-buddy-2.18.1.tar.bz2) = 553967 +MD5 (gnome2/bug-buddy-2.19.0.tar.bz2) = 9bba2979e84127cee40ecacc8fe60cff +SHA256 (gnome2/bug-buddy-2.19.0.tar.bz2) = f5da0766133198177debfd0b46bcb8ebb7bf0c7e4dfea524bc3f660b22dc0b8b +SIZE (gnome2/bug-buddy-2.19.0.tar.bz2) = 1006643 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 + #include + ++#ifdef __linux__ + #include ++#endif + #include + #include + #include +@@ -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; diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist index f1a4a5fcc..ae9007494 100644 --- a/devel/bug-buddy/pkg-plist +++ b/devel/bug-buddy/pkg-plist @@ -1,4 +1,14 @@ bin/bug-buddy +bin/minidump_dump +bin/minidump_stackwalk +lib/gtk-2.0/modules/libgnomebreakpad.a +lib/gtk-2.0/modules/libgnomebreakpad.la +lib/gtk-2.0/modules/libgnomebreakpad.so +lib/gtk-2.0/modules/libgnomebreakpad.so.0 +lib/libbreakpad.a +lib/libbreakpad.la +lib/libbreakpad.so +lib/libbreakpad.so.0 share/applications/bug-buddy.desktop share/bug-buddy/bug-buddy.glade share/bug-buddy/bug-buddy.menu @@ -12,6 +22,12 @@ share/bug-buddy/bugzilla/ximian/config share/bug-buddy/bugzilla/ximian/mostfreq share/bug-buddy/bugzilla/ximian/products share/bug-buddy/gdb-cmd +share/doc/breakpad-0.1/AUTHORS +share/doc/breakpad-0.1/COPYING +share/doc/breakpad-0.1/ChangeLog +share/doc/breakpad-0.1/INSTALL +share/doc/breakpad-0.1/NEWS +share/doc/breakpad-0.1/README share/icons/hicolor/48x48/apps/bug-buddy.png share/locale/am/LC_MESSAGES/bug-buddy.mo share/locale/ar/LC_MESSAGES/bug-buddy.mo @@ -63,6 +79,7 @@ share/locale/nb/LC_MESSAGES/bug-buddy.mo share/locale/ne/LC_MESSAGES/bug-buddy.mo share/locale/nl/LC_MESSAGES/bug-buddy.mo share/locale/nn/LC_MESSAGES/bug-buddy.mo +share/locale/oc/LC_MESSAGES/bug-buddy.mo share/locale/or/LC_MESSAGES/bug-buddy.mo share/locale/pa/LC_MESSAGES/bug-buddy.mo share/locale/pl/LC_MESSAGES/bug-buddy.mo @@ -88,6 +105,7 @@ share/locale/xh/LC_MESSAGES/bug-buddy.mo share/locale/zh_CN/LC_MESSAGES/bug-buddy.mo share/locale/zh_HK/LC_MESSAGES/bug-buddy.mo share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo +@dirrm share/doc/breakpad-0.1 @dirrm share/bug-buddy/bugzilla/ximian @dirrm share/bug-buddy/bugzilla/gnome @dirrm share/bug-buddy/bugzilla @@ -100,6 +118,8 @@ share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo @dirrmtry share/locale/ug @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/oc/LC_MESSAGES +@dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mg/LC_MESSAGES -- cgit v1.2.3