# HG changeset patch # User Aleksej Bobylev # Date 1544654814 -7200 # Node ID 4d9f82dabdbbb873757a12b54afe957a3d6fdc4c # Parent ea9e52516fb0052ffd77e24789ceba07e4fb0dec Update atkmm, cairo, cmake, db, elfutils, emacs, glib, glib-networking, glibmm, gobject-introspection, libsigc++, meson, openssl, zstd diff -r ea9e52516fb0 -r 4d9f82dabdbb atkmm/receipt --- a/atkmm/receipt Wed Dec 12 02:29:05 2018 +0200 +++ b/atkmm/receipt Thu Dec 13 00:46:54 2018 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="atkmm" -VERSION="2.24.2" +VERSION="2.28.0" CATEGORY="x-window" SHORT_DESC="C++ interface for the ATK accessibility toolkit library" MAINTAINER="devel@slitaz.org" @@ -15,6 +15,9 @@ BUILD_DEPENDS="atk-dev glibmm-dev" SPLIT="$PACKAGE-dev" +DEPENDS_std="atk glib glibmm libsigc++" +DEPENDS_dev="atkmm atk-dev glibmm-dev" + compile_rules() { sed -i "/^libdocdir =/ s|\$(book_name)|atkmm-$VERSION|" doc/Makefile.in @@ -23,16 +26,3 @@ make && make install } - -genpkg_rules() { - case $PACKAGE in - atkmm) - copy @std - DEPENDS="atk glib glibmm libsigc++" - ;; - *-dev) - copy @dev - DEPENDS="atkmm atk-dev glibmm-dev" - ;; - esac -} diff -r ea9e52516fb0 -r 4d9f82dabdbb cairo/receipt --- a/cairo/receipt Wed Dec 12 02:29:05 2018 +0200 +++ b/cairo/receipt Thu Dec 13 00:46:54 2018 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="cairo" -VERSION="1.14.12" +VERSION="1.16.0" CATEGORY="x-window" SHORT_DESC="2D graphics library" MAINTAINER="devel@slitaz.org" @@ -17,74 +17,30 @@ libspectre-dev poppler-dev librsvg-dev gtk2-dev xorg-pixman-dev" SPLIT="$PACKAGE-tools $PACKAGE-dev" -# use --nogl to disable building cairo-gl* packages -if [ -z "$nogl" ]; then - BUILD_DEPENDS="$BUILD_DEPENDS mesa-dev eudev-dev xorg-libXxf86vm-dev \ - libdrm-dev mesa-libegl xorg-libxshmfence-dev" - SPLIT="$SPLIT cairo-gl:gl cairo-gl-tools:gl cairo-gl-dev:gl" -fi COOKOPTS="skip-log-errors" +COPY_std="libcairo.so* libcairo-gobject.so* libcairo-script-interpreter.so*" +COPY_tools="bin/ cairo-fdr.so* cairo-sphinx.so* libcairo-trace.so*" + +CAT_tools="development|development tools" + +DEPENDS_std="fontconfig freetype glib libpng16 xorg-libX11 xorg-libxcb \ +xorg-pixman zlib" +DEPENDS_tools="cairo glib xorg-libX11 xorg-libXrender xorg-libxcb xorg-pixman \ +zlib" +DEPENDS_dev="cairo cairo-tools \ +fontconfig-dev freetype-dev glib-dev libpng16-dev xorg-libX11-dev \ +xorg-libXext-dev xorg-libXrender-dev xorg-libxcb-dev xorg-pixman-dev zlib-dev" + compile_rules() { - case "$SET" in - gl) SET_ARGS='--enable-gl';; - *) SET_ARGS='--disable-gl';; - esac - ./configure \ --enable-xcb \ --enable-xlib-xcb \ --enable-tee \ --disable-static \ - $SET_ARGS \ + --disable-gl \ $CONFIGURE_ARGS && fix libtool && make $MAKEFLAGS && make DESTDIR=$install install } - -genpkg_rules() { - case $PACKAGE in - cairo) - copy libcairo.so* libcairo-gobject.so* libcairo-script-interpreter.so* - DEPENDS="fontconfig freetype glib libpng16 xorg-libX11 xorg-libxcb \ - xorg-pixman zlib" - ;; - cairo-tools) - copy bin/ cairo-fdr.so* cairo-sphinx.so* libcairo-trace.so* - CAT="development|development tools" - DEPENDS="cairo glib xorg-libX11 xorg-libXrender xorg-libxcb \ - xorg-pixman zlib" - ;; - cairo-dev) - copy @dev - DEPENDS="cairo cairo-tools \ - fontconfig-dev freetype-dev glib-dev libpng16-dev xorg-libX11-dev \ - xorg-libXext-dev xorg-libXrender-dev xorg-libxcb-dev \ - xorg-pixman-dev zlib-dev" - ;; - - cairo-gl) - copy usr/lib/*.so* - CAT="x-window|with GL support" - DEPENDS="fontconfig freetype glib libpng16 mesa mesa-libegl \ - xorg-libX11 xorg-libxcb xorg-pixman zlib" - PROVIDE="cairo:mesa" - ;; - cairo-gl-tools) - copy usr/bin/ usr/lib/cairo/*.so* - CAT="development|development tools with GL support" - DEPENDS="cairo-gl glib mesa mesa-libegl xorg-libX11 \ - xorg-libXrender xorg-libxcb xorg-pixman zlib" - PROVIDE="cairo-tools:mesa cairo-tools:cairo-gl" - ;; - cairo-gl-dev) - copy @dev - CAT="development|development files with GL support" - DEPENDS="cairo-gl cairo-gl-tools \ - fontconfig-dev freetype-dev glib-dev libpng16-dev mesa-dev \ - xorg-libX11-dev xorg-libXext-dev xorg-libXrender-dev \ - xorg-libxcb-dev xorg-pixman-dev zlib-dev" - ;; - esac -} diff -r ea9e52516fb0 -r 4d9f82dabdbb cmake/receipt --- a/cmake/receipt Wed Dec 12 02:29:05 2018 +0200 +++ b/cmake/receipt Thu Dec 13 00:46:54 2018 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="cmake" -VERSION="3.12.4" +VERSION="3.13.1" CATEGORY="development" SHORT_DESC="Cross-platform build system generator" MAINTAINER="devel@slitaz.org" @@ -12,10 +12,22 @@ TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="http://www.cmake.org/files/v${VERSION%.*}/$TARBALL" -BUILD_DEPENDS="zlib-dev curl-dev bzip2-dev xz-dev libarchive-dev \ -expat-dev ncurses-dev gfortran libuv-dev jsoncpp-dev" +BUILD_DEPENDS="zlib-dev curl-dev bzip2-dev xz-dev libarchive-dev expat-dev \ +ncurses-dev gfortran libuv-dev jsoncpp-dev" SPLIT="$PACKAGE-common" +COPY_std="bin/" +COPY_common="@std @dev @rm" + +DEPENDS_std="cmake-common expat jsoncpp libarchive libcurl libuv ncurses \ +ncurses-libform zlib" +DEPENDS_common=" " + +CAT_common="development|common files" + +# CMake should be updated both with Boost: +# https://stackoverflow.com/questions/42123509/cmake-finds-boost-but-the-imported-targets-not-available-for-boost-version + compile_rules() { sed -i '/"lib64"/s/64//' Modules/GNUInstallDirs.cmake fix math @@ -29,20 +41,3 @@ make && make DESTDIR=$install install } - -genpkg_rules() { - case $PACKAGE in - cmake) - copy bin/ - DEPENDS="cmake-common expat jsoncpp libarchive libcurl libuv \ - ncurses ncurses-libform zlib" - ;; - cmake-common) - copy @std @dev @rm - CAT="development|common files" - ;; - esac -} - -# CMake should be updated both with Boost: -# https://stackoverflow.com/questions/42123509/cmake-finds-boost-but-the-imported-targets-not-available-for-boost-version diff -r ea9e52516fb0 -r 4d9f82dabdbb db/receipt --- a/db/receipt Wed Dec 12 02:29:05 2018 +0200 +++ b/db/receipt Thu Dec 13 00:46:54 2018 +0200 @@ -1,18 +1,34 @@ # SliTaz package receipt v2. PACKAGE="db" -VERSION="6.2.23" +VERSION="6.2.32" CATEGORY="misc" SHORT_DESC="Berkeley database system" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="BSD" WEB_SITE="https://www.oracle.com/database/berkeley-db/db.html" +LFS="http://www.linuxfromscratch.org/blfs/view/svn/server/db.html" +REPOLOGY="db6" TARBALL="$PACKAGE-$VERSION.tar.gz" -WGET_URL="http://download.oracle.com/berkeley-db/$TARBALL" +WGET_URL="https://download.oracle.com/berkeley-db/$TARBALL" SPLIT="libdb libdb-cxx $PACKAGE-dev" +COPY_std="bin/" +COPY_libdb="libdb-*so libdb.so" +COPY_libdb_cxx="libdb_cxx-*so libdb_cxx.so" + +DEPENDS_std="libdb" +DEPENDS_libdb="glibc-base" +DEPENDS_libdb_cxx="glibc-base" +DEPENDS_dev="db libdb libdb-cxx" + +CAT_libdb="libs|libraries" +CAT_libdb_cxx="libs|libraries for C++ support" + +TAGS_std="database" + compile_rules() { cd $src/build_unix ../dist/configure \ @@ -22,29 +38,9 @@ --disable-static \ $CONFIGURE_ARGS && make && - make docdir=/usr/share/doc/$PACKAGE-$VERSION install + make docdir=/usr/share/doc/$PACKAGE-$VERSION install || return 1 + + find $install -type f -exec chmod u+w '{}' \; # 444->644, 555->755 + find $install -type d -exec chmod g-w '{}' \; # 775->755 + chown -R 0:0 $install } - -genpkg_rules() { - case $PACKAGE in - db) - copy bin/ - DEPENDS="libdb" - TAGS="database" - ;; - libdb) - copy libdb-*so libdb.so - CAT="libs|libraries" - DEPENDS="glibc-base" - ;; - libdb-cxx) - copy libdb_cxx-*so libdb_cxx.so - CAT="libs|libraries for C++ support" - DEPENDS="glibc-base" - ;; - db-dev) - copy @dev - DEPENDS="db libdb libdb-cxx" - ;; - esac -} diff -r ea9e52516fb0 -r 4d9f82dabdbb elfutils/receipt --- a/elfutils/receipt Wed Dec 12 02:29:05 2018 +0200 +++ b/elfutils/receipt Thu Dec 13 00:46:54 2018 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="elfutils" -VERSION="0.174" +VERSION="0.175" CATEGORY="development" SHORT_DESC="ELF object file access library" MAINTAINER="pascal.bellard@slitaz.org" @@ -10,8 +10,8 @@ TARBALL="$PACKAGE-$VERSION.tar.bz2" WGET_URL="https://sourceware.org/elfutils/ftp/$VERSION/$TARBALL" -TARBALL_MD5="48bec24c0c8b2c16820326956dff9378" -TARBALL_SHA512="696708309c2a9a076099748809ecdc0490f4a8a842b2efc1aae0d746e7c5a8b203743f5626739eff837216b0c052696516b2821f5d3cc3f2eef86597c96d42df" +TARBALL_MD5="9a02b0382b78cc2d515fb950275d4c02" +TARBALL_SHA512="2c3168a34bbc8f22425faa263fc24ec50df39258a4f9ace4e6cd88e9764c435fee70c1a82db8273dbab70a75e5216a200bebf05af1d3ea77e444e35d71a4ed84" BUILD_DEPENDS="gettext zlib-dev bzip2-dev xz-dev" SPLIT="$PACKAGE-dev" @@ -21,10 +21,3 @@ make && make install } - -genpkg_rules() { - case $PACKAGE in - elfutils) copy @std;; - *-dev) copy @dev;; - esac -} diff -r ea9e52516fb0 -r 4d9f82dabdbb emacs/.icon.png Binary file emacs/.icon.png has changed diff -r ea9e52516fb0 -r 4d9f82dabdbb emacs/receipt --- a/emacs/receipt Wed Dec 12 02:29:05 2018 +0200 +++ b/emacs/receipt Thu Dec 13 00:46:54 2018 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="emacs" -VERSION="25.3" +VERSION="26.1" CATEGORY="editors" SHORT_DESC="The GNU Emacs editor" MAINTAINER="devel@slitaz.org" @@ -12,15 +12,33 @@ WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" BUILD_DEPENDS="atk-dev cairo-dev expat-dev dbus-dev freetype-dev \ -fontconfig-dev glib-dev gnutls-dev gtk2-dev jpeg-dev \ -libpng16-dev librsvg-dev ncurses-dev pango-dev tiff-dev xorg-dev \ -xorg-dev-proto" # giflib-dev: version 4 needed, add --with-gif=no) -SPLIT="$PACKAGE-help $PACKAGE-lisp-sources $PACKAGE" +fontconfig-dev glib-dev gnutls-dev gtk2-dev libjpeg-turbo-dev libpng16-dev \ +librsvg-dev ncurses-dev pango-dev tiff-dev xorg-dev xorg-dev-proto lcms2-dev" +# giflib-dev: version 4 needed, add --with-gif=no) +SPLIT="$PACKAGE-help $PACKAGE-lisp-sources $PACKAGE $PACKAGE-common" + +COPY_help="info/ tutorials/ refcards/*.pdf etc/[A-Z]* etc/*.txt" +COPY_lisp_sources="*.el.gz refcards/*.tex" +COPY_std="bin/ libexec/" +COPY_common="@std @rm" + +DEPENDS_help="emacs" +DEPENDS_lisp_sources="emacs" +DEPENDS_std="dbus fontconfig freetype gdk-pixbuf glib gtk2 lcms2 libgnutls \ +libpng16 librsvg libxml2 ncurses tiff xorg-libICE xorg-libSM xorg-libX11 \ +xorg-libXext xorg-libXfixes xorg-libXft xorg-libXpm xorg-libXrender \ +xorg-libxcb zlib" +DEPENDS_common=" " + +CAT_help="development|help files" +CAT_lisp_sources="development|Lisp source files" +CAT_common="editors|architecture independent part" + +SUGGESTED_std="alsa-lib" +TAGS_std="text-editor" compile_rules() { ./configure \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man \ --without-makeinfo \ --without-gconf \ --with-gif=no --with-jpeg=no \ @@ -28,9 +46,6 @@ --with-x \ --with-toolkit-scroll-bars \ --with-xpm=yes \ - --libexecdir=/usr/lib \ - --localstatedir=/var/lib \ - --sharedstatedir=/var/lib \ $CONFIGURE_ARGS && make $MAKEFLAGS && make DESTDIR=$install install || return 1 @@ -44,48 +59,6 @@ # Use default site-lisp ln -s ../site-lisp $install/usr/share/emacs/$VERSION/site-lisp - chown -R root:root $install + chown -R 0:0 $install + find $install -type f -exec chmod g-w '{}' \; # 664->644 } - -genpkg_rules() { - case $PACKAGE in - emacs-help) - copy \ - info/ \ - tutorials/ \ - refcards/*.pdf \ - etc/[A-Z]* \ - etc/*.txt - DEPENDS="emacs" - CAT="development|help files" - ;; - emacs-lisp-sources) - copy \ - *.el.gz \ - refcards/*.tex - DEPENDS="emacs" - CAT="development|Lisp source files" - ;; - emacs) - copy @std @dev @rm - strip -s $fs/usr/lib/emacs/$VERSION/i486-pc-linux-gnu/* 2>/dev/null - DEPENDS="atk cairo dbus expat freetype fontconfig giflib glib \ - gnutls gtk2 jpeg libpng16 librsvg util-linux-uuid \ - ncurses pango tiff xorg-server zlib librsvg libgsf \ - libgnutls harfbuzz" - SUGGESTED="alsa-lib" - TAGS="text-editor" - ;; - esac -} - -# linking /usr/bin/emacs to new version -post_install_emacs() { - ln -sf /usr/bin/emacs-$VERSION "$1/usr/bin/emacs" -} - -post_remove_emacs() { - rm -rf "$1/usr/share/emacs" - rm -rf "$1/usr/lib/emacs" - rm -f "$1/usr/bin/emacs" -} diff -r ea9e52516fb0 -r 4d9f82dabdbb glib-networking/receipt --- a/glib-networking/receipt Wed Dec 12 02:29:05 2018 +0200 +++ b/glib-networking/receipt Thu Dec 13 00:46:54 2018 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="glib-networking" -VERSION="2.56.1" +VERSION="2.58.0" CATEGORY="x-window" SHORT_DESC="TLS support for glib" MAINTAINER="devel@slitaz.org" @@ -15,21 +15,19 @@ BUILD_DEPENDS="meson ninja intltool gnutls-dev gsettings-desktop-schemas-dev \ glib-dev" +DEPENDS_std="glib libgnutls libp11-kit" +CONFIG_FILES_std="/etc/profile.d/gio.sh" + compile_rules() { mkdir build cd build meson-wrapper \ -Dlibproxy_support=false \ - -Dca_certificates_path=/etc/ssl/ca-bundle.crt && + -Dpkcs11_support=true \ + && ninja && ninja install || return 1 install -Dm644 $stuff/gio.sh $install/etc/profile.d/gio.sh } - -genpkg_rules() { - copy @std - DEPENDS="glib libgnutls libp11-kit" - CONFIG_FILES="/etc/profile.d/gio.sh" -} diff -r ea9e52516fb0 -r 4d9f82dabdbb glib/receipt --- a/glib/receipt Wed Dec 12 02:29:05 2018 +0200 +++ b/glib/receipt Thu Dec 13 00:46:54 2018 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="glib" -VERSION="2.56.1" +VERSION="2.58.1" CATEGORY="x-window" SHORT_DESC="C routines" MAINTAINER="devel@slitaz.org" @@ -13,46 +13,29 @@ WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" BUILD_DEPENDS="automake libtool zlib-dev libffi-dev gettext-dev \ -util-linux-mount-dev pcre-dev glib-dev elfutils-dev gtk-doc libxslt \ -docbook-xsl dbus-dev" -SPLIT="$PACKAGE-static $PACKAGE-dev" +util-linux-mount-dev pcre-dev libxslt docbook-xsl elfutils-dev" +SPLIT="$PACKAGE-static $PACKAGE-dev $PACKAGE" -# glib require glib to be built. -# And if glib failed to build and not present on the mirror, you will catch -# into the dead loop. Be careful! +COPY_static="*.a" +COPY_dev="gdbus-codegen gobject-query bin/gresource bin/gtester* \ +bin/glib-gettextize bin/glib-mkenums gdb/ gettext/ glib-2.0/ @dev @rm" + +DEPENDS_std="libffi libpcre util-linux-mount zlib" +DEPENDS_dev="glib elfutils libffi libpcre pcre-dev python util-linux-mount-dev \ +zlib-dev perl" + +CAT_static="development|static libraries" compile_rules() { # --enable-static: desktop-file-validate-static require such lib - NOCONFIGURE=1 ./autogen.sh && - ./configure \ + ./autogen.sh \ --enable-debug=no \ --enable-static \ + --disable-selinux \ --disable-fam \ + --enable-man \ $CONFIGURE_ARGS && fix libtool && make && make install } - -genpkg_rules() { - case $PACKAGE in - glib) - copy @std - # Python codegen, tester, Perl mkenums --> glib-dev - cd $fs/usr/bin - rm gdbus-codegen gtester* glib-mkenums glib-gettextize - rm -r $fs/usr/share - DEPENDS="elfutils libffi libpcre util-linux-mount zlib" - ;; - *-static) - copy *.a - DEPENDS=" " - CAT="development|static libraries" - ;; - *-dev) - copy @std @dev @rm - DEPENDS="glib libffi-dev pcre-dev python util-linux-mount-dev \ - zlib-dev perl" - ;; - esac -} diff -r ea9e52516fb0 -r 4d9f82dabdbb glib/stuff/patches/glib-2.54.3-meson_fixes-1.patch --- a/glib/stuff/patches/glib-2.54.3-meson_fixes-1.patch Wed Dec 12 02:29:05 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,242 +0,0 @@ -Submitted by: DJ Lucas (dj_AT_linuxfromscratch_DOT_org) -Date: 2017-11-04 -Initial Package Version: 2.54.2 -Upstream Status: Not submitted -Origin: Based on Arch Linux patches and upstream -Description: Fixes several build issue with meson - -Update: Reset for version 2.54.3 2018-01-12 bdubbs_AT_linuxfromscratch_DOT_org - -diff -Naurp glib-2.54.2-orig/config.h.meson glib-2.54.2/config.h.meson ---- glib-2.54.2-orig/config.h.meson 2017-10-27 17:42:46.000000000 -0500 -+++ glib-2.54.2/config.h.meson 2017-11-02 20:25:23.523120928 -0500 -@@ -247,6 +247,9 @@ - /* Define if libelf is available */ - #mesondefine HAVE_LIBELF - -+/* Define if libmount is available */ -+#mesondefine HAVE_LIBMOUNT -+ - /* Define to 1 if you have the header file. */ - #mesondefine HAVE_LINUX_MAGIC_H - -diff -Naurp glib-2.54.2-orig/docs/reference/gio/meson.build glib-2.54.2/docs/reference/gio/meson.build ---- glib-2.54.2-orig/docs/reference/gio/meson.build 2017-07-14 14:14:02.000000000 -0500 -+++ glib-2.54.2/docs/reference/gio/meson.build 2017-11-02 20:25:23.523120928 -0500 -@@ -52,9 +52,12 @@ if get_option('with-docs') != 'no' - 'gnetworkmonitorbase.h', - 'gnetworkmonitornetlink.h', - 'gnetworkmonitornm.h', -+ 'gnetworkmonitorportal.h', - 'gnotificationbackend.h', - 'gnotification-private.h', -+ 'gosxappinfo.h', - 'gpollfilemonitor.h', -+ 'gproxyresolverportal.h', - 'gregistrysettingsbackend.h', - 'gresourcefile.h', - 'gsettingsbackendinternal.h', -@@ -95,12 +98,22 @@ if get_option('with-docs') != 'no' - configuration: version_conf - ) - -+ # Meson uses paths relative to meson.source_root() in dependencies, -+ # which is invalid relative to current_source_dir(), so the compile -+ # process fails to find glib headers -+ top_build_dir = meson.build_root() -+ top_source_dir = meson.source_root() -+ glib_top_build_dir = join_paths(top_build_dir, 'glib') -+ glib_top_source_dir = join_paths(top_source_dir, 'glib') -+ -+ scan_dep = declare_dependency(include_directories : [ top_source_dir, glib_top_build_dir, glib_top_source_dir ]) -+ - gnome.gtkdoc('gio', - main_xml : 'gio-docs.xml', - namespace : 'g', - gobject_typesfile : 'gio.types', - mode : 'none', -- dependencies : [libgio_dep, libgobject_dep, libglib_dep], -+ dependencies : [libgio_dep, libgobject_dep, libglib_dep, scan_dep], - src_dir : 'gio', - scan_args : [ - '--rebuild-types', -diff -Naurp glib-2.54.2-orig/docs/reference/gobject/meson.build glib-2.54.2/docs/reference/gobject/meson.build ---- glib-2.54.2-orig/docs/reference/gobject/meson.build 2017-07-14 14:14:02.000000000 -0500 -+++ glib-2.54.2/docs/reference/gobject/meson.build 2017-11-02 20:25:23.523120928 -0500 -@@ -17,12 +17,23 @@ if get_option('with-docs') != 'no' - configuration: version_conf - ) - -+ # Meson uses paths relative to meson.source_root() in dependencies, -+ # which is invalid relative to current_source_dir(), so the compile -+ # process fails to find glib headers -+ doc_source_dir = meson.current_source_dir() -+ top_build_dir = meson.build_root() -+ top_source_dir = meson.source_root() -+ glib_top_build_dir = join_paths(top_build_dir, 'glib') -+ glib_top_source_dir = join_paths(top_source_dir, 'glib') -+ -+ scan_dep = declare_dependency(include_directories : [ doc_source_dir, top_source_dir, glib_top_build_dir, glib_top_source_dir ]) -+ - gnome.gtkdoc('gobject', - main_xml : 'gobject-docs.xml', - namespace : 'g', - gobject_typesfile : join_paths(meson.current_source_dir(), 'gobject.types'), - mode : 'none', -- dependencies : [libgobject_dep, libglib_dep], -+ dependencies : [libgobject_dep, libglib_dep, scan_dep], - src_dir : 'gobject', - scan_args : [ - '--deprecated-guards=G_DISABLE_DEPRECATED', -diff -Naurp glib-2.54.2-orig/gio/gdbus-2.0/codegen/meson.build glib-2.54.2/gio/gdbus-2.0/codegen/meson.build ---- glib-2.54.2-orig/gio/gdbus-2.0/codegen/meson.build 2017-10-27 17:42:46.000000000 -0500 -+++ glib-2.54.2/gio/gdbus-2.0/codegen/meson.build 2017-11-02 20:25:23.523120928 -0500 -@@ -13,7 +13,6 @@ gdbus_codegen_conf.set('VERSION', glib_v - gdbus_codegen_conf.set('PYTHON', python.path()) - - # Install gdbus-codegen executable --# FIXME: Set permissions - gdbus_codegen = configure_file(input : 'gdbus-codegen.in', - output : 'gdbus-codegen', - install : true, -diff -Naurp glib-2.54.2-orig/gio/meson.build glib-2.54.2/gio/meson.build ---- glib-2.54.2-orig/gio/meson.build 2017-10-27 17:42:46.000000000 -0500 -+++ glib-2.54.2/gio/meson.build 2017-11-02 20:25:23.523120928 -0500 -@@ -727,7 +727,7 @@ libgio = shared_library('gio-2.0', - libgobject_dep, libgmodule_dep] + platform_deps + network_libs, - c_args : gio_c_args, - # intl.lib is not compatible with SAFESEH -- link_args : noseh_link_args, -+ link_args : noseh_link_args + library_link_args, - ) - - libgio_dep = declare_dependency(link_with : libgio, -diff -Naurp glib-2.54.2-orig/gio/tests/gengiotypefuncs.py glib-2.54.2/gio/tests/gengiotypefuncs.py -diff -Naurp glib-2.54.2-orig/glib/meson.build glib-2.54.2/glib/meson.build ---- glib-2.54.2-orig/glib/meson.build 2017-10-02 09:17:23.000000000 -0500 -+++ glib-2.54.2/glib/meson.build 2017-11-02 20:25:23.523120928 -0500 -@@ -227,7 +227,7 @@ libglib = shared_library('glib-2.0', - soversion : soversion, - install : true, - # intl.lib is not compatible with SAFESEH -- link_args : noseh_link_args, -+ link_args : noseh_link_args + library_link_args, - include_directories : configinc, - link_with : [charset_lib, gnulib_lib], - dependencies : [pcre, thread_dep, libintl, librt] + libiconv + platform_deps, -@@ -283,8 +283,9 @@ configure_file( - input: 'libglib-gdb.py.in', - output: 'libglib-2.0.so.@0@-gdb.py'.format(library_version), - configuration: gdb_conf, -- install: true, -- install_dir: join_paths(get_option('datadir'), 'gdb/auto-load' + get_option('libdir')) -+ # FIXME: Figure out how to install this on Windows -+ install: host_system != 'windows', -+ install_dir: join_paths(glib_datadir, 'gdb', 'auto-load', './' + glib_libdir) - ) - - if enable_systemtap -diff -Naurp glib-2.54.2-orig/gmodule/meson.build glib-2.54.2/gmodule/meson.build ---- glib-2.54.2-orig/gmodule/meson.build 2017-07-14 14:14:02.000000000 -0500 -+++ glib-2.54.2/gmodule/meson.build 2017-11-02 20:25:23.523120928 -0500 -@@ -37,7 +37,7 @@ elif cc.has_function('NSLinkModule') - elif cc.links(dlopen_dlsym_test_code, args : '-ldl', name : 'dlopen() and dlsym() in libdl') - g_module_impl = 'G_MODULE_IMPL_DL' - libdl_dep = cc.find_library('dl') -- g_module_lib_args = '-ldl' -+ g_module_lib_args = ['-ldl'] - endif - - # additional checks for G_MODULE_IMPL_DL -@@ -72,6 +72,10 @@ if g_module_impl == '' - message('WARNING: No suitable GModule implementation found!') - endif - -+# For pc files -+glib_conf.set('G_MODULE_SUPPORTED', g_module_impl == '0' ? 'false' : 'true') -+glib_conf.set('G_MODULE_LIBS', ' '.join(g_module_lib_args)) -+ - gmoduleconf_conf.set('G_MODULE_IMPL', g_module_impl) - gmoduleconf_conf.set('G_MODULE_SUPPORTED', g_module_impl != '0') - gmoduleconf_conf.set('G_MODULE_HAVE_DLERROR', g_module_have_dlerror) -@@ -91,6 +95,7 @@ libgmodule = shared_library('gmodule-2.0 - install : true, - include_directories : [configinc, gmoduleinc], - dependencies : [libdl_dep, libglib_dep], -+ link_args : library_link_args, - c_args : ['-DG_LOG_DOMAIN="GModule"', '-DG_DISABLE_DEPRECATED'] + glib_hidden_visibility_args) - - libgmodule_dep = declare_dependency(link_with : libgmodule, -diff -Naurp glib-2.54.2-orig/gobject/meson.build glib-2.54.2/gobject/meson.build ---- glib-2.54.2-orig/gobject/meson.build 2017-10-27 17:42:46.000000000 -0500 -+++ glib-2.54.2/gobject/meson.build 2017-11-02 20:25:23.523120928 -0500 -@@ -61,6 +61,7 @@ libgobject = shared_library('gobject-2.0 - install : true, - include_directories : [configinc], - dependencies : [libintl, libffi_dep, libglib_dep], -+ link_args : library_link_args, - c_args : ['-DG_LOG_DOMAIN="GLib-GObject"', '-DGOBJECT_COMPILATION'] + glib_hidden_visibility_args) - - libgobject_dep = declare_dependency(link_with : libgobject, -@@ -76,7 +77,6 @@ python_tools_conf.set('VERSION', glib_ve - python_tools_conf.set('PYTHON', python.path()) - - foreach tool: python_tools -- # FIXME: Ensure we set the appropriate permissions - tool_bin = configure_file( - input : tool + '.in', - output : tool, -@@ -101,8 +101,9 @@ configure_file( - input: 'libgobject-gdb.py.in', - output: 'libgobject-2.0.so.@0@-gdb.py'.format(library_version), - configuration: gdb_conf, -- install: true, -- install_dir: join_paths(get_option('datadir'), 'gdb/auto-load/' + get_option('libdir')) -+ # FIXME: Figure out how to install this on Windows -+ install: host_system != 'windows', -+ install_dir: join_paths(glib_datadir, 'gdb', 'auto-load', './' + glib_libdir) - ) - - if enable_systemtap -diff -Naurp glib-2.54.2-orig/gthread/meson.build glib-2.54.2/gthread/meson.build ---- glib-2.54.2-orig/gthread/meson.build 2017-07-14 14:14:02.000000000 -0500 -+++ glib-2.54.2/gthread/meson.build 2017-11-02 20:25:23.523120928 -0500 -@@ -6,4 +6,5 @@ libgthread = shared_library('gthread-2.0 - soversion : soversion, - install : true, - dependencies : [libglib_dep], -+ link_args : library_link_args, - c_args : ['-DG_LOG_DOMAIN="GThread"' ] + glib_hidden_visibility_args) -diff -Naurp glib-2.54.2-orig/meson.build glib-2.54.2/meson.build ---- glib-2.54.2-orig/meson.build 2017-10-27 17:42:46.000000000 -0500 -+++ glib-2.54.2/meson.build 2017-11-02 20:25:23.523120928 -0500 -@@ -1484,7 +1484,7 @@ libmount_opt = get_option('enable-libmou - if host_system == 'linux' and libmount_opt != 'no' - libmount_dep = [dependency('mount', version : '>=2.28', required : false)] - if not libmount_dep[0].found() -- libmount_dep = [cc.find_library('mount')] -+ libmount_dep = [cc.find_library('mount', required : false)] - libmount_h = cc.has_header('libmount/libmount.h') - libmount_needed = libmount_opt == 'yes' and host_system == 'linux' - if libmount_needed and (not libmount_dep[0].found() or not libmount_h) -@@ -1527,12 +1527,20 @@ if use_system_pcre - endif - if libmount_dep.length() == 1 and libmount_dep[0].found() - glib_conf.set('LIBMOUNT_LIBS', '-lmount') -+ glib_conf.set('HAVE_LIBMOUNT', 1) - endif - glib_conf.set('GIO_MODULE_DIR', '${libdir}/gio/modules') - # FIXME: Missing: - # @G_MODULE_LIBS@ @SELINUX_LIBS@ @COCOA_LIBS@ @CARBON_LIBS@ @G_LIBS_EXTRA@ - # @PCRE_REQUIRES@ @GLIB_EXTRA_CFLAGS@ @G_THREAD_CFLAGS@ - -+# HACK -+glib_conf.set('G_THREAD_LIBS', '-pthread') -+glib_conf.set('G_THREAD_CFLAGS', '-pthread') -+glib_conf.set('G_MODULE_LDFLAGS', '-Wl,--export-dynamic') -+glib_conf.set('PCRE_REQUIRES', 'libpcre') -+library_link_args = [ '-Wl,-z,nodelete' ] -+ - # Tracing: dtrace - want_dtrace = get_option('enable-dtrace') - enable_dtrace = false diff -r ea9e52516fb0 -r 4d9f82dabdbb glib/stuff/patches/glib-2.54.3-skip_warnings-1.patch --- a/glib/stuff/patches/glib-2.54.3-skip_warnings-1.patch Wed Dec 12 02:29:05 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,75 +0,0 @@ -Submitted By: Bruce dubbs -Date: 2017-10-15 -Initial Package Version: 2.54.0 -Upstream Status: Not submitted -Origin: Self -Description: Adds a capabiility to skip printing warning messages using - an environment variable: GLIB_LOG_LEVEL. The value - of the variable is a digit that correponds to: - 1 Alert - 2 Critical - 3 Error - 4 Warning - 5 Notice - - For instance GLIB_LOG_LEVEL=4 will skip output of Waring and - Notice messages (and Info/Debug messages if they are turned on). - ---- glib-2.54.0/glib/gmessages.c 2017-08-19 08:39:20.000000000 -0500 -+++ glib-2.54.0-new/glib/gmessages.c 2017-10-15 14:45:52.004885278 -0500 -@@ -523,6 +523,35 @@ - - /* --- functions --- */ - -+/* skip_message -+ * -+ * This internal function queries an optional environment variable, -+ * GLIB_LOG_LEVEL and converts it to a value consistent -+ * with the type GLogLevelFlags. If the value is equal to -+ * or greater than the integer equivalent of the log_level. -+ * then the function returns a boolean that indicates that -+ * loging the output should be skipped. -+ */ -+ -+static gboolean skip_message( GLogLevelFlags log_level); -+ -+static gboolean skip_message( GLogLevelFlags log_level) -+{ -+ char* user_log_level; -+ int user_log_int; -+ gboolean skip = FALSE; -+ -+ user_log_level = getenv( "GLIB_LOG_LEVEL" ); -+ -+ user_log_int = ( user_log_level != NULL ) ? atoi( user_log_level ) : 0; -+ user_log_int = ( user_log_int != 0 ) ? 1 << user_log_int : 0; -+ -+ if ( user_log_int >= log_level ) skip = TRUE; -+ -+ return skip; -+} -+ -+ - static void _g_log_abort (gboolean breakpoint); - - static void -@@ -2496,6 +2525,9 @@ - g_return_val_if_fail (fields != NULL, G_LOG_WRITER_UNHANDLED); - g_return_val_if_fail (n_fields > 0, G_LOG_WRITER_UNHANDLED); - -+ /* If the user does not want this message level, just return */ -+ if ( skip_message( log_level) ) return G_LOG_WRITER_HANDLED; -+ - stream = log_level_to_file (log_level); - if (!stream || fileno (stream) < 0) - return G_LOG_WRITER_UNHANDLED; -@@ -2640,6 +2672,9 @@ - FILE *stream; - gsize i; - -+ /* If the user does not want this message level, just return */ -+ if ( skip_message( log_level) ) return G_LOG_WRITER_HANDLED; -+ - /* we cannot call _any_ GLib functions in this fallback handler, - * which is why we skip UTF-8 conversion, etc. - * since we either recursed or ran out of memory, we're in a pretty diff -r ea9e52516fb0 -r 4d9f82dabdbb glib/stuff/patches/glib-2.58.1-skip_warnings-1.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/glib/stuff/patches/glib-2.58.1-skip_warnings-1.patch Thu Dec 13 00:46:54 2018 +0200 @@ -0,0 +1,75 @@ +Submitted By: Bruce dubbs +Date: 2017-10-15 +Initial Package Version: 2.54.0 +Upstream Status: Not submitted +Origin: Self +Description: Adds a capabiility to skip printing warning messages using + an environment variable: GLIB_LOG_LEVEL. The value + of the variable is a digit that correponds to: + 1 Alert + 2 Critical + 3 Error + 4 Warning + 5 Notice + + For instance GLIB_LOG_LEVEL=4 will skip output of Waring and + Notice messages (and Info/Debug messages if they are turned on). + +--- glib-2.54.0/glib/gmessages.c 2017-08-19 08:39:20.000000000 -0500 ++++ glib-2.54.0-new/glib/gmessages.c 2017-10-15 14:45:52.004885278 -0500 +@@ -523,6 +523,35 @@ + + /* --- functions --- */ + ++/* skip_message ++ * ++ * This internal function queries an optional environment variable, ++ * GLIB_LOG_LEVEL and converts it to a value consistent ++ * with the type GLogLevelFlags. If the value is equal to ++ * or greater than the integer equivalent of the log_level. ++ * then the function returns a boolean that indicates that ++ * loging the output should be skipped. ++ */ ++ ++static gboolean skip_message( GLogLevelFlags log_level); ++ ++static gboolean skip_message( GLogLevelFlags log_level) ++{ ++ char* user_log_level; ++ int user_log_int; ++ gboolean skip = FALSE; ++ ++ user_log_level = getenv( "GLIB_LOG_LEVEL" ); ++ ++ user_log_int = ( user_log_level != NULL ) ? atoi( user_log_level ) : 0; ++ user_log_int = ( user_log_int != 0 ) ? 1 << user_log_int : 0; ++ ++ if ( user_log_int >= log_level ) skip = TRUE; ++ ++ return skip; ++} ++ ++ + static void _g_log_abort (gboolean breakpoint); + + static void +@@ -2496,6 +2525,9 @@ + g_return_val_if_fail (fields != NULL, G_LOG_WRITER_UNHANDLED); + g_return_val_if_fail (n_fields > 0, G_LOG_WRITER_UNHANDLED); + ++ /* If the user does not want this message level, just return */ ++ if ( skip_message( log_level) ) return G_LOG_WRITER_HANDLED; ++ + stream = log_level_to_file (log_level); + if (!stream || fileno (stream) < 0) + return G_LOG_WRITER_UNHANDLED; +@@ -2640,6 +2672,9 @@ + FILE *stream; + gsize i; + ++ /* If the user does not want this message level, just return */ ++ if ( skip_message( log_level) ) return G_LOG_WRITER_HANDLED; ++ + /* we cannot call _any_ GLib functions in this fallback handler, + * which is why we skip UTF-8 conversion, etc. + * since we either recursed or ran out of memory, we're in a pretty diff -r ea9e52516fb0 -r 4d9f82dabdbb glib/stuff/patches/grefcount.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/glib/stuff/patches/grefcount.patch Thu Dec 13 00:46:54 2018 +0200 @@ -0,0 +1,36 @@ +From 57efb14f0519e0b20a789c274db7777f16c98b35 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 13 Oct 2018 23:10:33 +0200 +Subject: [PATCH] grefcount: add missing gatomic.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Without gatomic.h, build fails on: +In file included from garcbox.c:24:0: +garcbox.c: In function ‘g_atomic_rc_box_acquire’: +grefcount.h:101:13: error: implicit declaration of function ‘g_atomic_int_get’; did you mean ‘__atomic_store’? [-Werror=implicit-function-declaration] + (void) (g_atomic_int_get (rc) == G_MAXINT ? 0 : g_atomic_int_inc ((rc))); \ + ^ +garcbox.c:292:3: note: in expansion of macro ‘g_atomic_ref_count_inc’ + g_atomic_ref_count_inc (&real_box->ref_count); + +Signed-off-by: Fabrice Fontaine +--- + glib/grefcount.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/glib/grefcount.h b/glib/grefcount.h +index dec9a5ffb..b6eced1b7 100644 +--- a/glib/grefcount.h ++++ b/glib/grefcount.h +@@ -23,6 +23,7 @@ + #error "Only can be included directly." + #endif + ++#include + #include + + G_BEGIN_DECLS +-- +2.18.1 diff -r ea9e52516fb0 -r 4d9f82dabdbb glib/stuff/patches/series --- a/glib/stuff/patches/series Wed Dec 12 02:29:05 2018 +0200 +++ b/glib/stuff/patches/series Thu Dec 13 00:46:54 2018 +0200 @@ -1,6 +1,8 @@ # from BLFS -#glib-2.54.3-meson_fixes-1.patch -#glib-2.54.3-skip_warnings-1.patch +glib-2.58.1-skip_warnings-1.patch # from https://www.archlinux.org/packages/core/x86_64/glib2/ noisy-glib-compile-schemas.diff + +# from https://gitlab.gnome.org/GNOME/glib/commit/57efb14f0519e0b20a789c274db7777f16c98b35 +grefcount.patch diff -r ea9e52516fb0 -r 4d9f82dabdbb glib/stuff/receipt.meson --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/glib/stuff/receipt.meson Thu Dec 13 00:46:54 2018 +0200 @@ -0,0 +1,39 @@ +# SliTaz package receipt v2. + +PACKAGE="glib" +VERSION="2.58.1" +CATEGORY="x-window" +SHORT_DESC="C routines" +MAINTAINER="devel@slitaz.org" +LICENSE="GPL2" +WEB_SITE="https://developer.gnome.org/glib/" +LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/glib2.html" + +TARBALL="$PACKAGE-$VERSION.tar.xz" +WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" + +BUILD_DEPENDS="meson ninja cmake pcre-dev libffi-dev zlib-dev gettext-dev \ +util-linux-mount-dev libxml2-tools elfutils-dev dbus-dev libxslt" +SPLIT="$PACKAGE-static $PACKAGE-dev $PACKAGE" + +COPY_static="*.a" +COPY_dev="gdbus-codegen gobject-query bin/gresource bin/gtester* bin/glib-* \ +gdb/ gettext/ glib-2.0/ @dev @rm" + +DEPENDS_std="elfutils libffi libpcre util-linux-mount zlib" +DEPENDS_dev="glib libffi-dev pcre-dev python util-linux-mount-dev zlib-dev perl" + +CAT_static="development|static libraries" + +compile_rules() { + mkdir build-glib # build/ already exists + cd build-glib + + meson-wrapper \ + --default-library=both \ + -Dselinux=false \ + -Dman=true \ + && + ninja && + ninja install +} diff -r ea9e52516fb0 -r 4d9f82dabdbb glibmm/receipt --- a/glibmm/receipt Wed Dec 12 02:29:05 2018 +0200 +++ b/glibmm/receipt Thu Dec 13 00:46:54 2018 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="glibmm" -VERSION="2.56.0" +VERSION="2.58.0" CATEGORY="x-window" SHORT_DESC="C++ bindings for GLib" MAINTAINER="devel@slitaz.org" @@ -15,6 +15,16 @@ BUILD_DEPENDS="glib-dev libsigc++-dev" SPLIT="libgiomm $PACKAGE-dev" +COPY_std="libglibmm*.so*" +COPY_libgiomm="libgiomm*.so*" +COPY_dev="@std @rm @dev" # perl and dev + +DEPENDS="glib libsigc++" +DEPENDS_libgiomm="glib glibmm libsigc++" +DEPENDS_dev="glibmm libgiomm glib-dev libsigc++-dev perl" + +CAT_libgiomm="x-window|GIO Framework" + compile_rules() { sed -i "/^libdocdir =/ s|\$(book_name)|glibmm-$VERSION|" docs/Makefile.in @@ -23,22 +33,3 @@ 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" - ;; - glibmm-dev) - copy @dev - DEPENDS="glibmm libgiomm \ - glib-dev libsigc++-dev perl" - ;; - esac -} diff -r ea9e52516fb0 -r 4d9f82dabdbb gobject-introspection/receipt --- a/gobject-introspection/receipt Wed Dec 12 02:29:05 2018 +0200 +++ b/gobject-introspection/receipt Thu Dec 13 00:46:54 2018 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="gobject-introspection" -VERSION="1.52.1" +VERSION="1.58.2" CATEGORY="development" SHORT_DESC="Introspection system for GObject-based libraries" MAINTAINER="devel@slitaz.org" @@ -12,9 +12,16 @@ TARBALL="$PACKAGE-$VERSION.tar.xz" WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" -BUILD_DEPENDS="glib-dev cairo-dev gtk-doc python-dev util-linux-mount-dev openssl-dev" +BUILD_DEPENDS="glib-dev cairo-dev gtk-doc python-dev util-linux-mount-dev \ +openssl-dev libffi-dev" SPLIT="$PACKAGE-dev" +COPY_std="@std *.typelib" +COPY_dev="@std @dev @rm" + +DEPENDS_std="glib libffi python" +DEPENDS_dev="gobject-introspection glib-dev libffi-dev" + compile_rules() { ./configure \ --disable-static \ @@ -23,17 +30,3 @@ make && make install } - -genpkg_rules() { - case $PACKAGE in - gobject-introspection) - copy @std *.typelib - rm -r $fs/usr/share - DEPENDS="glib libffi python" - ;; - *-dev) - copy @std @dev @rm - DEPENDS="gobject-introspection glib-dev libffi-dev" - ;; - esac -} diff -r ea9e52516fb0 -r 4d9f82dabdbb libsigc++/receipt --- a/libsigc++/receipt Wed Dec 12 02:29:05 2018 +0200 +++ b/libsigc++/receipt Thu Dec 13 00:46:54 2018 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="libsigc++" -VERSION="2.10.0" +VERSION="2.10.1" CATEGORY="system-tools" SHORT_DESC="Callback Framework for C++" MAINTAINER="devel@slitaz.org" @@ -24,10 +24,3 @@ make && make install } - -genpkg_rules() { - case $PACKAGE in - libsigc++) copy @std;; - *-dev) copy @dev;; - esac -} diff -r ea9e52516fb0 -r 4d9f82dabdbb meson/receipt --- a/meson/receipt Wed Dec 12 02:29:05 2018 +0200 +++ b/meson/receipt Thu Dec 13 00:46:54 2018 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="meson" -VERSION="0.48.2" +VERSION="0.49.0" CATEGORY="development" SHORT_DESC="A high performance build system" MAINTAINER="al.bobylev@gmail.com" diff -r ea9e52516fb0 -r 4d9f82dabdbb openssl/receipt --- a/openssl/receipt Wed Dec 12 02:29:05 2018 +0200 +++ b/openssl/receipt Thu Dec 13 00:46:54 2018 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="openssl" -VERSION="1.1.0h" +VERSION="1.1.1a" CATEGORY="security" SHORT_DESC="Open source Secure Sockets Layer" MAINTAINER="pascal.bellard@slitaz.org" @@ -12,11 +12,13 @@ TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="https://www.openssl.org/source/$TARBALL" # Integrity check: https://www.openssl.org/source/ -TARBALL_SHA256="5835626cde9e99656585fc7aaa2302a73a7e1340bf8c14fd635a62c66802a517" +TARBALL_SHA256="fc20130f8b7cbd2fb918b2f14e2f429e109c31ddd0fb38fc5d71d9ffed3f9f41" BUILD_DEPENDS="perl zlib-dev" SPLIT="$PACKAGE-dev" +TAGS_std="SSL security" + compile_rules() { # MAKEFLAGS make OpenSSL build fail. unset MAKEFLAGS MAKE_ARGS @@ -46,15 +48,3 @@ testsuite() { readelf -h $install/usr/bin/openssl } - -genpkg_rules() { - case $PACKAGE in - openssl) - copy @std - TAGS="SSL security" - ;; - openssl-dev) - copy @dev - ;; - esac -} diff -r ea9e52516fb0 -r 4d9f82dabdbb zstd/.icon.png Binary file zstd/.icon.png has changed diff -r ea9e52516fb0 -r 4d9f82dabdbb zstd/receipt --- a/zstd/receipt Wed Dec 12 02:29:05 2018 +0200 +++ b/zstd/receipt Thu Dec 13 00:46:54 2018 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="zstd" -VERSION="1.3.3" +VERSION="1.3.7" CATEGORY="base-system" SHORT_DESC="Zstandard - Fast real-time compression algorithm" MAINTAINER="pascal.bellard@slitaz.org" @@ -11,22 +11,12 @@ TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="https://github.com/facebook/zstd/archive/v$VERSION.tar.gz" -BUILD_DEPENDS="zlib-dev xz-dev lz4-dev" +BUILD_DEPENDS="grep zlib-dev xz-dev lz4-dev" SPLIT="$PACKAGE-dev" +TAGS_std="compression" + compile_rules() { make -C lib PREFIX=/usr install && make -C programs PREFIX=/usr install } - -genpkg_rules() { - case $PACKAGE in - zstd) - copy @std - TAGS="compression" - ;; - *-dev) - copy @dev - ;; - esac -}