Mercurial Mercurial > hg > mozilla / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
firefox-crashreporter.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Mon, 18 Jan 2010 18:36:29 +0100
changeset 53 770c275fd27c
parent 35 77612e091d2d
permissions -rw-r--r--
Remove obsolete "stable" reference in mozilla-plugin.pc
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
35
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
     1
 
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
     2
 
--- a/browser/app/Makefile.in
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
     3
 
+++ b/browser/app/Makefile.in
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
     4
 
@@ -223,22 +223,16 @@ endif
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
     5
 
 ifdef DEBUG
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
     6
 
 RCFLAGS += -DDEBUG
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
     7
 
 endif
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
     8
 
 RCFLAGS += -DFIREFOX_ICO=\"$(DIST)/branding/firefox-os2.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document-os2.ico\"
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
     9
 
 endif
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    10
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    11
 
 include $(topsrcdir)/config/rules.mk
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    12
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    13
 
-DEFINES += -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    14
 
-
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    15
 
-ifdef MOZILLA_OFFICIAL
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    16
 
-DEFINES += -DMOZILLA_OFFICIAL
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    17
 
-endif
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    18
 
-
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    19
 
 ifdef BUILD_STATIC_LIBS
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    20
 
 include $(topsrcdir)/config/static-rules.mk
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    21
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    22
 
 DEFINES += -DIMPL_XREAPI
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    23
 
 endif
34
2d77a25d185f Add firefox-crashreporter.patch to fix Firefox' application.ini
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    24
35
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    25
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),photon)
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    26
 
 LIBS += -lphexlib
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    27
 
@@ -277,16 +271,22 @@ install:: $(MOZ_APP_NAME)
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    28
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    29
 
 GARBAGE += $(MOZ_APP_NAME)
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    30
 
 GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, firefox.js)
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    31
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    32
 
 endif
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    33
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    34
 
 endif # LIBXUL_SDK
34
2d77a25d185f Add firefox-crashreporter.patch to fix Firefox' application.ini
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    35
35
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    36
 
+ifdef MOZILLA_OFFICIAL
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    37
 
+DEFINES += -DMOZILLA_OFFICIAL
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    38
 
+endif
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    39
 
+
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    40
 
+DEFINES += -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    41
 
+
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    42
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    43
 
 libs::
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    44
 
 	$(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    45
 
 	$(INSTALL) $(IFLAGS1) $(DIST)/branding/document.png   $(DIST)/bin/icons
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    46
 
 	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png  $(DIST)/bin/chrome/icons/default
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    47
 
 	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png  $(DIST)/bin/chrome/icons/default
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    48
 
 	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png  $(DIST)/bin/chrome/icons/default
77612e091d2d Change firefox-crashreporter.patch to fix the real issue (bmo#536144)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 34
diff changeset 
    49
 
 endif
mozilla