diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2013-09-27 20:45:41 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2013-09-27 20:45:41 +0000 |
| commit | db2812723c19ddd788dd0dd476c8b40840f25cda (patch) | |
| tree | 1636aa7a16ea08eabaa642ce2099639369d37268 /app-office/libreoffice | |
| parent | Fix manifest (bug #486216). (diff) | |
| download | gentoo-2-db2812723c19ddd788dd0dd476c8b40840f25cda.tar.gz gentoo-2-db2812723c19ddd788dd0dd476c8b40840f25cda.tar.bz2 gentoo-2-db2812723c19ddd788dd0dd476c8b40840f25cda.zip | |
Revbump for annoying localc bug 485862, new stable candidate
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 84AD142F)
Diffstat (limited to 'app-office/libreoffice')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 9 | ||||
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-4.1.2.2-idfattrib.patch | 15 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-4.1.2.2-r1.ebuild (renamed from app-office/libreoffice/libreoffice-4.1.2.2.ebuild) | 4 |
3 files changed, 26 insertions, 2 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index c77c6839f56c..125c0572c93d 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.509 2013/09/23 12:05:28 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.510 2013/09/27 20:45:40 dilfridge Exp $ + +*libreoffice-4.1.2.2-r1 (27 Sep 2013) + + 27 Sep 2013; Andreas K. Huettel <dilfridge@gentoo.org> + -libreoffice-4.1.2.2.ebuild, +libreoffice-4.1.2.2-r1.ebuild, + +files/libreoffice-4.1.2.2-idfattrib.patch: + Revbump for annoying localc bug 485862, new stable candidate *libreoffice-4.1.2.2 (23 Sep 2013) diff --git a/app-office/libreoffice/files/libreoffice-4.1.2.2-idfattrib.patch b/app-office/libreoffice/files/libreoffice-4.1.2.2-idfattrib.patch new file mode 100644 index 000000000000..9402b6b77097 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-4.1.2.2-idfattrib.patch @@ -0,0 +1,15 @@ +--- a/sc/inc/global.hxx 2013-09-17 19:27:21.000000000 +0300 ++++ b/sc/inc/global.hxx 2013-09-24 23:12:34.277966796 +0300 +@@ -190,7 +190,7 @@ const sal_uInt16 IDF_HARDATTR = 0x0020 + const sal_uInt16 IDF_OUTLINE = 0x0800; /// Sheet / outlining (grouping) information + const sal_uInt16 IDF_NOCAPTIONS = 0x0200; /// Internal use only (undo etc.): do not copy/delete caption objects of cell notes. + const sal_uInt16 IDF_ADDNOTES = 0x0400; /// Internal use only (copy from clip): do not delete existing cell contents when pasting notes. + const sal_uInt16 IDF_SPECIAL_BOOLEAN = 0x1000; +-const sal_uInt16 IDF_ATTRIB = IDF_HARDATTR | IDF_STYLES | IDF_OUTLINE; ++const sal_uInt16 IDF_ATTRIB = IDF_HARDATTR | IDF_STYLES; + const sal_uInt16 IDF_CONTENTS = IDF_VALUE | IDF_DATETIME | IDF_STRING | IDF_NOTE | IDF_FORMULA | IDF_OUTLINE; + const sal_uInt16 IDF_ALL = IDF_CONTENTS | IDF_ATTRIB | IDF_OBJECTS; +otes. + + /// Copy flags for auto/series fill functions: do not touch notes and drawing objects. + const sal_uInt16 IDF_AUTOFILL = IDF_ALL & ~(IDF_NOTE | IDF_OBJECTS); diff --git a/app-office/libreoffice/libreoffice-4.1.2.2.ebuild b/app-office/libreoffice/libreoffice-4.1.2.2-r1.ebuild index 61e5bf0253cd..ad56a49c2918 100644 --- a/app-office/libreoffice/libreoffice-4.1.2.2.ebuild +++ b/app-office/libreoffice/libreoffice-4.1.2.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.2.2.ebuild,v 1.1 2013/09/23 12:05:28 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.2.2-r1.ebuild,v 1.1 2013/09/27 20:45:40 dilfridge Exp $ EAPI=5 @@ -230,6 +230,8 @@ DEPEND="${COMMON_DEPEND} PATCHES=( # not upstreamable stuff "${FILESDIR}/${PN}-3.7-system-pyuno.patch" + # bug 485862 + "${FILESDIR}/${P}-idfattrib.patch" ) REQUIRED_USE=" |