wok-next rev 20988
Small updates
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Mon Oct 01 01:18:37 2018 +0300 (2018-10-01) |
| parents | fc9ee6d3aa6f |
| children | fc8399b41cda |
| files | adwaita-icon-theme/receipt apr/receipt arpack-ng/receipt atk/receipt aubio/receipt augeas/receipt freeimage/receipt freeimage/stuff/patches/0001-no-root-install.patch freeimage/stuff/patches/0002-fix-cpuid-x86.patch freeimage/stuff/patches/0005-makefile-gnu.patch freeimage/stuff/patches/gcc4.5_ln.patch freeimage/stuff/patches/series |
line diff
1.1 --- a/adwaita-icon-theme/receipt Sun Sep 30 05:22:24 2018 +0300 1.2 +++ b/adwaita-icon-theme/receipt Mon Oct 01 01:18:37 2018 +0300 1.3 @@ -1,39 +1,25 @@ 1.4 # SliTaz package receipt v2. 1.5 1.6 PACKAGE="adwaita-icon-theme" 1.7 -VERSION="3.22.0" # please, synchronize with the gtk+3 version (3.22.x) 1.8 +VERSION="3.30.0" 1.9 CATEGORY="customization" 1.10 SHORT_DESC="A collection of icons used at the basis for GNOME themes" 1.11 MAINTAINER="al.bobylev@gmail.com" 1.12 LICENSE="LGPL3 CC-BY-SA-3" 1.13 WEB_SITE="https://github.com/GNOME/adwaita-icon-theme" 1.14 +LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/adwaita-icon-theme.html" 1.15 +HOST_ARCH="any" 1.16 1.17 TARBALL="$PACKAGE-$VERSION.tar.xz" 1.18 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 1.19 1.20 -# Rules to configure and make the package. 1.21 -compile_rules() 1.22 -{ 1.23 - # http://www.linuxfromscratch.org/blfs/view/stable/x/adwaita-icon-theme.html 1.24 - 1.25 +compile_rules() { 1.26 ./configure \ 1.27 - --prefix=/usr \ 1.28 $CONFIGURE_ARGS && 1.29 - make && make install && 1.30 - 1.31 - # fix icons 1.32 - sed -i 's|-inkscape-font-specification:'Cantarell Bold';||' \ 1.33 - $install/usr/share/icons/Adwaita/scalable/actions/address-book-new-symbolic.svg && 1.34 - sed -i 's|-inkscape-font-specification:'Bitstream Vera Sans';||' \ 1.35 - $install/usr/share/icons/Adwaita/scalable/actions/call-stop-symbolic.svg && 1.36 - sed -i '/<<<<<<< HEAD/,/=======/d; />>>>>>>/d' \ 1.37 - $install/usr/share/icons/Adwaita/scalable/actions/send-to-symbolic.svg && 1.38 - sed -i 's|-inkscape-font-specification:'Andale Mono';||' \ 1.39 - $install/usr/share/icons/Adwaita/scalable/places/folder-download-symbolic.svg 1.40 + make && 1.41 + make install 1.42 } 1.43 1.44 -# Rules to gen a SliTaz package suitable for Tazpkg. 1.45 -genpkg_rules() 1.46 -{ 1.47 +genpkg_rules() { 1.48 copy @std 1.49 }
2.1 --- a/apr/receipt Sun Sep 30 05:22:24 2018 +0300 2.2 +++ b/apr/receipt Mon Oct 01 01:18:37 2018 +0300 2.3 @@ -1,13 +1,13 @@ 2.4 # SliTaz package receipt v2. 2.5 2.6 PACKAGE="apr" 2.7 -VERSION="1.6.3" 2.8 +VERSION="1.6.5" 2.9 CATEGORY="misc" 2.10 SHORT_DESC="Apache Portable Runtime Library" 2.11 MAINTAINER="lehswe@gmail.com" 2.12 LICENSE="Apache" 2.13 WEB_SITE="http://apr.apache.org/" 2.14 -LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/apr.html" 2.15 +LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/apr.html" 2.16 2.17 TARBALL="$PACKAGE-$VERSION.tar.bz2" 2.18 WGET_URL="https://archive.apache.org/dist/apr/$TARBALL" 2.19 @@ -16,7 +16,6 @@ 2.20 SPLIT="apr-dev" 2.21 2.22 COOKOPTS="skip-log-errors" 2.23 -CROSS="error: cannot check for file existence when cross compiling" 2.24 2.25 compile_rules() { 2.26 # should define prefix
3.1 --- a/arpack-ng/receipt Sun Sep 30 05:22:24 2018 +0300 3.2 +++ b/arpack-ng/receipt Mon Oct 01 01:18:37 2018 +0300 3.3 @@ -1,7 +1,7 @@ 3.4 # SliTaz package receipt v2. 3.5 3.6 PACKAGE="arpack-ng" 3.7 -VERSION="3.5.0" 3.8 +VERSION="3.6.3" 3.9 CATEGORY="development" 3.10 SHORT_DESC="Fortran77 subroutines to solve large scale eigenvalue problems" 3.11 MAINTAINER="pascal.bellard@slitaz.org" 3.12 @@ -16,7 +16,9 @@ 3.13 3.14 compile_rules() { 3.15 ./bootstrap && 3.16 - ./configure $CONFIGURE_ARGS && 3.17 + ./configure \ 3.18 + --disable-static \ 3.19 + $CONFIGURE_ARGS && 3.20 fix libtool && 3.21 make && 3.22 make install
4.1 --- a/atk/receipt Sun Sep 30 05:22:24 2018 +0300 4.2 +++ b/atk/receipt Mon Oct 01 01:18:37 2018 +0300 4.3 @@ -1,7 +1,7 @@ 4.4 # SliTaz package receipt v2. 4.5 4.6 PACKAGE="atk" 4.7 -VERSION="2.29.92" 4.8 +VERSION="2.30.0" 4.9 CATEGORY="x-window" 4.10 SHORT_DESC="Accessibility toolkit" 4.11 MAINTAINER="pankso@slitaz.org"
5.1 --- a/aubio/receipt Sun Sep 30 05:22:24 2018 +0300 5.2 +++ b/aubio/receipt Mon Oct 01 01:18:37 2018 +0300 5.3 @@ -1,7 +1,7 @@ 5.4 # SliTaz package receipt v2. 5.5 5.6 PACKAGE="aubio" 5.7 -VERSION="0.4.6" 5.8 +VERSION="0.4.7" 5.9 CATEGORY="multimedia" 5.10 SHORT_DESC="A collection of tools for music analysis" 5.11 MAINTAINER="jozee@slitaz.org" 5.12 @@ -12,8 +12,8 @@ 5.13 WGET_URL="https://aubio.org/pub/$TARBALL" 5.14 5.15 BUILD_DEPENDS="python-dev fftw-dev libsndfile-dev libsamplerate-dev jack-dev \ 5.16 -ffmpeg-dev python-numpy" 5.17 -SPLIT="$PACKAGE-dev python-aubio:py" 5.18 +ffmpeg-dev python-numpy python3-dev python3-numpy" 5.19 +SPLIT="$PACKAGE-dev python-aubio:py python3-aubio:py3" 5.20 5.21 COOKOPTS="instant-pack" 5.22 5.23 @@ -34,6 +34,12 @@ 5.24 5.25 python -B setup.py install --root=$install 5.26 ;; 5.27 + py3) 5.28 + # python3-aubio require freshly built aubio-dev 5.29 + tazpkg -gi --quiet --local --cookmode aubio-dev 5.30 + 5.31 + python3 -B setup.py install --root=$install 5.32 + ;; 5.33 esac 5.34 } 5.35 5.36 @@ -46,11 +52,17 @@ 5.37 ;; 5.38 *-dev) 5.39 copy @dev 5.40 + DEPENDS="aubio" 5.41 ;; 5.42 python-aubio) 5.43 copy @std 5.44 CAT="python|Python bindings" 5.45 DEPENDS="aubio python" 5.46 ;; 5.47 + python3-aubio) 5.48 + copy @std 5.49 + CAT="python|Python3 bindings" 5.50 + DEPENDS="aubio python3" 5.51 + ;; 5.52 esac 5.53 }
6.1 --- a/augeas/receipt Sun Sep 30 05:22:24 2018 +0300 6.2 +++ b/augeas/receipt Mon Oct 01 01:18:37 2018 +0300 6.3 @@ -1,9 +1,9 @@ 6.4 # SliTaz package receipt v2. 6.5 6.6 PACKAGE="augeas" 6.7 -VERSION="1.10.1" 6.8 +VERSION="1.11.0" 6.9 CATEGORY="system-tools" 6.10 -SHORT_DESC="A configuration editing tool" 6.11 +SHORT_DESC="Configuration editing tool" 6.12 MAINTAINER="al.bobylev@gmail.com" 6.13 LICENSE="LGPL2.1" 6.14 WEB_SITE="http://augeas.net/" 6.15 @@ -15,7 +15,9 @@ 6.16 SPLIT="augeas-dev" 6.17 6.18 compile_rules() { 6.19 - ./configure $CONFIGURE_ARGS && 6.20 + ./configure \ 6.21 + --disable-static \ 6.22 + $CONFIGURE_ARGS && 6.23 fix libtool && 6.24 make && 6.25 make install
7.1 --- a/freeimage/receipt Sun Sep 30 05:22:24 2018 +0300 7.2 +++ b/freeimage/receipt Mon Oct 01 01:18:37 2018 +0300 7.3 @@ -1,31 +1,22 @@ 7.4 # SliTaz package receipt v2. 7.5 7.6 PACKAGE="freeimage" 7.7 -VERSION="3141" 7.8 +VERSION="3.18.0" 7.9 CATEGORY="graphics" 7.10 SHORT_DESC="Library to support popular graphics image formats like PNG, BMP, \ 7.11 JPEG, TIFF and others" 7.12 MAINTAINER="jozee@slitaz.org" 7.13 LICENSE="GPL2" 7.14 -WEB_SITE="http://freeimage.sourceforge.net/" 7.15 +WEB_SITE="http://freeimage.sourceforge.net/" 7.16 7.17 -TARBALL="FreeImage$VERSION.zip" 7.18 -WGET_URL="http://downloads.sourceforge.net/$PACKAGE/$TARBALL" 7.19 +TARBALL="FreeImage${VERSION//.}.zip" 7.20 +WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 7.21 7.22 -SPLIT="freeimage-dev" 7.23 +SPLIT="$PACKAGE-dev" 7.24 7.25 compile_rules() { 7.26 - pkgdir=$DESTDIR 7.27 - incl=$pkgdir/usr/include 7.28 - dest=$pkgdir/usr/lib 7.29 - install -d $dest 7.30 - install -d $incl 7.31 - sed -e "s|INCDIR = /usr/include|INCDIR = $incl|g" -i Makefile.gnu 7.32 - sed -e "s|INSTALLDIR = /usr/lib|INSTALLDIR = $dest|g" -i Makefile.gnu 7.33 - sed -e "s|ldconfig||g" -i Makefile.gnu 7.34 - export CXXFLAGS="-Wno-narrowing" 7.35 make && 7.36 - make DESTDIR=$pkgdir install 7.37 + make DESTDIR=$install install 7.38 } 7.39 7.40 genpkg_rules() {
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 8.2 +++ b/freeimage/stuff/patches/0001-no-root-install.patch Mon Oct 01 01:18:37 2018 +0300 8.3 @@ -0,0 +1,16 @@ 8.4 +diff -ruN a/Makefile.gnu b/Makefile.gnu 8.5 +--- a/Makefile.gnu 2015-04-09 16:34:02.315316841 +0200 8.6 ++++ b/Makefile.gnu 2015-04-09 16:34:28.875483201 +0200 8.7 +@@ -71,9 +71,9 @@ 8.8 + 8.9 + install: 8.10 + install -d $(INCDIR) $(INSTALLDIR) 8.11 +- install -m 644 -o root -g root $(HEADER) $(INCDIR) 8.12 +- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) 8.13 +- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) 8.14 ++ install -m 644 $(HEADER) $(INCDIR) 8.15 ++ install -m 644 $(STATICLIB) $(INSTALLDIR) 8.16 ++ install -m 755 $(SHAREDLIB) $(INSTALLDIR) 8.17 + ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME) 8.18 + ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME) 8.19 + # ldconfig
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 9.2 +++ b/freeimage/stuff/patches/0002-fix-cpuid-x86.patch Mon Oct 01 01:18:37 2018 +0300 9.3 @@ -0,0 +1,67 @@ 9.4 +Fix build issue caused by invalid register usage on x86 9.5 + 9.6 +Patch taken from https://github.com/openexr/openexr/issues/128. 9.7 + 9.8 +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 9.9 + 9.10 +Index: b/Source/OpenEXR/IlmImf/ImfSystemSpecific.cpp 9.11 +=================================================================== 9.12 +--- a/Source/OpenEXR/IlmImf/ImfSystemSpecific.cpp 9.13 ++++ b/Source/OpenEXR/IlmImf/ImfSystemSpecific.cpp 9.14 +@@ -40,21 +40,19 @@ 9.15 + 9.16 + namespace { 9.17 + #if defined(IMF_HAVE_SSE2) && defined(__GNUC__) 9.18 +- 9.19 ++#include <cpuid.h> 9.20 + // Helper functions for gcc + SSE enabled 9.21 +- void cpuid(int n, int &eax, int &ebx, int &ecx, int &edx) 9.22 ++ void cpuid(unsigned int n, unsigned int &eax, unsigned int &ebx, 9.23 ++ unsigned int &ecx, unsigned int &edx) 9.24 + { 9.25 +- __asm__ __volatile__ ( 9.26 +- "cpuid" 9.27 +- : /* Output */ "=a"(eax), "=b"(ebx), "=c"(ecx), "=d"(edx) 9.28 +- : /* Input */ "a"(n) 9.29 +- : /* Clobber */); 9.30 ++ __get_cpuid(n, &eax, &ebx, &ecx, &edx); 9.31 + } 9.32 + 9.33 + #else // IMF_HAVE_SSE2 && __GNUC__ 9.34 + 9.35 + // Helper functions for generic compiler - all disabled 9.36 +- void cpuid(int n, int &eax, int &ebx, int &ecx, int &edx) 9.37 ++ void cpuid(unsigned int n, unsigned int &eax, unsigned int &ebx, 9.38 ++ unsigned int &ecx, unsigned int &edx) 9.39 + { 9.40 + eax = ebx = ecx = edx = 0; 9.41 + } 9.42 +@@ -64,7 +62,7 @@ 9.43 + 9.44 + #ifdef OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX 9.45 + 9.46 +- void xgetbv(int n, int &eax, int &edx) 9.47 ++ void xgetbv(unsigned int n, unsigned int &eax, unsigned int &edx) 9.48 + { 9.49 + __asm__ __volatile__ ( 9.50 + "xgetbv" 9.51 +@@ -75,7 +73,7 @@ 9.52 + 9.53 + #else // OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX 9.54 + 9.55 +- void xgetbv(int n, int &eax, int &edx) 9.56 ++ void xgetbv(unsigned int n, unsigned int &eax, unsigned int &edx) 9.57 + { 9.58 + eax = edx = 0; 9.59 + } 9.60 +@@ -94,8 +92,8 @@ 9.61 + f16c(false) 9.62 + { 9.63 + bool osxsave = false; 9.64 +- int max = 0; 9.65 +- int eax, ebx, ecx, edx; 9.66 ++ unsigned int max = 0; 9.67 ++ unsigned int eax, ebx, ecx, edx; 9.68 + 9.69 + cpuid(0, max, ebx, ecx, edx); 9.70 + if (max > 0)
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 10.2 +++ b/freeimage/stuff/patches/0005-makefile-gnu.patch Mon Oct 01 01:18:37 2018 +0300 10.3 @@ -0,0 +1,24 @@ 10.4 +diff --git a/Makefile.gnu b/Makefile.gnu 10.5 +index 92f6358..293ee97 100644 10.6 +--- a/Makefile.gnu 10.7 ++++ b/Makefile.gnu 10.8 +@@ -15,7 +15,8 @@ LIBRARIES = -lstdc++ 10.9 + 10.10 + MODULES = $(SRCS:.c=.o) 10.11 + MODULES := $(MODULES:.cpp=.o) 10.12 +-CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden 10.13 ++CFLAGS ?= -O3 10.14 ++CFLAGS += -fPIC -fexceptions -fvisibility=hidden 10.15 + # OpenJPEG 10.16 + CFLAGS += -DOPJ_STATIC 10.17 + # LibRaw 10.18 +@@ -23,7 +24,8 @@ CFLAGS += -DNO_LCMS 10.19 + # LibJXR 10.20 + CFLAGS += -DDISABLE_PERF_MEASUREMENT -D__ANSI__ 10.21 + CFLAGS += $(INCLUDE) 10.22 +-CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy 10.23 ++CXXFLAGS ?= -O3 10.24 ++CXXFLAGS += -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy 10.25 + # LibJXR 10.26 + CXXFLAGS += -D__ANSI__ 10.27 + CXXFLAGS += $(INCLUDE)
11.1 --- a/freeimage/stuff/patches/gcc4.5_ln.patch Sun Sep 30 05:22:24 2018 +0300 11.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 11.3 @@ -1,62 +0,0 @@ 11.4 -diff -Naur FreeImage.orig//Makefile.fip FreeImage.new//Makefile.fip 11.5 ---- FreeImage.orig//Makefile.fip 2010-08-10 19:15:20.000000000 +0200 11.6 -+++ FreeImage.new//Makefile.fip 2010-09-12 23:29:36.000000000 +0200 11.7 -@@ -15,9 +15,9 @@ 11.8 - 11.9 - MODULES = $(SRCS:.c=.o) 11.10 - MODULES := $(MODULES:.cpp=.o) 11.11 --CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS 11.12 -+CFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS 11.13 - CFLAGS += $(INCLUDE) 11.14 --CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy 11.15 -+CXXFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy 11.16 - CXXFLAGS += $(INCLUDE) 11.17 - 11.18 - ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64) 11.19 -diff -Naur FreeImage.orig//Makefile.gnu FreeImage.new//Makefile.gnu 11.20 ---- FreeImage.orig//Makefile.gnu 2010-08-10 19:15:20.000000000 +0200 11.21 -+++ FreeImage.new//Makefile.gnu 2010-09-12 23:01:57.000000000 +0200 11.22 -@@ -15,9 +15,9 @@ 11.23 - 11.24 - MODULES = $(SRCS:.c=.o) 11.25 - MODULES := $(MODULES:.cpp=.o) 11.26 --CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS 11.27 -+CFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS 11.28 - CFLAGS += $(INCLUDE) 11.29 --CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy 11.30 -+CXXFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy 11.31 - CXXFLAGS += $(INCLUDE) 11.32 - 11.33 - ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64) 11.34 -@@ -65,9 +65,6 @@ 11.35 - install -m 644 -o root -g root $(HEADER) $(INCDIR) 11.36 - install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) 11.37 - install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) 11.38 -- ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME) 11.39 -- ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME) 11.40 -- ldconfig 11.41 - 11.42 - clean: 11.43 - rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME) 11.44 -diff -Naur FreeImage.orig//Source/FreeImageToolkit/Background.cpp FreeImage.new//Source/FreeImageToolkit/Background.cpp 11.45 ---- FreeImage.orig//Source/FreeImageToolkit/Background.cpp 2010-08-10 19:15:20.000000000 +0200 11.46 -+++ FreeImage.new//Source/FreeImageToolkit/Background.cpp 2010-08-10 19:16:12.000000000 +0200 11.47 -@@ -21,6 +21,7 @@ 11.48 - 11.49 - #include "FreeImage.h" 11.50 - #include "Utilities.h" 11.51 -+#include <limits.h> 11.52 - 11.53 - /** @brief Determines, whether a palletized image is visually greyscale or not. 11.54 - 11.55 -diff -Naur FreeImage.orig//Source/OpenEXR/Imath/ImathMatrix.h FreeImage.new//Source/OpenEXR/Imath/ImathMatrix.h 11.56 ---- FreeImage.orig//Source/OpenEXR/Imath/ImathMatrix.h 2010-08-10 19:15:20.000000000 +0200 11.57 -+++ FreeImage.new//Source/OpenEXR/Imath/ImathMatrix.h 2010-08-10 21:43:26.000000000 +0200 11.58 -@@ -51,6 +51,7 @@ 11.59 - 11.60 - #include <iostream> 11.61 - #include <iomanip> 11.62 -+#include <cstring> 11.63 - 11.64 - #if (defined _WIN32 || defined _WIN64) && defined _MSC_VER 11.65 - // suppress exception specification warnings
12.1 --- a/freeimage/stuff/patches/series Sun Sep 30 05:22:24 2018 +0300 12.2 +++ b/freeimage/stuff/patches/series Mon Oct 01 01:18:37 2018 +0300 12.3 @@ -1,1 +1,5 @@ 12.4 -gcc4.5_ln.patch 12.5 +# From Alpine Linux: 12.6 +# https://git.alpinelinux.org/cgit/aports/tree/testing/freeimage 12.7 +0001-no-root-install.patch 12.8 +0002-fix-cpuid-x86.patch 12.9 +0005-makefile-gnu.patch