View | Details | Raw Unified | Return to bug 206234 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	apache-openoffice
4
PORTNAME=	apache-openoffice
5
PORTVERSION=	${AOOVERSION}
5
PORTVERSION=	${AOOVERSION}
6
PORTREVISION=	1
6
PORTREVISION=	2
7
CATEGORIES=	editors java
7
CATEGORIES=	editors java
8
MASTER_SITES=	APACHE/openoffice/${PORTVERSION}/source \
8
MASTER_SITES=	APACHE/openoffice/${PORTVERSION}/source \
9
		http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \
9
		http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \
(-)files/patch-nss (+69 lines)
Line 0 Link Here
1
--- xmlsecurity/source/xmlsec/nss/makefile.mk	2016/01/16 13:04:30	1724970
2
+++ xmlsecurity/source/xmlsec/nss/makefile.mk	2016/01/16 13:11:53	1724971
3
@@ -42,6 +42,10 @@
4
 	@echo "No nss -> no libxmlsec -> no xmlsecurity/nss"
5
 .ENDIF
6
 
7
+.IF "$(SYSTEM_NSS)" == "YES"
8
+CFLAGS+=-DSYSTEM_NSS
9
+.ENDIF
10
+
11
 .IF "$(SYSTEM_NSS)" != "YES"
12
 MOZ_INC = $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
13
 NSS_CFLAGS = -I$(MOZ_INC)$/nss
14
--- xmlsecurity/source/xmlsec/nss/nssinitializer.cxx	2016/01/16 13:04:30	1724970
15
+++ xmlsecurity/source/xmlsec/nss/nssinitializer.cxx	2016/01/16 13:11:53	1724971
16
@@ -234,7 +234,7 @@
17
 //the location of the roots module to the profile, which makes FF2 and TB2 use
18
 //it instead of there own module.
19
 //
20
-//When using SYSTEM_MOZILLA then the libnss3.so lib is typically found in
21
+//When using SYSTEM_NSS then the libnss3.so lib is typically found in
22
 ///usr/lib. This folder may, however, NOT contain the roots certificate
23
 //module. That is, just providing the library name in SECMOD_LoadUserModule or
24
 //SECMOD_AddNewModule will FAIL to load the mozilla unless the LD_LIBRARY_PATH
25
@@ -289,7 +289,7 @@
26
     out_nss_init = true;
27
     
28
 #ifdef XMLSEC_CRYPTO_NSS
29
-#if defined SYSTEM_MOZILLA
30
+#if defined SYSTEM_NSS
31
     if (!SECMOD_HasRootCerts())
32
     {
33
 #endif
34
@@ -298,7 +298,7 @@
35
 #if defined OS2
36
         // YD the nss system dlls names are ending with 'k'
37
         OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "nssckbik" SAL_DLLEXTENSION));
38
-#elif defined SYSTEM_MOZILLA
39
+#elif defined SYSTEM_NSS
40
         OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "libnssckbi" SAL_DLLEXTENSION));
41
 #else
42
         OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "${OOO_BASE_DIR}/program/libnssckbi" SAL_DLLEXTENSION));
43
@@ -352,7 +352,7 @@
44
             xmlsec_trace("Adding new root certificate module failed.");
45
             return_value = false;
46
         }
47
-#if SYSTEM_MOZILLA
48
+#if SYSTEM_NSS
49
     }
50
 #endif
51
 #endif
52
--- extensions/source/mozbootstrap/MNSProfileDiscover.cxx.orig	2016-01-19 09:06:50.753350000 +0100
53
+++ extensions/source/mozbootstrap/MNSProfileDiscover.cxx	2016-01-19 09:08:17.120488000 +0100
54
@@ -123,9 +123,14 @@
55
                     {
56
                         isRelative = sIsRelative.toInt32();
57
                     }
58
+                    if (isRelative)
59
+                    {
60
+                        // Make it absolute
61
+                        profilePath = regDir + profilePath;
62
+                    }
63
 
64
                     ProfileStruct*  profileItem     = new ProfileStruct(product,profileName,
65
-                            regDir + profilePath);
66
+                            profilePath);
67
                     m_Product.mProfileList[profileName] = profileItem;
68
 
69
                     sal_Int32 isDefault = 0;

Return to bug 206234