From e3f12fc3f9f0b4320cac73bd4e685b35e5e2ed5d Mon Sep 17 00:00:00 2001
From: "reed%reedloden.com"
 <reed%reedloden.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 28 Nov 2007 22:47:01 +0000
Subject: [PATCH] Bug 405368 - "Allow runtime overrides by Linux version for
 chrome" [p=ventnor.bugzilla@yahoo.com.au (Michael Ventnor) r=bsmedberg
 a1.9=beltzner]

git-svn-id: svn://10.0.0.236/trunk@240073 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/chrome/src/Makefile.in          | 8 ++++++++
 mozilla/chrome/src/nsChromeRegistry.cpp | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/mozilla/chrome/src/Makefile.in b/mozilla/chrome/src/Makefile.in
index e450c132aff..38c6c942488 100644
--- a/mozilla/chrome/src/Makefile.in
+++ b/mozilla/chrome/src/Makefile.in
@@ -86,9 +86,17 @@ EXTRA_DSO_LDOPTS = \
                 $(MOZ_COMPONENT_LIBS) \
                 $(NULL)
 
+ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
+EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS)
+endif
+
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 EXTRA_DSO_LDOPTS += $(TK_LIBS)
 endif
 
 include $(topsrcdir)/config/rules.mk
 
+ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
+CXXFLAGS          += $(MOZ_GTK2_CFLAGS)
+endif
+
diff --git a/mozilla/chrome/src/nsChromeRegistry.cpp b/mozilla/chrome/src/nsChromeRegistry.cpp
index d56438b9906..04a3b89b434 100644
--- a/mozilla/chrome/src/nsChromeRegistry.cpp
+++ b/mozilla/chrome/src/nsChromeRegistry.cpp
@@ -48,6 +48,8 @@
 #include <windows.h>
 #elif defined(XP_MACOSX)
 #include <Carbon/Carbon.h>
+#elif defined(MOZ_WIDGET_GTK2)
+#include <gtk/gtk.h>
 #endif
 
 #include "nsAppDirectoryServiceDefs.h"
@@ -2143,6 +2145,10 @@ nsChromeRegistry::ProcessManifestBuffer(char *buf, PRInt32 length,
                                          majorVersion,
                                          minorVersion);
   }
+#elif defined(MOZ_WIDGET_GTK2)
+  nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(),
+                                       gtk_major_version,
+                                       gtk_minor_version);
 #endif
 
   char *token;