rpms/openoffice.org/devel workspace.gslpatches2.patch, NONE, 1.1 openoffice.org.spec, 1.222, 1.223 openoffice.org-1.9.88.NONE.gcc3gcj4.patch, 1.3, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jun 13 15:10:57 UTC 2005
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18727
Modified Files:
openoffice.org.spec
Added Files:
workspace.gslpatches2.patch
Removed Files:
openoffice.org-1.9.88.NONE.gcc3gcj4.patch
Log Message:
rh#157813# lohit tamil (et al) combining characters rendering misplacement
workspace.gslpatches2.patch:
inc/alpha.hxx | 1 +
inc/bitmap.hxx | 1 +
inc/outdev.hxx | 1 +
source/glyphs/gcach_layout.cxx | 9 ++-------
unx/gtk/window/gtkframe.cxx | 21 ++++++++++++++++-----
unx/source/app/wmadaptor.cxx | 10 +++++-----
6 files changed, 26 insertions(+), 17 deletions(-)
--- NEW FILE workspace.gslpatches2.patch ---
Index: inc/alpha.hxx
===================================================================
RCS file: /cvs/gsl/vcl/inc/alpha.hxx,v
retrieving revision 1.7
retrieving revision 1.7.156.1
diff -u -p -r1.7 -r1.7.156.1
--- openoffice.org.orig/vcl/inc/alpha.hxx 13 Jan 2005 17:25:24 -0000 1.7
+++ openoffice.org/vcl/inc/alpha.hxx 31 May 2005 09:37:43 -0000 1.7.156.1
@@ -75,6 +75,7 @@
// -------------
class ImageList;
+class BitmapEx;
class VCL_DLLPUBLIC AlphaMask : private Bitmap
{
Index: inc/bitmap.hxx
===================================================================
RCS file: /cvs/gsl/vcl/inc/bitmap.hxx,v
retrieving revision 1.15
retrieving revision 1.15.92.1
diff -u -p -r1.15 -r1.15.92.1
--- openoffice.org.orig/vcl/inc/bitmap.hxx 10 Mar 2005 13:12:51 -0000 1.15
+++ openoffice.org/vcl/inc/bitmap.hxx 31 May 2005 09:37:44 -0000 1.15.92.1
@@ -276,6 +276,7 @@ class ResId;
class RMBitmap;
class GDIMetaFile;
class AlphaMask;
+class OutputDevice;
struct BitmapSystemData
{
Index: inc/outdev.hxx
===================================================================
RCS file: /cvs/gsl/vcl/inc/outdev.hxx,v
retrieving revision 1.58
retrieving revision 1.58.80.1
diff -u -p -r1.58 -r1.58.80.1
--- openoffice.org.orig/vcl/inc/outdev.hxx 29 Mar 2005 11:45:06 -0000 1.58
+++ openoffice.org/vcl/inc/outdev.hxx 31 May 2005 09:37:45 -0000 1.58.80.1
@@ -130,6 +130,7 @@ class AlphaMask;
class FontCharMap;
class SalLayout;
class ImplLayoutArgs;
+class VirtualDevice;
#ifndef _COM_SUN_STAR_UNO_REFERENCE_H_
#include <com/sun/star/uno/Reference.h>
Index: source/glyphs/gcach_layout.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/glyphs/gcach_layout.cxx,v
retrieving revision 1.34
retrieving revision 1.34.144.1
diff -u -p -r1.34 -r1.34.144.1
--- openoffice.org.orig/vcl/source/glyphs/gcach_layout.cxx 31 Jan 2005 09:18:58 -0000 1.34
+++ openoffice.org/vcl/source/glyphs/gcach_layout.cxx 13 Jun 2005 14:14:29 -0000 1.34.144.1
@@ -290,19 +290,14 @@ float IcuFontFromServerFont::getYPixelsP
float IcuFontFromServerFont::getScaleFactorX() const
{
- const ImplFontSelectData& r = mrServerFont.GetFontSelData();
- float fXScale = r.mnWidth ? r.mnWidth : r.mnHeight;
- fXScale /= mrServerFont.GetEmUnits();
- return fXScale;
+ return 1.0;
}
// -----------------------------------------------------------------------
float IcuFontFromServerFont::getScaleFactorY() const
{
- float fYScale = mrServerFont.GetFontSelData().mnHeight;
- fYScale /= mrServerFont.GetEmUnits();
- return fYScale; //TODO
+ return 1.0;
}
// -----------------------------------------------------------------------
Index: unx/gtk/window/gtkframe.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/window/gtkframe.cxx,v
retrieving revision 1.30
retrieving revision 1.30.12.3
diff -u -p -r1.30 -r1.30.12.3
--- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx 18 May 2005 08:04:16 -0000 1.30
+++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx 2 Jun 2005 09:34:43 -0000 1.30.12.3
@@ -355,6 +355,7 @@ void GtkSalFrame::hardIMReset()
#endif
m_bWasPreedit = false;
CallCallback( SALEVENT_ENDEXTTEXTINPUT, (void*)NULL );
+ updateIMSpotLocation();
}
}
@@ -2270,12 +2271,10 @@ gboolean GtkSalFrame::signalKey( GtkWidg
{
pThis->m_bSendModChangeOnRelease = false;
pThis->m_bSingleAltPress = false;
+ pThis->updateIMSpotLocation();
}
}
- if( !aDel.isDeleted() )
- pThis->updateIMSpotLocation();
-
return TRUE;
}
@@ -2410,6 +2409,7 @@ void GtkSalFrame::signalIMCommit( GtkIMC
#endif
pThis->m_bWasPreedit = false;
pThis->doKeyCallback( rKP.state, rKP.keyval, rKP.hardware_keycode, rKP.group, rKP.time, aOrigCode, true, true );
+ pThis->updateIMSpotLocation();
return;
}
}
@@ -2421,7 +2421,11 @@ void GtkSalFrame::signalIMCommit( GtkIMC
pThis->m_bWasPreedit = false;
pThis->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&aTextEvent);
if( ! aDel.isDeleted() )
+ {
pThis->CallCallback( SALEVENT_ENDEXTTEXTINPUT, NULL );
+ if( ! aDel.isDeleted() )
+ pThis->updateIMSpotLocation();
+ }
}
void GtkSalFrame::signalIMPreeditChanged( GtkIMContext* pContext, gpointer frame )
@@ -2441,7 +2445,7 @@ void GtkSalFrame::signalIMPreeditChanged
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, ":signalImPreeditChanged '%s'\n", pText );
#endif
- bool bEndPreedit = (!pText || !*pText) && pThis->m_bWasPreedit;
+ bool bEndPreedit = (!pText || !*pText);
SalExtTextInputEvent aTextEvent;
@@ -2511,13 +2515,17 @@ void GtkSalFrame::signalIMPreeditChanged
vcl::DeletionListener aDel( pThis );
- pThis->m_bWasPreedit = true;
+ if (!bEndPreedit)
+ pThis->m_bWasPreedit = true;
+
pThis->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&aTextEvent);
delete [] pSalAttribs;
if( bEndPreedit && ! aDel.isDeleted() )
pThis->CallCallback( SALEVENT_ENDEXTTEXTINPUT, NULL );
+ if( ! aDel.isDeleted() )
+ pThis->updateIMSpotLocation();
}
void GtkSalFrame::signalIMPreeditStart( GtkIMContext* pContext, gpointer frame )
@@ -2540,7 +2548,10 @@ void GtkSalFrame::signalIMPreeditEnd( Gt
fprintf( stderr, ":signalImPreeditEnd\n" );
#endif
GTK_YIELD_GRAB();
+ vcl::DeletionListener aDel( pThis );
pThis->CallCallback( SALEVENT_ENDEXTTEXTINPUT, NULL );
+ if( ! aDel.isDeleted() )
+ pThis->updateIMSpotLocation();
}
}
Index: unx/source/app/wmadaptor.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/wmadaptor.cxx,v
retrieving revision 1.54
retrieving revision 1.54.60.1
diff -u -p -r1.54 -r1.54.60.1
--- openoffice.org.orig/vcl/unx/source/app/wmadaptor.cxx 12 Apr 2005 12:20:27 -0000 1.54
+++ openoffice.org/vcl/unx/source/app/wmadaptor.cxx 8 Jun 2005 13:03:34 -0000 1.54.60.1
@@ -537,7 +537,7 @@ NetWMAdaptor::NetWMAdaptor( SalDisplay*
&& pProperty
)
{
- m_nDesktops = *(sal_uInt32*)pProperty;
+ m_nDesktops = *(long*)pProperty;
XFree( pProperty );
pProperty = NULL;
// get work areas
@@ -558,7 +558,7 @@ NetWMAdaptor::NetWMAdaptor( SalDisplay*
)
{
m_aWMWorkAreas = ::std::vector< Rectangle > ( m_nDesktops );
- sal_uInt32* pValues = (sal_uInt32*)pProperty;
+ long* pValues = (long*)pProperty;
for( int i = 0; i < m_nDesktops; i++ )
{
Point aPoint( pValues[4*i],
@@ -795,7 +795,7 @@ GnomeWMAdaptor::GnomeWMAdaptor( SalDispl
&& pProperty
)
{
- m_nDesktops = *(sal_uInt32*)pProperty;
+ m_nDesktops = *(long*)pProperty;
XFree( pProperty );
pProperty = NULL;
}
@@ -1222,7 +1222,7 @@ void NetWMAdaptor::setNetWMState( X11Sal
&& pProperty
)
{
- nCurrent = *(sal_Int32*)pProperty;
+ nCurrent = *(long*)pProperty;
XFree( pProperty );
}
else if( pProperty )
@@ -1338,7 +1338,7 @@ void GnomeWMAdaptor::setGnomeWMState( X1
&& pProperty
)
{
- nCurrent = *(sal_Int32*)pProperty;
+ nCurrent = *(long*)pProperty;
XFree( pProperty );
}
else if( pProperty )
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- openoffice.org.spec 13 Jun 2005 09:16:24 -0000 1.222
+++ openoffice.org.spec 13 Jun 2005 15:10:55 -0000 1.223
@@ -11,7 +11,6 @@
%define langpack_langs en-US
%endif
#undef to try and compile with gcc3 and gcj4
-%define gcc_is_gcc4 1
%define gccver 3.4.3
%define gcjver 4.0.0
%define _unpackaged_files_terminate_build 0
@@ -49,11 +48,7 @@
BuildRequires: perl, sed, zip, bzip2, unzip, tar, findutils
BuildRequires: autoconf, make >= 3.79.1, ant, flex, bison, perl-Compress-Zlib
BuildRequires: gcc >= %{gccver}, gcc-c++ >= %{gccver}, binutils
-%if %{gcc_is_gcc4}
BuildRequires: gcc-java >= %{gcjver}, libgcj-devel >= %{gcjver}
-%else
-BuildRequires: gcc4-java >= %{gcjver}, libgcj4-devel >= %{gcjver}
-%endif
BuildRequires: java-1.4.2-gcj-compat-devel
BuildRequires: libart_lgpl-devel >= 2.3.11, zlib-devel, freetype-devel,
BuildRequires: gtk2-devel >= 2.4.8, gnome-vfs2-devel, cups-devel, curl-devel
@@ -75,48 +70,44 @@
Patch10: openoffice.org-1.9.87.warnnoterroronmissing.patch
Patch11: openoffice.org-1.9.87.rh151357.patch
Patch12: openoffice.org-1.9.87.ooo50575.fragments.patch
-Patch13: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
-Patch14: openoffice.org-1.9.88.rh133741.alwaysgtk.patch
-Patch15: openoffice.org-1.9.88.ooo46217.allowfallbacktoenUSfromotherenglish.patch
-Patch16: openoffice.org-1.9.89.ooo35627.parallel.cppumaker.patch
-Patch17: openoffice.org-1.9.89.oooXXXXX.parallel.sysui.patch
-Patch18: openoffice.org-1.9.89.ooo44027.pthreadchange.patch
-Patch19: openoffice.org-1.9.89.ooo46912.setjmpoutsidenamespace.binfilter.patch
-Patch20: openoffice.org-1.9.89.oooXXXXX.upstreamhatesthefp.officecfg.patch
-Patch21: openoffice.org-1.9.89.rh152269.nfs.desktop.patch
-Patch22: openoffice.org-1.9.89.gccXXXXX.hsqldbproblems.hsqldb.patch
-Patch23: openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch
-Patch24: openoffice.org-1.9.90.ooo46585.sunmiscisnotstandard.filter.patch
-Patch25: openoffice.org-1.9.92.oooXXXXX.addindic.patch
-Patch26: openoffice.org-1.9.92.oooXXXXX.gtk-nwf-combo-box-button-fix.patch
-Patch27: openoffice.org-1.9.96.ooo35641.noxfonts.vcl.patch
-Patch28: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
-Patch29: openoffice.org-1.9.97.rh156067.noversionedicons.patch
-Patch30: openoffice.org-1.9.97.ooo48600.rtfparseerror.svx.patch
-Patch31: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch
-Patch32: openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch
-Patch33: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch
-Patch34: openoffice.org-1.9.103.oooXXXXX.installation.disable-epm.fix.patch
-Patch35: openoffice.org-1.9.104-use-fontconfig-everywhere.patch
-Patch36: openoffice.org-1.9.104-berkeleydb-jni-casting-misuse.patch
-Patch37: workspace.gcc4fwdecl.patch
-Patch38: workspace-fpicker4.patch
-Patch39: openoffice.org-1.9.106.ooo44627.sal.brokencondition.patch
-Patch40: openoffice.org-1.9.106.ooo50172.icu.tamilvowelslikepango.patch
-Patch41: workspace.vcl39.patch
-Patch42: openoffice.org-1.9.108.ooo30133.lingucomponent.ukrainean.patch
-Patch43: openoffice.org-1.9.108.ooo48814.solenv.nostripwithsimpleinstall.patch
-Patch44: openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch
+Patch13: openoffice.org-1.9.88.rh133741.alwaysgtk.patch
+Patch14: openoffice.org-1.9.88.ooo46217.allowfallbacktoenUSfromotherenglish.patch
+Patch15: openoffice.org-1.9.89.ooo35627.parallel.cppumaker.patch
+Patch16: openoffice.org-1.9.89.oooXXXXX.parallel.sysui.patch
+Patch17: openoffice.org-1.9.89.ooo44027.pthreadchange.patch
+Patch18: openoffice.org-1.9.89.ooo46912.setjmpoutsidenamespace.binfilter.patch
+Patch19: openoffice.org-1.9.89.oooXXXXX.upstreamhatesthefp.officecfg.patch
+Patch20: openoffice.org-1.9.89.rh152269.nfs.desktop.patch
+Patch21: openoffice.org-1.9.89.gccXXXXX.hsqldbproblems.hsqldb.patch
+Patch22: openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch
+Patch23: openoffice.org-1.9.90.ooo46585.sunmiscisnotstandard.filter.patch
+Patch24: openoffice.org-1.9.92.oooXXXXX.addindic.patch
+Patch25: openoffice.org-1.9.92.oooXXXXX.gtk-nwf-combo-box-button-fix.patch
+Patch26: openoffice.org-1.9.96.ooo35641.noxfonts.vcl.patch
+Patch27: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
+Patch28: openoffice.org-1.9.97.rh156067.noversionedicons.patch
+Patch29: openoffice.org-1.9.97.ooo48600.rtfparseerror.svx.patch
+Patch30: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch
+Patch31: openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch
+Patch32: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch
+Patch33: openoffice.org-1.9.103.oooXXXXX.installation.disable-epm.fix.patch
+Patch34: openoffice.org-1.9.104-use-fontconfig-everywhere.patch
+Patch35: openoffice.org-1.9.104-berkeleydb-jni-casting-misuse.patch
+Patch36: workspace.gcc4fwdecl.patch
+Patch37: workspace-fpicker4.patch
+Patch38: openoffice.org-1.9.106.ooo44627.sal.brokencondition.patch
+Patch39: openoffice.org-1.9.106.ooo50172.icu.tamilvowelslikepango.patch
+Patch40: workspace.vcl39.patch
+Patch41: openoffice.org-1.9.108.ooo30133.lingucomponent.ukrainean.patch
+Patch42: openoffice.org-1.9.108.ooo48814.solenv.nostripwithsimpleinstall.patch
+Patch43: openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch
+Patch44: workspace.gslpatches2.patch
%define instdir %{_libdir}/openoffice.org%{version}
%define withlang --with-lang="%{langpack_langs}"
-%if %{gcc_is_gcc4}
%define java_interpreter gij
-%else
-%define java_interpreter gij4
-%endif
%description
OpenOffice.org is an Open Source, community-developed, multi-platform
@@ -146,11 +137,7 @@
# We need at least 32-bit redhat-artwork and 32-bit gtk2-engines, but
# rpm doesn't "do the right thing" if only the packages are Required.
Requires: libbluecurve.so, libcrux-engine.so
-%if %{gcc_is_gcc4}
Requires: libgcj >= %{gcjver}
-%else
-Requires: libgcj4 >= %{gcjver}
-%endif
Requires: java-1.4.2-gcj-compat
PreReq: desktop-file-utils >= 0.9, gtk2 >= 2.4.8
Obsoletes: openoffice.org
@@ -688,38 +675,38 @@
%patch10 -p1 -b .warnnoterroronmissing.patch
%patch11 -p1 -b .rh151357.patch
%patch12 -p1 -b .ooo50575.fragments.patch
-%patch13 -p1 -b .gcc3gcj4.patch
-%patch14 -p1 -b .rh133741.alwaysgtk.patch
-%patch15 -p1 -b .ooo46217.allowfallbacktoenUSfromotherenglish.patch
-%patch16 -p1 -b .ooo35627.parallel.cppumaker.patch
-%patch17 -p1 -b .oooXXXXX.parallel.sysui.patch
-%patch18 -p1 -b .ooo44027.pthreadchange.patch
-%patch19 -p1 -b .ooo46912.setjmpoutsidenamespace.binfilter.patch
-%patch20 -p1 -b .oooXXXXX.upstreamhatesthefp.officecfg.patch
-%patch21 -p1 -b .rh152269.nfs.desktop.patch
-%patch22 -p1 -b .gccXXXXX.hsqldbproblems.hsqldb.patch
-%patch23 -p1 -b .oooXXXXX.fontfallbacks.officecfg.patch
-%patch24 -p1 -b .ooo46585.sunmiscisnotstandard.filter.patch
-%patch25 -p1 -b .oooXXXXX.addindic.patch
-%patch26 -p1 -b .oooXXXXX.gtk-nwf-combo-box-button-fix.patch
-%patch27 -p1 -b .ooo35641.noxfonts.vcl.patch
-%patch28 -p1 -b .ooo48256.nolongname.sysui.patch
-%patch29 -p1 -b .rh156067.noversionedicons.patch
-%patch30 -p1 -b .ooo48600.rtfparseerror.svx.patch
-%patch31 -p1 -b .gcc19870.gcjaccessproblem.filter.patch
-%patch32 -p1 -b .ooo48610.searchalltemplates.wizards.patch
-%patch33 -p1 -b .gcc19870.gcjaccessproblem.wizards.patch
-%patch34 -p1 -b .oooXXXXX.installation.disable-epm.fix.patch
-%patch35 -p1 -b .use-fontconfig-everwhere.patch
-%patch36 -p1 -b .berkeleydb-jni-casting-misuse.patch
-%patch37 -p1 -b .workspace.gcc4fwdecl.patch
-%patch38 -p1 -b .workspace-fpicker4.patch
-%patch39 -p1 -b .ooo44627.sal.brokencondition.patch
-%patch40 -p1 -b .ooo50172.icu.tamilvowelslikepango.patch
-%patch41 -p1 -b .workspace.vcl39.patch
-%patch42 -p1 -b .ooo30133.lingucomponent.ukrainean.patch
-%patch43 -p1 -b .ooo48814.solenv.nostripwithsimpleinstall.patch
-%patch44 -p1 -b .ooo47323.binfilter.stupiddetect.patch
+%patch13 -p1 -b .rh133741.alwaysgtk.patch
+%patch14 -p1 -b .ooo46217.allowfallbacktoenUSfromotherenglish.patch
+%patch15 -p1 -b .ooo35627.parallel.cppumaker.patch
+%patch16 -p1 -b .oooXXXXX.parallel.sysui.patch
+%patch17 -p1 -b .ooo44027.pthreadchange.patch
+%patch18 -p1 -b .ooo46912.setjmpoutsidenamespace.binfilter.patch
+%patch19 -p1 -b .oooXXXXX.upstreamhatesthefp.officecfg.patch
+%patch20 -p1 -b .rh152269.nfs.desktop.patch
+%patch21 -p1 -b .gccXXXXX.hsqldbproblems.hsqldb.patch
+%patch22 -p1 -b .oooXXXXX.fontfallbacks.officecfg.patch
+%patch23 -p1 -b .ooo46585.sunmiscisnotstandard.filter.patch
+%patch24 -p1 -b .oooXXXXX.addindic.patch
+%patch25 -p1 -b .oooXXXXX.gtk-nwf-combo-box-button-fix.patch
+%patch26 -p1 -b .ooo35641.noxfonts.vcl.patch
+%patch27 -p1 -b .ooo48256.nolongname.sysui.patch
+%patch28 -p1 -b .rh156067.noversionedicons.patch
+%patch29 -p1 -b .ooo48600.rtfparseerror.svx.patch
+%patch30 -p1 -b .gcc19870.gcjaccessproblem.filter.patch
+%patch31 -p1 -b .ooo48610.searchalltemplates.wizards.patch
+%patch32 -p1 -b .gcc19870.gcjaccessproblem.wizards.patch
+%patch33 -p1 -b .oooXXXXX.installation.disable-epm.fix.patch
+%patch34 -p1 -b .use-fontconfig-everwhere.patch
+%patch35 -p1 -b .berkeleydb-jni-casting-misuse.patch
+%patch36 -p1 -b .workspace.gcc4fwdecl.patch
+%patch37 -p1 -b .workspace-fpicker4.patch
+%patch38 -p1 -b .ooo44627.sal.brokencondition.patch
+%patch39 -p1 -b .ooo50172.icu.tamilvowelslikepango.patch
+%patch40 -p1 -b .workspace.vcl39.patch
+%patch41 -p1 -b .ooo30133.lingucomponent.ukrainean.patch
+%patch42 -p1 -b .ooo48814.solenv.nostripwithsimpleinstall.patch
+%patch43 -p1 -b .ooo47323.binfilter.stupiddetect.patch
+%patch44 -p1 -b .workspace.gslpatches2.patch
#start ludicrous workaround
#while we include these libs we need this, if/when we move to system
@@ -777,14 +764,8 @@
export RPM=echo
export EPM=DUMMY
export PKGFORMAT="rpm -simple $RPM_BUILD_ROOT/%{instdir}"
-export BUILD_SPECIAL=1
#don't duplicate english helpcontent about the place
unset DEFAULT_TO_ENGLISH_FOR_PACKING
-%if !%{gcc_is_gcc4}
-#this is needed for a mix of gcc/g++ 3.4.x and gcj/gij 4.0.x
-export GCJ_CFLAGS="-I`$JAVACOMPILER -print-search-dirs | grep install | awk ' { print $2 } '`""include"
-export GCJ_LDFLAGS="-L`$JAVACOMPILER -print-search-dirs | grep install | awk ' { print $2 } '`"
-%endif
cd transex3/prj
build --dlv_switch link --all -P$MAXBUILDS
deliver
@@ -2533,6 +2514,8 @@
%changelog
* Mon Jun 13 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.109-2
- rh#159169# crash due to dodgy casting when save to legacy impress format
+- ooo#50571#/rh#157813# add workspace.gslpatches2.patch to fix bizarre
+ lohit combining characters rendering bug
* Fri Jun 10 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.109-1
- rh#158943# Require some fonts
--- openoffice.org-1.9.88.NONE.gcc3gcj4.patch DELETED ---
More information about the fedora-cvs-commits
mailing list