Djam/libreoffice
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/libreoffice.git synced 2025-02-23 18:43:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

LOG Add patch to fix Impress crash with libreoffice-kde4

Browse source
This commit is contained in:
Andrey Bondrov 2013-09-26 18:11:50 +11:00
parent 57871a0628
commit 69ef044788
2 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libreoffice-4.1.2.2-impress-kde-crash-hack.patch Normal file
View file

@ -0,0 +1,19 @@
diff -urN libreoffice-4.1.2.2-orig/vcl/unx/kde4/KDESalGraphics.cxx libreoffice-4.1.2.2-patched/vcl/unx/kde4/KDESalGraphics.cxx
--- libreoffice-4.1.2.2-orig/vcl/unx/kde4/KDESalGraphics.cxx 2013-09-18 03:27:21.000000000 +1100
+++ libreoffice-4.1.2.2-patched/vcl/unx/kde4/KDESalGraphics.cxx 2013-09-26 17:51:27.000000000 +1100
@@ -167,8 +167,13 @@
option->state |= state;
option->rect = image->rect();
- QPainter painter(image);
- kapp->style()->drawComplexControl(element, option, &painter);
+ // Hack: Don't display tiny useless scrollbars
+ // Impress is known to crash when adding effects (segfault is triggered by 15x18 scrollbar)
+ if (!((option->type == QStyleOption::SO_Slider) && ((option->rect.width() * option->rect.height()) < 300)))
+ {
+ QPainter painter(image);
+ kapp->style()->drawComplexControl(element, option, &painter);
+ }
}
int getFrameWidth()

11
libreoffice.spec
View file

@ -46,7 +46,7 @@ Summary: Office suite
Name: libreoffice Name: libreoffice
Epoch: 1 Epoch: 1
Version: 4.1.2 Version: 4.1.2
Release: 2 Release: 3
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic
Group: Office Group: Office
Url: http://www.libreoffice.org Url: http://www.libreoffice.org
@ -79,14 +79,19 @@ Patch0: libreoffice-4.1.0.1-non-fatal-error-during-test.patch
Patch1: libreoffice-3.5.2.2-icu-49.patch Patch1: libreoffice-3.5.2.2-icu-49.patch
Patch2: help-images-mdv64789.patch Patch2: help-images-mdv64789.patch
Patch3: libreoffice-4.1-libcmis-0.4.patch Patch3: libreoffice-4.1-libcmis-0.4.patch
# ROSA bugfix patches
# Force Qt4 event loops because with glib event loops libreoffice-kde4 doesn't work well # Force Qt4 event loops because with glib event loops libreoffice-kde4 doesn't work well
# Requires patched Qt4, see https://bugreports.qt-project.org/browse/QTBUG-16934 # Requires patched Qt4, see https://bugreports.qt-project.org/browse/QTBUG-16934
Patch4: libreoffice-4.1.2.2-kde-qt-event-loop.patch Patch50: libreoffice-4.1.2.2-kde-qt-event-loop.patch
# Hack: Don't display tiny useless scrollbars with libreoffice-kde4
# Impress is known to crash when adding effects (segfault is triggered by 15x18 scrollbar)
Patch51: libreoffice-4.1.2.2-impress-kde-crash-hack.patch
# ROSA vendor patch # ROSA vendor patch
Patch100: libreoffice-4.1-vendor.patch Patch100: libreoffice-4.1-vendor.patch
# Bugfix patches, including upstream # Other bugfix patches, including upstream
Patch200: 0001-Avoid-crash-when-a-comment-contains-data-but-no-text.patch Patch200: 0001-Avoid-crash-when-a-comment-contains-data-but-no-text.patch
Patch201: 0001-Resolves-rhbz-1006850-crash-in-SwCommentRuler-GetCom.patch Patch201: 0001-Resolves-rhbz-1006850-crash-in-SwCommentRuler-GetCom.patch
Patch202: 0001-Resolves-rhbz-968892-force-render-full-grapheme-with.patch Patch202: 0001-Resolves-rhbz-968892-force-render-full-grapheme-with.patch