rpms/openoffice.org/devel workspace.vcl102.patch, NONE, 1.1 openoffice.org.spec, 1.1994, 1.1995
Caolan McNamara
caolanm at fedoraproject.org
Wed Aug 26 13:11:57 UTC 2009
- Previous message: rpms/openoffice.org/F-11 workspace.vcl102.patch, NONE, 1.1 openoffice.org.spec, 1.1929, 1.1930
- Next message: rpms/sugar-write/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 sugar-write.spec, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3997/devel
Modified Files:
openoffice.org.spec
Added Files:
workspace.vcl102.patch
Log Message:
backport workspace.vcl102.patch to fix xdg support
workspace.vcl102.patch:
gconflayer.cxx | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
--- NEW FILE workspace.vcl102.patch ---
fix setting default working directory using xdg-user-dirs tool (#101461)
Reading default working directory using xdg variables was working only
if ~/Documents exists, patch from #75329 is incomplete and missed to
migrate the gconflayer code to xdg in isDependencySatisfied().
Signed-off-by: Olivier Blin <blino at mandriva.com>
--- shell/source/backends/gconfbe/gconflayer.cxx.~1.15.~ 2008-04-11 09:56:13.000000000 +0200
+++ shell/source/backends/gconfbe/gconflayer.cxx 2009-04-30 17:39:41.000000000 +0200
@@ -396,16 +396,11 @@
case SETTING_WORK_DIRECTORY:
{
- osl::Security aSecurity;
- rtl::OUString aDocumentsDirURL;
- if ( aSecurity.getHomeDir( aDocumentsDirURL ) )
- {
- aDocumentsDirURL += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/Documents" ) );
- osl::Directory aDocumentsDir( aDocumentsDirURL );
+ rtl::OUString aDocumentsDirURL = xdg_user_dir_lookup("DOCUMENTS");
+ osl::Directory aDocumentsDir( aDocumentsDirURL );
- if( osl::FileBase::E_None == aDocumentsDir.open() )
- return sal_True;
- }
+ if( osl::FileBase::E_None == aDocumentsDir.open() )
+ return sal_True;
}
break;
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1994
retrieving revision 1.1995
diff -u -p -r1.1994 -r1.1995
--- openoffice.org.spec 26 Aug 2009 11:11:18 -0000 1.1994
+++ openoffice.org.spec 26 Aug 2009 13:11:57 -0000 1.1995
@@ -1,6 +1,6 @@
%define oootag OOO310
%define ooomilestone 19
-%define rh_rpm_release 2
+%define rh_rpm_release 3
# rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
%define __jar_repack %{nil}
@@ -156,6 +156,7 @@ Patch78: workspace.cmcfixes62.patch
Patch79: openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
Patch80: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
Patch81: workspace.os131.patch
+Patch82: workspace.vcl102.patch
%define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
%define instdir %{_libdir}
@@ -1697,6 +1698,7 @@ cat %{PATCH11} >> svtools/source/dialogs
%patch79 -p0 -b .ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
%patch80 -p0 -b .ooo104329.dbaccess.primarykeys.patch
%patch81 -p0 -b .workspace.os131.patch
+%patch82 -p0 -b .workspace.vcl102.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4206,6 +4208,9 @@ fi
unopkg list --shared > /dev/null 2>&1 || :
%changelog
+* Wed Aug 26 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.3
+- backport workspace.vcl102.patch to fix xdg support
+
* Mon Aug 24 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.2
- hyphen-as require
- add workspace.cmcfixes62.patch for 64bit odbc goodness and rebuild
- Previous message: rpms/openoffice.org/F-11 workspace.vcl102.patch, NONE, 1.1 openoffice.org.spec, 1.1929, 1.1930
- Next message: rpms/sugar-write/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 sugar-write.spec, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list