Summary: | app-office/libreoffice-3.4.5.2, 3.4.99.2 fails to build with kde-4.7.97 | ||
---|---|---|---|
Product: | Gentoo Linux | Reporter: | Andreas K. Hüttel <dilfridge> |
Component: | Current packages | Assignee: | Gentoo Office Team <office> |
Status: | RESOLVED FIXED | ||
Severity: | normal | CC: | kde |
Priority: | Normal | ||
Version: | unspecified | ||
Hardware: | All | ||
OS: | Linux | ||
Whiteboard: | |||
Package list: | Runtime testing required: | --- | |
Attachments: |
full build log, compressed
emerge --info |
Description
Andreas K. Hüttel
2012-01-05 16:51:32 UTC
Created attachment 298021 [details]
full build log, compressed
Created attachment 298023 [details]
emerge --info
3.4.4.2-r1 built fine with kde-4.7.95 3.4.5.2 fails to build with kde-4.7.97 the subdirectory "fpicker" is idencical in 3.4.4.2-r1 and 3.4.5.2 :( Same problem with 3.4.99.2 After some analysis... In KDE-4.8, a new value was introduced in the enum SettingsCategory in kglobalsettings.h, SETTINGS_LOCALE. (Commit 7bc79dbe by Lamarque V. Souza in kdelibs/kdeui/kernel/kglobalsettings.h, line 595 now). 590 /** 591 * Valid values for the settingsChanged signal 592 */ 593 enum SettingsCategory { SETTINGS_MOUSE, SETTINGS_COMPLETION, SETTINGS_PATHS, 594 SETTINGS_POPUPMENU, SETTINGS_QT, SETTINGS_SHORTCUTS, 595 SETTINGS_LOCALE }; Unfortunately, libreoffice already #defines SETTINGS_LOCALE, namely in vcl/inc/vcl/settings.hxx, line 1160: 1160 #define SETTINGS_LOCALE ((sal_uLong)0x00000200) And KFilePicker.cxx includes vcl/svapp.hxx which includes vcl/settings.hxx... bang. No idea how exactly to solve this, but someone familiar with the code should be able to do it quickly now... :o) I should really read my backlog... Thanks Luboš! http://cgit.freedesktop.org/libreoffice/core/commit/?id=0d7e2108425da1f81c20a605145679168486df59 + 08 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> + +files/libreoffice-kde48.patch, libreoffice-3.4.5.2.ebuild, + libreoffice-3.4.99.2.ebuild: + Fix build with kde-4.8, bug 397775 + |