# HG changeset patch # User Aleksej Bobylev # Date 1512661180 -7200 # Node ID ab7c63b804204f7a5caf5d3c3f2d98a37ba4478a # Parent bb53e6d98ac8db724425703da7967e568553a5f6 Follow BLFS Chapter 9 "General Libraries": up apr, apr-util, aspell, autoconf213 (for js), dbus-glib, enchant, exempi, fftw, glib, glibmm, gmime, gobject-introspection, gsl, js, libboost. js is 39.7MB / 87.6MB now. Looks like it's proper time to kick off polkit (Hi, Xander! You was right.) diff -r bb53e6d98ac8 -r ab7c63b80420 apr-util/receipt --- a/apr-util/receipt Thu Dec 07 14:34:32 2017 +0200 +++ b/apr-util/receipt Thu Dec 07 17:39:40 2017 +0200 @@ -1,24 +1,24 @@ # SliTaz package receipt v2. PACKAGE="apr-util" -VERSION="1.5.4" +VERSION="1.6.0" CATEGORY="development" SHORT_DESC="APR Library Utilities" MAINTAINER="lehswe@gmail.com" LICENSE="Apache" WEB_SITE="http://apr.apache.org/" +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/apr-util.html" TARBALL="$PACKAGE-$VERSION.tar.bz2" -WGET_URL="http://archive.apache.org/dist/apr/$TARBALL" +WGET_URL="https://archive.apache.org/dist/apr/$TARBALL" BUILD_DEPENDS="apr-dev openssl-dev gdbm-dev postgresql-dev sqlite3-dev \ unixODBC-dev expat-dev mysql-dev openldap-dev" SPLIT="apr-dbd-mysql apr-dbd-odbc apr-dbd-pgsql apr-dbd-sqlite apr-crypto \ apr-dbm-gdbm apr-util-dev" -# Rules to configure and make the package. -compile_rules() -{ +compile_rules() { + fix ld && ./configure \ --prefix=/usr \ --with-apr=/usr \ @@ -32,49 +32,49 @@ make install } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ +genpkg_rules() { case $PACKAGE in apr-util) + copy libaprutil-1.so* aprutil.exp DEPENDS="apr expat util-linux-uuid" - copy libaprutil-1.so* aprutil.exp ;; apr-dbd-mysql) + copy *mysql*.so DEPENDS="apr-util libcrypto libmysqlclient libssl zlib" CAT="libdevel|MySQL DBD driver" - copy *mysql*.so ;; apr-dbd-odbc) + copy *odbc*.so DEPENDS="apr-util libunixODBC" CAT="libdevel|ODBC DBD driver" - copy *odbc*.so ;; apr-dbd-pgsql) + copy *pgsql*.so DEPENDS="apr-util libpostgresqlclient" CAT="libdevel|PostgreSQL DBD driver" - copy *pgsql*.so ;; apr-dbd-sqlite) + copy *sqlite*.so DEPENDS="apr-util libsqlite3" CAT="libdevel|SQLite DBD driver" - copy *sqlite*.so ;; apr-crypto) + copy *crypto*.so DEPENDS="apr-util libcrypto libssl" CAT="libdevel|OpenSSL crypto plugin" - copy *crypto*.so ;; apr-dbm-gdbm) + copy *dbm*.so DEPENDS="apr-util gdbm" CAT="libdevel|GDBM plugin" - copy *dbm*.so ;; *-dev) copy @dev - DEPENDS="apr-dev expat-dev gdbm-dev libcrypto-dev mysql-dev \ - openldap-dev openssl-dev postgresql-dev sqlite3-dev unixODBC-dev \ - util-linux-uuid-dev zlib-dev" + DEPENDS="apr-util apr-dbd-mysql apr-dbd-odbc apr-dbd-pgsql \ + apr-dbd-sqlite apr-crypto apr-dbm-gdbm \ + apr-dev expat-dev gdbm-dev mysql-dev openldap-dev openssl-dev \ + postgresql-dev sqlite3-dev unixODBC-dev util-linux-uuid-dev \ + zlib-dev" ;; esac } diff -r bb53e6d98ac8 -r ab7c63b80420 apr/receipt --- a/apr/receipt Thu Dec 07 14:34:32 2017 +0200 +++ b/apr/receipt Thu Dec 07 17:39:40 2017 +0200 @@ -1,23 +1,23 @@ # SliTaz package receipt v2. PACKAGE="apr" -VERSION="1.5.2" +VERSION="1.6.2" CATEGORY="misc" SHORT_DESC="Apache Portable Runtime Library" MAINTAINER="lehswe@gmail.com" LICENSE="Apache" WEB_SITE="http://apr.apache.org/" +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/apr.html" CROSS="error: cannot check for file existence when cross compiling" TARBALL="$PACKAGE-$VERSION.tar.bz2" -WGET_URL="http://archive.apache.org/dist/apr/$TARBALL" +WGET_URL="https://archive.apache.org/dist/apr/$TARBALL" BUILD_DEPENDS="util-linux-uuid-dev" SPLIT="apr-dev" +COOKOPTS="skip-log-errors" -# Rules to configure and make the package. -compile_rules() -{ +compile_rules() { ./configure \ --prefix=/usr \ --disable-static \ @@ -29,9 +29,7 @@ make && make install } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ +genpkg_rules() { case $PACKAGE in apr) copy *.so* *.exp @@ -39,7 +37,7 @@ ;; apr-dev) copy @dev build/ - DEPENDS="apr glibc-dev util-linux-uuid-dev" + DEPENDS="apr util-linux-uuid-dev" ;; esac } diff -r bb53e6d98ac8 -r ab7c63b80420 apr/stuff/patches/apr-fix-configure.patch --- a/apr/stuff/patches/apr-fix-configure.patch Thu Dec 07 14:34:32 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ ---- a/configure -+++ b/configure -@@ -14744,7 +14744,7 @@ - $RM out/* && rmdir out - cd .. - $RM -r conftest -- $RM conftest* -+ $RM conftest* 2>/dev/null - - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -@@ -16030,7 +16030,7 @@ - if ${lt_cv_archive_cmds_need_lc+:} false; then : - $as_echo_n "(cached) " >&6 - else -- $RM conftest* -+ $RM conftest* 2>/dev/null - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 -@@ -17744,7 +17744,7 @@ - - - # get libtool's setting of shlibpath_var -- eval `grep "^shlibpath_var=[A-Z_]*$" $apr_builddir/libtool` -+ eval `grep "^shlibpath_var=[A-Z_]*$" $apr_builddir/libtool 2>/dev/null` - if test "x$shlibpath_var" = "x"; then - shlibpath_var=REPLACE_WITH_YOUR_SHLIBPATH_VAR - fi -@@ -30203,7 +30203,7 @@ - - cfgfile="${ofile}T" - trap "$RM \"$cfgfile\"; exit 1" 1 2 15 -- $RM "$cfgfile" -+ $RM "$cfgfile" 2>/dev/null - - cat <<_LT_EOF >> "$cfgfile" - #! $SHELL diff -r bb53e6d98ac8 -r ab7c63b80420 apr/stuff/patches/series --- a/apr/stuff/patches/series Thu Dec 07 14:34:32 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -apr-fix-configure.patch diff -r bb53e6d98ac8 -r ab7c63b80420 aspell/receipt --- a/aspell/receipt Thu Dec 07 14:34:32 2017 +0200 +++ b/aspell/receipt Thu Dec 07 17:39:40 2017 +0200 @@ -7,7 +7,7 @@ MAINTAINER="paul@slitaz.org" LICENSE="LGPL2" WEB_SITE="http://aspell.net/" -TAGS="spell check" +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/aspell.html" HOST_ARCH="i486 arm" TARBALL="$PACKAGE-$VERSION.tar.gz" @@ -16,24 +16,31 @@ BUILD_DEPENDS="perl gettext ncurses-dev" SPLIT="aspell-dev" -# Rules to configure and make the package. -compile_rules() -{ - ./configure $CONFIGURE_ARGS && make && make install +compile_rules() { + # fix some problems identified by gcc7: + sed -i '/ top.do_check ==/s/top.do_check/*&/' modules/filter/tex.cpp + sed -i '/word ==/s/word/*&/' prog/check_funs.cpp + + ./configure $CONFIGURE_ARGS && make && make install || return 1 ln -svfn aspell-0.60 $install/usr/lib/aspell + docdir="$install/usr/share/doc/aspell-$VERSION" - install -v -m755 -d $docdir/aspell.html && - install -v -m755 -d $docdir/aspell-dev.html && - install -v -m644 manual/aspell.html/* $docdir/aspell.html && - install -v -m644 manual/aspell-dev.html/* $docdir/aspell-dev.html + install -v -m755 -d $docdir/aspell.html + install -v -m755 -d $docdir/aspell-dev.html + install -v -m644 manual/aspell.html/* $docdir/aspell.html + install -v -m644 manual/aspell-dev.html/* $docdir/aspell-dev.html } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ +genpkg_rules() { case $PACKAGE in - aspell) copy @std; DEPENDS="ncurses" ;; - aspell-dev) copy @dev ;; + aspell) + copy @std + DEPENDS="ncurses" + TAGS="spell check" + ;; + *-dev) + copy @dev + ;; esac } diff -r bb53e6d98ac8 -r ab7c63b80420 autoconf213/receipt --- a/autoconf213/receipt Thu Dec 07 14:34:32 2017 +0200 +++ b/autoconf213/receipt Thu Dec 07 17:39:40 2017 +0200 @@ -7,15 +7,14 @@ MAINTAINER="psychomaniak@xakep.ru" LICENSE="GPL2" WEB_SITE="http://www.gnu.org/software/autoconf/" +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/autoconf213.html" -TARBALL="$PACKAGE-$VERSION.tar.gz" -WGET_URL="http://ftpmirror.gnu.org/autoconf/autoconf-$VERSION.tar.gz" +TARBALL="autoconf-$VERSION.tar.gz" +WGET_URL="http://ftpmirror.gnu.org/autoconf/$TARBALL" BUILD_DEPENDS="m4 perl sed" -# Rules to configure and make the package. -compile_rules() -{ +compile_rules() { ./configure \ --prefix=/usr \ --program-suffix=-2.13 && @@ -23,9 +22,7 @@ make prefix="$DESTDIR/usr" install } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ +genpkg_rules() { copy @std @dev DEPENDS="m4 perl" } diff -r bb53e6d98ac8 -r ab7c63b80420 dbus-glib/receipt --- a/dbus-glib/receipt Thu Dec 07 14:34:32 2017 +0200 +++ b/dbus-glib/receipt Thu Dec 07 17:39:40 2017 +0200 @@ -7,47 +7,50 @@ MAINTAINER="pankso@slitaz.org" LICENSE="GPL2" WEB_SITE="https://freedesktop.org/wiki/Software/DBusBindings/#dbus-glibobsoleteunmaintained" +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/dbus-glib.html" HOST_ARCH="i486 arm" TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="http://dbus.freedesktop.org/releases/dbus-glib/$TARBALL" +BUILD_DEPENDS_arm="dbus-dev glib-dev expat-dev" BUILD_DEPENDS="dbus-dev glib-dev expat-dev gettext gtk-doc" -BUILD_DEPENDS_arm="dbus-dev glib-dev expat-dev" SPLIT="dbus-glib-dev" -# Handle cross compilation. Host pkg-config/gettext are used -case "$ARCH" in - arm*) - export ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=yes} ;; -esac -# Rules to configure and make the package. -compile_rules() -{ +compile_rules() { + case "$ARCH" in + arm*) export ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=yes} ;; + esac + + fix ld ./configure \ --sysconfdir=/etc \ --disable-static \ - $CONFIGURE_ARGS && + --disable-bash-completion \ + $CONFIGURE_ARGS || return 1 + case "$ARCH" in arm) patch -p1 < $stuff/dbus-glib.patch && patch -p0 < $stuff/dbus.patch ;; - esac && + esac + + fix libtool make && make install } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ +genpkg_rules() { case $PACKAGE in dbus-glib) - copy bin/ *.so* # exclude bash completion - DEPENDS="dbus glib expat" + copy @std + DEPENDS="dbus expat glib" ;; *-dev) copy @dev - DEPENDS="dbus-glib dbus-dev glib-dev" + DEPENDS="dbus-glib dbus-dev glib-dev libffi-dev pcre-dev \ + util-linux-blkid-dev util-linux-mount-dev util-linux-uuid-dev \ + zlib-dev" ;; esac } diff -r bb53e6d98ac8 -r ab7c63b80420 enchant/receipt --- a/enchant/receipt Thu Dec 07 14:34:32 2017 +0200 +++ b/enchant/receipt Thu Dec 07 17:39:40 2017 +0200 @@ -7,30 +7,22 @@ MAINTAINER="pankso@slitaz.org" LICENSE="LGPL2.1" WEB_SITE="https://abiword.github.io/enchant/" -TAGS="spell check" +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/enchant.html" HOST_ARCH="i486 arm" TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="https://github.com/AbiWord/enchant/releases/download/enchant-${VERSION//./-}/$TARBALL" BUILD_DEPENDS="glib-dev hunspell-dev aspell-dev" -SPLIT="enchant-aspell enchant-hunspell enchant-dev" +SPLIT="enchant-aspell enchant-hunspell enchant enchant-dev" -# Rules to configure and make the package. -compile_rules() -{ - ./configure $CONFIGURE_ARGS && make && make install +compile_rules() { + fix ld && + ./configure $CONFIGURE_ARGS && fix libtool && make && make install } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ +genpkg_rules() { case $PACKAGE in - enchant) - copy @std - find $fs \( -name libenchant_aspell.so -o -name libenchant_myspell.so \) -delete - SUGGESTED="aspell" - ;; enchant-aspell) copy libenchant_aspell.so CAT="text|aspell backend" @@ -41,6 +33,12 @@ CAT="text|hunspell backend" DEPENDS="enchant hunspell" ;; + enchant) + copy @std @rm + DEPENDS="glib" + SUGGESTED="aspell" + TAGS="spell check" + ;; enchant-dev) copy @dev DEPENDS="enchant enchant-aspell enchant-hunspell aspell hunspell \ @@ -48,4 +46,3 @@ ;; esac } - diff -r bb53e6d98ac8 -r ab7c63b80420 exempi/receipt --- a/exempi/receipt Thu Dec 07 14:34:32 2017 +0200 +++ b/exempi/receipt Thu Dec 07 17:39:40 2017 +0200 @@ -1,12 +1,13 @@ # SliTaz package receipt v2. PACKAGE="exempi" -VERSION="2.4.2" +VERSION="2.4.3" CATEGORY="utilities" LICENSE="GPL3" SHORT_DESC="An implementation of XMP (Adobe's Extensible Metadata Platform)" MAINTAINER="yuripourre@gmail.com" WEB_SITE="https://libopenraw.freedesktop.org/wiki/Exempi/" +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/exempi.html" TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="https://libopenraw.freedesktop.org/download/$TARBALL" @@ -14,21 +15,23 @@ BUILD_DEPENDS="expat-dev zlib-dev libboost-dev libboost-unit-test-framework" SPLIT="exempi-dev" -# Rules to configure and make the package. -compile_rules() -{ +compile_rules() { ./configure \ --disable-static \ $CONFIGURE_ARGS && make && - make DESTDIR=$DESTDIR install + make install } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ +genpkg_rules() { case $PACKAGE in - exempi) copy @std; DEPENDS="expat zlib";; - *-dev) copy @dev; DEPENDS="expat-dev zlib-dev";; + exempi) + copy @std + DEPENDS="expat zlib" + ;; + *-dev) + copy @dev + DEPENDS="exempi expat-dev zlib-dev" + ;; esac } diff -r bb53e6d98ac8 -r ab7c63b80420 fftw-dev/receipt --- a/fftw-dev/receipt Thu Dec 07 14:34:32 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="fftw-dev" -VERSION="3.3.6-pl2" -CATEGORY="development" -SHORT_DESC="A library for computing the discrete Fourier transform (DFT) \ -(development files)" -MAINTAINER="jozee@slitaz.org" -LICENSE="GPL2" -WEB_SITE="http://www.fftw.org/" - -WANTED="fftw" -DEPENDS="fftw" - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - copy @dev -} diff -r bb53e6d98ac8 -r ab7c63b80420 fftw/receipt --- a/fftw/receipt Thu Dec 07 14:34:32 2017 +0200 +++ b/fftw/receipt Thu Dec 07 17:39:40 2017 +0200 @@ -1,4 +1,4 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="fftw" VERSION="3.3.6-pl2" @@ -7,13 +7,14 @@ MAINTAINER="jozee@slitaz.org" LICENSE="GPL2" WEB_SITE="http://www.fftw.org/" +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/fftw.html" TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="http://www.fftw.org/$TARBALL" BUILD_DEPENDS="gfortran" +SPLIT="fftw-dev" -# Rules to configure and make the package. compile_rules() { # build double precision ./configure \ @@ -44,8 +45,9 @@ make DESTDIR=$DESTDIR install } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - copy @std +genpkg_rules() { + case $PACKAGE in + fftw) copy @std;; + *-dev) copy @dev;; + esac } diff -r bb53e6d98ac8 -r ab7c63b80420 glib/receipt --- a/glib/receipt Thu Dec 07 14:34:32 2017 +0200 +++ b/glib/receipt Thu Dec 07 17:39:40 2017 +0200 @@ -1,32 +1,32 @@ # SliTaz package receipt v2. PACKAGE="glib" -VERSION="2.50.3" +VERSION="2.52.3" CATEGORY="x-window" SHORT_DESC="C routines" MAINTAINER="pankso@slitaz.org" LICENSE="GPL2" WEB_SITE="https://developer.gnome.org/glib/" +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/glib2.html" HOST_ARCH="i486 arm" TARBALL="$PACKAGE-$VERSION.tar.xz" WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" +BUILD_DEPENDS_arm="pcre-dev libffi-dev zlib-dev elfutils-dev libxml2-dev" BUILD_DEPENDS="perl indent python zlib-dev libffi-dev gettext-tools elfutils-dev \ pcre-dev gtk-doc libxslt libxml2-tools dbus-dev util-linux-mount-dev" -BUILD_DEPENDS_arm="pcre-dev libffi-dev zlib-dev elfutils-dev libxml2-dev" SPLIT="glib-dev" -# Rules to configure and make the package. -compile_rules() -{ +compile_rules() { + fix ld case "$ARCH" in i?86) ./configure \ - --sysconfdir=/etc \ - --with-pcre=system \ - --enable-static \ - $CONFIGURE_ARGS ;; + --sysconfdir=/etc \ + --with-pcre=system \ + --enable-static \ + $CONFIGURE_ARGS ;; arm*) # Native ARM build --> if ARCH != SLITAZ_ARCH ? export LD_LIBRARY_PATH=/cross/$ARCH/sysroot/usr/lib:/usr/lib:/lib @@ -50,6 +50,7 @@ --enable-static=yes \ --disable-rpath ;; esac && + fix libtool && make && make DESTDIR=/ install && make DESTDIR=$DESTDIR install @@ -60,9 +61,7 @@ # Installing into / is safe since we working in the Aufs layer... } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ +genpkg_rules() { case $PACKAGE in glib) copy @std @@ -70,13 +69,11 @@ cd $fs/usr/bin rm gdbus-codegen gtester* glib-mkenums glib-gettextize rm -r $fs/usr/share - DEPENDS="elfutils libffi pcre util-linux-blkid util-linux-mount \ - util-linux-uuid zlib" + DEPENDS="elfutils libffi pcre util-linux-mount zlib" PROVIDE="libgio" # deprecated ;; glib-dev) - copy @std @dev - remove_already_packed + copy @std @dev @rm DEPENDS="glib glibc-dev libffi-dev pcre-dev util-linux-blkid-dev \ util-linux-mount-dev util-linux-uuid-dev zlib-dev perl python" PROVIDE="libgio-dev" # deprecated diff -r bb53e6d98ac8 -r ab7c63b80420 glibmm/receipt --- a/glibmm/receipt Thu Dec 07 14:34:32 2017 +0200 +++ b/glibmm/receipt Thu Dec 07 17:39:40 2017 +0200 @@ -13,36 +13,34 @@ WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" BUILD_DEPENDS="glib-dev libsigc++-dev" -SPLIT="libgiomm libgiomm-dev glibmm-dev" +SPLIT="libgiomm glibmm-dev" compile_rules() { sed -i "/^libdocdir =/ s|\$(book_name)|glibmm-$VERSION|" docs/Makefile.in - ./configure $CONFIGURE_ARGS && make && make install + fix ld && + ./configure $CONFIGURE_ARGS && + fix libtool && + make && make install } genpkg_rules() { case $PACKAGE in + glibmm) + copy libglibmm*.so* + DEPENDS="glib libsigc++" + ;; libgiomm) copy libgiomm*.so* DEPENDS="glib glibmm libsigc++" CAT="x-window|GIO Framework" ;; - libgiomm-dev) - copy giomm-2.4/ libgiomm*.la giomm-2.4.pc - DEPENDS="libgiomm glib-dev glibmm-dev libffi-dev libsigc++-dev \ - pcre-dev util-linux-blkid-dev util-linux-mount-dev \ - util-linux-uuid-dev zlib-dev" - CAT="development|GIO Framework development files" - ;; - glibmm) - copy libglibmm*.so* - DEPENDS="glib libsigc++" - ;; glibmm-dev) - copy glibmm-2.4/ libglibmm*.la glibmm-2.4.pc - DEPENDS="glibmm libgiomm-dev \ - glib-dev libffi-dev libsigc++-dev pcre-dev perl" + copy @dev + DEPENDS="glibmm libgiomm \ + glib-dev libffi-dev libsigc++-dev pcre-dev util-linux-blkid-dev \ + util-linux-mount-dev util-linux-uuid-dev zlib-dev perl" + PROVIDE="libgiomm-dev" # single dev package now ;; esac } diff -r bb53e6d98ac8 -r ab7c63b80420 gmime-dev/receipt --- a/gmime-dev/receipt Thu Dec 07 14:34:32 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="gmime-dev" -VERSION="2.6.7" -CATEGORY="development" -SHORT_DESC="library for parsing messages using MIME" -MAINTAINER="allan316@gmail.com" -LICENSE="LGPL2.1" -WEB_SITE="http://spruce.sourceforge.net/gmime" -WANTED="gmime" - -DEPENDS="gmime gpgme-dev pkg-config" - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/lib - cp -a $install/usr/include $fs/usr - cp -a $install/usr/lib/*.*a $fs/usr/lib - cp -a $install/usr/lib/pkgconfig $fs/usr/lib -} - diff -r bb53e6d98ac8 -r ab7c63b80420 gmime/receipt --- a/gmime/receipt Thu Dec 07 14:34:32 2017 +0200 +++ b/gmime/receipt Thu Dec 07 17:39:40 2017 +0200 @@ -1,34 +1,43 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="gmime" -VERSION="2.6.7" +VERSION="2.6.23" CATEGORY="development" -SHORT_DESC="library for parsing messages using MIME" +SHORT_DESC="Parsing messages using MIME" MAINTAINER="allan316@gmail.com" LICENSE="LGPL2.1" +WEB_SITE="http://spruce.sourceforge.net/gmime/" +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/gmime.html" + TARBALL="$PACKAGE-$VERSION.tar.xz" -WEB_SITE="http://spruce.sourceforge.net/gmime" -WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:3}/$TARBALL" +WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" -DEPENDS="glib gpgme zlib" -BUILD_DEPENDS="glib-dev gpgme-dev zlib-dev" +BUILD_DEPENDS="gtk-doc zlib-dev glib-dev gpgme-dev gobject-introspection-dev \ +vala" +SPLIT="gmime-dev" +COOKOPTS="skip-log-errors" -# Rules to configure and make the package. -compile_rules() -{ - cd $src +compile_rules() { + fix ld ./configure \ + --disable-static \ --enable-smime \ - --disable-mono \ - --disable-static \ - --build=$HOST_SYSTEM \ - --host=$HOST_SYSTEM 2>&1 | grep -v "can't remove" && - make && make DESTDIR=$DESTDIR install + $CONFIGURE_ARGS && + fix libtool && + make && make install } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/lib - cp -a $install/usr/lib/*.so* $fs/usr/lib +genpkg_rules() { + case $PACKAGE in + gmime) + copy @std + DEPENDS="glib gpgme zlib" + ;; + *-dev) + copy @dev + DEPENDS="gmime glib-dev gpgme-dev libassuan-dev libffi-dev \ + libgpg-error-dev pcre-dev util-linux-blkid-dev \ + util-linux-mount-dev util-linux-uuid-dev zlib-dev" + ;; + esac } diff -r bb53e6d98ac8 -r ab7c63b80420 gobject-introspection/receipt --- a/gobject-introspection/receipt Thu Dec 07 14:34:32 2017 +0200 +++ b/gobject-introspection/receipt Thu Dec 07 17:39:40 2017 +0200 @@ -1,52 +1,48 @@ # SliTaz package receipt v2. PACKAGE="gobject-introspection" -VERSION="1.50.0" +VERSION="1.52.1" CATEGORY="development" SHORT_DESC="Introspection system for GObject-based libraries" MAINTAINER="pankso@slitaz.org" LICENSE="LGPL2 MIT" WEB_SITE="https://wiki.gnome.org/Projects/GObjectIntrospection" +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/gobject-introspection.html" #HOST_ARCH="i486 arm" TARBALL="$PACKAGE-$VERSION.tar.xz" WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" +BUILD_DEPENDS_arm="glib-dev libffi-dev cairo-dev dbus-dev" BUILD_DEPENDS="glib-dev cairo-dev gtk-doc python-dev util-linux-mount-dev" -BUILD_DEPENDS_arm="glib-dev libffi-dev cairo-dev dbus-dev" SPLIT="gobject-introspection-dev" -# Handle cross compilation -case "$ARCH" in - arm*) - export CFLAGS="$CFLAGS -L/cross/$ARCH/sysroot/usr/lib" - export LDFLAGS="$LDFLAGS -L/cross/$ARCH/sysroot/usr/lib" - export PKG_CONFIG_PATH="/cross/$ARCH/sysroot/usr/pkgconfig" - ;; -esac +compile_rules() { + case "$ARCH" in + arm*) + export CFLAGS="$CFLAGS -L/cross/$ARCH/sysroot/usr/lib" + export LDFLAGS="$LDFLAGS -L/cross/$ARCH/sysroot/usr/lib" + export PKG_CONFIG_PATH="/cross/$ARCH/sysroot/usr/pkgconfig" + ;; + esac -# Rules to configure and make the package. -compile_rules() -{ + fix ld ./configure \ --disable-static \ $CONFIGURE_ARGS && + fix libtool && make && make install } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ +genpkg_rules() { case $PACKAGE in gobject-introspection) copy @std *.typelib rm -r $fs/usr/share - DEPENDS="glib libffi pcre util-linux-blkid util-linux-mount \ - util-linux-uuid zlib" + DEPENDS="glib libffi python" ;; *-dev) - copy @std @dev - remove_already_packed + copy @std @dev @rm DEPENDS="gobject-introspection glib-dev libffi-dev \ pcre-dev util-linux-blkid-dev util-linux-mount-dev \ util-linux-uuid-dev zlib-dev" diff -r bb53e6d98ac8 -r ab7c63b80420 grantlee/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/grantlee/receipt Thu Dec 07 17:39:40 2017 +0200 @@ -0,0 +1,41 @@ +# SliTaz package receipt v2. + +PACKAGE="grantlee" +VERSION="5.1.0" +CATEGORY="libdevel" +SHORT_DESC="Libraries for text templating with Qt" +MAINTAINER="al.bobylev@gmail.com" +LICENSE="LGPL2.1" +WEB_SITE="https://github.com/steveire/grantlee" +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/grantlee.html" + +TARBALL="$PACKAGE-$VERSION.tar.gz" +WGET_URL="http://downloads.grantlee.org/$TARBALL" + +BUILD_DEPENDS="cmake qt5-dev mesa17-dev" +SPLIT="grantlee-dev" + +compile_rules() { + mkdir build + cd build + + fix ld + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + .. && + make && + make install +} + +genpkg_rules() { + case $PACKAGE in + grantlee) + copy @std + DEPENDS="qt5-base qt5-script" + ;; + *-dev) + copy @dev + ;; + esac +} diff -r bb53e6d98ac8 -r ab7c63b80420 gsl-dev/receipt --- a/gsl-dev/receipt Thu Dec 07 14:34:32 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="gsl-dev" -VERSION="2.3" -CATEGORY="development" -SHORT_DESC="GNU Scientific Library (development files)" -MAINTAINER="pankso@slitaz.org" -LICENSE="GPL3" -WEB_SITE="https://www.gnu.org/software/gsl/" - -WANTED="gsl" -DEPENDS="gsl" - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - copy *.h *.a *.la *.pc *.m4 gsl-config -} diff -r bb53e6d98ac8 -r ab7c63b80420 gsl/receipt --- a/gsl/receipt Thu Dec 07 14:34:32 2017 +0200 +++ b/gsl/receipt Thu Dec 07 17:39:40 2017 +0200 @@ -1,27 +1,30 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="gsl" -VERSION="2.3" +VERSION="2.4" CATEGORY="libdevel" SHORT_DESC="GNU Scientific Library" MAINTAINER="pankso@slitaz.org" LICENSE="GPL3" WEB_SITE="https://www.gnu.org/software/gsl/" +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/gsl.html" TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" -# Rules to configure and make the package. -compile_rules() -{ - ./configure $CONFIGURE_ARGS && +SPLIT="gsl-dev" + +compile_rules() { + ./configure \ + --disable-static \ + $CONFIGURE_ARGS && make $MAKEFLAGS && make install } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - copy bin/ *.so* - find $fs -name gsl-config -delete +genpkg_rules() { + case $PACKAGE in + gsl) copy @std;; + *-dev) copy @dev;; + esac } diff -r bb53e6d98ac8 -r ab7c63b80420 js/receipt --- a/js/receipt Thu Dec 07 14:34:32 2017 +0200 +++ b/js/receipt Thu Dec 07 17:39:40 2017 +0200 @@ -1,45 +1,64 @@ # SliTaz package receipt v2. PACKAGE="js" -VERSION="17.0.0" +VERSION="38.2.1" CATEGORY="libdevel" SHORT_DESC="Mozilla's JavaScript engine written in C/C++" MAINTAINER="al.bobylev@gmail.com" LICENSE="MPL2" WEB_SITE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey" +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/js38.html" -TARBALL="mozjs$VERSION.tar.gz" -WGET_URL="http://ftp.mozilla.org/pub/mozilla.org/js/$TARBALL" +TARBALL="mozjs-$VERSION.rc0.tar.bz2" +#WGET_URL="https://people.mozilla.org/~sstangl/$TARBALL" +# SpiderMonkey no more released separately, URL is wrong, see: +# https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/38 +# Use BLFS 8.1 source mirror: +WGET_URL="http://ftp.osuosl.org/pub/blfs/8.1/m/$TARBALL" -BUILD_DEPENDS="perl python nspr-dev zlib-dev" +BUILD_DEPENDS="autoconf213 xorg-libXt-dev python-dev xorg-libX11-dev nspr-dev \ +zlib-dev icu-dev" SPLIT="js-dev" -# Rules to configure and make the package. -compile_rules() -{ - cd js/src && +compile_rules() { + cd js/src - sed -i 's/(defined\((@TEMPLATE_FILE)\))/\1/' config/milestone.pl && + autoconf-2.13 && ./configure \ - --enable-readline \ - --enable-threadsafe \ + --with-intl-api \ + --with-system-zlib \ --with-system-ffi \ --with-system-nspr \ + --with-system-icu \ + --enable-threadsafe \ + --enable-readline \ $CONFIGURE_ARGS && - make && make install && + make && make install || return 1 - find $install/usr/include/js-${VERSION%.*}/ \ - $install/usr/lib/libmozjs-${VERSION%.*}.a \ - $install/usr/lib/pkgconfig/mozjs-${VERSION%.*}.pc \ + cd $install/usr/include/mozjs-38 + for link in $(find . -type l); do + header=$(readlink $link) + rm -f $link + cp -pv $header $link + chmod 644 $link + done + cd - >/dev/null + + find $install/usr/include/ \ + $install/usr/lib/pkgconfig/ \ -type f -exec chmod -v 644 '{}' \; } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ +genpkg_rules() { case $PACKAGE in - js) copy @std; DEPENDS="ncurses nspr readline zlib";; - js-dev) copy @dev; DEPENDS="js nspr-dev";; + js) + copy @std + DEPENDS="icu libicu ncurses nspr readline zlib" + ;; + js-dev) + copy @dev + DEPENDS="js nspr-dev" + ;; esac } diff -r bb53e6d98ac8 -r ab7c63b80420 js/stuff/patches/js38-38.2.1-upstream_fixes-2.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/js/stuff/patches/js38-38.2.1-upstream_fixes-2.patch Thu Dec 07 17:39:40 2017 +0200 @@ -0,0 +1,231 @@ +Submitted By: Douglas R. Reno +Date: 2017-04-01 +Inital Package Version: 38.2.1 +Upstream Status: Declined +Origin: https://git.gnome.org/browse/jhbuild/tree/patches +Description: Fixes build and functionality problems within mozjs38. + + +diff -Naurp mozjs-38.0.0.orig/build/autoconf/icu.m4 mozjs-38.0.0/build/autoconf/icu.m4 +--- mozjs-38.0.0.orig/build/autoconf/icu.m4 2015-09-17 15:12:19.000000000 -0500 ++++ mozjs-38.0.0/build/autoconf/icu.m4 2017-04-01 19:31:59.957994136 -0500 +@@ -73,7 +73,8 @@ if test -n "$USE_ICU"; then + fi + fi + +- version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"` ++ #version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"` ++ version=57.1 + if test x"$version" = x; then + AC_MSG_ERROR([cannot determine icu version number from uvernum.h header file $lineno]) + fi +diff -Naurp mozjs-38.0.0.orig/js/src/configure mozjs-38.0.0/js/src/configure +--- mozjs-38.0.0.orig/js/src/configure 2015-09-17 15:38:10.000000000 -0500 ++++ mozjs-38.0.0/js/src/configure 2017-04-01 19:31:59.958994141 -0500 +@@ -1662,9 +1662,9 @@ esac + + fi + +-MOZILLA_VERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --topsrcdir $srcdir` +-MOZILLA_UAVERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --topsrcdir $srcdir --uaversion` +-MOZILLA_SYMBOLVERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --topsrcdir $srcdir --symbolversion` ++MOZILLA_VERSION=`python $srcdir/python/mozbuild/mozbuild/milestone.py --topsrcdir $srcdir` ++MOZILLA_UAVERSION=`python $srcdir/python/mozbuild/mozbuild/milestone.py --topsrcdir $srcdir --uaversion` ++MOZILLA_SYMBOLVERSION=`python $srcdir/python/mozbuild/mozbuild/milestone.py --topsrcdir $srcdir --symbolversion` + + cat >> confdefs.pytmp < typed; +- mozilla::AlignedStorage2 value; ++ AnyRegister typed; ++ ValueOperand value; + } data; + +- AnyRegister& dataTyped() { +- MOZ_ASSERT(hasTyped()); +- return *data.typed.addr(); +- } +- ValueOperand& dataValue() { +- MOZ_ASSERT(hasValue()); +- return *data.value.addr(); +- } +- +- AnyRegister dataTyped() const { +- MOZ_ASSERT(hasTyped()); +- return *data.typed.addr(); +- } +- const ValueOperand& dataValue() const { +- MOZ_ASSERT(hasValue()); +- return *data.value.addr(); +- } +- + public: + +- TypedOrValueRegister() +- : type_(MIRType_None) +- {} ++ TypedOrValueRegister() = default; + + TypedOrValueRegister(MIRType type, AnyRegister reg) + : type_(type) + { +- dataTyped() = reg; ++ data.typed = reg; + } + + MOZ_IMPLICIT TypedOrValueRegister(ValueOperand value) + : type_(MIRType_Value) + { +- dataValue() = value; ++ data.value = value; + } + + MIRType type() const { +@@ -220,11 +198,13 @@ class TypedOrValueRegister + } + + AnyRegister typedReg() const { +- return dataTyped(); ++ MOZ_ASSERT(hasTyped()); ++ return data.typed; + } + + ValueOperand valueReg() const { +- return dataValue(); ++ MOZ_ASSERT(hasValue()); ++ return data.value; + } + + AnyRegister scratchReg() { +@@ -240,19 +220,18 @@ class ConstantOrRegister + // Whether a constant value is being stored. + bool constant_; + +- // Space to hold either a Value or a TypedOrValueRegister. + union U { +- mozilla::AlignedStorage2 constant; +- mozilla::AlignedStorage2 reg; ++ Value constant; ++ TypedOrValueRegister reg; + } data; + + Value& dataValue() { + MOZ_ASSERT(constant()); +- return *data.constant.addr(); ++ return data.constant; + } + TypedOrValueRegister& dataReg() { + MOZ_ASSERT(!constant()); +- return *data.reg.addr(); ++ return data.reg; + } + + public: +diff -Naurp mozjs-38.0.0.orig/js/src/Makefile.in mozjs-38.0.0/js/src/Makefile.in +--- mozjs-38.0.0.orig/js/src/Makefile.in 2015-09-17 15:12:18.000000000 -0500 ++++ mozjs-38.0.0/js/src/Makefile.in 2017-04-01 19:31:59.961994157 -0500 +@@ -208,10 +208,13 @@ endif + SCRIPTS = $(JS_CONFIG_NAME) + SDK_BINARY = $(JS_CONFIG_NAME) + +-$(LIBRARY_NAME).pc: js.pc ++$(JS_CONFIG_NAME): js-config + cp $^ $@ + +-install:: $(LIBRARY_NAME).pc ++$(JS_LIBRARY_NAME).pc: js.pc ++ cp $^ $@ ++ ++install:: $(JS_LIBRARY_NAME).pc + $(SYSINSTALL) $^ $(DESTDIR)$(libdir)/pkgconfig + + install:: js-config.h diff -r bb53e6d98ac8 -r ab7c63b80420 js/stuff/patches/series --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/js/stuff/patches/series Thu Dec 07 17:39:40 2017 +0200 @@ -0,0 +1,2 @@ +# http://www.linuxfromscratch.org/patches/blfs/8.1/js38-38.2.1-upstream_fixes-2.patch +js38-38.2.1-upstream_fixes-2.patch diff -r bb53e6d98ac8 -r ab7c63b80420 libboost/receipt --- a/libboost/receipt Thu Dec 07 14:34:32 2017 +0200 +++ b/libboost/receipt Thu Dec 07 17:39:40 2017 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="libboost" -VERSION="1.63.0" +VERSION="1.64.0" CATEGORY="meta" SHORT_DESC="Boost C++ libraries" MAINTAINER="chadi.elahmad@gmail.com" @@ -9,7 +9,7 @@ WEB_SITE="http://www.boost.org/" TARBALL="boost-$VERSION.tar.bz2" -WGET_URL="$SF_MIRROR/boost/boost_${VERSION//./_}.tar.bz2" +WGET_URL="https://dl.bintray.com/boostorg/release/$VERSION/source/boost_${VERSION//./_}.tar.bz2" BUILD_DEPENDS="icu-dev zlib-dev bzip2-dev python-dev" l="libboost" @@ -39,25 +39,17 @@ # libboost-x-dev by the pair libboost-x and libboost-dev. -# Rules to configure and make the package. -compile_rules() -{ +compile_rules() { ./bootstrap.sh --prefix=$install/usr && ./b2 stage threading=multi link=shared && - ./b2 install threading=multi link=shared && + ./b2 install threading=multi link=shared || return 1 - docdir=$install/share/doc/boost-$VERSION && - mkdir -p $docdir && - cp -a $src/doc/html/* $docdir && - chown -R root:root $docdir && - find $docdir -type f -exec chmod 644 '{}' \; + cook_pick_docs doc/html/* find $install -name '*.hpp' -exec chmod 644 '{}' \; } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ +genpkg_rules() { DEPENDS=" " case $PACKAGE in *-chrono) DEPENDS="$l-system";; @@ -90,8 +82,7 @@ CAT="doc|documentation" ;; libboost-dev) - copy @dev - remove_already_packed + copy @dev @rm ;; *) p=${PACKAGE#*-}