[esc/f15] Resolves #688361 - Fix additinal ESC Gecko issues.
Jack Magne
jmagne at fedoraproject.org
Sat Sep 17 01:37:30 UTC 2011
commit 305e95d8e1dbbbeaac20daf7cec4b84ba4a31ed7
Author: Jack Magne <jmagne at localhost.localdomain>
Date: Fri Sep 16 11:34:32 2011 -0700
Resolves #688361 - Fix additinal ESC Gecko issues.
esc-1.1.0-fix11.patch | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
---
diff --git a/esc-1.1.0-fix11.patch b/esc-1.1.0-fix11.patch
index 5ecf83e..bd6110e 100755
--- a/esc-1.1.0-fix11.patch
+++ b/esc-1.1.0-fix11.patch
@@ -1,6 +1,15 @@
diff -up ./esc/src/app/xpcom/Makefile.sdk.fix11 ./esc/src/app/xpcom/Makefile.sdk
---- ./esc/src/app/xpcom/Makefile.sdk.fix11 2011-09-16 09:43:28.473284954 -0700
-+++ ./esc/src/app/xpcom/Makefile.sdk 2011-09-16 09:43:43.701284958 -0700
+--- ./esc/src/app/xpcom/Makefile.sdk.fix11 2011-09-16 11:28:43.413286053 -0700
++++ ./esc/src/app/xpcom/Makefile.sdk 2011-09-16 11:28:43.529286053 -0700
+@@ -108,7 +108,7 @@ endif
+ ifeq ($(OS_ARCH),Linux)
+ CPPFLAGS += -fno-rtti \
+ -fno-exceptions \
+- -fshort-wchar -fPIC
++ -fshort-wchar -fPIC -std=gnu++0x
+ GECKO_LD_LIBS=-L$(GECKO_SDK_PATH)/lib $(GECKO_SDK_PATH)/lib/libxpcomglue.a -lnssutil3 -lnss3 -lcrmf -lssl3 -lsmime3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl
+ endif
+
@@ -129,6 +129,10 @@ ifdef ESC_VERSION
GECKO_DEFINES += -DESC_VERSION=$(ESC_VERSION)
endif
@@ -13,8 +22,8 @@ diff -up ./esc/src/app/xpcom/Makefile.sdk.fix11 ./esc/src/app/xpcom/Makefile.sdk
NSPR_INCLUDE = /usr/include/nspr4
diff -up ./esc/src/app/xpcom/rhCoolKey.cpp.fix11 ./esc/src/app/xpcom/rhCoolKey.cpp
---- ./esc/src/app/xpcom/rhCoolKey.cpp.fix11 2011-09-16 09:05:12.564284553 -0700
-+++ ./esc/src/app/xpcom/rhCoolKey.cpp 2011-09-16 09:05:23.507284562 -0700
+--- ./esc/src/app/xpcom/rhCoolKey.cpp.fix11 2011-09-16 11:28:43.510286053 -0700
++++ ./esc/src/app/xpcom/rhCoolKey.cpp 2011-09-16 11:28:43.530286053 -0700
@@ -538,7 +538,7 @@ PRBool rhCoolKey::InitInstance()
char xpcom_path[4096];
@@ -38,9 +47,21 @@ diff -up ./esc/src/app/xpcom/rhCoolKey.cpp.fix11 ./esc/src/app/xpcom/rhCoolKey.c
char *lib_name =(char *) XPCOM_LIB_NAME ;
+diff -up ./esc/src/app/xpcom/tray/Makefile.sdk.fix11 ./esc/src/app/xpcom/tray/Makefile.sdk
+--- ./esc/src/app/xpcom/tray/Makefile.sdk.fix11 2011-09-16 11:31:59.645286087 -0700
++++ ./esc/src/app/xpcom/tray/Makefile.sdk 2011-09-16 11:32:10.859286088 -0700
+@@ -23,7 +23,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
+ include $(CORE_DEPTH)/coreconf/rules.mk
+
+ ifeq ($(OS_ARCH),Linux)
+-CXXFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) $(NOTIFY_CXX_FLAGS) -fPIC
++CXXFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) $(NOTIFY_CXX_FLAGS) -fPIC -std=gnu++0x
+ endif
+
+
diff -up ./esc/src/app/xul/esc/application.ini.fix11 ./esc/src/app/xul/esc/application.ini
---- ./esc/src/app/xul/esc/application.ini.fix11 2011-09-16 09:44:03.935284960 -0700
-+++ ./esc/src/app/xul/esc/application.ini 2011-09-16 09:47:31.836285002 -0700
+--- ./esc/src/app/xul/esc/application.ini.fix11 2011-09-16 11:28:43.511286053 -0700
++++ ./esc/src/app/xul/esc/application.ini 2011-09-16 11:28:43.532286053 -0700
@@ -25,11 +25,11 @@ Vendor=RedHat
Name=ESC
;
More information about the scm-commits
mailing list