Do the PFRAG.debug dance so that it produces a working debug-enabled

package. Teach users how to properly report bugs, and add a
run-mozilla.sh patch so that it finds our gdb. While here remove
updates/ subdir at uninstall time, otherwise it stays..
This commit is contained in:
landry 2010-10-27 12:59:29 +00:00
parent d4ee90931f
commit 4ea899788a
5 changed files with 116 additions and 3 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.49 2010/10/27 08:14:17 landry Exp $ # $OpenBSD: Makefile,v 1.50 2010/10/27 12:59:29 landry Exp $
COMMENT = Mozilla web browser COMMENT = Mozilla web browser
@ -7,12 +7,27 @@ MOZILLA_BRANCH = 1.9.1
MOZILLA_PROJECT = firefox35 MOZILLA_PROJECT = firefox35
MOZILLA_CODENAME = browser MOZILLA_CODENAME = browser
REVISION = 0
SO_VERSION = 24.0 SO_VERSION = 24.0
# NOTE: Must bump minor version if any shlib's are removed from the # NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues. # components dir to avoid pkg_add -r issues.
MOZILLA_LIBS = browsercomps browserdirprovider imgicon mozjs \ MOZILLA_LIBS = browsercomps browserdirprovider imgicon mozjs \
xpcom xul nullplugin unixprintplugin xpcom xul nullplugin unixprintplugin
FLAVOR ?=
.if ${FLAVOR:L:Mdebug}
MOZILLA_LIBS += accessibility appcomps auth autoconfig caps chardet chrome \
commandlines composer cookie docshell embedcomponents fileview \
gkgfxthebes gklayout gkplugin htmlpars i18n imglib2 intlapp \
jar50 jsd mozfind necko nsappshell oji permissions \
pipboot pipnss pippki places pref rdf remoteservice \
satchel spellchecker storagecomps system-pref tkautocomplete \
toolkitcomps txmgr uconv ucvmath universalchardet \
unixproxy webbrwsr widget_gtk2 windowds xpconnect xpinstall \
zipwriter gfxpsshar gkgfx gtkxtbin jsj thebes xpcom_core
.endif
CATEGORIES = www CATEGORIES = www
HOMEPAGE= http://www.mozilla.org/projects/firefox/ HOMEPAGE= http://www.mozilla.org/projects/firefox/

View File

@ -1,4 +1,4 @@
$OpenBSD: README.OpenBSD,v 1.2 2010/04/28 06:50:23 landry Exp $ $OpenBSD: README.OpenBSD,v 1.3 2010/10/27 12:59:29 landry Exp $
If you encounter strange problems relating to bookmarks, downloads, If you encounter strange problems relating to bookmarks, downloads,
window placement, toolbars, history, or other settings, it is window placement, toolbars, history, or other settings, it is
@ -62,3 +62,10 @@ In order to use CUPS for printing, you will need to install the cups
subpackage of gtk+2, i.e.: subpackage of gtk+2, i.e.:
# pkg_add gtk+2-cups # pkg_add gtk+2-cups
Debugging
If you encounter crashes, you might want to build the debug FLAVOR of
this package, and run 'firefox35 -g' to run firefox inside gdb, so
that you can gather debugging logs and traces.
Bug reports without that information will be ignored.

View File

@ -0,0 +1,31 @@
$OpenBSD: patch-build_unix_run-mozilla_sh,v 1.1 2010/10/27 12:59:29 landry Exp $
help to find our debugger
--- build/unix/run-mozilla.sh.orig Wed Oct 27 12:52:10 2010
+++ build/unix/run-mozilla.sh Wed Oct 27 12:52:26 2010
@@ -105,25 +105,7 @@ moz_test_binary()
##########################################################################
moz_get_debugger()
{
- debuggers="ddd gdb dbx bdb"
- debugger="notfound"
- done="no"
- for d in $debuggers
- do
- moz_test_binary /bin/type
- if [ $? -eq 1 ]
- then
- dpath=`LC_MESSAGES=C type ${d} | awk '{print $3;}' | sed -e 's/\.$//'`
- else
- dpath=`which ${d}`
- fi
- if [ -x "$dpath" ]
- then
- debugger=$dpath
- break
- fi
- done
- echo $debugger
+ echo "/usr/bin/gdb"
return 0
}
##########################################################################

