Mercurial Mercurial > hg > mozilla / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
snapshot 2012061500
authorWolfgang Rosenauer <wr@rosenauer.org>
Tue, 19 Jun 2012 10:13:07 +0200
changeset 484 62b8d7fa9144
parent 483 6a8f38a81faf
child 491 43deb5e6462d
snapshot 2012061500
MozillaFirefox/MozillaFirefox.spec file | annotate | diff | comparison | revisions
firefox-branded-icons.patch file | annotate | diff | comparison | revisions
firefox-kde.patch file | annotate | diff | comparison | revisions 
--- a/MozillaFirefox/MozillaFirefox.spec	Tue Jun 19 10:12:39 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Tue Jun 19 10:13:07 2012 +0200
@@ -54,7 +54,7 @@
 %endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2012060500
+%define         releasedate 2012061500
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
--- a/firefox-branded-icons.patch	Tue Jun 19 10:12:39 2012 +0200
+++ b/firefox-branded-icons.patch	Tue Jun 19 10:13:07 2012 +0200
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent 8e4bf8e8a79138350231e03dc567d893f67b2a29
+# Parent 7272ee3a4df832b885fec122f02d32f23dcc9cdb
 
 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
 --- a/browser/app/Makefile.in
@@ -23,9 +23,9 @@
  libs:: $(srcdir)/profile/prefs.js
  	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile
  
+ ifndef LIBXUL_SDK
  # channel-prefs.js is handled separate from other prefs due to bug 756325
  libs:: $(srcdir)/profile/channel-prefs.js
- 	$(NSINSTALL) -D $(DIST)/bin/defaults/pref
 diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in
 --- a/browser/branding/official/Makefile.in
 +++ b/browser/branding/official/Makefile.in
--- a/firefox-kde.patch	Tue Jun 19 10:12:39 2012 +0200
+++ b/firefox-kde.patch	Tue Jun 19 10:13:07 2012 +0200
@@ -1727,16 +1727,20 @@
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -521,16 +521,17 @@
- @BINPATH@/@PREF_DIR@/services-sync.js
+@@ -522,18 +522,20 @@
  @BINPATH@/@PREF_DIR@/services-aitc.js
  #endif
  @BINPATH@/greprefs.js
  @BINPATH@/defaults/autoconfig/platform.js
  @BINPATH@/defaults/autoconfig/prefcalls.js
+ #ifndef LIBXUL_SDK
  ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
  @BINPATH@/defaults/pref/channel-prefs.js
 +@BINPATH@/defaults/pref/kde.js
+ #else
+ @BINPATH@/@PREF_DIR@/channel-prefs.js
++@BINPATH@/@PREF_DIR@/kde.js
+ #endif
  @BINPATH@/defaults/profile/prefs.js
  
  ; [Layout Engine Resources]
@@ -1744,4 +1748,3 @@
  @BINPATH@/res/EditorOverride.css
  @BINPATH@/res/contenteditable.css
  @BINPATH@/res/designmode.css
- @BINPATH@/res/TopLevelImageDocument.css
mozilla