|
 |
f35d1b |
diff -up ./esc/src/app/xpcom/Makefile.sdk.fix11 ./esc/src/app/xpcom/Makefile.sdk
|
|
|
f35d1b |
--- ./esc/src/app/xpcom/Makefile.sdk.fix11 2011-09-16 11:28:43.413286053 -0700
|
|
|
f35d1b |
+++ ./esc/src/app/xpcom/Makefile.sdk 2011-09-16 11:28:43.529286053 -0700
|
|
|
f35d1b |
@@ -108,7 +108,7 @@ endif
|
|
|
f35d1b |
ifeq ($(OS_ARCH),Linux)
|
|
|
f35d1b |
CPPFLAGS += -fno-rtti \
|
|
|
f35d1b |
-fno-exceptions \
|
|
|
f35d1b |
- -fshort-wchar -fPIC
|
|
|
f35d1b |
+ -fshort-wchar -fPIC -std=gnu++0x
|
|
|
f35d1b |
GECKO_LD_LIBS=-L$(GECKO_SDK_PATH)/lib $(GECKO_SDK_PATH)/lib/libxpcomglue.a -lnssutil3 -lnss3 -lcrmf -lssl3 -lsmime3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl
|
|
|
f35d1b |
endif
|
|
|
f35d1b |
|
|
|
f35d1b |
@@ -129,6 +129,10 @@ ifdef ESC_VERSION
|
|
|
f35d1b |
GECKO_DEFINES += -DESC_VERSION=$(ESC_VERSION)
|
|
|
f35d1b |
endif
|
|
|
f35d1b |
|
|
|
f35d1b |
+ifdef GECKO_BIN_PATH
|
|
|
f35d1b |
+GECKO_DEFINES += -DGECKO_BIN_PATH=$(GECKO_BIN_PATH)
|
|
|
f35d1b |
+endif
|
|
|
f35d1b |
+
|
|
|
f35d1b |
NSS_INCLUDE = /usr/include/nss3
|
|
|
f35d1b |
NSPR_INCLUDE = /usr/include/nspr4
|
|
|
f35d1b |
|
|
|
f35d1b |
diff -up ./esc/src/app/xpcom/rhCoolKey.cpp.fix11 ./esc/src/app/xpcom/rhCoolKey.cpp
|
|
|
f35d1b |
--- ./esc/src/app/xpcom/rhCoolKey.cpp.fix11 2011-09-16 11:28:43.510286053 -0700
|
|
|
f35d1b |
+++ ./esc/src/app/xpcom/rhCoolKey.cpp 2011-09-16 11:28:43.530286053 -0700
|
|
|
f35d1b |
@@ -538,7 +538,7 @@ PRBool rhCoolKey::InitInstance()
|
|
|
f35d1b |
|
|
|
f35d1b |
char xpcom_path[4096];
|
|
|
f35d1b |
xpcom_path[0] = 0;
|
|
|
f35d1b |
-
|
|
|
f35d1b |
+/*
|
|
|
f35d1b |
static const GREVersionRange greVersion =
|
|
|
f35d1b |
{
|
|
|
f35d1b |
"1.9", PR_TRUE,
|
|
|
f35d1b |
@@ -550,6 +550,13 @@ PRBool rhCoolKey::InitInstance()
|
|
|
f35d1b |
return PR_FALSE;
|
|
|
f35d1b |
}
|
|
|
f35d1b |
|
|
|
f35d1b |
+*/
|
|
|
f35d1b |
+
|
|
|
f35d1b |
+ char *grePath = (char *) GETSTRING(GECKO_BIN_PATH);
|
|
|
f35d1b |
+
|
|
|
f35d1b |
+
|
|
|
f35d1b |
+ snprintf(xpcom_path,4096,grePath);
|
|
|
f35d1b |
+
|
|
|
f35d1b |
char *lib_name =(char *) XPCOM_LIB_NAME ;
|
|
|
f35d1b |
|
|
|
f35d1b |
|
|
|
f35d1b |
diff -up ./esc/src/app/xpcom/tray/Makefile.sdk.fix11 ./esc/src/app/xpcom/tray/Makefile.sdk
|
|
|
f35d1b |
--- ./esc/src/app/xpcom/tray/Makefile.sdk.fix11 2011-09-16 11:31:59.645286087 -0700
|
|
|
f35d1b |
+++ ./esc/src/app/xpcom/tray/Makefile.sdk 2011-09-16 11:32:10.859286088 -0700
|
|
|
f35d1b |
@@ -23,7 +23,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
|
|
|
f35d1b |
include $(CORE_DEPTH)/coreconf/rules.mk
|
|
|
f35d1b |
|
|
|
f35d1b |
ifeq ($(OS_ARCH),Linux)
|
|
|
f35d1b |
-CXXFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) $(NOTIFY_CXX_FLAGS) -fPIC
|
|
|
f35d1b |
+CXXFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) $(NOTIFY_CXX_FLAGS) -fPIC -std=gnu++0x
|
|
|
f35d1b |
endif
|
|
|
f35d1b |
|
|
|
f35d1b |
|
|
|
f35d1b |
diff -up ./esc/src/app/xul/esc/application.ini.fix11 ./esc/src/app/xul/esc/application.ini
|
|
|
f35d1b |
--- ./esc/src/app/xul/esc/application.ini.fix11 2011-09-16 11:28:43.511286053 -0700
|
|
|
f35d1b |
+++ ./esc/src/app/xul/esc/application.ini 2011-09-16 11:28:43.532286053 -0700
|
|
|
f35d1b |
@@ -25,11 +25,11 @@ Vendor=RedHat
|
|
|
f35d1b |
Name=ESC
|
|
|
f35d1b |
;
|
|
|
f35d1b |
; This field specifies your application's version. This field is optional.
|
|
|
f35d1b |
-Version=1.1.0-15
|
|
|
f35d1b |
+Version=1.1.0-16
|
|
|
f35d1b |
;
|
|
|
f35d1b |
; This field specifies your application's build ID (timestamp). This field is
|
|
|
f35d1b |
; required.
|
|
|
f35d1b |
-BuildID=0000001015
|
|
|
f35d1b |
+BuildID=0000001016
|
|
|
f35d1b |
;
|
|
|
f35d1b |
; This ID is just an example. Every XUL app ought to have it's own unique ID.
|
|
|
f35d1b |
; You can use the microsoft "guidgen" or "uuidgen" tools, or go on
|
|
|
f35d1b |
@@ -41,12 +41,12 @@ ID={6380471b-1924-4b48-b652-49f42951af86
|
|
|
f35d1b |
; This field is required. It specifies the minimum Gecko version that this
|
|
|
f35d1b |
; application requires. Specifying 1.8 matches all releases with a version
|
|
|
f35d1b |
; prefixed by 1.8 (e.g., 1.8a4, 1.8b, 1.8.2).
|
|
|
f35d1b |
-MinVersion=1.99
|
|
|
f35d1b |
+MinVersion=6.0.0
|
|
|
f35d1b |
;
|
|
|
f35d1b |
; This field is optional. It specifies the maximum Gecko version that this
|
|
|
f35d1b |
; application requires. It should be specified if your application uses
|
|
|
f35d1b |
; unfrozen interfaces. Specifying 1.8 matches all releases with a version
|
|
|
f35d1b |
; prefixed by 1.8 (e.g., 1.8a4, 1.8b, 1.8.2).
|
|
|
f35d1b |
-MaxVersion=2.99
|
|
|
f35d1b |
+MaxVersion=20.0.0
|
|
|
f35d1b |
|
|
|
f35d1b |
[Shell]
|