mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-31 11:21:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

testing/xournal: build fix for armv7

Browse Source
This commit is contained in:
Natanael Copa 2019-06-10 14:11:29 +00:00
parent a46c750b47
commit acf6101af7
2 changed files with 60 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
testing/xournal/APKBUILD
View File

@ -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"

56
testing/xournal/static-inline.patch Normal file
View File

@ -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.;