wok-next rev 20542
Up cairo (1.14.12), cookutils (1044), freetype (deps), harfbuzz (deps), jsoncpp (1.8.4), libdrm (2.4.89), librsvg (2.42.2), mesa (17.3.4), pango (1.40.14).
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Mon Apr 02 10:44:00 2018 +0300 (2018-04-02) |
| parents | f763caa043f3 |
| children | 41c6e4b2a165 |
| files | cairo/receipt cookutils/receipt freetype/receipt harfbuzz/receipt jsoncpp/receipt jsoncpp/stuff/patches/0001-json_writer-fix-build-with-glibc-2.26.patch jsoncpp/stuff/patches/series libdrm/receipt librsvg/receipt mesa/receipt mesa/stuff/patches/0005-c99_math-fix-build-issue-with-glibc-2.26.patch mesa/stuff/patches/series pango/receipt |
line diff
1.1 --- a/cairo/receipt Sat Mar 31 13:24:46 2018 +0300 1.2 +++ b/cairo/receipt Mon Apr 02 10:44:00 2018 +0300 1.3 @@ -1,12 +1,13 @@ 1.4 # SliTaz package receipt v2. 1.5 1.6 PACKAGE="cairo" 1.7 -VERSION="1.14.8" 1.8 +VERSION="1.14.12" 1.9 CATEGORY="x-window" 1.10 SHORT_DESC="2D graphics library" 1.11 MAINTAINER="pankso@slitaz.org" 1.12 LICENSE="MPL LGPL2.1" 1.13 WEB_SITE="https://www.cairographics.org/" 1.14 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/cairo.html" 1.15 1.16 TARBALL="$PACKAGE-$VERSION.tar.xz" 1.17 WGET_URL="${WEB_SITE}releases/$TARBALL" 1.18 @@ -20,6 +21,7 @@ 1.19 BUILD_DEPENDS="$BUILD_DEPENDS mesa-dev eudev-dev xorg-libXxf86vm-dev \ 1.20 libdrm-dev mesa-libegl xorg-libxshmfence-dev" 1.21 SPLIT="$SPLIT cairo-gl:gl cairo-gl-tools:gl cairo-gl-dev:gl" 1.22 +COOKOPTS="skip-log-errors" 1.23 1.24 compile_rules() { 1.25 case "$ARCH" in 1.26 @@ -32,12 +34,12 @@ 1.27 esac 1.28 1.29 ./configure \ 1.30 - --disable-silent-rules \ 1.31 --enable-xcb \ 1.32 --enable-xlib-xcb \ 1.33 --enable-tee \ 1.34 --disable-static \ 1.35 - $SET_ARGS $ARCH_ARGS $CONFIGURE_ARGS && 1.36 + $SET_ARGS \ 1.37 + $CONFIGURE_ARGS && 1.38 fix libtool && 1.39 make $MAKEFLAGS && 1.40 make DESTDIR=$DESTDIR install
2.1 --- a/cookutils/receipt Sat Mar 31 13:24:46 2018 +0300 2.2 +++ b/cookutils/receipt Mon Apr 02 10:44:00 2018 +0300 2.3 @@ -1,7 +1,7 @@ 2.4 # SliTaz package receipt v2. 2.5 2.6 PACKAGE="cookutils" 2.7 -VERSION="1040" 2.8 +VERSION="1044" 2.9 CATEGORY="base-system" 2.10 SHORT_DESC="SliTaz packages builder new generation" 2.11 MAINTAINER="pankso@slitaz.org"
3.1 --- a/freetype/receipt Sat Mar 31 13:24:46 2018 +0300 3.2 +++ b/freetype/receipt Mon Apr 02 10:44:00 2018 +0300 3.3 @@ -35,12 +35,11 @@ 3.4 case $PACKAGE in 3.5 freetype) 3.6 copy @std 3.7 - DEPENDS="zlib libpng16 harfbuzz" 3.8 + DEPENDS="bzlib libharfbuzz libpng16 zlib" 3.9 ;; 3.10 freetype-dev) 3.11 copy @dev 3.12 - DEPENDS="freetype bzip2-dev glib-dev harfbuzz-dev libpng16-dev \ 3.13 - pcre-dev zlib-dev" 3.14 + DEPENDS="freetype bzip2-dev harfbuzz-dev libpng16-dev zlib-dev" 3.15 ;; 3.16 esac 3.17 }
4.1 --- a/harfbuzz/receipt Sat Mar 31 13:24:46 2018 +0300 4.2 +++ b/harfbuzz/receipt Mon Apr 02 10:44:00 2018 +0300 4.3 @@ -19,6 +19,7 @@ 4.4 ./configure \ 4.5 --with-gobject \ 4.6 $CONFIGURE_ARGS && 4.7 + fix libtool && 4.8 make && 4.9 make install 4.10 } 4.11 @@ -33,7 +34,7 @@ 4.12 harfbuzz) 4.13 copy bin/ 4.14 CAT="system-tools|applications" 4.15 - DEPENDS="libharfbuzz cairo" 4.16 + DEPENDS="cairo freetype glib libharfbuzz" 4.17 ;; 4.18 libharfbuzz) 4.19 copy libharfbuzz.so* libharfbuzz-gobject.so* 4.20 @@ -43,18 +44,17 @@ 4.21 libharfbuzz-icu) 4.22 copy libharfbuzz-icu.so* 4.23 CAT="libs|ICU integration" 4.24 - DEPENDS="libicu libharfbuzz" 4.25 + DEPENDS="libharfbuzz libicu" 4.26 ;; 4.27 harfbuzz-icu-dev) 4.28 copy *-icu.h *-icu.pc # *-icu.la 4.29 CAT="development|ICU integration development files" 4.30 - DEPENDS="libharfbuzz-icu harfbuzz-dev icu-dev" 4.31 + DEPENDS="harfbuzz-dev icu-dev" 4.32 PROVIDE="harfbuzz-icu" # fake for cookutils as it always wanted to install package without '-dev' 4.33 ;; 4.34 harfbuzz-dev) 4.35 copy @dev @rm 4.36 - DEPENDS="harfbuzz bzip2-dev freetype-dev glib-dev libffi-dev \ 4.37 - libpng16-dev pcre-dev" 4.38 + DEPENDS="harfbuzz glib-dev" 4.39 ;; 4.40 esac 4.41 }
5.1 --- a/jsoncpp/receipt Sat Mar 31 13:24:46 2018 +0300 5.2 +++ b/jsoncpp/receipt Mon Apr 02 10:44:00 2018 +0300 5.3 @@ -1,7 +1,7 @@ 5.4 # SliTaz package receipt v2. 5.5 5.6 PACKAGE="jsoncpp" 5.7 -VERSION="0.10.2" 5.8 +VERSION="1.8.4" 5.9 CATEGORY="development" 5.10 SHORT_DESC="A C++ library for interacting with JSON" 5.11 MAINTAINER="pascal.bellard@slitaz.org" 5.12 @@ -14,7 +14,6 @@ 5.13 BUILD_DEPENDS="cmake" 5.14 5.15 compile_rules() { 5.16 - fix math 5.17 mkdir build 5.18 cd build 5.19 cmake \
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/jsoncpp/stuff/patches/0001-json_writer-fix-build-with-glibc-2.26.patch Mon Apr 02 10:44:00 2018 +0300 6.3 @@ -0,0 +1,33 @@ 6.4 +From 2cb87c456f95510d55dd40f783435ecd1177c453 Mon Sep 17 00:00:00 2001 6.5 +From: Romain Naour <romain.naour@gmail.com> 6.6 +Date: Sat, 26 Aug 2017 19:39:03 +0200 6.7 +Subject: [PATCH] json_writer: fix build with glibc >= 2.26 6.8 + 6.9 +src/lib_json/json_writer.cpp:45:23: error: 'isfinite' is not a member of 'std' 6.10 + #define isfinite std::isfinite 6.11 + ^ 6.12 + 6.13 +Signed-off-by: Romain Naour <romain.naour@gmail.com> 6.14 +--- 6.15 + src/lib_json/json_writer.cpp | 3 +++ 6.16 + 1 file changed, 3 insertions(+) 6.17 + 6.18 +diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp 6.19 +index 02f1cb1..a3189cb 100644 6.20 +--- a/src/lib_json/json_writer.cpp 6.21 ++++ b/src/lib_json/json_writer.cpp 6.22 +@@ -42,9 +42,12 @@ 6.23 + #else 6.24 + #include <cmath> 6.25 + #if !(defined(__QNXNTO__)) // QNX already defines isfinite 6.26 ++// std::isfinite is not defined on glibc >= 2.26 6.27 ++#if !(defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 26))) 6.28 + #define isfinite std::isfinite 6.29 + #endif 6.30 + #endif 6.31 ++#endif 6.32 + 6.33 + #if defined(_MSC_VER) 6.34 + #if !defined(WINCE) && defined(__STDC_SECURE_LIB__) && _MSC_VER >= 1500 // VC++ 9.0 and above 6.35 +-- 6.36 +2.9.5
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 7.2 +++ b/jsoncpp/stuff/patches/series Mon Apr 02 10:44:00 2018 +0300 7.3 @@ -0,0 +1,2 @@ 7.4 +# from http://patchwork.ozlabs.org/patch/809144/ 7.5 +0001-json_writer-fix-build-with-glibc-2.26.patch
8.1 --- a/libdrm/receipt Sat Mar 31 13:24:46 2018 +0300 8.2 +++ b/libdrm/receipt Mon Apr 02 10:44:00 2018 +0300 8.3 @@ -1,7 +1,7 @@ 8.4 # SliTaz package receipt v2. 8.5 8.6 PACKAGE="libdrm" 8.7 -VERSION="2.4.82" 8.8 +VERSION="2.4.89" 8.9 CATEGORY="x-window" 8.10 SHORT_DESC="Freedesktop DRM Library" 8.11 MAINTAINER="al.bobylev@gmail.com" 8.12 @@ -39,16 +39,19 @@ 8.13 DEPENDS="eudev linux-drm xorg-libpciaccess" 8.14 ;; 8.15 *-amdgpu) 8.16 - copy libdrm_amdgpu.so* 8.17 + copy libdrm_amdgpu.so* amdgpu.ids 8.18 CAT="x-window|AMDGPU API" 8.19 + DEPENDS="libdrm" 8.20 ;; 8.21 *-etnaviv) 8.22 copy libdrm_etnaviv.so* 8.23 CAT="x-window|Etnaviv API" 8.24 + DEPENDS="libdrm" 8.25 ;; 8.26 *-exynos) 8.27 copy libdrm_exynos.so* 8.28 CAT="x-window|EXYNOS API" 8.29 + DEPENDS="libdrm" 8.30 ;; 8.31 *-intel) 8.32 copy libdrm_intel.so* 8.33 @@ -58,18 +61,22 @@ 8.34 *-nouveau) 8.35 copy libdrm_nouveau.so* 8.36 CAT="x-window|Nouveau API" 8.37 + DEPENDS="libdrm" 8.38 ;; 8.39 *-omap) 8.40 copy libdrm_omap.so* 8.41 CAT="x-window|OMAP API" 8.42 + DEPENDS="libdrm" 8.43 ;; 8.44 *-radeon) 8.45 copy libdrm_radeon.so* 8.46 CAT="x-window|Radeon API" 8.47 + DEPENDS="libdrm" 8.48 ;; 8.49 *-tegra) 8.50 copy libdrm_tegra.so* 8.51 CAT="x-window|Tegra API" 8.52 + DEPENDS="libdrm" 8.53 ;; 8.54 *-dev) 8.55 copy @dev
9.1 --- a/librsvg/receipt Sat Mar 31 13:24:46 2018 +0300 9.2 +++ b/librsvg/receipt Mon Apr 02 10:44:00 2018 +0300 9.3 @@ -1,7 +1,7 @@ 9.4 # SliTaz package receipt v2. 9.5 9.6 PACKAGE="librsvg" 9.7 -VERSION="2.40.18" 9.8 +VERSION="2.42.2" 9.9 CATEGORY="graphics" 9.10 SHORT_DESC="Rendering SVG" 9.11 MAINTAINER="erjo@slitaz.org" 9.12 @@ -13,12 +13,13 @@ 9.13 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 9.14 9.15 BUILD_DEPENDS="glib-dev gdk-pixbuf-dev libxml2-dev pango-dev libcroco-dev \ 9.16 -gtk-doc gobject-introspection-dev vala gtk+3-dev" 9.17 +gtk-doc gobject-introspection-dev vala gtk+3-dev rust" 9.18 SPLIT="rsvg-convert rsvg-view librsvg-dev" 9.19 9.20 compile_rules() { 9.21 ./configure \ 9.22 --enable-vala \ 9.23 + --disable-static \ 9.24 $CONFIGURE_ARGS && 9.25 fix libtool && 9.26 make &&
10.1 --- a/mesa/receipt Sat Mar 31 13:24:46 2018 +0300 10.2 +++ b/mesa/receipt Mon Apr 02 10:44:00 2018 +0300 10.3 @@ -1,7 +1,7 @@ 10.4 # SliTaz package receipt v2. 10.5 10.6 PACKAGE="mesa" 10.7 -VERSION="17.2.4" 10.8 +VERSION="17.3.4" 10.9 CATEGORY="x-window" 10.10 SHORT_DESC="Open-source implementaton of OpenGL" 10.11 MAINTAINER="al.bobylev@gmail.com" 10.12 @@ -18,12 +18,11 @@ 10.13 xorg-libXdamage-dev xorg-libXfixes-dev xorg-libXxf86vm-dev expat-dev \ 10.14 elfutils-dev llvm-dev xorg-libpciaccess-dev wayland-dev libva-dev libvdpau-dev \ 10.15 wayland-protocols-dev libatomic zlib-dev xorg-libXi-dev" 10.16 -#BUILD_DEPENDS="${BUILD_DEPENDS/libva-dev/}" 10.17 +BUILD_DEPENDS="${BUILD_DEPENDS/libva-dev/}" 10.18 SPLIT="mesa-dri mesa-libegl mesa-libgbm mesa-osmesa mesa-libswrAVX \ 10.19 mesa-libwayland-egl mesa-libxatracker mesa-vdpau mesa mesa-dev" 10.20 10.21 compile_rules() { 10.22 - fix math 10.23 # Removed from the full list: freedreno,vc4 10.24 # because we haven't appropriate libdrm-* packages (they are only for ARM) 10.25 GLL_DRV="i915,nouveau,r300,r600,radeonsi,svga,swrast,swr,virgl,etnaviv,imx"
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 11.2 +++ b/mesa/stuff/patches/0005-c99_math-fix-build-issue-with-glibc-2.26.patch Mon Apr 02 10:44:00 2018 +0300 11.3 @@ -0,0 +1,81 @@ 11.4 +From f8ef875d8b5313d8f15f8680dc0c512c10756ea8 Mon Sep 17 00:00:00 2001 11.5 +From: Romain Naour <romain.naour@gmail.com> 11.6 +Date: Sat, 26 Aug 2017 19:20:56 +0200 11.7 +Subject: [PATCH] c99_math: fix build issue with glibc >= 2.26 11.8 +MIME-Version: 1.0 11.9 +Content-Type: text/plain; charset=UTF-8 11.10 +Content-Transfer-Encoding: 8bit 11.11 + 11.12 +The workaround is not required anymore since glibc 2.26 and 11.13 +trigger a build issue: 11.14 + 11.15 +In file included from ../../src/gallium/auxiliary/util/u_math.h:44:0, 11.16 + from ../../src/mesa/main/macros.h:35, 11.17 + from glsl_types.cpp:25: 11.18 +../../include/c99_math.h:196:12: error: « std::fpclassify » was not declared in this scope 11.19 + using std::fpclassify; 11.20 + ^~~~~~~~~~ 11.21 +../../include/c99_math.h:197:12: error: « std::isfinite » was not declared in this scope 11.22 + using std::isfinite; 11.23 + ^~~~~~~~ 11.24 +../../include/c99_math.h:198:12: error: « std::isinf » was not declared in this scope 11.25 + using std::isinf; 11.26 + ^~~~~ 11.27 +../../include/c99_math.h:199:12: error: « std::isnan » was not declared in this scope 11.28 + using std::isnan; 11.29 + ^~~~~ 11.30 +../../include/c99_math.h:200:12: error: « std::isnormal » was not declared in this scope 11.31 + using std::isnormal; 11.32 + ^~~~~~~~ 11.33 +../../include/c99_math.h:201:12: error: « std::signbit » was not declared in this scope 11.34 + using std::signbit; 11.35 + ^~~~~~~ 11.36 +../../include/c99_math.h:202:12: error: « std::isgreater » was not declared in this scope 11.37 + using std::isgreater; 11.38 + ^~~~~~~~~ 11.39 +../../include/c99_math.h:203:12: error: « std::isgreaterequal » was not declared in this scope 11.40 + using std::isgreaterequal; 11.41 + ^~~~~~~~~~~~~~ 11.42 +../../include/c99_math.h:204:12: error: « std::isless » was not declared in this scope 11.43 + using std::isless; 11.44 + ^~~~~~ 11.45 +../../include/c99_math.h:205:12: error: « std::islessequal » was not declared in this scope 11.46 + using std::islessequal; 11.47 + ^~~~~~~~~~~ 11.48 +../../include/c99_math.h:206:12: error: « std::islessgreater » was not declared in this scope 11.49 + using std::islessgreater; 11.50 + ^~~~~~~~~~~~~ 11.51 +../../include/c99_math.h:207:12: error: « std::isunordered » was not declared in this scope 11.52 + using std::isunordered; 11.53 + ^~~~~~~~~~~ 11.54 + 11.55 +Signed-off-by: Romain Naour <romain.naour@gmail.com> 11.56 +--- 11.57 + include/c99_math.h | 5 +++++ 11.58 + 1 file changed, 5 insertions(+) 11.59 + 11.60 +diff --git a/include/c99_math.h b/include/c99_math.h 11.61 +index e906c26..6fd257e 100644 11.62 +--- a/include/c99_math.h 11.63 ++++ b/include/c99_math.h 11.64 +@@ -193,6 +193,10 @@ fpclassify(double x) 11.65 + #if __cplusplus >= 201103L && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 23)) 11.66 + #include <cmath> 11.67 + 11.68 ++/* This workaround is not necessary since Glibc 2.26 11.69 ++ * https://sourceware.org/git/?p=glibc.git;a=commit;h=2072f5c34ede81dde9e0d953d57a0690a66b0f12 11.70 ++ */ 11.71 ++#if (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 25) 11.72 + using std::fpclassify; 11.73 + using std::isfinite; 11.74 + using std::isinf; 11.75 +@@ -206,6 +210,7 @@ using std::islessequal; 11.76 + using std::islessgreater; 11.77 + using std::isunordered; 11.78 + #endif 11.79 ++#endif 11.80 + 11.81 + 11.82 + #endif /* #define _C99_MATH_H_ */ 11.83 +-- 11.84 +2.9.5
12.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 12.2 +++ b/mesa/stuff/patches/series Mon Apr 02 10:44:00 2018 +0300 12.3 @@ -0,0 +1,2 @@ 12.4 +# from http://patchwork.ozlabs.org/patch/809139/ 12.5 +0005-c99_math-fix-build-issue-with-glibc-2.26.patch
13.1 --- a/pango/receipt Sat Mar 31 13:24:46 2018 +0300 13.2 +++ b/pango/receipt Mon Apr 02 10:44:00 2018 +0300 13.3 @@ -1,7 +1,7 @@ 13.4 # SliTaz package receipt v2. 13.5 13.6 PACKAGE="pango" 13.7 -VERSION="1.40.3" 13.8 +VERSION="1.40.14" 13.9 CATEGORY="x-window" 13.10 SHORT_DESC="Layout and rendering of internationalized text" 13.11 MAINTAINER="pankso@slitaz.org" 13.12 @@ -11,40 +11,37 @@ 13.13 TARBALL="$PACKAGE-$VERSION.tar.xz" 13.14 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 13.15 13.16 -BUILD_DEPENDS_arm="cairo-dev libxml2-dev xorg-libXft-dev" 13.17 -BUILD_DEPENDS="harfbuzz-dev xorg-libXft-dev cairo-dev gobject-introspection-dev" 13.18 +BUILD_DEPENDS="harfbuzz-dev xorg-libXft-dev cairo-dev \ 13.19 +gobject-introspection-dev meson ninja" 13.20 SPLIT="pango-dev" 13.21 13.22 compile_rules() { 13.23 - case "$ARCH" in 13.24 - arm*) 13.25 - export LIBTOOL=${HOST_SYSTEM}-libtool 13.26 - ARCH_ARGS="--enable-introspection=no" ;; 13.27 - esac 13.28 + mkdir build 13.29 + cd build 13.30 13.31 - ./configure \ 13.32 - $ARCH_ARGS \ 13.33 - $CONFIGURE_ARGS && 13.34 - fix libtool && 13.35 - make && 13.36 - make install 13.37 + meson \ 13.38 + --prefix=/usr \ 13.39 + --sysconfdir=/etc \ 13.40 + .. && 13.41 + ninja && 13.42 + ninja install || return 1 13.43 + 13.44 + rm -rf \ 13.45 + $install/usr/libexec/installed-tests \ 13.46 + $install/usr/share/installed-tests 13.47 } 13.48 13.49 genpkg_rules() { 13.50 case $PACKAGE in 13.51 pango) 13.52 copy bin/ *.so* 13.53 - DEPENDS="bzlib cairo fontconfig freetype glib harfbuzz libffi \ 13.54 - liblzma libpng16 xorg-libxcb libxml2 pcre xorg-pixman xorg-libX11 xorg-libXau \ 13.55 - xorg-libXdmcp xorg-libXext xorg-libXft xorg-libXrender zlib" 13.56 + DEPENDS="cairo fontconfig freetype glib libharfbuzz xorg-libX11 \ 13.57 + xorg-libXft xorg-libXrender" 13.58 ;; 13.59 *-dev) 13.60 copy @dev 13.61 - DEPENDS="pango bzip2-dev cairo-dev fontconfig-dev freetype-dev \ 13.62 - glib-dev glibc-dev harfbuzz-dev libffi-dev xz-dev libpng16-dev \ 13.63 - xorg-libxcb-dev libxml2-dev pcre-dev xorg-pixman-dev xorg-libX11-dev \ 13.64 - xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev xorg-libXft-dev \ 13.65 - xorg-libXrender-dev zlib-dev" 13.66 + DEPENDS="pango cairo-dev fontconfig-dev freetype-dev glib-dev \ 13.67 + harfbuzz-dev xorg-libXft-dev" 13.68 ;; 13.69 esac 13.70 }