rpms/esc
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix build error because of new nss-devel package.

Browse Source
This commit is contained in:
Jack Magne 2008-01-19 02:28:49 +00:00
parent c6957907a0
commit fca182140c
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
esc-1.0.1-nss-devel-fix.patch Normal file
View File

@ -0,0 +1,14 @@
--- ./esc/src/lib/coolkey/CoolKeyHandler.cpp.fix9 2008-01-18 11:56:55.000000000 -0800
+++ ./esc/src/lib/coolkey/CoolKeyHandler.cpp 2008-01-18 11:59:12.000000000 -0800
@@ -49,6 +49,11 @@
#include <string>
+#ifndef CKO_NETSCAPE
+#define CKO_NETSCAPE CKO_NSS
+#endif
+
+
#ifndef CKO_MOZILLA_READER
#define CKO_MOZILLA_READER (CKO_NETSCAPE+5)
#define CKA_MOZILLA_IS_COOL_KEY (CKO_NETSCAPE+24)

2
esc.spec
View File

@ -16,6 +16,7 @@ Patch5: esc-1.0.1-log-fixes.patch
Patch6: esc-1.0.1-log-fixes-1.patch Patch6: esc-1.0.1-log-fixes-1.patch
Patch7: esc-1.0.1-lic-fix.patch Patch7: esc-1.0.1-lic-fix.patch
Patch8: esc-1.0.1-misc.patch Patch8: esc-1.0.1-misc.patch
Patch9: esc-1.0.1-nss-devel-fix.patch
BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1 BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1
BuildRequires: glib2-devel libIDL-devel atk-devel gtk2-devel libjpeg-devel BuildRequires: glib2-devel libIDL-devel atk-devel gtk2-devel libjpeg-devel
@ -74,6 +75,7 @@ cryptographic smartcards.
%patch6 -p1 -b .fix6 %patch6 -p1 -b .fix6
%patch7 -p1 -b .fix7 %patch7 -p1 -b .fix7
%patch8 -p1 -b .fix8 %patch8 -p1 -b .fix8
%patch9 -p1 -b .fix9
#Unpack xulrunner where esc expects it to be. #Unpack xulrunner where esc expects it to be.