[arch-commits] Commit in gtk-engine-murrine/trunk (PKGBUILD fix-crasher.patch)

[Balló György]

    Date: Wednesday, January 24, 2018 @ 19:07:17
  Author: bgyorgy
Revision: 286626

upgpkg: gtk-engine-murrine 0.98.2-3

Fix FS#48294

Added:
  gtk-engine-murrine/trunk/fix-crasher.patch
Modified:
  gtk-engine-murrine/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   15 ++++++++++++---
 fix-crasher.patch |   12 ++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-24 19:01:15 UTC (rev 286625)
+++ PKGBUILD	2018-01-24 19:07:17 UTC (rev 286626)
@@ -7,7 +7,7 @@
 
 pkgname=gtk-engine-murrine
 pkgver=0.98.2
-pkgrel=2
+pkgrel=3
 pkgdesc="GTK2 engine to make your desktop look like a 'murrina', an italian word meaning the art glass works done by Venicians glass blowers."
 arch=('x86_64')
 url="http://cimitan.com/murrine/project/murrine"
@@ -14,9 +14,17 @@
 license=('LGPL3')
 depends=('gtk2')
 makedepends=('intltool')
-source=(https://ftp.gnome.org/pub/GNOME/sources/murrine/0.98/murrine-${pkgver}.tar.xz)
-sha256sums=('e9c68ae001b9130d0f9d1b311e8121a94e5c134b82553ba03971088e57d12c89')
+source=(https://ftp.gnome.org/pub/GNOME/sources/murrine/0.98/murrine-${pkgver}.tar.xz
+        fix-crasher.patch)
+sha256sums=('e9c68ae001b9130d0f9d1b311e8121a94e5c134b82553ba03971088e57d12c89'
+            'e33f76ea23e38eecd2921300c7c01ff06ca33f63b9c7810d83d95e47681fe7da')
 
+prepare() {
+  cd murrine-${pkgver}
+  # https://bugs.archlinux.org/task/48294
+  patch -Np1 -i ../fix-crasher.patch
+}
+
 build() {
   cd murrine-${pkgver}
   ./configure \
@@ -23,6 +31,7 @@
     --prefix=/usr \
     --enable-animation \
     --enable-animationrtl
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 

Added: fix-crasher.patch
===================================================================
--- fix-crasher.patch	                        (rev 0)
+++ fix-crasher.patch	2018-01-24 19:07:17 UTC (rev 286626)
@@ -0,0 +1,12 @@
+Index: gtk2-engines-murrine-0.98.2/src/murrine_style.c
+===================================================================
+--- gtk2-engines-murrine-0.98.2.orig/src/murrine_style.c
++++ gtk2-engines-murrine-0.98.2/src/murrine_style.c
+@@ -2171,6 +2171,7 @@ murrine_style_draw_layout (GtkStyle
+ 			cairo_t *cr; 
+ 			cr = murrine_begin_paint (window, area); 
+ 			cairo_translate (cr, x+xos, y+yos); 
++			pango_cairo_update_layout (cr, layout);
+ 			pango_cairo_layout_path (cr, layout);
+ 			murrine_set_color_rgba (cr, &temp, 0.5);
+ 			cairo_stroke (cr);