|
 |
ec4b96 |
diff -up ./esc/src/app/daemon/manifest.mn.fix8 ./esc/src/app/daemon/manifest.mn
|
|
|
ec4b96 |
--- ./esc/src/app/daemon/manifest.mn.fix8 2010-04-15 16:27:07.232078448 -0700
|
|
|
ec4b96 |
+++ ./esc/src/app/daemon/manifest.mn 2010-04-15 14:24:46.297068110 -0700
|
|
|
ec4b96 |
@@ -37,7 +37,7 @@ DEFINES += $(shell pkg-config --cflags x
|
|
|
ec4b96 |
CPPFLAGS += $(DEFINES) -g
|
|
|
ec4b96 |
|
|
|
ec4b96 |
LDFLAGS += -lstdc++ -L$(CORE_DIST)/$(OBJDIR)/lib -L$(XULRUNNER_LIBS_LDFLAGS) -lnss3 -lnspr4 -lssl3 -lckyapplet $(shell pkg-config --libs xft)
|
|
|
ec4b96 |
-LDFLAGS += -lckymanager -lhttpchunked
|
|
|
ec4b96 |
+LDFLAGS += -lckymanager -lhttpchunked -lm -lnss3 -lplc4 -lplds4
|
|
|
ec4b96 |
# MODULE public and private header directories are implicitly REQUIRED.
|
|
|
ec4b96 |
|
|
|
ec4b96 |
CPPSRCS = \
|
|
|
ec4b96 |
diff -up ./esc/src/app/xpcom/rhCoolKey.cpp.fix8 ./esc/src/app/xpcom/rhCoolKey.cpp
|
|
|
ec4b96 |
--- ./esc/src/app/xpcom/rhCoolKey.cpp.fix8 2010-04-15 14:45:37.907068106 -0700
|
|
|
ec4b96 |
+++ ./esc/src/app/xpcom/rhCoolKey.cpp 2010-04-15 14:46:23.392066709 -0700
|
|
|
ec4b96 |
@@ -30,7 +30,7 @@
|
|
|
ec4b96 |
#else
|
|
|
ec4b96 |
#include "nsServiceManagerUtils.h"
|
|
|
ec4b96 |
#endif
|
|
|
ec4b96 |
-#include "pipnss/nsICertOverrideService.h"
|
|
|
ec4b96 |
+#include "nsICertOverrideService.h"
|
|
|
ec4b96 |
#include "nsIPrefBranch.h"
|
|
|
ec4b96 |
#include "nsIPrefService.h"
|
|
|
ec4b96 |
#include "nsCOMPtr.h"
|
|
|
ec4b96 |
@@ -41,7 +41,7 @@
|
|
|
ec4b96 |
#include "prlink.h"
|
|
|
ec4b96 |
#include "prthread.h"
|
|
|
ec4b96 |
#include "nscore.h"
|
|
|
ec4b96 |
-#include "content/nsCopySupport.h"
|
|
|
ec4b96 |
+#include "nsCopySupport.h"
|
|
|
ec4b96 |
#include <vector>
|
|
|
ec4b96 |
#include <string>
|
|
|
ec4b96 |
#include <time.h>
|
|
|
ec4b96 |
diff -up ./esc/src/app/xpcom/tray/rhLinuxTray.cpp.fix8 ./esc/src/app/xpcom/tray/rhLinuxTray.cpp
|
|
|
ec4b96 |
--- ./esc/src/app/xpcom/tray/rhLinuxTray.cpp.fix8 2010-04-15 14:43:35.271068664 -0700
|
|
|
ec4b96 |
+++ ./esc/src/app/xpcom/tray/rhLinuxTray.cpp 2010-04-15 14:43:48.685066431 -0700
|
|
|
ec4b96 |
@@ -21,7 +21,7 @@
|
|
|
ec4b96 |
#include "nsIGenericFactory.h"
|
|
|
ec4b96 |
#include <prlog.h>
|
|
|
ec4b96 |
#include "notifytray.h"
|
|
|
ec4b96 |
-#include "intl/nsIStringBundle.h"
|
|
|
ec4b96 |
+#include "nsIStringBundle.h"
|
|
|
ec4b96 |
#include <gdk/gdkx.h>
|
|
|
ec4b96 |
#include <stdlib.h>
|
|
|
ec4b96 |
|
|
|
ec4b96 |
diff -up ./esc/src/app/xpcom/tray/rhTray.h.fix8 ./esc/src/app/xpcom/tray/rhTray.h
|
|
|
ec4b96 |
--- ./esc/src/app/xpcom/tray/rhTray.h.fix8 2010-04-15 14:44:38.565066710 -0700
|
|
|
ec4b96 |
+++ ./esc/src/app/xpcom/tray/rhTray.h 2010-04-15 14:45:02.118067548 -0700
|
|
|
ec4b96 |
@@ -23,8 +23,8 @@
|
|
|
ec4b96 |
#include "nsEmbedString.h"
|
|
|
ec4b96 |
#include <list>
|
|
|
ec4b96 |
#include "nsCOMPtr.h"
|
|
|
ec4b96 |
-#include "widget/nsIBaseWindow.h"
|
|
|
ec4b96 |
-#include "widget/nsIWidget.h"
|
|
|
ec4b96 |
+#include "nsIBaseWindow.h"
|
|
|
ec4b96 |
+#include "nsIWidget.h"
|
|
|
ec4b96 |
#include <time.h>
|
|
|
ec4b96 |
|
|
|
ec4b96 |
extern "C" {
|
|
|
ec4b96 |
diff -up ./esc/src/app/xul/esc/application.ini.fix8 ./esc/src/app/xul/esc/application.ini
|
|
|
ec4b96 |
--- ./esc/src/app/xul/esc/application.ini.fix8 2010-04-15 14:47:59.377066710 -0700
|
|
|
ec4b96 |
+++ ./esc/src/app/xul/esc/application.ini 2010-04-15 14:51:07.476068385 -0700
|
|
|
ec4b96 |
@@ -25,11 +25,11 @@ Vendor=RedHat
|
|
|
ec4b96 |
Name=ESC
|
|
|
ec4b96 |
;
|
|
|
ec4b96 |
; This field specifies your application's version. This field is optional.
|
|
|
ec4b96 |
-Version=1.1.0-9
|
|
|
ec4b96 |
+Version=1.1.0-12
|
|
|
ec4b96 |
;
|
|
|
ec4b96 |
; This field specifies your application's build ID (timestamp). This field is
|
|
|
ec4b96 |
; required.
|
|
|
ec4b96 |
-BuildID=0000001011
|
|
|
ec4b96 |
+BuildID=0000001012
|
|
|
ec4b96 |
;
|
|
|
ec4b96 |
; This ID is just an example. Every XUL app ought to have it's own unique ID.
|
|
|
ec4b96 |
; You can use the microsoft "guidgen" or "uuidgen" tools, or go on
|