rpms/openoffice.org/devel openoffice.org-2.1.0.ooo72058.vcl.dontalwaysaddunderline.patch, NONE, 1.1 openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch, 1.3, 1.4 openoffice.org.spec, 1.952, 1.953
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Nov 28 10:44:01 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28331
Modified Files:
openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
openoffice.org.spec
Added Files:
openoffice.org-2.1.0.ooo72058.vcl.dontalwaysaddunderline.patch
Log Message:
some more fixes
openoffice.org-2.1.0.ooo72058.vcl.dontalwaysaddunderline.patch:
gtkframe.cxx | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
--- NEW FILE openoffice.org-2.1.0.ooo72058.vcl.dontalwaysaddunderline.patch ---
--- OOE680_m5/vcl/unx/gtk/window/gtkframe.cxx.orig 2006-11-28 10:18:53.000000000 +0000
+++ OOE680_m5/vcl/unx/gtk/window/gtkframe.cxx 2006-11-28 10:24:31.000000000 +0000
@@ -3073,6 +3073,7 @@
end = g_utf8_pointer_to_offset (pText, pText + end);
tmp_list = attr_list = pango_attr_iterator_get_attrs (iter);
+ sal_attr = 0;
while (tmp_list)
{
PangoAttribute *pango_attr = (PangoAttribute *)(tmp_list->data);
@@ -3080,10 +3081,10 @@
switch (pango_attr->klass->type)
{
case PANGO_ATTR_BACKGROUND:
- sal_attr |= (SAL_EXTTEXTINPUT_ATTR_HIGHLIGHT | SAL_EXTTEXTINPUT_CURSOR_INVISIBLE);
+ sal_attr |= (SAL_EXTTEXTINPUT_ATTR_HIGHLIGHT | SAL_EXTTEXTINPUT_CURSOR_INVISIBLE);
break;
case PANGO_ATTR_UNDERLINE:
- sal_attr |= SAL_EXTTEXTINPUT_ATTR_UNDERLINE;
+ sal_attr |= SAL_EXTTEXTINPUT_ATTR_UNDERLINE;
break;
case PANGO_ATTR_STRIKETHROUGH:
sal_attr |= SAL_EXTTEXTINPUT_ATTR_REDTEXT;
@@ -3094,6 +3095,8 @@
pango_attribute_destroy (pango_attr);
tmp_list = tmp_list->next;
}
+ if (sal_attr == 0)
+ sal_attr |= SAL_EXTTEXTINPUT_ATTR_UNDERLINE;
g_slist_free (attr_list);
// Set the sal attributes on our text
openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch:
distributions/OpenOfficeorg/javavendors_linux.xml | 0
jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml | 8 ++++----
jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx | 1 -
plugins/sunmajor/pluginlib/gnujre.cxx | 0
source/javavm/javavm.cxx | 0
stoc/source/javavm/javavm.cxx | 3 +++
6 files changed, 7 insertions(+), 5 deletions(-)
Index: openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch 30 Jan 2006 15:01:18 -0000 1.3
+++ openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch 28 Nov 2006 10:43:59 -0000 1.4
@@ -67,3 +67,18 @@
case JFW_E_RUNNING_JVM:
{
//This service should make sure that we do not start java twice.
+Index: plugins/sunmajor/pluginlib/gnujre.cxx
+===================================================================
+RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx,v
+retrieving revision 1.12
+diff -u -r1.12 gnujre.cxx
+--- openoffice.org.orig/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 27 Sep 2006 10:54:01 -0000 1.12
++++ openoffice.org/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 27 Nov 2006 16:04:59 -0000
+@@ -67,7 +67,6 @@
+ {
+ static char const* ar[]= {
+ "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
+- "/gcj-4.1.1/libjvm.so",
+ "/libgcj.so.7",
+ "/libgcj.so.6"
+ };
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.952
retrieving revision 1.953
diff -u -r1.952 -r1.953
--- openoffice.org.spec 27 Nov 2006 13:22:49 -0000 1.952
+++ openoffice.org.spec 28 Nov 2006 10:43:59 -0000 1.953
@@ -1,6 +1,6 @@
%define oootag OOE680
%define ooomilestone 5
-%define rh_rpm_release 2
+%define rh_rpm_release 3
# gcc#19664#
%define stlvisibilityfcked 1
@@ -73,7 +73,9 @@
Patch7: openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
Patch8: openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
Patch9: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
+%if %{langpacks}
Patch10: openoffice.org-1.9.84.rhXXXXXX.lingucomponent.contribdict.patch
+%endif
Patch11: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
Patch12: openoffice.org-1.9.129.ooo54603.fontconfig.patch
Patch13: openoffice.org-1.9.115.ooo51931.fixxmlsec.patch
@@ -132,6 +134,8 @@
Patch66: openoffice.org-2.1.0.ooo71662.dbaccess.noasync.patch
Patch67: openoffice.org-2.1.0.ooo71815.bridges.x86_64.patch
Patch68: openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch
+Patch69: visibility.warning.patch
+Patch70: openoffice.org-2.1.0.ooo72058.vcl.dontalwaysaddunderline.patch
%define instdir %{_libdir}/openoffice.org2.1
@@ -941,7 +945,9 @@
%patch7 -p1 -b .rh156677.cripplemenus.sysui.patch
%patch8 -p1 -b .rh171692.jvmfwk.defaulttogcj.patch
%patch9 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
+%if %{langpacks}
%patch10 -p1 -b .rhXXXXXX.lingucomponent.contribdict.patch
+%endif
%patch11 -p1 -b .ooo48256.nolongname.sysui.patch
%patch12 -p1 -b .ooo54603.fontconfig.patch
%patch13 -p1 -b .ooo51931.fixxmlsec.patch
@@ -1000,6 +1006,8 @@
%patch66 -p1 -R -b .ooo71662.dbaccess.noasync.patch
%patch67 -p1 -b .ooo71815.bridges.x86_64.patch
%patch68 -p1 -b .ooo72014.officecfg.malayammenu.patch
+%patch69 -p1 -b .visibility.warning.patch
+%patch70 -p1 -b .ooo72058.vcl.dontalwaysaddunderline.patch
%if %{langpacks}
tar xzf %{SOURCE1}
@@ -1020,7 +1028,7 @@
cd config_office
autoconf
export PATH=$PATH:/usr/sbin
-%configure --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj --enable-gcjaot --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --without-system-mspack --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms --with-images=industrial %{stlflags} %{withlang}
+%configure --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj --enable-gcjaot --enable-symbols --enable-werror --enable-lockdown --enable-evolution2 --enable-cairo --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --without-system-mspack --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms --with-images=industrial %{stlflags} %{withlang}
cd ..
./bootstrap
source Linux*Env.Set.sh
@@ -1062,9 +1070,7 @@
# see tamil translation issue rh#159381#, remove when complete and upstreamed
cd transex3/prj
-if ! build --dlv_switch -link --all -P$MAXBUILDS -- -s; then
- build --dlv_switch -link --all
-fi
+build --dlv_switch -link --all -P$MAXBUILDS -- -s
deliver -link
localize -m -x -l bn -f %{SOURCE10}
localize -m -x -l pa-IN -f %{SOURCE12}
@@ -1832,10 +1838,14 @@
%{instdir}/share/config/wizard
%dir %{instdir}/share/dict
%dir %{instdir}/share/dict/ooo
+%if %{langpacks}
%{instdir}/share/dict/ooo/DicOOo.sxw
%{instdir}/share/dict/ooo/dictionary.lst
%{instdir}/share/dict/ooo/WordNet_license.txt
%{instdir}/share/dict/ooo/*en_*
+%else
+%{instdir}/share/dict/ooo/*
+%endif
%dir %{instdir}/share/dtd
%{instdir}/share/dtd/officedocument
%{instdir}/share/fonts
@@ -2500,6 +2510,11 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Tue Nov 28 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.1.0-5.3
+- rhbz#217361 wrong libjvm on ppc32/ppc64 multiarch installed libgcj's
+- rhbz#217490/ooo#72058 don't add underline to preedit if not necessary
+- visibility.warning.patch
+
* Mon Nov 27 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.1.0-5.2
- Resolves: rhbz#217321 openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch
- Resolves: rhbz#217234 visibility and inline local static data
More information about the fedora-cvs-commits
mailing list