From 23fd4d048255ae78d59650abbc5a065e7cf0e6d8 Mon Sep 17 00:00:00 2001 From: alihanozturk Date: Wed, 15 Feb 2017 13:52:22 +0300 Subject: [PATCH] some packages update and rebuild --- multimedia/misc/gd/actions.py | 2 +- .../misc/gd/files/gd-2.1.0-multilib.patch | 34 +++++++++++++ multimedia/misc/gd/files/gd-2.2.3-tests.patch | 42 +++++++++++++++ .../misc/gd/files/gd-2.2.4-upstream.patch | 51 +++++++++++++++++++ multimedia/misc/gd/pspec.xml | 15 +++++- multimedia/misc/jansson/pspec.xml | 9 +++- multimedia/misc/libass/pspec.xml | 27 ++++++---- multimedia/misc/libbluray/pspec.xml | 9 +++- multimedia/misc/libcdr/pspec.xml | 9 +++- 9 files changed, 182 insertions(+), 16 deletions(-) create mode 100644 multimedia/misc/gd/files/gd-2.1.0-multilib.patch create mode 100644 multimedia/misc/gd/files/gd-2.2.3-tests.patch create mode 100644 multimedia/misc/gd/files/gd-2.2.4-upstream.patch diff --git a/multimedia/misc/gd/actions.py b/multimedia/misc/gd/actions.py index 941499b607..0422280235 100644 --- a/multimedia/misc/gd/actions.py +++ b/multimedia/misc/gd/actions.py @@ -26,4 +26,4 @@ def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) pisitools.dohtml(".") - pisitools.dodoc("COPYING", "NEWS", "ChangeLog") + pisitools.dodoc("COPYING", "README*") diff --git a/multimedia/misc/gd/files/gd-2.1.0-multilib.patch b/multimedia/misc/gd/files/gd-2.1.0-multilib.patch new file mode 100644 index 0000000000..28c3d12795 --- /dev/null +++ b/multimedia/misc/gd/files/gd-2.1.0-multilib.patch @@ -0,0 +1,34 @@ +diff -up gd-2.1.0/config/gdlib-config.in.multilib gd-2.1.0/config/gdlib-config.in +--- gd-2.1.0/config/gdlib-config.in.multilib 2013-04-21 16:58:17.820010758 +0200 ++++ gd-2.1.0/config/gdlib-config.in 2013-04-21 16:59:27.896317922 +0200 +@@ -7,9 +7,10 @@ + # installation directories + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ ++libdir=`pkg-config gdlib --variable=libdir` + includedir=@includedir@ + bindir=@bindir@ ++ldflags=`pkg-config gdlib --variable=ldflags` + + usage() + { +@@ -68,7 +69,7 @@ while test $# -gt 0; do + echo @GDLIB_REVISION@ + ;; + --ldflags) +- echo @LDFLAGS@ ++ echo $ldflags + ;; + --libs) + echo -lgd @LIBS@ @LIBICONV@ +@@ -83,7 +84,7 @@ while test $# -gt 0; do + echo "GD library @VERSION@" + echo "includedir: $includedir" + echo "cflags: -I@includedir@" +- echo "ldflags: @LDFLAGS@" ++ echo "ldflags: $ldflags" + echo "libs: @LIBS@ @LIBICONV@" + echo "libdir: $libdir" + echo "features: @FEATURES@" + diff --git a/multimedia/misc/gd/files/gd-2.2.3-tests.patch b/multimedia/misc/gd/files/gd-2.2.3-tests.patch new file mode 100644 index 0000000000..079506e2b7 --- /dev/null +++ b/multimedia/misc/gd/files/gd-2.2.3-tests.patch @@ -0,0 +1,42 @@ +From 2b3dd57a6ccb2940f2e9119ae04e14362e2a1f61 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Fri, 22 Jul 2016 08:14:12 +0200 +Subject: [PATCH] Fix gd2/gd2_read.c:8:6: error: 'error' may be used + uninitialized in this function [-Werror=maybe-uninitialized] + +Also report about any error, not only the last one. +--- + tests/gd2/gd2_read.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/tests/gd2/gd2_read.c b/tests/gd2/gd2_read.c +index 94fe069..8ce8bd1 100644 +--- a/tests/gd2/gd2_read.c ++++ b/tests/gd2/gd2_read.c +@@ -5,7 +5,7 @@ + + int main(int argc, char *argv[]) + { +- int error, i = 0; ++ int error = 0, i = 0; + gdImagePtr im, exp; + FILE *fp; + char *path[] = { +@@ -40,8 +40,6 @@ int main(int argc, char *argv[]) + gdTestErrorMsg("image %s differs from expected result\n", path[i]); + gdImageDestroy(im); + error = 1; +- } else { +- error = 0; + } + if (exp) { + gdImageDestroy(exp); +@@ -52,8 +50,6 @@ int main(int argc, char *argv[]) + gdTestErrorMsg("image %s should have failed to be loaded\n", path[i]); + gdImageDestroy(im); + error = 1; +- } else { +- error = 0; + } + } + i++; \ No newline at end of file diff --git a/multimedia/misc/gd/files/gd-2.2.4-upstream.patch b/multimedia/misc/gd/files/gd-2.2.4-upstream.patch new file mode 100644 index 0000000000..a40c766cbb --- /dev/null +++ b/multimedia/misc/gd/files/gd-2.2.4-upstream.patch @@ -0,0 +1,51 @@ +From c9b601a658a79e6ea2aad29fbf60ca6e24ccef1e Mon Sep 17 00:00:00 2001 +From: "Christoph M. Becker" +Date: Wed, 18 Jan 2017 13:59:02 +0100 +Subject: [PATCH] Fix build issue regarding INT_MAX + +For portability gd_gd2.c needs to include . +--- + src/gd_gd2.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/gd_gd2.c b/src/gd_gd2.c +index c2904ca..049c4c5 100644 +--- a/src/gd_gd2.c ++++ b/src/gd_gd2.c +@@ -74,6 +74,7 @@ + + /* 2.0.29: no more errno.h, makes windows happy */ + #include ++#include + #include + #include "gd.h" + #include "gd_errors.h" + + +From 55ac28a293eaa8c531870c8bb8ecc04b333975f4 Mon Sep 17 00:00:00 2001 +From: "Christoph M. Becker" +Date: Thu, 19 Jan 2017 01:02:58 +0100 +Subject: [PATCH] Fix #357: 2.2.4: Segfault in test suite. + +We make sure to never pass a negative `int` as argument to a `size_t` +parameter. +--- + src/gd_io_dp.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/gd_io_dp.c b/src/gd_io_dp.c +index eda2eeb..cb38794 100644 +--- a/src/gd_io_dp.c ++++ b/src/gd_io_dp.c +@@ -292,6 +292,10 @@ static int dynamicGetbuf(gdIOCtxPtr ctx, void *buf, int len) + rlen = dp->realSize - dp->pos; + } + ++ if (rlen < 0) { ++ return 0; ++ } ++ + memcpy(buf, (void *) ((char *)dp->data + dp->pos), rlen); + dp->pos += rlen; + + diff --git a/multimedia/misc/gd/pspec.xml b/multimedia/misc/gd/pspec.xml index d4d9cbaeee..026a00d901 100644 --- a/multimedia/misc/gd/pspec.xml +++ b/multimedia/misc/gd/pspec.xml @@ -13,7 +13,8 @@ library A fast library for creating graphic images The gd graphics library allows your code to quickly draw images complete with lines, arcs, text, multiple colors, cut and paste from other images, and flood fills, and to write out the result as a PNG or JPEG file. This is particularly useful in Web applications, where PNG and JPEG are two of the formats accepted for inline images by most browsers. Note that gd is not a paint program. - https://github.com/libgd/libgd/archive/gd-2.1.1.tar.gz + https://github.com/libgd/libgd/releases/download/gd-2.2.4/libgd-2.2.4.tar.xz + fontconfig-devel zlib-devel freetype-devel @@ -23,7 +24,10 @@ libvpx-devel - gd-2.1.1-libvpx-1.4.0.patch + + gd-2.1.0-multilib.patch + gd-2.2.3-tests.patch + gd-2.2.4-upstream.patch @@ -67,6 +71,13 @@ + + 2017-02-15 + 2.2.4 + Version Bump + Pisi Linux Community + admin@pisilinux.org + 2016-06-12 2.1.1 diff --git a/multimedia/misc/jansson/pspec.xml b/multimedia/misc/jansson/pspec.xml index b08d519459..734d777de3 100644 --- a/multimedia/misc/jansson/pspec.xml +++ b/multimedia/misc/jansson/pspec.xml @@ -12,7 +12,7 @@ library Jansson is a C library for encoding, decoding and manipulating JSON data. It features: Simple and intuitive API and data model, Comprehensive documentation, No dependencies on other libraries, Full Unicode support (UTF-8), Extensive test suite. - http://www.digip.org/jansson/releases/jansson-2.7.tar.bz2 + http://www.digip.org/jansson/releases/jansson-2.9.tar.bz2 glibc-devel @@ -46,6 +46,13 @@ + + 2017-02-15 + 2.9 + Version Bump + Pisi Linux Community + admin@pisilinux.org + 2016-06-09 2.7 diff --git a/multimedia/misc/libass/pspec.xml b/multimedia/misc/libass/pspec.xml index 6ca9c31d19..9f4ee2d86d 100644 --- a/multimedia/misc/libass/pspec.xml +++ b/multimedia/misc/libass/pspec.xml @@ -12,20 +12,20 @@ library Subtitle rendering library libass is a portable subtitle rendering library for the ASS/SSA. - https://github.com/libass/libass/releases/download/0.13.1/libass-0.13.1.tar.xz + https://github.com/libass/libass/releases/download/0.13.6/libass-0.13.6.tar.xz - fontconfig-devel - freetype-devel - fribidi-devel + fontconfig-devel + freetype-devel + fribidi-devel libass - fontconfig - freetype - fribidi + fontconfig + freetype + fribidi harfbuzz @@ -39,9 +39,9 @@ Development files for libass libass - fontconfig-devel - freetype-devel - fribidi-devel + fontconfig-devel + freetype-devel + fribidi-devel harfbuzz-devel @@ -51,6 +51,13 @@ + + 2017-02-15 + 0.13.6 + Version Bump + Pisi Linux Community + admin@pisilinux.org + 2016-06-09 0.13.1 diff --git a/multimedia/misc/libbluray/pspec.xml b/multimedia/misc/libbluray/pspec.xml index e22458c1f8..1b8f55fafa 100644 --- a/multimedia/misc/libbluray/pspec.xml +++ b/multimedia/misc/libbluray/pspec.xml @@ -12,7 +12,7 @@ library Library to access Blu-Ray disks for video playback Libbluray package is aiming to provide a full portable free open source bluray library, which can be plugged into popular media players to allow full bluray navigation and playback on Linux. It will eventually be compatible with all current titles, and will be easily portable and embeddable in standard players such as mplayer and vlc. - ftp://ftp.videolan.org/pub/videolan/libbluray/0.9.2/libbluray-0.9.2.tar.bz2 + ftp://ftp.videolan.org/pub/videolan/libbluray/0.9.3/libbluray-0.9.3.tar.bz2 libtool doxygen @@ -60,6 +60,13 @@ + + 2017-02-15 + 0.9.3 + Version Bump + Pisi Linux Community + admin@pisilinux.org + 2016-06-09 0.9.2 diff --git a/multimedia/misc/libcdr/pspec.xml b/multimedia/misc/libcdr/pspec.xml index 99e6003f16..848d42cffe 100644 --- a/multimedia/misc/libcdr/pspec.xml +++ b/multimedia/misc/libcdr/pspec.xml @@ -14,7 +14,7 @@ library Library parsing the Corel cdr documents Libcdr is library providing ability to interpret and import Corel Draw drawings into various applications. - http://dev-www.libreoffice.org/src/libcdr/libcdr-0.1.2.tar.xz + http://dev-www.libreoffice.org/src/libcdr/libcdr-0.1.3.tar.xz doxygen zlib-devel @@ -61,6 +61,13 @@ + + 2017-02-15 + 0.1.3 + Version Bump + Pisi Linux Community + admin@pisilinux.org + 2016-06-09 0.1.2