diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-12-04 20:44:11 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-12-04 20:45:28 +0000 |
| commit | 7797d50617286763917acae4e6da01fe74861bf7 (patch) | |
| tree | b0d35041bc0b93c1d502995ecdf394126ff5f986 /main/abiword | |
| parent | 1f5823db3d669c777d0a59c4074baec685428d95 (diff) | |
| download | aports-7797d50617286763917acae4e6da01fe74861bf7.tar.bz2 aports-7797d50617286763917acae4e6da01fe74861bf7.tar.xz | |
main/abiword: fix ruler bug
from upstream: http://bugzilla.abisource.com/show_bug.cgi?id=13582
Diffstat (limited to 'main/abiword')
| -rw-r--r-- | main/abiword/APKBUILD | 12 | ||||
| -rw-r--r-- | main/abiword/fix-ruler.patch | 48 |
2 files changed, 56 insertions, 4 deletions
diff --git a/main/abiword/APKBUILD b/main/abiword/APKBUILD index 3704bf38cc..3c9dbad0ec 100644 --- a/main/abiword/APKBUILD +++ b/main/abiword/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=abiword pkgver=3.0.0 -pkgrel=3 +pkgrel=4 pkgdesc="A fully-featured word processor" url="http://www.abisource.com" arch="all" @@ -30,6 +30,7 @@ done source="http://www.abisource.com/downloads/$pkgname/$pkgver/source/$pkgname-$pkgver.tar.gz pdf.patch + fix-ruler.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -85,8 +86,11 @@ plugins() { } md5sums="8d9c41cff3a8fbef8d0c835c65600e65 abiword-3.0.0.tar.gz -ba81b555f1980b2f070c494fce50b830 pdf.patch" +ba81b555f1980b2f070c494fce50b830 pdf.patch +4afd1975c3b9de7ed48f2fd01f80a5f4 fix-ruler.patch" sha256sums="d17e318c00ff4eb353e0e7994b098b1d4f9ddd8712ac0261a0e38b89081fac01 abiword-3.0.0.tar.gz -94ab986c208fe13c2f89a0b6af5983dee19f8e9e6267e07f95e053e2c50826d4 pdf.patch" +94ab986c208fe13c2f89a0b6af5983dee19f8e9e6267e07f95e053e2c50826d4 pdf.patch +ad605e37716731c58e15d68e3e7527b03506fe807b3475fbf60f05eb3e9ebddf fix-ruler.patch" sha512sums="3f9804b17f27b8afa2f5bcccdb1b5d6270339ad4f518523208f2e2cde54cb28391575cfd3639aaadc13ab50d5908260b159ca7b41fd92ed5a449d7012e5a4637 abiword-3.0.0.tar.gz -6c5c25d049254e16577f8adb0d046e52cbf1d5dfc7c89dc8a23357447d17ce07f09b5864f0ccd0dfefa289ced685aa22de7de51f0681f50373728c9764cf5650 pdf.patch" +6c5c25d049254e16577f8adb0d046e52cbf1d5dfc7c89dc8a23357447d17ce07f09b5864f0ccd0dfefa289ced685aa22de7de51f0681f50373728c9764cf5650 pdf.patch +a1f52bdf1e7e2d21c63c334ba624a5a6ee62b6c06f31ebc8d74e9fa2dbd5022a2c09fb16c743f2dab7ba3e9ce41989908fb47638c4593cbe5f9d8c537e2fbddd fix-ruler.patch" diff --git a/main/abiword/fix-ruler.patch b/main/abiword/fix-ruler.patch new file mode 100644 index 0000000000..3f470831c4 --- /dev/null +++ b/main/abiword/fix-ruler.patch @@ -0,0 +1,48 @@ +commit f1d711aa84c95430319fd92ffbcb03df36e5e76e +Author: Hubert Figuière <hub@figuiere.net> +Date: Sat Feb 22 10:41:55 2014 -0500 + + Bug 13582 - Fix redraw region in custom widget. + + Cherry-picked from trunk@33870 and reworked for 3.0.x + +diff --git a/src/af/gr/gtk/gr_UnixCairoGraphics.cpp b/src/af/gr/gtk/gr_UnixCairoGraphics.cpp +index 4c8d23c..15d7a7d 100644 +--- a/src/af/gr/gtk/gr_UnixCairoGraphics.cpp ++++ b/src/af/gr/gtk/gr_UnixCairoGraphics.cpp +@@ -520,7 +520,7 @@ void GR_UnixCairoGraphics::_beginPaint() + { + UT_ASSERT(ev->type == GDK_EXPOSE || ev->type == GDK_DAMAGE); + if (ev->type == GDK_EXPOSE || ev->type == GDK_DAMAGE) +- UT_ASSERT(ev->expose.window == m_pWin); ++ UT_ASSERT(ev->expose.window == m_pWin || ev->expose.window == gdk_window_get_effective_parent (m_pWin)); + } + } + #endif +diff --git a/src/af/xap/gtk/xap_UnixCustomWidget.cpp b/src/af/xap/gtk/xap_UnixCustomWidget.cpp +index b0b7015..5150afe 100644 +--- a/src/af/xap/gtk/xap_UnixCustomWidget.cpp ++++ b/src/af/xap/gtk/xap_UnixCustomWidget.cpp +@@ -45,16 +45,18 @@ void XAP_UnixCustomWidget::_fe::expose(XAP_UnixCustomWidget *self, GdkEventExpos + #endif + { + #if GTK_CHECK_VERSION(3,0,0) +- GdkEventExpose *ev = reinterpret_cast<GdkEventExpose *>(gtk_get_current_event()); +-#endif ++ self->m_cr = cr; ++ double x1, y1, x2, y2; ++ cairo_clip_extents(cr, &x1, &y1, &x2, &y2); ++ ++ UT_Rect r(x1, y1, x2 - x1, y2 - y1); ++#else + UT_Rect r( + ev->area.x, + ev->area.y, + ev->area.width, + ev->area.height + ); +-#if GTK_CHECK_VERSION(3,0,0) +- self->m_cr = cr; + #endif + self->draw(&r); + } |