summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Horak <jhorak@redhat.com>2013-06-13 14:46:13 +0200
committerJan Horak <jhorak@redhat.com>2013-06-13 14:46:13 +0200
commit68cb18598c323f66252dcca34f6f7b01d278b58e (patch)
tree056adff8c3eb0efcdd494196e4ccb9821450ef93
parentFixed firefox.sh - do not override TMPDIR if set by user (diff)
downloadlibrewolf-fedora-ff-68cb18598c323f66252dcca34f6f7b01d278b58e.tar.gz
librewolf-fedora-ff-68cb18598c323f66252dcca34f6f7b01d278b58e.tar.bz2
librewolf-fedora-ff-68cb18598c323f66252dcca34f6f7b01d278b58e.zip
Enabled crashreporter
-rw-r--r--firefox-mozconfig1
-rw-r--r--firefox-mozconfig-debuginfo5
-rw-r--r--firefox.spec17
3 files changed, 2 insertions, 21 deletions
diff --git a/firefox-mozconfig b/firefox-mozconfig
index 54ef4df..6f66a64 100644
--- a/firefox-mozconfig
+++ b/firefox-mozconfig
@@ -22,7 +22,6 @@ ac_add_options --enable-canvas
ac_add_options --enable-startup-notification
ac_add_options --enable-libxul
ac_add_options --with-system-libxul
-ac_add_options --disable-crashreporter
ac_add_options --enable-safe-browsing
ac_add_options --enable-libnotify
ac_add_options --disable-necko-wifi
diff --git a/firefox-mozconfig-debuginfo b/firefox-mozconfig-debuginfo
deleted file mode 100644
index 4dd2427..0000000
--- a/firefox-mozconfig-debuginfo
+++ /dev/null
@@ -1,5 +0,0 @@
-# For mozilla's debuginfo:
-export CFLAGS="$CFLAGS -gdwarf-2"
-export CXXFLAGS="$CXXFLAGS -gdwarf-2"
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-crashreporter
diff --git a/firefox.spec b/firefox.spec
index 871b580..da6fb99 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -28,7 +28,7 @@
%define official_branding 1
%define build_langpacks 1
-%define include_debuginfo 0
+%define include_debuginfo 1
%if %{alpha_version} > 0
%global pre_version a%{alpha_version}
@@ -66,7 +66,6 @@ Source1: firefox-langpacks-%{version}%{?pre_version}-20130514.tar.xz
Source10: firefox-mozconfig
Source11: firefox-mozconfig-branded
Source12: firefox-redhat-default-prefs.js
-Source13: firefox-mozconfig-debuginfo
Source20: firefox.desktop
Source21: firefox.sh.in
Source23: firefox.1
@@ -141,9 +140,6 @@ cd %{tarballdir}
%if %{official_branding}
%{__cat} %{SOURCE11} >> .mozconfig
%endif
-%if %{include_debuginfo}
-%{__cat} %{SOURCE13} >> .mozconfig
-%endif
# Set up SDK path
MOZILLA_SDK_PATH=`pkg-config --variable=sdkdir libxul`
@@ -224,12 +220,6 @@ MOZ_SMP_FLAGS=-j1
export LDFLAGS="-Wl,-rpath,%{mozappdir}"
make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
-# create debuginfo for crash-stats.mozilla.com
-%if %{include_debuginfo}
-#cd %{moz_objdir}
-make buildsymbols
-%endif
-
#---------------------------------------------------------------------
%install
@@ -433,10 +423,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{mozappdir}/webapprt/omni.ja
%{mozappdir}/webapprt/webapprt.ini
%if %{include_debuginfo}
-#%{mozappdir}/crashreporter
-%{mozappdir}/crashreporter-override.ini
-#%{mozappdir}/Throbber-small.gif
-#%{mozappdir}/plugin-container
+%{mozappdir}/browser/crashreporter-override.ini
%endif
#---------------------------------------------------------------------
bgstack15