diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2005-05-19 16:34:01 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2005-05-19 16:34:01 +0000 |
| commit | 86ddee4b4b66a3d20259b776fec9e19822bd4531 (patch) | |
| tree | 6fcc409007e09a6e76bd4fdf1c9ade5b23d9e546 /app-office | |
| parent | new upstream version (diff) | |
| download | gentoo-2-86ddee4b4b66a3d20259b776fec9e19822bd4531.tar.gz gentoo-2-86ddee4b4b66a3d20259b776fec9e19822bd4531.tar.bz2 gentoo-2-86ddee4b4b66a3d20259b776fec9e19822bd4531.zip | |
another kde file picker fix
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'app-office')
3 files changed, 35 insertions, 2 deletions
diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog index 69a2c7d8dfe4..5e19d5036b32 100644 --- a/app-office/openoffice-ximian/ChangeLog +++ b/app-office/openoffice-ximian/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-office/openoffice-ximian # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.130 2005/05/09 06:13:57 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.131 2005/05/19 16:34:01 suka Exp $ + + 19 May 2005; Andreas Proschofsky <suka@gentoo.org> + +files/1.1.4/fpicker-kde-filter-name.diff, + openoffice-ximian-1.3.11.ebuild: + Adding another kde-file-picker fix. No revision bump as this is a minor + fix, and would mean an unnecessary recompile for a lot of people. With + this patch this actually is no the same as the upstream ooo-build-1.3.12 *openoffice-ximian-1.3.11 (09 May 2005) diff --git a/app-office/openoffice-ximian/files/1.1.4/fpicker-kde-filter-name.diff b/app-office/openoffice-ximian/files/1.1.4/fpicker-kde-filter-name.diff new file mode 100644 index 000000000000..e7961297ea5f --- /dev/null +++ b/app-office/openoffice-ximian/files/1.1.4/fpicker-kde-filter-name.diff @@ -0,0 +1,21 @@ +--- fpicker/source/unx/kde/kdefilepicker.cxx 2005-05-09 15:16:26.005903927 +0200 ++++ fpicker/source/unx/kde/kdefilepicker.cxx 2005-05-09 15:16:13.962981172 +0200 +@@ -714,4 +714,18 @@ void FileFilterComboHack::setCurrentFilt + { + setCurrentText( filter ); + filterChanged(); ++ ++ // Workaround for 'Filter name (*.blah)' vs. 'Filter name' ++ if ( currentText() != text( currentItem() ) ) ++ { ++ int nItem = 0; ++ for ( ; nItem < count() && !text( nItem ).startsWith( filter ); ++nItem ); ++ ++ if ( nItem < count() ) ++ setCurrentItem( nItem ); ++ else ++ setCurrentItem( 0 ); ++ ++ filterChanged(); ++ } + } diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.11.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.11.ebuild index d460ff830da1..6d4107ada3f8 100644 --- a/app-office/openoffice-ximian/openoffice-ximian-1.3.11.ebuild +++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.11.ebuild,v 1.1 2005/05/09 06:13:57 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.11.ebuild,v 1.2 2005/05/19 16:34:01 suka Exp $ # Notes: # @@ -304,6 +304,11 @@ src_unpack() { einfo "Applying Ximian OO.org Patches" ${PATCHDIR}/patches/apply.pl ${PATCHDIR}/patches/${PATCHLEVEL} ${S} -f --distro=${DISTRO} || die "Ximian patches failed" + #Fix for kde file picker problems + if use kde; then + epatch ${FILESDIR}/${OO_VER}/fpicker-kde-filter-name.diff + fi + #Fix for hardened if use hardened; then epatch ${FILESDIR}/${OO_VER}/pthreadlink-fix.patch |