View File

@ -0,0 +1,58 @@
@comment $OpenBSD: PFRAG.debug,v 1.1 2010/10/27 12:59:29 landry Exp $
@lib ${MOZILLA_PROJECT}/components/libaccessibility.so.${LIBaccessibility_VERSION}
@lib ${MOZILLA_PROJECT}/components/libappcomps.so.${LIBappcomps_VERSION}
@lib ${MOZILLA_PROJECT}/components/libauth.so.${LIBauth_VERSION}
@lib ${MOZILLA_PROJECT}/components/libautoconfig.so.${LIBautoconfig_VERSION}
@lib ${MOZILLA_PROJECT}/components/libcaps.so.${LIBcaps_VERSION}
@lib ${MOZILLA_PROJECT}/components/libchardet.so.${LIBchardet_VERSION}
@lib ${MOZILLA_PROJECT}/components/libchrome.so.${LIBchrome_VERSION}
@lib ${MOZILLA_PROJECT}/components/libcommandlines.so.${LIBcommandlines_VERSION}
@lib ${MOZILLA_PROJECT}/components/libcomposer.so.${LIBcomposer_VERSION}
@lib ${MOZILLA_PROJECT}/components/libcookie.so.${LIBcookie_VERSION}
@lib ${MOZILLA_PROJECT}/components/libdocshell.so.${LIBdocshell_VERSION}
@lib ${MOZILLA_PROJECT}/components/libembedcomponents.so.${LIBembedcomponents_VERSION}
@lib ${MOZILLA_PROJECT}/components/libfileview.so.${LIBfileview_VERSION}
@lib ${MOZILLA_PROJECT}/components/libgkgfxthebes.so.${LIBgkgfxthebes_VERSION}
@lib ${MOZILLA_PROJECT}/components/libgklayout.so.${LIBgklayout_VERSION}
@lib ${MOZILLA_PROJECT}/components/libgkplugin.so.${LIBgkplugin_VERSION}
@lib ${MOZILLA_PROJECT}/components/libhtmlpars.so.${LIBhtmlpars_VERSION}
@lib ${MOZILLA_PROJECT}/components/libi18n.so.${LIBi18n_VERSION}
@lib ${MOZILLA_PROJECT}/components/libimglib2.so.${LIBimglib2_VERSION}
@lib ${MOZILLA_PROJECT}/components/libintlapp.so.${LIBintlapp_VERSION}
@lib ${MOZILLA_PROJECT}/components/libjar50.so.${LIBjar50_VERSION}
@lib ${MOZILLA_PROJECT}/components/libjsd.so.${LIBjsd_VERSION}
@lib ${MOZILLA_PROJECT}/components/libmozfind.so.${LIBmozfind_VERSION}
@lib ${MOZILLA_PROJECT}/components/libnecko.so.${LIBnecko_VERSION}
@lib ${MOZILLA_PROJECT}/components/libnsappshell.so.${LIBnsappshell_VERSION}
@lib ${MOZILLA_PROJECT}/components/liboji.so.${LIBoji_VERSION}
@lib ${MOZILLA_PROJECT}/components/libpermissions.so.${LIBpermissions_VERSION}
@lib ${MOZILLA_PROJECT}/components/libpipboot.so.${LIBpipboot_VERSION}
@lib ${MOZILLA_PROJECT}/components/libpipnss.so.${LIBpipnss_VERSION}
@lib ${MOZILLA_PROJECT}/components/libpippki.so.${LIBpippki_VERSION}
@lib ${MOZILLA_PROJECT}/components/libplaces.so.${LIBplaces_VERSION}
@lib ${MOZILLA_PROJECT}/components/libpref.so.${LIBpref_VERSION}
@lib ${MOZILLA_PROJECT}/components/librdf.so.${LIBrdf_VERSION}
@lib ${MOZILLA_PROJECT}/components/libremoteservice.so.${LIBremoteservice_VERSION}
@lib ${MOZILLA_PROJECT}/components/libsatchel.so.${LIBsatchel_VERSION}
@lib ${MOZILLA_PROJECT}/components/libspellchecker.so.${LIBspellchecker_VERSION}
@lib ${MOZILLA_PROJECT}/components/libstoragecomps.so.${LIBstoragecomps_VERSION}
@lib ${MOZILLA_PROJECT}/components/libsystem-pref.so.${LIBsystem-pref_VERSION}
@lib ${MOZILLA_PROJECT}/components/libtkautocomplete.so.${LIBtkautocomplete_VERSION}
@lib ${MOZILLA_PROJECT}/components/libtoolkitcomps.so.${LIBtoolkitcomps_VERSION}
@lib ${MOZILLA_PROJECT}/components/libtxmgr.so.${LIBtxmgr_VERSION}
@lib ${MOZILLA_PROJECT}/components/libuconv.so.${LIBuconv_VERSION}
@lib ${MOZILLA_PROJECT}/components/libucvmath.so.${LIBucvmath_VERSION}
@lib ${MOZILLA_PROJECT}/components/libuniversalchardet.so.${LIBuniversalchardet_VERSION}
@lib ${MOZILLA_PROJECT}/components/libunixproxy.so.${LIBunixproxy_VERSION}
@lib ${MOZILLA_PROJECT}/components/libwebbrwsr.so.${LIBwebbrwsr_VERSION}
@lib ${MOZILLA_PROJECT}/components/libwidget_gtk2.so.${LIBwidget_gtk2_VERSION}
@lib ${MOZILLA_PROJECT}/components/libwindowds.so.${LIBwindowds_VERSION}
@lib ${MOZILLA_PROJECT}/components/libxpconnect.so.${LIBxpconnect_VERSION}
@lib ${MOZILLA_PROJECT}/components/libxpinstall.so.${LIBxpinstall_VERSION}
@lib ${MOZILLA_PROJECT}/components/libzipwriter.so.${LIBzipwriter_VERSION}
@lib ${MOZILLA_PROJECT}/libgfxpsshar.so.${LIBgfxpsshar_VERSION}
@lib ${MOZILLA_PROJECT}/libgkgfx.so.${LIBgkgfx_VERSION}
@lib ${MOZILLA_PROJECT}/libgtkxtbin.so.${LIBgtkxtbin_VERSION}
@lib ${MOZILLA_PROJECT}/libjsj.so.${LIBjsj_VERSION}
@lib ${MOZILLA_PROJECT}/libthebes.so.${LIBthebes_VERSION}
@lib ${MOZILLA_PROJECT}/libxpcom_core.so.${LIBxpcom_core_VERSION}

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.10 2010/08/02 16:05:37 landry Exp $ @comment $OpenBSD: PLIST,v 1.11 2010/10/27 12:59:29 landry Exp $
bin/${MOZILLA_PROJECT} bin/${MOZILLA_PROJECT}
${MOZILLA_PROJECT}/ ${MOZILLA_PROJECT}/
${MOZILLA_PROJECT}/LICENSE ${MOZILLA_PROJECT}/LICENSE
@ -347,8 +347,10 @@ ${MOZILLA_PROJECT}/searchplugins/google.xml
${MOZILLA_PROJECT}/searchplugins/wikipedia.xml ${MOZILLA_PROJECT}/searchplugins/wikipedia.xml
${MOZILLA_PROJECT}/searchplugins/yahoo.xml ${MOZILLA_PROJECT}/searchplugins/yahoo.xml
share/applications/${MOZILLA_PROJECT}.desktop share/applications/${MOZILLA_PROJECT}.desktop
%%debug%%
@exec %D/bin/update-desktop-database @exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database @unexec-delete %D/bin/update-desktop-database
@exec TEMP=`mktemp -d` && cd %D/firefox35 && env HOME=$TEMP LD_LIBRARY_PATH=%D/firefox35 ./regxpcom && rm -fr $TEMP @exec TEMP=`mktemp -d` && cd %D/firefox35 && env HOME=$TEMP LD_LIBRARY_PATH=%D/firefox35 ./regxpcom && rm -fr $TEMP
@unexec rm -f %D/firefox35/components/compreg.dat @unexec rm -f %D/firefox35/components/compreg.dat
@unexec rm -f %D/firefox35/components/xpti.dat @unexec rm -f %D/firefox35/components/xpti.dat
@unexec rm -Rf %D/firefox35/updates