rpms/openoffice.org/devel openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch, NONE, 1.1 openoffice.org.spec, 1.1297, 1.1298
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Thu Sep 6 08:27:02 UTC 2007
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9589
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch
Log Message:
next version
openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch:
--- NEW FILE openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch ---
Index: ./source/customshapes/EnhancedCustomShapeFunctionParser.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx,v
retrieving revision 1.10
diff -u -r1.10 EnhancedCustomShapeFunctionParser.cxx
--- openoffice.org.orig/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx 24 Oct 2006 13:42:15 -0000 1.10
+++ openoffice.org/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx 6 Sep 2007 08:10:27 -0000
@@ -1201,7 +1201,7 @@
const ::boost::spirit::parse_info<StringIteratorT> aParseInfo(
::boost::spirit::parse( aStart,
aEnd,
- aExpressionGrammer,
+ aExpressionGrammer >> ::boost::spirit::end_p,
::boost::spirit::space_p ) );
OSL_DEBUG_ONLY(::std::cout.flush()); // needed to keep stdout and cout in sync
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1297
retrieving revision 1.1298
diff -u -r1.1297 -r1.1298
--- openoffice.org.spec 5 Sep 2007 08:38:13 -0000 1.1297
+++ openoffice.org.spec 6 Sep 2007 08:26:29 -0000 1.1298
@@ -1,6 +1,6 @@
%define oootag OOG680
-%define ooomilestone 3
-%define rh_rpm_release 2
+%define ooomilestone 4
+%define rh_rpm_release 1
# undef to get english only and no-langpacks for a faster smoketest build
%define langpacks 1
@@ -142,6 +142,7 @@
Patch60: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
Patch61: openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
Patch62: openoffice.org-2.3.0.ooo74751.bean.mawt.patch
+Patch63: openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch
%define instdir %{_libdir}/openoffice.org
@@ -1078,6 +1079,7 @@
%patch60 -p1 -b .ooo80967.ucb.neon27.patch
%patch61 -p1 -b .ooo81112.reportdesign.parallel.patch
%patch62 -p1 -b .ooo74751.bean.mawt.patch
+%patch63 -p1 -b .ooo77672.boost.use.end_p.patch
%if %{linkopt}
chmod a+x solenv/bin/mklinkscript.pl
@@ -1109,12 +1111,17 @@
esac
ARCH_FLAGS="$ARCH_FLAGS $i"
done
-#something odd with <= limit of 125 in framework/source/loadenv/loadenv.cxx and
-#the frame from tools->bibliography not closable wrt the mutex in
-#LoadEnvListener so use >= 128
-export ARCH_FLAGS="$ARCH_FLAGS -finline-limit=128"
-#add -fno-threadsafe-statics (our statics are already double-locked) to C++ only
-export CXX="$CXX -fno-threadsafe-statics"
+export ARCH_FLAGS
+
+##very not happy with gcc at the moment wrt launching the bibliography,
+##let's go conservative for a bit
+##something odd with <= limit of 125 in framework/source/loadenv/loadenv.cxx and
+##the frame from tools->bibliography not closable wrt the mutex in
+##LoadEnvListener so use >= 128, but want 64
+#export ARCH_FLAGS="$ARCH_FLAGS -finline-limit=128"
+##add -fno-threadsafe-statics (our statics are already double-locked) to C++ only
+#export CXX="$CXX -fno-threadsafe-statics"
+
#convert _smp_mflags to dmake equivalent
SMP_MFLAGS=%{?_smp_mflags}
SMP_MFLAGS=-P$[${SMP_MFLAGS/-j/}]
@@ -1152,26 +1159,27 @@
export GNOME_MIME_THEME=hicolor
./create_tree.sh
-#start of jakub based suggestion on prelink optimization
-cd ../../../../desktop/source/app
-%if ! %{linkopt}
-sed -i -e "s/OBJ/SLO/" makefile.mk
-dmake
-%endif
-cd ../../util
-%if ! %{linkopt}
-%if %{stlport_abi_lockin}
-`(cat ../$OUTPATH.pro/misc/soffice.soffice_5.cmd | sed -e "s/obj/slo/g" | sed -e "s/bin\/soffice/lib\/libsoffice.so -shared/" && grep ^lib ../$OUTPATH.pro/misc/pagein-common | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs | xargs`
-%else
-`(cat ../$OUTPATH.pro/misc/soffice.soffice_5.cmd | sed -e "s/obj/slo/g" | sed -e "s/bin\/soffice/lib\/libsoffice.so -shared/" && grep ^lib ../$OUTPATH.pro/misc/pagein-common | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | grep -v stlport | xargs | xargs`
-%endif
-%endif
-$LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/soffice
-`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/swriter) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-writer | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
-`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/scalc) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-calc| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
-`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/simpress) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-impress| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
-`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/sdraw) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-draw| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
-#end of jakub based suggestion on prelink optimization
+#disable for now, breaks icedtea
+##start of jakub based suggestion on prelink optimization
+#cd ../../../../desktop/source/app
+#%if ! %{linkopt}
+#sed -i -e "s/OBJ/SLO/" makefile.mk
+#dmake
+#%endif
+#cd ../../util
+#%if ! %{linkopt}
+#%if %{stlport_abi_lockin}
+#`(cat ../$OUTPATH.pro/misc/soffice.soffice_5.cmd | sed -e "s/obj/slo/g" | sed -e "s/bin\/soffice/lib\/libsoffice.so -shared/" && grep ^lib ../$OUTPATH.pro/misc/pagein-common | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs | xargs`
+#%else
+#`(cat ../$OUTPATH.pro/misc/soffice.soffice_5.cmd | sed -e "s/obj/slo/g" | sed -e "s/bin\/soffice/lib\/libsoffice.so -shared/" && grep ^lib ../$OUTPATH.pro/misc/pagein-common | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | grep -v stlport | xargs | xargs`
+#%endif
+#%endif
+#$LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/soffice
+#`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/swriter) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-writer | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
+#`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/scalc) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-calc| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
+#`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/simpress) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-impress| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
+#`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/sdraw) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-draw| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
+##end of jakub based suggestion on prelink optimization
echo build end time is `date`, diskspace: `df -h . | tail -n 1`
%install
@@ -1191,14 +1199,15 @@
echo - ---dump log end---
dmake openoffice_en-US
fi
-%if ! %{linkopt}
-cp -f ../../desktop/$OUTPATH.pro/lib/libsoffice.so $RPM_BUILD_ROOT/%{instdir}/program
-%endif
-cp -f ../../desktop/$OUTPATH.pro/bin/soffice $RPM_BUILD_ROOT/%{instdir}/program/soffice.bin
-cp -f ../../desktop/$OUTPATH.pro/bin/swriter $RPM_BUILD_ROOT/%{instdir}/program/swriter.bin
-cp -f ../../desktop/$OUTPATH.pro/bin/scalc $RPM_BUILD_ROOT/%{instdir}/program/scalc.bin
-cp -f ../../desktop/$OUTPATH.pro/bin/simpress $RPM_BUILD_ROOT/%{instdir}/program/simpress.bin
-cp -f ../../desktop/$OUTPATH.pro/bin/sdraw $RPM_BUILD_ROOT/%{instdir}/program/sdraw.bin
+#disable for now, breaks icedtea
+#%if ! %{linkopt}
+#cp -f ../../desktop/$OUTPATH.pro/lib/libsoffice.so $RPM_BUILD_ROOT/%{instdir}/program
+#%endif
+#cp -f ../../desktop/$OUTPATH.pro/bin/soffice $RPM_BUILD_ROOT/%{instdir}/program/soffice.bin
+#cp -f ../../desktop/$OUTPATH.pro/bin/swriter $RPM_BUILD_ROOT/%{instdir}/program/swriter.bin
+#cp -f ../../desktop/$OUTPATH.pro/bin/scalc $RPM_BUILD_ROOT/%{instdir}/program/scalc.bin
+#cp -f ../../desktop/$OUTPATH.pro/bin/simpress $RPM_BUILD_ROOT/%{instdir}/program/simpress.bin
+#cp -f ../../desktop/$OUTPATH.pro/bin/sdraw $RPM_BUILD_ROOT/%{instdir}/program/sdraw.bin
chmod -R +w $RPM_BUILD_ROOT/%{instdir}
%if %{langpacks}
dmake ooolanguagepack
@@ -2358,7 +2367,7 @@
%{instdir}/program/resource/date680en-US.res
%{instdir}/program/resource/sc680en-US.res
%{instdir}/program/scalc
-%{instdir}/program/scalc.bin
+#%{instdir}/program/scalc.bin
%dir %{instdir}/share
%dir %{instdir}/share/registry
%dir %{instdir}/share/registry/data
@@ -2411,7 +2420,7 @@
%{instdir}/help/en/sdraw.*
%dir %{instdir}/program
%{instdir}/program/sdraw
-%{instdir}/program/sdraw.bin
+#%{instdir}/program/sdraw.bin
%dir %{instdir}/share
%dir %{instdir}/share/registry
%dir %{instdir}/share/registry/data
@@ -2478,7 +2487,7 @@
%{instdir}/program/libswui680*.so
%{instdir}/program/libwpft680*.so
%{instdir}/program/swriter
-%{instdir}/program/swriter.bin
+#%{instdir}/program/swriter.bin
%dir %{instdir}/program/classes
%{instdir}/program/classes/writer2latex.jar
%dir %{instdir}/share
@@ -2547,7 +2556,7 @@
%{instdir}/program/libanimcore.so
%{instdir}/program/libplaceware*.so
%{instdir}/program/simpress
-%{instdir}/program/simpress.bin
+#%{instdir}/program/simpress.bin
%dir %{instdir}/share
%dir %{instdir}/share/config
%{instdir}/share/config/soffice.cfg
@@ -2761,6 +2770,13 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Thu Sep 06 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-4.1
+- ooo#77672 fix ::boost::spirit::parse to use ::boost::spirit::end_p for 1.34 change
+ makes drawing shapes work properly again
+- next version
+- disable custom launchers, it breaks icedtea for some reason I haven't time to
+ figure out
+
* Tue Sep 04 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-3.2
- rebuild against icu
- rebuild against icedtea
More information about the fedora-extras-commits
mailing list