rpms/esc/devel esc-1.0.0-ui-enhance.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: jmagne

Update of /cvs/dist/rpms/esc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24899

Modified Files:
	esc-1.0.0-ui-enhance.patch 
Log Message:
Fix to patch#6 that removed, in error, the changes to allow Xulrunner build using the system NSS and NSPR packages.


esc-1.0.0-ui-enhance.patch:
 rpm/esc                                              |   10 
 rpm/esc.spec                                         |   20 
 src/app/xpcom/Makefile.moz                           |    2 
 src/app/xpcom/rhCoolKey.cpp                          |   60 -
 src/app/xpcom/tray/Makefile.moz                      |    8 
 src/app/xpcom/tray/rhITray.idl                       |    8 
 src/app/xpcom/tray/rhLinuxTray.cpp                   |   59 +
 src/app/xpcom/tray/rhMacTray.cpp                     |   31 
 src/app/xpcom/tray/rhTray.cpp                        |   34 +
 src/app/xul/esc/chrome/content/esc/ESC.js            |  603 +++++++++++--------
 src/app/xul/esc/chrome/content/esc/TRAY.js           |   80 ++
 src/app/xul/esc/chrome/content/esc/advancedinfo.xul  |    2 
 src/app/xul/esc/chrome/content/esc/config.xul        |   16 
 src/app/xul/esc/chrome/content/esc/esc.css           |   21 
 src/app/xul/esc/chrome/content/esc/esc.xul           |   21 
 src/app/xul/esc/chrome/content/esc/esc_browser.xul   |   51 -
 src/app/xul/esc/chrome/content/esc/hiddenWindow.html |   11 
 src/app/xul/esc/chrome/content/esc/hiddenWindow.xul  |   26 
 src/app/xul/esc/chrome/content/esc/password.js       |    4 
 src/app/xul/esc/chrome/content/esc/settings.xul      |   19 
 src/app/xul/esc/chrome/locale/en-US/esc.dtd          |    5 
 src/app/xul/esc/chrome/locale/en-US/esc.properties   |   13 
 src/app/xul/esc/components/escCLH.js                 |    2 
 src/lib/NssHttpClient/request.cpp                    |    2 
 src/lib/NssHttpClient/response.cpp                   |    2 
 src/lib/coolkey/CoolKey.cpp                          |   20 
 src/lib/coolkey/CoolKeyHandler.cpp                   |   46 -
 src/lib/coolkey/CoolKey_Message.cpp                  |    2 
 src/lib/coolkey/NSSManager.cpp                       |   11 
 src/lib/coolkey/SlotUtils.cpp                        |    2 
 src/lib/coolkey/SmartCardMonitoringThread.cpp        |    5 
 src/lib/notifytray/Makefile                          |    7 
 src/lib/notifytray/manifest.mn                       |    7 
 src/lib/notifytray/notifyareaicon.c                  |   11 
 src/lib/notifytray/notifyareaicon.h                  |    4 
 src/lib/notifytray/notifytray.c                      |   75 ++
 src/lib/notifytray/notifytray.h                      |    4 
 37 files changed, 825 insertions(+), 479 deletions(-)

Index: esc-1.0.0-ui-enhance.patch
===================================================================
RCS file: /cvs/dist/rpms/esc/devel/esc-1.0.0-ui-enhance.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- esc-1.0.0-ui-enhance.patch	18 Aug 2006 15:47:05 -0000	1.1
+++ esc-1.0.0-ui-enhance.patch	19 Aug 2006 05:06:17 -0000	1.2
@@ -3166,17 +3166,6 @@
  
             recordMessage(chromeURI);
  
---- ./esc/src/xulrunner/Makefile.fix6	2006-08-16 20:50:10.000000000 -0700
-+++ ./esc/src/xulrunner/Makefile	2006-08-16 20:50:28.000000000 -0700
-@@ -65,8 +65,6 @@
- 	echo "ac_add_options --enable-default-toolkit=gtk2" >> $@.$(TYPE)
- 	echo "ac_add_options --enable-xft" >> $@.$(TYPE)
- 	echo "ac_add_options --disable-freetype2" >> $@.$(TYPE)
--	echo "ac_add_options --with-system-nspr" >> $@.$(TYPE)
--	echo "ac_add_options --with-system-nss" >> $@.$(TYPE)
- endif
- ifeq ($(OS_ARCH), WINNT)
- 	echo "ac_add_options --disable-javaxpcom" >> $@.$(TYPE)
 --- ./esc/rpm/esc.fix6	2006-08-16 20:14:22.000000000 -0700
 +++ ./esc/rpm/esc	2006-08-16 20:19:32.000000000 -0700
 @@ -1,5 +1,11 @@