upstream prerelease 3.7.3; libXaw3D rebuild

2 files changed, 24 insertions, 8 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 0bc70f087f4d..b1fbc4457e80 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,25 @@
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gv
-pkgver=3.7.2
+pkgver=3.7.3
 pkgrel=1
 pkgdesc="A program to view PostScript and PDF documents"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/gv/"
 license=('GPL')
-depends=('xaw3d' 'ghostscript' 'desktop-file-utils')
+depends=('xaw3d>=1.6' 'ghostscript' 'desktop-file-utils')
 install=gv.install
-source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz gv.desktop gv.png)
-md5sums=('eb47d465755b7291870af66431c6f2e1'
+source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz gv.desktop gv.png
+        buildfix.diff)
+md5sums=('98ae3e9ce338b64ba5ab622389c5960e'
          'cf04652952f2d0903bc7578b4826f50c'
-         'ab0e3879dbe39e59ad1c923020c28a86')
-sha1sums=('d9573e17f5d88d150fccb257ce205dbceab83e8a'
-          'c8230fe08ee6d22525678a97832f44941237d174'
-          '35b9168e526527001b1b5b8ee34a5b69d9369590')
+         'ab0e3879dbe39e59ad1c923020c28a86'
+         '943baf7a6bb61389a09a4ec71083a900')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  # https://trac.macports.org/browser/trunk/dports/print/gv/files/patch-src-Scrollbar.c.diff?rev=89338
+  patch -Np0 -i ${srcdir}/buildfix.diff
   sed -i -e "s:-dGraphicsAlphaBits=2:\0 -dAlignToPixels=0:" src/Makefile.{am,in}
   ./configure --prefix=/usr
   make
diff --git a/buildfix.diff b/buildfix.diff
new file mode 100644
index 000000000000..76c88b158b27
--- /dev/null
+++ b/buildfix.diff
@@ -0,0 +1,15 @@
+This piece of code is from libXaw3d-1.6/src/Scrollbar.c (Line 644)
+
+http://bugs.gentoo.org/399753
+
+--- src/Scrollbar.c
++++ src/Scrollbar.c
+@@ -1006,7 +1006,7 @@
+    TOPLOC = newtop;
+    SHOWNLENGTH = newbot-newtop+1;
+ 
+-   (*swclass->threeD_class.shadowdraw) (w, event, region, FALSE);
++   (*swclass->threeD_class.shadowdraw) (w, event, region, sbw->threeD.relief, FALSE);
+ 
+    ENDMESSAGE(Redisplay)
+ }