diff options
Diffstat (limited to 'testing/dia')
-rw-r--r-- | testing/dia/APKBUILD | 48 | ||||
-rw-r--r-- | testing/dia/isfinite.patch | 142 | ||||
-rw-r--r-- | testing/dia/isinf.patch | 16 |
3 files changed, 0 insertions, 206 deletions
diff --git a/testing/dia/APKBUILD b/testing/dia/APKBUILD deleted file mode 100644 index c23f67152e..0000000000 --- a/testing/dia/APKBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> -pkgname=dia -pkgver=0.97.2 -pkgrel=1 -pkgdesc="a GTK+ based diagram creation program" -url="http://live.gnome.org/Dia" -arch="all" -license="GPL2" -depends= -depends_dev= -makedepends="gtk+-dev libxml2-dev" -install="" -subpackages="$pkgname-doc $pkgname-lang" -source="http://ftp.gnome.org/pub/gnome/sources/dia/${pkgver%.*}/dia-$pkgver.tar.xz - isinf.patch - isfinite.patch" - -_builddir="$srcdir"/dia-$pkgver -prepare() { - local i - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done -} - -build() { - cd "$_builddir" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --localstatedir=/var \ - || return 1 - make || return 1 -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install || return 1 - rm "$pkgdir"/usr/lib/dia/*.la || return 1 -} - -md5sums="1e1180a513fb567709b09bc19f12105e dia-0.97.2.tar.xz -cbbc32d417297b855353f86b484b369b isinf.patch -eda8e89483e97473d983b048f834861a isfinite.patch" diff --git a/testing/dia/isfinite.patch b/testing/dia/isfinite.patch deleted file mode 100644 index 173b00046a..0000000000 --- a/testing/dia/isfinite.patch +++ /dev/null @@ -1,142 +0,0 @@ -diff --git a/lib/arrows.c b/lib/arrows.c -index 4371946..5b6cd3a 100644 ---- a/lib/arrows.c -+++ b/lib/arrows.c -@@ -18,7 +18,7 @@ - - #include <config.h> - --#define _BSD_SOURCE 1 /* to get finite */ -+#define _GNU_SOURCE 1 /* to get isfinite */ - #include <math.h> - #include <stdio.h> - #include <string.h> -@@ -29,11 +29,7 @@ - - #ifdef G_OS_WIN32 - #include <float.h> --#define finite(d) _finite(d) --#endif -- --#ifdef __EMX__ --#define finite(d) isfinite(d) -+#define isfinite(d) _finite(d) - #endif - - #include "arrows.h" -@@ -421,7 +417,7 @@ draw_one_exactly(DiaRenderer *renderer, Point *to, Point *from, - else { - vl.x = 1.0; vl.y = 0.0; - } -- if (!finite(vl.x)) { -+ if (!isfinite(vl.x)) { - vl.x = 1.0; vl.y = 0.0; - } - point_get_perp(&vt,&vl); -@@ -498,7 +494,7 @@ draw_one_or_none(DiaRenderer *renderer, Point *to, Point *from, - else { - vl.x = 1.0; vl.y = 0.0; - } -- if (!finite(vl.x)) { -+ if (!isfinite(vl.x)) { - vl.x = 1.0; vl.y = 0.0; - } - point_get_perp(&vt,&vl); -@@ -610,7 +606,7 @@ draw_fill_ellipse(DiaRenderer *renderer, Point *to, Point *from, - else { - vl.x = 1.0; vl.y = 0.0; - } -- if (!finite(vl.x)) { -+ if (!isfinite(vl.x)) { - vl.x = 1.0; vl.y = 0.0; - } - point_get_perp(&vt,&vl); -@@ -672,7 +668,7 @@ draw_empty_ellipse(DiaRenderer *renderer, Point *to, Point *from, - else { - vl.x = 1.0; vl.y = 0.0; - } -- if (!finite(vl.x)) { -+ if (!isfinite(vl.x)) { - vl.x = 1.0; vl.y = 0.0; - } - -@@ -718,7 +714,7 @@ calculate_box (Point *poly, const Point *to, const Point *from, - else { - vl.x = 1.0; vl.y = 0.0; - } -- if (!finite(vl.x)) { -+ if (!isfinite(vl.x)) { - vl.x = 1.0; vl.y = 0.0; - } - point_get_perp(&vt,&vl); -@@ -832,7 +828,7 @@ draw_fill_dot(DiaRenderer *renderer, Point *to, Point *from, - else { - vl.x = 1.0; vl.y = 0.0; - } -- if (!finite(vl.x)) { -+ if (!isfinite(vl.x)) { - vl.x = 1.0; vl.y = 0.0; - } - point_get_perp(&vt,&vl); -@@ -908,7 +904,7 @@ draw_integral(DiaRenderer *renderer, Point *to, Point *from, - else { - vl.x = 1.0; vl.y = 0.0; - } -- if (!finite(vl.x)) { -+ if (!isfinite(vl.x)) { - vl.x = 1.0; vl.y = 0.0; - } - point_get_perp(&vt,&vl); -@@ -946,7 +942,7 @@ calculate_slashed (Point *poly, const Point *to, const Point *from, - else { - vl.x = 1.0; vl.y = 0.0; - } -- if (!finite(vl.x)) { -+ if (!isfinite(vl.x)) { - vl.x = 1.0; vl.y = 0.0; - } - point_get_perp(&vt,&vl); -diff --git a/lib/boundingbox.c b/lib/boundingbox.c -index 6d2749f..6938537 100644 ---- a/lib/boundingbox.c -+++ b/lib/boundingbox.c -@@ -21,7 +21,7 @@ - - #include <config.h> - --#define _BSD_SOURCE 1 -+#define _GNU_SOURCE 1 /* to get isfinite */ - #include <math.h> - #include <string.h> /* memcmp() */ - -@@ -510,7 +510,7 @@ polybezier_bbox(const BezPoint *pts, int numpoints, - real overshoot; - Point vovs,pto; - -- if (finite(alpha)) -+ if (isfinite(alpha)) - overshoot = extra->middle_trans / sin(alpha/2.0); - else /* prependicular? */ - overshoot = extra->middle_trans; -diff --git a/objects/standard/arc.c b/objects/standard/arc.c -index 28302a6..80674a3 100644 ---- a/objects/standard/arc.c -+++ b/objects/standard/arc.c -@@ -21,7 +21,7 @@ - #endif - - #include <assert.h> --#define _BSD_SOURCE 1 /* to get finite */ -+#define _GNU_SOURCE 1 /* to get finite */ - #include <math.h> - - #include "intl.h" -@@ -407,7 +407,7 @@ arc_compute_midpoint(Arc *arc, const Point * ep0, const Point * ep1 , Point * mi - angle -= -atan2(oep0->y - arc->center.y, oep0->x - arc->center.x); /* minus angle of old */ - angle += -atan2(ep1->y - arc->center.y, ep1->x - arc->center.x); /* plus angle of new */ - angle -= -atan2(oep1->y - arc->center.y, oep1->x - arc->center.x); /* minus angle of old */ -- if (!finite(angle)){ -+ if (!isfinite(angle)){ - return 0; - } - if (angle < -1 * M_PI){ diff --git a/testing/dia/isinf.patch b/testing/dia/isinf.patch deleted file mode 100644 index 4cd4adbc86..0000000000 --- a/testing/dia/isinf.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- ./configure.orig -+++ ./configure -@@ -17436,11 +17436,11 @@ - #ifdef __cplusplus - extern "C" - #endif --char isinf (); -+#include <math.h> - int - main () - { --return isinf (); -+return isinf (0.0); - ; - return 0; - } |