------------------------------------------------------------
revno: 2027
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Mon 2010-06-14 20:53:53 +0200
message:
add +kde4-statusbar-redrawing-border-width.diff; shorten some changelog lines
added:
patches/kde4-statusbar-redrawing-border-width.diff
modified:
changelog
patches/series
=== modified file 'changelog'
--- a/changelog 2010-06-14 09:07:33 +0000
+++ b/changelog 2010-06-14 18:53:53 +0000
@@ -9,18 +9,20 @@
on build time
* debian/patches/installer-globals-max-1-regcomp.diff: only try to register
one component at a time
+ * debian/patches/kde4-statusbar-redrawing-border-width.diff: backport; add
+ better border width (closes: #584322)
* debian/control.in:
- update Vcs-Bzr:
* debian/rules:
- run smoketest for armel again (the logic was flawed anyway and
- disabled smoketest for all archs)
- * debian/smoketest/*, debian/rules: disable Database{Insert,Delete,Seek}
tests
- on armel. No regression. Base (still) unusable, though :/
- * debian/rules, debian/control*in: disable Base and associated stuff for
armel
- (indirecly closes: #585829)
+ disabled smok)etest for all archs)
+ * debian/smoketest/*, debian/rules: disable Database{Insert,Delete,Seek}
+ tests on armel. No regression. Base (still) unusable, though :/
+ * debian/rules, debian/control*in: disable Base and associated stuff for
+ armel (As Base is now gone this closes: #585829)
- -- Rene Engelhard <[email protected]> Mon, 14 Jun 2010 08:01:39 +0200
+ -- Rene Engelhard <[email protected]> Mon, 14 Jun 2010 17:33:19 +0200
openoffice.org (1:3.2.1-1) unstable; urgency=medium
=== added file 'patches/kde4-statusbar-redrawing-border-width.diff'
--- a/patches/kde4-statusbar-redrawing-border-width.diff 1970-01-01
00:00:00 +0000
+++ b/patches/kde4-statusbar-redrawing-border-width.diff 2010-06-14
18:53:53 +0000
@@ -0,0 +1,55 @@
+diff --git a/patches/dev300/apply b/patches/dev300/apply
+index 9eeb20a..f53e9e9 100644
+--- openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/apply
++++ openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/apply
+@@ -2345,6 +2345,8 @@ kde4-border-frame.diff, i#111464, jholesov
+
+ # redraw the status bar when needed; backport from CWS vcl109; fix by pl
+ kde4-statusbar-redrawing.diff, bnc#567886, i#107945, pmladek
++# do not crash with non-Oxygen theme; use better border width
++kde4-statusbar-redrawing-2.diff, bnc#612491, i#109176, pmladek
+
+ [ KDE4Experimental ]
+ # Not yet ported to co-exist with the KDE3 stuff
+diff --git a/patches/dev300/kde4-statusbar-redrawing-2.diff
b/patches/dev300/kde4-statusbar-redrawing-2.diff
+new file mode 100644
+index 0000000..24fe201
+--- /dev/null
++++
openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/kde4-statusbar-redrawing-2.diff
+@@ -0,0 +1,36 @@
++--- vcl/unx/kde4/KDESalGraphics.cxx.old 2010-06-14 14:21:03.000000000
+0200
+++++ vcl/unx/kde4/KDESalGraphics.cxx 2010-06-14 17:03:45.000000000 +0200
++@@ -454,15 +454,28 @@ BOOL KDESalGraphics::drawNativeControl(
++ lcl_drawFrame(QStyle::PE_Frame, m_image,
++
vclStateValue2StateFlag(nControlState, value));
++
++- int size = kapp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin);
+++ // draw just the border, see
http://qa.openoffice.org/issues/show_bug.cgi?id=107945
+++ // FIXME: how to get the actual frame width?
QStyle::PM_DefaultFrameWidth is "1" for Oxygen
+++ // and the frame is 2 pixels in reality
+++ int nFrameWidth =
kapp->style()->pixelMetric(QStyle::PM_DefaultFrameWidth) + 1;
++ pTempClipRegion = XCreateRegion();
++ XRectangle xRect = { widgetRect.left(), widgetRect.top(),
widgetRect.width(), widgetRect.height() };
++ XUnionRectWithRegion( &xRect, pTempClipRegion, pTempClipRegion );
++ XLIB_Region pSubtract = XCreateRegion();
++- xRect.x += size;
++- xRect.y += size;
++- xRect.width -= 2* size;
++- xRect.height -= 2*size;
+++ xRect.x += nFrameWidth;
+++ xRect.y += nFrameWidth;
+++
+++ // do not crash for too small widgets, see
http://qa.openoffice.org/issues/show_bug.cgi?id=112102
+++ if ( xRect.width > 2*nFrameWidth )
+++ xRect.width -= 2*nFrameWidth;
+++ else
+++ xRect.width = 0;
+++
+++ if (xRect.height > 2*nFrameWidth)
+++ xRect.height -= 2*nFrameWidth;
+++ else
+++ xRect.height = 0;
+++
++ XUnionRectWithRegion( &xRect, pSubtract, pSubtract );
++ XSubtractRegion( pTempClipRegion, pSubtract, pTempClipRegion );
++ XDestroyRegion( pSubtract );
=== modified file 'patches/series'
--- a/patches/series 2010-06-14 07:22:41 +0000
+++ b/patches/series 2010-06-14 18:53:53 +0000
@@ -6,3 +6,4 @@
fix-smoketest-without-java.diff
fix-nodep-check.diff
installer-globals-max-1-regcomp.diff
+kde4-statusbar-redrawing-border-width.diff
