Update xournal to 0.4.8

* Features:
  - option to auto-save documents and recover auto-saves (after Edward Yang,
    Aiwarrior, Timo Kluck)
  - new Export to PDF code using cairo (and config option to enable legacy
    code)
  - horizontal view mode
  - improved touchscreen handling
  - pencil cursor option (patch by Luciano Siqueira)
  - added "new pages duplicate background" option (new default is false)
  - updated Windows build and packaging instructions
* XInput device handling:
  - ignore events from non-drawing devices by default (ignore_other_devices)
  - "touchscreen as hand tool" option (after Rumen Zarev and Daniel German)
  - "pen disables touchscreen" option; dialog box to designate touch device
  - tweaks to xinput event processing for touchscreens
* Bugfixes:
  - generate cursors from pixbufs (fixes a Win32 bug)
  - work around Win32 bug: refuse paste if mismatched format
  - fix configure.in for automake-1.13 (Florian Bruhin, Andreas Huettel)
  - smoother icons for eraser and shapes buttons (by Colin Macdonald)
  - fix a cross-platform g_basename() issue (after Daniel German)
  - bugfix for file paths with non-English characters in Win32
  - add some margin around lasso selection rectangle (after Niklas Beisert)
  - warn for fontconfig cache generation in Win32
* Translations:
  - Chinese (simplified) translation (by Mutse)
  - updated German translation (Stefan Holtzhauer)
  - Polish translation (by Mis Uszatek)
  - Chinese (traditional) translation (William Chao)
  - Japanese translation (by Hiroshi Saito)

4 files changed, 69 insertions, 9 deletions

diff --git a/editors/xournal/Makefile b/editors/xournal/Makefile
index 75308e5a9ef..3a4941d1ef4 100644
--- a/editors/xournal/Makefile
+++ b/editors/xournal/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2015/11/23 10:30:15 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2016/01/04 02:06:48 markd Exp $
 
-DISTNAME=	xournal-0.4.7
-PKGREVISION=	27
+DISTNAME=	xournal-0.4.8
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xournal/}
 
diff --git a/editors/xournal/PLIST b/editors/xournal/PLIST
index d09478d908a..1cfa53cffbf 100644
--- a/editors/xournal/PLIST
+++ b/editors/xournal/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2012/07/07 20:33:09 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/01/04 02:06:48 markd Exp $
 bin/xournal
 share/locale/ca/LC_MESSAGES/xournal.mo
 share/locale/cs/LC_MESSAGES/xournal.mo
@@ -6,8 +6,12 @@ share/locale/de/LC_MESSAGES/xournal.mo
 share/locale/es/LC_MESSAGES/xournal.mo
 share/locale/fr/LC_MESSAGES/xournal.mo
 share/locale/it/LC_MESSAGES/xournal.mo
+share/locale/ja/LC_MESSAGES/xournal.mo
 share/locale/nl/LC_MESSAGES/xournal.mo
+share/locale/pl/LC_MESSAGES/xournal.mo
 share/locale/pt_BR/LC_MESSAGES/xournal.mo
+share/locale/zh_CN/LC_MESSAGES/xournal.mo
+share/locale/zh_TW/LC_MESSAGES/xournal.mo
 share/xournal/html-doc/manual.html
 share/xournal/html-doc/pixmaps
 share/xournal/html-doc/screenshot.png
diff --git a/editors/xournal/distinfo b/editors/xournal/distinfo
index a2270823269..544566cbd03 100644
--- a/editors/xournal/distinfo
+++ b/editors/xournal/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 03:32:24 agc Exp $
+$NetBSD: distinfo,v 1.4 2016/01/04 02:06:48 markd Exp $
 
-SHA1 (xournal-0.4.7.tar.gz) = d2556bf21bef2df99bef0a6d1cb251d5e0f12d3f
-RMD160 (xournal-0.4.7.tar.gz) = 7735e37ba07c57fb89231a2a27cf6357490af699
-SHA512 (xournal-0.4.7.tar.gz) = 476048b36c73b412dc7e003df5b61b3d694570fde77cbde057e887c1251c4ef18389567f2a63259b4e93a14ef4681536dcbb0f04ead28b60d70c9a4bd33a1cb0
-Size (xournal-0.4.7.tar.gz) = 553391 bytes
+SHA1 (xournal-0.4.8.tar.gz) = e8b15c427287928e0995cc1b3bc83c2897c689ef
+RMD160 (xournal-0.4.8.tar.gz) = 4e2afb964fc8b4808c125cd65e9c36f6124f8542
+SHA512 (xournal-0.4.8.tar.gz) = cfd5760a0e832ef02786a29cb744d4932aeee97c4d6992b430e647bd59aaef1042735203824d0eaf9da9b884dcdadcfb8f5acea221638db91438ae46a6ee42bf
+Size (xournal-0.4.8.tar.gz) = 641240 bytes
+SHA1 (patch-src_xo-shapes.c) = ab5a56780dd6fa37a3b51f89468c6100137454f3
diff --git a/editors/xournal/patches/patch-src_xo-shapes.c b/editors/xournal/patches/patch-src_xo-shapes.c
new file mode 100644
index 00000000000..a434cc20f64
--- /dev/null
+++ b/editors/xournal/patches/patch-src_xo-shapes.c
@@ -0,0 +1,56 @@
+$NetBSD: patch-src_xo-shapes.c,v 1.1 2016/01/04 02:06:48 markd Exp $
+
+gcc 5.3 didn't like the "inline"s
+
+--- src/xo-shapes.c.orig	2014-06-15 20:21:05.000000000 +0000
++++ src/xo-shapes.c
+@@ -72,42 +73,42 @@ void calc_inertia(double *pt, int start,
+ 
+ /* compute normalized quantities */
+ 
+-inline double center_x(struct Inertia s) 
++double center_x(struct Inertia s) 
+ { 
+   return s.sx/s.mass;
+ }
+ 
+-inline double center_y(struct Inertia s) 
++double center_y(struct Inertia s) 
+ { 
+   return s.sy/s.mass;
+ }
+ 
+-inline double I_xx(struct Inertia s)
++double I_xx(struct Inertia s)
+ {
+   if (s.mass <= 0.) return 0.;
+   return (s.sxx - s.sx*s.sx/s.mass)/s.mass;
+ }
+ 
+-inline double I_xy(struct Inertia s)
++double I_xy(struct Inertia s)
+ {
+   if (s.mass <= 0.) return 0.;
+   return (s.sxy - s.sx*s.sy/s.mass)/s.mass;
+ }
+ 
+-inline double I_yy(struct Inertia s)
++double I_yy(struct Inertia s)
+ {
+   if (s.mass <= 0.) return 0.;
+   return (s.syy - s.sy*s.sy/s.mass)/s.mass;
+ }
+ 
+-inline double I_rad(struct Inertia s)
++double I_rad(struct Inertia s)
+ {
+   double ixx = I_xx(s), iyy = I_yy(s);
+   if (ixx+iyy <= 0.) return 0.;
+   return sqrt(ixx+iyy);
+ }
+ 
+-inline double I_det(struct Inertia s)
++double I_det(struct Inertia s)
+ {
+   double ixx = I_xx(s), iyy = I_yy(s), ixy = I_xy(s);
+   if (s.mass <= 0.) return 0.;