testing/xournal: build fix for armv7

2 files changed, 60 insertions, 2 deletions

diff --git a/testing/xournal/APKBUILD b/testing/xournal/APKBUILD
index 08f13281d9..f1da4eb8ad 100644
--- a/testing/xournal/APKBUILD
+++ b/testing/xournal/APKBUILD
@@ -9,7 +9,8 @@ arch="all !aarch64"
 license="GPL-2.0"
 makedepends="libgnomecanvas-dev poppler-dev gtk+2.0-dev libart-lgpl-dev"
 subpackages="$pkgname-lang"
-source="https://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+source="https://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz
+        static-inline.patch"
 builddir="$srcdir/"$pkgname-$pkgver
 
 build() {
@@ -32,4 +33,5 @@ package() {
         make DESTDIR="$pkgdir" install
 }
 
-sha512sums="cfd5760a0e832ef02786a29cb744d4932aeee97c4d6992b430e647bd59aaef1042735203824d0eaf9da9b884dcdadcfb8f5acea221638db91438ae46a6ee42bf  xournal-0.4.8.tar.gz"
+sha512sums="cfd5760a0e832ef02786a29cb744d4932aeee97c4d6992b430e647bd59aaef1042735203824d0eaf9da9b884dcdadcfb8f5acea221638db91438ae46a6ee42bf  xournal-0.4.8.tar.gz
+de5dbe8a6ee98215cca22e0776817f655b7dfe741ebb186e7fdfa0569bc078888f84669d0ddbcf7abfd31232a533b02f00acc8b2a7204339b2e69a4a7f8f7df4  static-inline.patch"
diff --git a/testing/xournal/static-inline.patch b/testing/xournal/static-inline.patch
new file mode 100644
index 0000000000..5a87495028
--- /dev/null
+++ b/testing/xournal/static-inline.patch
@@ -0,0 +1,56 @@
+diff --git a/src/xo-shapes.c b/src/xo-shapes.c
+index 33840fd..4ed17da 100644
+--- a/src/xo-shapes.c
++++ b/src/xo-shapes.c
+@@ -72,42 +72,42 @@ void calc_inertia(double *pt, int start, int end, struct Inertia *s)
+ 
+ /* compute normalized quantities */
+ 
+-inline double center_x(struct Inertia s) 
+-{ 
++static inline double center_x(struct Inertia s)
++{
+   return s.sx/s.mass;
+ }
+ 
+-inline double center_y(struct Inertia s) 
+-{ 
++static inline double center_y(struct Inertia s)
++{
+   return s.sy/s.mass;
+ }
+ 
+-inline double I_xx(struct Inertia s)
++static inline 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)
++static inline 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)
++static inline 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)
++static inline 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)
++static inline 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.;