rpms/openoffice.org/devel workspace.cmcfixes77.patch, NONE, 1.1 openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch, 1.2, 1.3 openoffice.org.spec, 1.2296, 1.2297 sources, 1.410, 1.411 workspace.impress195.patch, 1.2, 1.3 openoffice.org-3.3.0.oooXXXXX.afms.buildtype.patch, 1.2, NONE openoffice.org-3.3.0.oooXXXXX.offapi.weirdness.patch, 1.1, NONE
Caolan McNamara
caolanm at fedoraproject.org
Tue Jul 20 14:30:24 UTC 2010
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5121
Modified Files:
openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
openoffice.org.spec sources workspace.impress195.patch
Added Files:
workspace.cmcfixes77.patch
Removed Files:
openoffice.org-3.3.0.oooXXXXX.afms.buildtype.patch
openoffice.org-3.3.0.oooXXXXX.offapi.weirdness.patch
Log Message:
upstream build fixes
workspace.cmcfixes77.patch:
configure.in | 61 ++++++++++----
libtextcat/makefile.mk | 6 +
lingucomponent/prj/build.lst | 2
officecfg/registry/data/org/openoffice/Office/Paths.xcu | 3
officecfg/registry/data/org/openoffice/Office/makefile.mk | 2
postprocess/packregistry/makefile.mk | 5 +
psprint_config/prj/build.lst | 2
scp2/source/ooo/file_library_ooo.scp | 2
scp2/source/ooo/file_ooo.scp | 3
scp2/source/ooo/makefile.mk | 8 +
set_soenv.in | 2
solenv/bin/modules/installer/ziplist.pm | 1
solenv/config/sooo330.ini | 2
13 files changed, 77 insertions(+), 22 deletions(-)
--- NEW FILE workspace.cmcfixes77.patch ---
diff -r 85e7cfbbb08a configure.in
--- a/configure.in Tue Jun 29 15:31:44 2010 +0200
+++ b/configure.in Tue Jul 20 09:57:11 2010 +0100
@@ -546,6 +546,12 @@
AC_ARG_WITH(system-lpsolve,
[ --with-system-lpsolve Use lpsolve already on system
],,)
+AC_ARG_WITH(system-libtextcat,
+[ --with-system-libtextcat Use libtextcat already on system
+],,)
+AC_ARG_WITH(external-libtextcat-data,
+[ --with-system-libtextcat-data Use libtextcat data already on system
+],,)
AC_ARG_WITH(system-cppunit,
[ --with-system-cppunit Use cppunit already on system
],,)
@@ -5142,6 +5148,38 @@
fi
AC_SUBST(SYSTEM_LPSOLVE)
+dnl ===================================================================
+dnl Checking for libtextcat
+dnl ===================================================================
+AC_MSG_CHECKING([which libtextcat to use])
+if test -n "$with_system_libtextcat" && test "$with_system_libtextcat" != "no"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_LIBTEXTCAT=YES
+ AC_CHECK_HEADER(libtextcat/textcat.h, [],
+ [ AC_MSG_ERROR(libtextcat headers not found.)], [])
+ AC_CHECK_LIB(textcat, special_textcat_Init, ,
+ [ AC_MSG_ERROR(libtextcat library not found or not suitable. libtextcat typically needs to be patched)], [])
+else
+ AC_MSG_RESULT([internal])
+ SYSTEM_LIBTEXTCAT=NO
+ BUILD_TYPE="$BUILD_TYPE LIBTEXTCAT"
+fi
+AC_SUBST(SYSTEM_LIBTEXTCAT)
+
+AC_MSG_CHECKING([which libtextcat data directory to use])
+if test -n "$with_system_libtextcat_data" && test "$with_system_libtextcat_data" != "no"; then
+ if test "$with_system_libtextcat_data" = "yes"; then
+ SYSTEM_LIBTEXTCAT_DATA=file:///usr/share/libtextcat
+ else
+ SYSTEM_LIBTEXTCAT_DATA=file://$with_system_libtextcat_data
+ fi
+ AC_MSG_RESULT([$SYSTEM_LIBTEXTCAT_DATA])
+else
+ AC_MSG_RESULT([internal])
+ BUILD_TYPE="$BUILD_TYPE LIBTEXTCATDATA"
+fi
+AC_SUBST(SYSTEM_LIBTEXTCAT_DATA)
+
dnl ***************************************
dnl testing libc version for Linux...
dnl ***************************************
@@ -6504,6 +6542,7 @@
AC_MSG_CHECKING([whether to include AFMs])
if test "$with_afms" != "no"; then
AC_MSG_RESULT([yes])
+ BUILD_TYPE="$BUILD_TYPE AFMS"
else
AC_MSG_RESULT([no])
WITHOUT_AFMS=YES
diff -r 85e7cfbbb08a libtextcat/makefile.mk
--- a/libtextcat/makefile.mk Tue Jun 29 15:31:44 2010 +0200
+++ b/libtextcat/makefile.mk Tue Jul 20 09:57:11 2010 +0100
@@ -30,6 +30,12 @@
PRJNAME=libtextcat
TARGET=libtextcat
+.IF "$(SYSTEM_LIBTEXTCAT)" == "YES"
+all:
+ @echo "An already available installation of libtextcat should exist on your system."
+ @echo "Therefore the version provided here does not need to be built in addition."
+.ENDIF
+
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
diff -r 85e7cfbbb08a lingucomponent/prj/build.lst
--- a/lingucomponent/prj/build.lst Tue Jun 29 15:31:44 2010 +0200
+++ b/lingucomponent/prj/build.lst Tue Jul 20 09:57:11 2010 +0100
@@ -1,4 +1,4 @@
-lc lingucomponent : linguistic libtextcat svl HYPHEN:hyphen HUNSPELL:hunspell MYTHES:mythes NULL
+lc lingucomponent : linguistic LIBTEXTCAT:libtextcat LIBTEXTCATDATA:libtextcat svl HYPHEN:hyphen HUNSPELL:hunspell MYTHES:mythes NULL
lc lingucomponent usr1 - all lc_mkout NULL
lc lingucomponent\inc nmake - all lc_inc NULL
lc lingucomponent\source\lingutil nmake - all lc_util lc_inc NULL
diff -r 85e7cfbbb08a officecfg/registry/data/org/openoffice/Office/Paths.xcu
--- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu Tue Jun 29 15:31:44 2010 +0200
+++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu Tue Jul 20 09:57:11 2010 +0100
@@ -169,7 +169,8 @@
<node oor:name="Fingerprint" oor:op="fuse" oor:mandatory="true">
<node oor:name="InternalPaths">
- <node oor:name="$(insturl)/share/fingerprint" oor:op="fuse" />
+ <node install:module="internallibtextcatdata" oor:name="$(insturl)/share/fingerprint" oor:op="fuse"/>
+ <node install:module="externallibtextcatdata" oor:name="${SYSTEM_LIBTEXTCAT_DATA}" oor:op="fuse"/>
</node>
</node>
diff -r 85e7cfbbb08a officecfg/registry/data/org/openoffice/Office/makefile.mk
--- a/officecfg/registry/data/org/openoffice/Office/makefile.mk Tue Jun 29 15:31:44 2010 +0200
+++ b/officecfg/registry/data/org/openoffice/Office/makefile.mk Tue Jul 20 09:57:11 2010 +0100
@@ -87,6 +87,8 @@
Paths-macosx.xcu \
Paths-unxwnt.xcu \
Paths-unixdesktop.xcu \
+ Paths-internallibtextcatdata.xcu \
+ Paths-externallibtextcatdata.xcu \
Writer-cjk.xcu \
Impress-ogltrans.xcu \
Embedding-calc.xcu \
diff -r 85e7cfbbb08a postprocess/packregistry/makefile.mk
--- a/postprocess/packregistry/makefile.mk Tue Jun 29 15:31:44 2010 +0200
+++ b/postprocess/packregistry/makefile.mk Tue Jul 20 09:57:11 2010 +0100
@@ -343,6 +343,11 @@
MY_FILES_main += $(MY_MOD)/DataAccess/mozab2.xcu
.END
.END
+.IF "$(SYSTEM_LIBTEXTCAT_DATA)" != ""
+MY_FILES_main += $(MY_MOD)/org/openoffice/Office/Paths-externallibtextcatdata.xcu
+.ELSE
+MY_FILES_main += $(MY_MOD)/org/openoffice/Office/Paths-internallibtextcatdata.xcu
+.END
MY_DEPS_math = main
MY_FILES_math = \
diff -r 85e7cfbbb08a psprint_config/prj/build.lst
--- a/psprint_config/prj/build.lst Tue Jun 29 15:31:44 2010 +0200
+++ b/psprint_config/prj/build.lst Tue Jul 20 09:57:11 2010 +0100
@@ -1,4 +1,4 @@
-pc psprint_config : soltools afms NULL
+pc psprint_config : soltools AFMS:afms NULL
pc psprint_config usr1 - all pc_mkout NULL
pc psprint_config\configuration nmake - u pc_conf NULL
pc psprint_config\configuration\ppds nmake - u pc_ppds NULL
diff -r 85e7cfbbb08a scp2/source/ooo/file_library_ooo.scp
--- a/scp2/source/ooo/file_library_ooo.scp Tue Jun 29 15:31:44 2010 +0200
+++ b/scp2/source/ooo/file_library_ooo.scp Tue Jul 20 09:57:11 2010 +0100
@@ -1669,6 +1669,7 @@
#endif
End
+#ifndef SYSTEM_LIBTEXTCAT
File gid_File_Lib_Libtextcat
TXT_FILE_BODY;
Styles = (PACKED);
@@ -1679,6 +1680,7 @@
Name = "libtextcat.dll";
#endif
End
+#endif
STD_UNO_LIB_FILE( gid_File_Lib_Guesslang, guesslang )
diff -r 85e7cfbbb08a scp2/source/ooo/file_ooo.scp
--- a/scp2/source/ooo/file_ooo.scp Tue Jun 29 15:31:44 2010 +0200
+++ b/scp2/source/ooo/file_ooo.scp Tue Jul 20 09:57:11 2010 +0100
@@ -523,6 +523,7 @@
#endif
#endif
+#ifndef SYSTEM_LIBTEXTCAT_DATA
// fingerprint files (lm)
File gid_File_Conf_Fpdb
@@ -1036,7 +1037,7 @@
Dir = gid_Dir_Share_Fingerprint;
Styles = (PACKED);
End
-
+#endif
// mod files
diff -r 85e7cfbbb08a scp2/source/ooo/makefile.mk
--- a/scp2/source/ooo/makefile.mk Tue Jun 29 15:31:44 2010 +0200
+++ b/scp2/source/ooo/makefile.mk Tue Jul 20 09:57:11 2010 +0100
@@ -233,6 +233,14 @@
SCPDEFS+=-DSYSTEM_PYTHON
.ENDIF
+.IF "$(SYSTEM_LIBTEXTCAT)" == "YES"
+SCPDEFS+=-DSYSTEM_LIBTEXTCAT
+.ENDIF
+
+.IF "$(SYSTEM_LIBTEXTCAT_DATA)" != ""
+SCPDEFS+=-DSYSTEM_LIBTEXTCAT_DATA
+.ENDIF
+
.IF "$(ENABLE_SVCTAGS)" == "YES"
SCPDEFS+=-DENABLE_SVCTAGS
.ENDIF
diff -r 85e7cfbbb08a set_soenv.in
--- a/set_soenv.in Tue Jun 29 15:31:44 2010 +0200
+++ b/set_soenv.in Tue Jul 20 09:57:11 2010 +0100
@@ -1926,6 +1926,8 @@
ToFile( "SYSTEM_MYTHES", "@SYSTEM_MYTHES@", "e" );
ToFile( "MYTHES_CFLAGS", "@MYTHES_CFLAGS@", "e" );
ToFile( "MYTHES_LIBS", "@MYTHES_LIBS@", "e" );
+ToFile( "SYSTEM_LIBTEXTCAT", "@SYSTEM_LIBTEXTCAT@","e" );
+ToFile( "SYSTEM_LIBTEXTCAT_DATA","@SYSTEM_LIBTEXTCAT_DATA@","e" );
ToFile( "PAM", "@PAM@", "e" );
ToFile( "NEW_SHADOW_API", "@NEW_SHADOW_API@", "e" );
ToFile( "PAM_LINK", "@PAM_LINK@", "e" );
diff -r 85e7cfbbb08a solenv/bin/modules/installer/ziplist.pm
--- a/solenv/bin/modules/installer/ziplist.pm Tue Jun 29 15:31:44 2010 +0200
+++ b/solenv/bin/modules/installer/ziplist.pm Tue Jul 20 09:57:11 2010 +0100
@@ -806,6 +806,7 @@
$variableshashref->{'PRODUCTMINOR'} = $localminor;
$variableshashref->{'PRODUCTBUILDID'} = $installer::globals::buildid;
+ $variableshashref->{'SYSTEM_LIBTEXTCAT_DATA'} = $ENV{'SYSTEM_LIBTEXTCAT_DATA'} , if( defined $ENV{'SYSTEM_LIBTEXTCAT_DATA'} && $ENV{'SYSTEM_LIBTEXTCAT_DATA'} ne "" );
}
1;
diff -r 85e7cfbbb08a solenv/config/sooo330.ini
--- a/solenv/config/sooo330.ini Tue Jun 29 15:31:44 2010 +0200
+++ b/solenv/config/sooo330.ini Tue Jul 20 09:57:11 2010 +0100
@@ -9,7 +9,7 @@
BMP_WRITES_FLAG TRUE
BUILD_SPECIAL TRUE
BUILD_STAX YES
- BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN MYTHES JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST MDDS EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT
+ BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN MYTHES JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST MDDS EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT LIBTEXTCAT LIBTEXTCATDATA AFMS
common_build TRUE
COMMON_OUTDIR common
CONFIG_PROJECT config_office
--- a/configure.in 2010-07-07 12:32:33.000000000 +0100
+++ b/configure.in 2010-07-07 12:33:27.000000000 +0100
@@ -3853,7 +3856,11 @@
[
AC_CHECK_FILE(/usr/share/java/lucene-core.jar,
[ LUCENE_CORE_JAR=/usr/share/java/lucene-core.jar ],
- [ AC_MSG_ERROR(lucene-core.jar replacement not found)]
+ [ AC_CHECK_FILE(/usr/share/java/lucene.jar,
+ [ LUCENE_CORE_JAR=/usr/share/java/lucene.jar ],
+ [ AC_MSG_ERROR(lucene-core.jar replacement not found)]
+ )
+ ]
)
]
)
@@ -3876,22 +3883,6 @@
AC_CHECK_FILE($LUCENE_CORE_JAR, [],
[ AC_MSG_ERROR(lucene-analyzers.jar not found.)], [])
fi
- AC_MSG_CHECKING([whether lucene is version 2.x])
- export LUCENE_CORE_JAR
- if $PERL -e 'use Archive::Zip;
- my $file = "$ENV{'LUCENE_CORE_JAR'}";
- my $zip = Archive::Zip->new( $file );
- my $mf = $zip->contents ( "META-INF/MANIFEST.MF" );
- if ( $mf =~ m/Specification-Version: 2.*/ ) {
- exit 0;
- } else {
- exit 1;
- }'; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_ERROR([no, you need lucene 2])
- fi
-
else
AC_MSG_RESULT([internal])
SYSTEM_LUCENE=NO
openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch:
dp_misc.cxx | 29 ++++++++++++++++++++++-------
1 file changed, 22 insertions(+), 7 deletions(-)
Index: openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch 20 Jul 2010 12:17:58 -0000 1.2
+++ openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch 20 Jul 2010 14:30:20 -0000 1.3
@@ -1,7 +1,7 @@
diff -ru desktop.orig/source/deployment/misc/dp_misc.cxx desktop/source/deployment/misc/dp_misc.cxx
--- desktop.orig/source/deployment/misc/dp_misc.cxx 2010-07-20 08:31:24.000000000 +0100
+++ desktop/source/deployment/misc/dp_misc.cxx 2010-07-20 09:12:23.000000000 +0100
-@@ -145,6 +145,23 @@
+@@ -143,6 +143,23 @@
return pipe.is();
}
@@ -25,7 +25,7 @@ diff -ru desktop.orig/source/deployment/
//Returns true if the Folder was more recently modified then
//the lastsynchronized file. That is the repository needs to
-@@ -183,22 +200,19 @@
+@@ -181,15 +198,12 @@
//compare the modification time of the extension folder and the last
//modified file
@@ -42,19 +42,10 @@ diff -ru desktop.orig/source/deployment/
- TimeValue timeFolder = statFolder.getModifyTime();
- TimeValue timeFile = statFile.getModifyTime();
-
-- if (timeFile.Seconds < timeFolder.Seconds)
-+ if (timeFile.Seconds < timeFolder.Seconds)
+ if (timeFile.Seconds < timeFolder.Seconds)
bNeedsSync = true;
}
- else
- {
- OSL_ASSERT(0);
-- bNeedsSync = true;
-+ bNeedsSync = true;
- }
- }
- else
-@@ -212,6 +220,7 @@
+@@ -204,6 +218,7 @@
OSL_ASSERT(0);
bNeedsSync = true;
}
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2296
retrieving revision 1.2297
diff -u -p -r1.2296 -r1.2297
--- openoffice.org.spec 20 Jul 2010 12:17:58 -0000 1.2296
+++ openoffice.org.spec 20 Jul 2010 14:30:23 -0000 1.2297
@@ -1,6 +1,6 @@
%define oootag OOO330
%define ooomilestone 1
-%define rh_rpm_release 4.1
+%define rh_rpm_release 4
# rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
%define __jar_repack %{nil}
@@ -115,11 +115,10 @@ Patch37: workspace.tl81.patch
Patch38: openoffice.org-3.3.0.ooo112384.sw.export.doc.styledoesntexist.patch
Patch39: workspace.gtk3.patch
Patch40: workspace.sb128.patch
-Patch41: openoffice.org-3.3.0.oooXXXXX.offapi.weirdness.patch
-Patch42: openoffice.org-3.3.0.oooXXXXX.afms.buildtype.patch
-Patch43: workspace.sb126.patch
-Patch44: openoffice.org-3.3.0.ooo113259.vcl.xioerror.patch
-Patch45: openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
+Patch41: workspace.cmcfixes77.patch
+Patch42: workspace.sb126.patch
+Patch43: openoffice.org-3.3.0.ooo113259.vcl.xioerror.patch
+Patch44: openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@@ -1648,11 +1647,10 @@ cp -p %{SOURCE5} external/unowinreg/unow
%patch38 -p0 -b .ooo112384.sw.export.doc.styledoesntexist.patch
%patch39 -p0 -b .workspace.gtk3.patch
%patch40 -p1 -b .workspace.sb128.patch
-%patch41 -p0 -b .oooXXXXX.offapi.weirdness.patch
-%patch42 -p0 -b .oooXXXXX.afms.buildtype.patch
-%patch43 -p1 -b .workspace.sb126.patch
-%patch44 -p0 -b .openoffice.org-3.3.0.ooo113259.vcl.xioerror.patch
-%patch45 -p0 -b .openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
+%patch41 -p1 -b .workspace.cmcfixes77.patch
+%patch42 -p1 -b .workspace.sb126.patch
+%patch43 -p0 -b .openoffice.org-3.3.0.ooo113259.vcl.xioerror.patch
+%patch44 -p0 -b .openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1671,9 +1669,9 @@ autoconf
--with-system-jfreereport --with-vba-package-format="builtin" \
--with-system-libs --with-system-headers --with-system-mozilla \
--with-system-mythes --with-system-dicts --with-system-apache-commons \
- --with-system-libtextcat --without-system-saxon \
+ --with-system-libtextcat --with-system-libtextcat-data --without-system-saxon \
--with-external-dict-dir=/usr/share/myspell --without-myspell-dicts \
- --without-fonts --without-agg --without-ppds --without-afms %{stlflags} \
+ --without-fonts --without-agg --without-ppds --without-afms %{stlflags} \
--with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS" \
--with-external-tar=`pwd`/ext_sources
@@ -2886,7 +2884,6 @@ rm -rf $RPM_BUILD_ROOT
%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Common
%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/NoSurveyAndSystemFpicker.xcu
%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Paths
-%{basisinstdir}/share/registry/modules/org/openoffice/Office/Paths/libtextcat.xcu
%{basisinstdir}/share/registry/modules/org/openoffice/Office/Paths/SystemAutoCorrect.xcu
%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Recovery
%{basisinstdir}/share/registry/modules/org/openoffice/Office/Recovery/AutoSaveRecovery.xcu
@@ -3798,9 +3795,6 @@ unopkg remove --shared org.openoffice.le
%endif
%changelog
-* Tue Jul 20 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-1.4.1
-- Related: ooo#113273 make the patch applicable (dtardon)
-
* Tue Jul 20 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-1.4
- Resolves: ooo#113273 resolve links for extensions modify time
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -p -r1.410 -r1.411
--- sources 16 Jul 2010 17:30:12 -0000 1.410
+++ sources 20 Jul 2010 14:30:24 -0000 1.411
@@ -14,5 +14,5 @@ b54bcc9fdb23389e961b281508d9110c docume
1b4d9a03ebb4c864015620153afb77c6 Tigert-templates.tar.gz
f0cda31fe18bf9289629a321663031b8 redhat-templates.tar.gz
20613b42d66eadc11c719374355f745c redhat-langpacks.tar.gz
-99bf42c02028cdaf6628356ca982bc65 redhat-registry.tar.gz
+011e6e849144d5ca35299f015073652b redhat-registry.tar.gz
8f01ee56b0b4128fc5b655777c92b77d OOO330_m1.tar.bz2
workspace.impress195.patch:
canvas/source/cairo/cairo_canvasfont.cxx | 5 +++
canvas/source/directx/dx_textlayout_drawhelper.cxx | 6 ++++
canvas/source/vcl/canvasfont.cxx | 5 +++
cppcanvas/inc/cppcanvas/renderer.hxx | 3 ++
cppcanvas/source/mtfrenderer/implrenderer.cxx | 10 ++++++-
drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx | 2 +
drawinglayer/source/attribute/fontattribute.cxx | 20 +++++++++++---
drawinglayer/source/primitive2d/textlayoutdevice.cxx | 2 +
drawinglayer/source/processor2d/canvasprocessor.cxx | 5 +++
sd/source/ui/framework/factories/BasicViewFactory.cxx | 3 +-
sd/source/ui/framework/factories/BasicViewFactory.hxx | 1
11 files changed, 56 insertions(+), 6 deletions(-)
Index: workspace.impress195.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.impress195.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- workspace.impress195.patch 14 Jul 2010 14:01:51 -0000 1.2
+++ workspace.impress195.patch 20 Jul 2010 14:30:24 -0000 1.3
@@ -1,12 +1,13 @@
diff -ru sd.orig/source/ui/framework/factories/BasicViewFactory.cxx sd/source/ui/framework/factories/BasicViewFactory.cxx
--- sd.orig/source/ui/framework/factories/BasicViewFactory.cxx 2009-05-25 09:21:53.000000000 +0100
+++ sd/source/ui/framework/factories/BasicViewFactory.cxx 2009-05-25 10:03:48.000000000 +0100
-@@ -145,7 +145,8 @@
+@@ -141,8 +141,9 @@
+ mpViewShellContainer(new ViewShellContainer()),
mpBase(NULL),
mpFrameView(NULL),
++ mpWindow(new WorkWindow(NULL,WB_STDWORK)),
mpViewCache(new ViewCache()),
- mxLocalPane(new Pane(Reference<XResourceId>(), new WorkWindow(NULL,WB_STDWORK)))
-+ mpWindow(new WorkWindow(NULL,WB_STDWORK)),
+ mxLocalPane(new Pane(Reference<XResourceId>(), mpWindow.get()))
{
(void)rxContext;
--- openoffice.org-3.3.0.oooXXXXX.afms.buildtype.patch DELETED ---
--- openoffice.org-3.3.0.oooXXXXX.offapi.weirdness.patch DELETED ---
More information about the scm-commits
mailing list