Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Andreas Proschofsky (suka)" <suka@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/openoffice/files: gentoo-3.0.0.diff fixsandbox.diff gentoo-2.4.1.diff
Date: Sun, 28 Dec 2008 18:40:53
Message-Id: E1LH0ZG-0005nK-Sc@stork.gentoo.org
1 suka 08/12/28 18:40:50
2
3 Modified: gentoo-3.0.0.diff
4 Added: fixsandbox.diff
5 Removed: gentoo-2.4.1.diff
6 Log:
7 Silent bump to ooo-build 3.0.0.3.6, also lots of other build fixes and cleanups, see ChangeLog
8 for more information
9 (Portage version: 2.2_rc20/cvs/Linux 2.6.28-gentoo i686)
10
11 Revision Changes Path
12 1.6 app-office/openoffice/files/gentoo-3.0.0.diff
13
14 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.0.0.diff?rev=1.6&view=markup
15 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.0.0.diff?rev=1.6&content-type=text/plain
16 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.0.0.diff?r1=1.5&r2=1.6
17
18 Index: gentoo-3.0.0.diff
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/files/gentoo-3.0.0.diff,v
21 retrieving revision 1.5
22 retrieving revision 1.6
23 diff -u -r1.5 -r1.6
24 --- gentoo-3.0.0.diff 24 Oct 2008 19:07:21 -0000 1.5
25 +++ gentoo-3.0.0.diff 28 Dec 2008 18:40:50 -0000 1.6
26 @@ -8,48 +8,18 @@
27 $OOINSTBASE/program/soffice $2 "\$@"
28 EOT
29 chmod 755 $1
30 ---- distro-configs/CommonLinux.conf.in
31 -+++ distro-configs/CommonLinux.conf.in
32 -@@ -2,8 +2,6 @@
33 - --with-openldap
34 - --with-build-version=\"Build @OOO_BUILDVERSION@\"
35 - --without-fonts
36 ----with-system-freetype
37 ----with-system-gcc
38 - --with-system-jpeg
39 - --with-system-libxml
40 - --with-system-mozilla
41 -@@ -14,7 +12,6 @@
42 - --with-system-poppler
43 - --with-unix-wrapper=ooffice@OOO_BINSUFFIX@
44 - --enable-evolution2
45 ----enable-atkbridge
46 - --with-alloc=system
47 - --with-vba-package-format=builtin
48 - @CAIRO_CONFIGURE_FLAG@
49 ---- distro-configs/Gentoo.conf.in
50 -+++ distro-configs/Gentoo.conf.in
51 -@@ -16,7 +16,7 @@
52 - --with-system-neon
53 - --with-system-openssl
54 - --with-system-vigra
55 ----with-system-xrender-headers
56 -+--with-system-xrender
57 - --without-myspell-dicts
58 - --without-stlport
59 - --with-vendor=\"Gentoo Foundation\"
60 --- patches/dev300/apply
61 +++ patches/dev300/apply
62 -@@ -1425,7 +1425,11 @@
63 +@@ -1458,6 +1458,12 @@
64 + [ GentooOnly ]
65 SectionOwner => aprosky
66
67 - # system lucene classpath
68 --gentoo-system-lucene.diff
69 -+#gentoo-system-lucene.diff
70 +# No java build
71 +nojavanostax.diff
72 +# Fix freezes with dict|hyph-stuff in one dir
73 +hunspell-one-dir-nocrash.diff
74 ++# Sandbox problem with wrong path
75 ++fixsandbox.diff
76 # Allow build to proceed with PaX enabled
77 gentoo-pax-fix.diff, aprosky
78 # support server-only versions of 64bit JDKs
79 @@ -64,51 +34,22 @@
80 +CFLAGS+=-DUSE_MODERN_SPIRIT
81 +.ENDIF
82 .ENDIF
83 ---- patches/dev300/scp2_extensions.diff
84 -+++ patches/dev300/scp2_extensions.diff
85 -@@ -370,7 +370,7 @@
86 - +/* ** SUN Template Pack (en-US)** */
87 - +
88 - +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_en_US
89 --+Module gid_Module_Optional_Extensions_Sun_Template_Pack_en-US
90 -++Module gid_Module_Optional_Extensions_SUN_Template_Pack_en-US
91 - + PackageInfo = "packinfo_extensions.txt";
92 - + MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_en-US);
93 - + ParentID = gid_Module_Optional_Extensions;
94 -@@ -385,7 +385,7 @@
95 - +/* ** SUN Template Pack (de)** */
96 - +
97 - +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_de
98 --+Module gid_Module_Optional_Extensions_Sun_Template_Pack_de
99 -++Module gid_Module_Optional_Extensions_SUN_Template_Pack_de
100 - + PackageInfo = "packinfo_extensions.txt";
101 - + MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_de);
102 - + ParentID = gid_Module_Optional_Extensions;
103 -@@ -400,7 +400,7 @@
104 - +/* ** SUN Template Pack (it)** */
105 - +
106 - +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_it
107 --+Module gid_Module_Optional_Extensions_Sun_Template_Pack_it
108 -++Module gid_Module_Optional_Extensions_SUN_Template_Pack_it
109 - + PackageInfo = "packinfo_extensions.txt";
110 - + MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_it);
111 - + ParentID = gid_Module_Optional_Extensions;
112 -@@ -415,7 +415,7 @@
113 - +/* ** SUN Template Pack (fr)** */
114 - +
115 - +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_fr
116 --+Module gid_Module_Optional_Extensions_Sun_Template_Pack_fr
117 -++Module gid_Module_Optional_Extensions_SUN_Template_Pack_fr
118 - + PackageInfo = "packinfo_extensions.txt";
119 - + MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_fr);
120 - + ParentID = gid_Module_Optional_Extensions;
121 -@@ -430,7 +430,7 @@
122 - +/* ** SUN Template Pack (es)** */
123 - +
124 - +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_es
125 --+Module gid_Module_Optional_Extensions_Sun_Template_Pack_es
126 -++Module gid_Module_Optional_Extensions_SUN_Template_Pack_es
127 - + PackageInfo = "packinfo_extensions.txt";
128 - + MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_es);
129 - + ParentID = gid_Module_Optional_Extensions;
130 +--- bin/install-mono
131 ++++ bin/install-mono
132 +@@ -32,13 +32,13 @@
133 + # to be found in PKG_CONFIG_PATH, though
134 + mkdir -p $OODESTDIR${LIBDIRBASE}/pkgconfig/
135 + sed -e "s|@OOOINSTALLDIRNAME@|$OOOINSTALLDIRNAME|g" \
136 +- $SRCDIR/mono-ooo.pc.in >${OODESTDIR}${LIBDIRBASE}/pkgconfig/mono-$OOOINSTALLDIRNAME.pc
137 ++ $TOOLSDIR/src/mono-ooo.pc.in >${OODESTDIR}${LIBDIRBASE}/pkgconfig/mono-$OOOINSTALLDIRNAME.pc
138 +
139 + # extra dlls config files
140 + for dll in cli_uno_bridge.dll ; do
141 + sed -e "s|@LIBDIRBASE@|$LIBDIRBASE|g" \
142 + -e "s|@OOOINSTALLDIRNAME@|$OOOINSTALLDIRNAME|g" \
143 +- $SRCDIR/$dll.config.in > $OOINSTDIR/ure/lib/$dll.config
144 ++ $TOOLSDIR/src/$dll.config.in > $OOINSTDIR/ure/lib/$dll.config
145 + if test -n "$OODESTDIR" ; then
146 + file_list=`grep "^$OOINSTBASE/ure/lib/$dll$" $OODESTDIR/gid* | head -n 1 | cut -d: -f1`
147 + echo "$OOINSTBASE/ure/lib/$dll.config" >>$file_list
148
149
150
151
152 1.1 app-office/openoffice/files/fixsandbox.diff
153
154 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/fixsandbox.diff?rev=1.1&view=markup
155 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/fixsandbox.diff?rev=1.1&content-type=text/plain
156
157 Index: fixsandbox.diff
158 ===================================================================
159 --- officecfg/util/makefile.mk
160 +++ officecfg/util/makefile.mk
161 @@ -41,7 +41,6 @@
162
163 $(MISC)$/$(TARGET)_delzip :
164 -$(RM) $(BIN)$/registry_{$(alllangiso)}.zip
165 - -$(RM) $(COMMON_OUTPUT)$/bin$/registry_{$(alllangiso)}.zip
166
167 $(BIN)$/registry_{$(alllangiso)}.zip : $(MISC)$/$(TARGET)_delzip
168 cd $(MISC)$/registry$/res$/$(@:b:s/registry_//) && zip -ru ..$/..$/..$/..$/bin$/registry_$(@:b:s/registry_//).zip org/*
Report Message
Find on MARC Find on Google Groups