1 |
suka 07/09/18 11:23:59 |
2 |
|
3 |
Modified: gentoo-2.3.0.diff |
4 |
Log: |
5 |
Update to newer ooo-build-snapshot |
6 |
(Portage version: 2.1.3.9) |
7 |
|
8 |
Revision Changes Path |
9 |
1.2 app-office/openoffice/files/2.3.0/gentoo-2.3.0.diff |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.0/gentoo-2.3.0.diff?rev=1.2&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.0/gentoo-2.3.0.diff?rev=1.2&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.0/gentoo-2.3.0.diff?r1=1.1&r2=1.2 |
14 |
|
15 |
Index: gentoo-2.3.0.diff |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/files/2.3.0/gentoo-2.3.0.diff,v |
18 |
retrieving revision 1.1 |
19 |
retrieving revision 1.2 |
20 |
diff -u -r1.1 -r1.2 |
21 |
--- gentoo-2.3.0.diff 18 Sep 2007 07:27:56 -0000 1.1 |
22 |
+++ gentoo-2.3.0.diff 18 Sep 2007 11:23:59 -0000 1.2 |
23 |
@@ -8,68 +8,6 @@ |
24 |
EOT |
25 |
chmod 755 $1 |
26 |
} |
27 |
---- patches/src680/apply |
28 |
-+++ patches/src680/apply |
29 |
-@@ -80,8 +80,8 @@ |
30 |
- Frugalware: LinuxCommon, GnomeVFS, GlobalDesktopFiles, NonArkCommon, NoRpath, NovellOnly, NovellOnlyUnix, NotDebian, FrugalwareOnly, CalcSolver, OOXML |
31 |
- QiLinux: LinuxCommon, GlobalDesktopFiles |
32 |
- #Gentoo |
33 |
--GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CalcSolver, CairoFonts, BerkeleyDB43, STLport5 |
34 |
--GentooUnstable: GentooBase, GentooExperimental, OOXML, OOXSTLport5 |
35 |
-+GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CalcSolver, CairoFonts, BerkeleyDB43, STLport5, OOXML, OOXSTLport5 |
36 |
-+GentooUnstable: GentooBase, GentooExperimental |
37 |
- Gentoo : GentooBase |
38 |
- Gentoo64: GentooBase |
39 |
- # rPath Linux |
40 |
-@@ -719,6 +719,10 @@ |
41 |
- |
42 |
- # fixes linking dependency in the reportdesign module |
43 |
- buildfix-reportdesign-util-dep.diff, i#81550, pmladek |
44 |
-+ |
45 |
-+# don't define -DCURL_NO_OLDIES, breaks with curl 7.17.0 |
46 |
-+# Debian #442338, Debian #442368 |
47 |
-+ucb-no-CURL_NO_OLDIES.diff |
48 |
- |
49 |
- [ NovellOnlyWin32 ] |
50 |
- SectionOwner => tml |
51 |
-@@ -1055,18 +1055,8 @@ |
52 |
- [ GentooExperimental ] |
53 |
- SectionOwner => hmth |
54 |
- |
55 |
--# deliver - sshhhh.... |
56 |
--silent_deliver-i79798.diff, i#79798 |
57 |
- # Gnu JRE paths. |
58 |
- gentooexperimental-gnujre.diff |
59 |
--# unused java code |
60 |
--disable-parser-jaxp.diff |
61 |
--# default inc/lib |
62 |
--config_office-XINC-XLIB-defaults.diff, i#65976 |
63 |
--# gdi/font.cxx: stl list error |
64 |
--vcl_font-NO_LIST.diff |
65 |
--# linux-headers-2.6.22 issue?! |
66 |
--linux-headers.diff |
67 |
- |
68 |
- [ GentooOnly ] |
69 |
- SectionOwner => aprosky |
70 |
-@@ -1081,6 +1071,17 @@ |
71 |
- system-db-check.diff, i#65979, hmth |
72 |
- # User ~/.ooo-2.0 as user dir |
73 |
- scp2-user-config-ooo-2.0.diff, pmladek |
74 |
-+# deliver - sshhhh.... |
75 |
-+silent_deliver-i79798.diff, i#79798 |
76 |
-+# unused java code |
77 |
-+disable-parser-jaxp.diff |
78 |
-+# default inc/lib |
79 |
-+config_office-XINC-XLIB-defaults.diff, i#65976 |
80 |
-+# gdi/font.cxx: stl list error |
81 |
-+vcl_font-NO_LIST.diff |
82 |
-+# linux-headers-2.6.22 issue?! |
83 |
-+linux-headers.diff |
84 |
-+ |
85 |
- |
86 |
- [ DebianBaseOnly ] |
87 |
- SectionOwner => rengelha |
88 |
- |
89 |
--- distro-configs/Gentoo.conf.in |
90 |
+++ distro-configs/Gentoo.conf.in |
91 |
@@ -3,7 +3,6 @@ |
92 |
@@ -80,15 +18,15 @@ |
93 |
--with-system-boost |
94 |
--with-system-curl |
95 |
--with-system-db |
96 |
---- configure.in |
97 |
-+++ configure.in |
98 |
-@@ -1024,7 +1024,7 @@ |
99 |
- UPSTREAM_NAME= |
100 |
- UPSTREAM_SOURCE= |
101 |
- UPSTREAM_URI= |
102 |
--if test "$with_tag" = "OOG680_m3" ; then # more milestones to come... |
103 |
-+if test "$with_tag" = "OOG680_m5" ; then # more milestones to come... |
104 |
- UPSTREAM_NAME="OOo_2.3.0_src" |
105 |
- if test "z$with_mirror" != "z" ; then |
106 |
- UPSTREAM_SOURCE="MIRROR" |
107 |
+--- patches/src680/apply |
108 |
++++ patches/src680/apply |
109 |
+@@ -145,7 +145,7 @@ |
110 |
+ # crashes with undo/redo |
111 |
+ |
112 |
+ #realize a new feature named as Show Data Form in OpenOffice |
113 |
+-sc-dataform.diff, Amelia Wang |
114 |
++#sc-dataform.diff, Amelia Wang |
115 |
+ |
116 |
+ #First work on field enhancements... |
117 |
+ sw-field-patch.diff, flr, n#248354 |
118 |
|
119 |
|
120 |
|
121 |
|
122 |
-- |
123 |
gentoo-commits@g.o mailing list |