| 1 |
suka 08/10/20 18:27:52 |
| 2 |
|
| 3 |
Modified: gentoo-3.0.0.diff |
| 4 |
Log: |
| 5 |
Another fix for the templates install problem, see bug #242494. Also fix the build with gcc-3.x / |
| 6 |
hardened, bugs #220026 and #242802 |
| 7 |
(Portage version: 2.2_rc12/cvs/Linux 2.6.27-gentoo i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.4 app-office/openoffice/files/gentoo-3.0.0.diff |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.0.0.diff?rev=1.4&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.0.0.diff?rev=1.4&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.0.0.diff?r1=1.3&r2=1.4 |
| 15 |
|
| 16 |
Index: gentoo-3.0.0.diff |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/files/gentoo-3.0.0.diff,v |
| 19 |
retrieving revision 1.3 |
| 20 |
retrieving revision 1.4 |
| 21 |
diff -u -r1.3 -r1.4 |
| 22 |
--- gentoo-3.0.0.diff 16 Oct 2008 12:03:36 -0000 1.3 |
| 23 |
+++ gentoo-3.0.0.diff 20 Oct 2008 18:27:52 -0000 1.4 |
| 24 |
@@ -51,4 +51,62 @@ |
| 25 |
# Allow build to proceed with PaX enabled |
| 26 |
gentoo-pax-fix.diff, aprosky |
| 27 |
# support server-only versions of 64bit JDKs |
| 28 |
+--- patches/dev300/svg-import-filter.diff |
| 29 |
++++ patches/dev300/svg-import-filter.diff |
| 30 |
+@@ -787,7 +787,7 @@ |
| 31 |
+ + $(SLO)$/units.obj |
| 32 |
+ + |
| 33 |
+ +.IF "$(COMID)"=="gcc3" |
| 34 |
+-+.IF "$(CCNUMVER)">="000400000000" |
| 35 |
+++.IF "$(CCNUMVER)">="000400000000" || "$(SYSTEM_BOOST)"=="YES" |
| 36 |
+ +CFLAGS+=-DUSE_MODERN_SPIRIT |
| 37 |
+ +.ENDIF |
| 38 |
+ .ENDIF |
| 39 |
+--- patches/dev300/scp2_extensions.diff |
| 40 |
++++ patches/dev300/scp2_extensions.diff |
| 41 |
+@@ -370,7 +370,7 @@ |
| 42 |
+ +/* ** SUN Template Pack (en-US)** */ |
| 43 |
+ + |
| 44 |
+ +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_en_US |
| 45 |
+-+Module gid_Module_Optional_Extensions_Sun_Template_Pack_en-US |
| 46 |
+++Module gid_Module_Optional_Extensions_SUN_Template_Pack_en-US |
| 47 |
+ + PackageInfo = "packinfo_extensions.txt"; |
| 48 |
+ + MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_en-US); |
| 49 |
+ + ParentID = gid_Module_Optional_Extensions; |
| 50 |
+@@ -385,7 +385,7 @@ |
| 51 |
+ +/* ** SUN Template Pack (de)** */ |
| 52 |
+ + |
| 53 |
+ +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_de |
| 54 |
+-+Module gid_Module_Optional_Extensions_Sun_Template_Pack_de |
| 55 |
+++Module gid_Module_Optional_Extensions_SUN_Template_Pack_de |
| 56 |
+ + PackageInfo = "packinfo_extensions.txt"; |
| 57 |
+ + MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_de); |
| 58 |
+ + ParentID = gid_Module_Optional_Extensions; |
| 59 |
+@@ -400,7 +400,7 @@ |
| 60 |
+ +/* ** SUN Template Pack (it)** */ |
| 61 |
+ + |
| 62 |
+ +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_it |
| 63 |
+-+Module gid_Module_Optional_Extensions_Sun_Template_Pack_it |
| 64 |
+++Module gid_Module_Optional_Extensions_SUN_Template_Pack_it |
| 65 |
+ + PackageInfo = "packinfo_extensions.txt"; |
| 66 |
+ + MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_it); |
| 67 |
+ + ParentID = gid_Module_Optional_Extensions; |
| 68 |
+@@ -415,7 +415,7 @@ |
| 69 |
+ +/* ** SUN Template Pack (fr)** */ |
| 70 |
+ + |
| 71 |
+ +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_fr |
| 72 |
+-+Module gid_Module_Optional_Extensions_Sun_Template_Pack_fr |
| 73 |
+++Module gid_Module_Optional_Extensions_SUN_Template_Pack_fr |
| 74 |
+ + PackageInfo = "packinfo_extensions.txt"; |
| 75 |
+ + MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_fr); |
| 76 |
+ + ParentID = gid_Module_Optional_Extensions; |
| 77 |
+@@ -430,7 +430,7 @@ |
| 78 |
+ +/* ** SUN Template Pack (es)** */ |
| 79 |
+ + |
| 80 |
+ +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_es |
| 81 |
+-+Module gid_Module_Optional_Extensions_Sun_Template_Pack_es |
| 82 |
+++Module gid_Module_Optional_Extensions_SUN_Template_Pack_es |
| 83 |
+ + PackageInfo = "packinfo_extensions.txt"; |
| 84 |
+ + MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_es); |
| 85 |
+ + ParentID = gid_Module_Optional_Extensions; |
Archives