commit 171b95a01d184bf0d2e50b59f384952095fc0df0 Author: Tim Biermann <tbier@posteo.de> Date: Sat Jan 28 14:46:39 2023 +0100 libodfgen: pulled patches from libreoffice diff --git a/libodfgen/.signature b/libodfgen/.signature index 9d105757f..f8509f89b 100644 --- a/libodfgen/.signature +++ b/libodfgen/.signature @@ -1,5 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF35qWkx3rvgleJbTk1I8pixwYSEzCKkUfnL95yP0riG/M5OHhzF9PJ0FA7CCLn7SjG9kUch0yMp/CDekqycWABQI= -SHA256 (Pkgfile) = 0e3369201ab67fe60660ff1c45aa43d4b42f6b0c4b9a30e98e1b2cbe736657ec +RWSagIOpLGJF30tyuE4P5l9nCO5trupl5Dp2ZLFPwb4cb86okJV+M3qKzK7TcrQvctUuBPD/E6Ko/KzUdi5FdWUxnJXeJY5tWw8= +SHA256 (Pkgfile) = d2ea97ef5459ae02cf2ca5bdc9a00648a409aa3569f2f7ee1eedbc3d9481525b SHA256 (.footprint) = 3b091d64dfdb60806313f7ed17ebe9fa035d7f5114b075823cc280f3400b5fa6 SHA256 (libodfgen-0.1.8.tar.xz) = 55200027fd46623b9bdddd38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625 +SHA256 (ellipticalarc.patch) = d73447cd236f5c20fceefdb278c856af2f05a185782ad2bdb23a220d38ac0a9c +SHA256 (rpath.patch) = 02f11d9b12f858482a958feb91e9a0b1ed303976888142a464d33c3560d1d908 diff --git a/libodfgen/Pkgfile b/libodfgen/Pkgfile index 9bf49199d..3a1b0758a 100644 --- a/libodfgen/Pkgfile +++ b/libodfgen/Pkgfile @@ -5,11 +5,17 @@ name=libodfgen version=0.1.8 -release=2 -source=(https://sourceforge.net/projects/libwpd/files/libodfgen/$name-$version/$name...) +release=3 +source=(https://sourceforge.net/projects/libwpd/files/libodfgen/$name-$version/$name... + ellipticalarc.patch + rpath.patch) build() { cd $name-$version + + patch -Np0 -i $SRC/ellipticalarc.patch + patch -Np0 -i $SRC/rpath.patch + ./configure --prefix=/usr \ --without-docs make diff --git a/libodfgen/ellipticalarc.patch b/libodfgen/ellipticalarc.patch new file mode 100644 index 000000000..27aaee77c --- /dev/null +++ b/libodfgen/ellipticalarc.patch @@ -0,0 +1,13 @@ +--- src/GraphicFunctions.cxx ++++ src/GraphicFunctions.cxx +@@ -59,6 +59,10 @@ + double rx, double ry, double phi, bool largeArc, bool sweep, double x, double y, + double &xmin, double &ymin, double &xmax, double &ymax) + { ++ if (x0 == x && y0 == y) { ++ return; ++ } ++ + phi *= M_PI/180; + if (rx < 0.0) + rx *= -1.0; diff --git a/libodfgen/rpath.patch b/libodfgen/rpath.patch new file mode 100644 index 000000000..698cf5dca --- /dev/null +++ b/libodfgen/rpath.patch @@ -0,0 +1,10 @@ +--- configure ++++ configure +@@ -13940,6 +13940,7 @@ + esac + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + + lynxos*)