wok-next rev 21071
Update atkmm, cairo, cmake, db, elfutils, emacs, glib, glib-networking, glibmm, gobject-introspection, libsigc++, meson, openssl, zstd
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Thu Dec 13 00:46:54 2018 +0200 (2018-12-13) |
| parents | ea9e52516fb0 |
| children | d01953cd12ed |
| files | atkmm/receipt cairo/receipt cmake/receipt db/receipt elfutils/receipt emacs/.icon.png emacs/receipt glib-networking/receipt glib/receipt glib/stuff/patches/glib-2.54.3-meson_fixes-1.patch glib/stuff/patches/glib-2.54.3-skip_warnings-1.patch glib/stuff/patches/glib-2.58.1-skip_warnings-1.patch glib/stuff/patches/grefcount.patch glib/stuff/patches/series glib/stuff/receipt.meson glibmm/receipt gobject-introspection/receipt libsigc++/receipt meson/receipt openssl/receipt zstd/.icon.png zstd/receipt |
line diff
1.1 --- a/atkmm/receipt Wed Dec 12 02:29:05 2018 +0200 1.2 +++ b/atkmm/receipt Thu Dec 13 00:46:54 2018 +0200 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt v2. 1.5 1.6 PACKAGE="atkmm" 1.7 -VERSION="2.24.2" 1.8 +VERSION="2.28.0" 1.9 CATEGORY="x-window" 1.10 SHORT_DESC="C++ interface for the ATK accessibility toolkit library" 1.11 MAINTAINER="devel@slitaz.org" 1.12 @@ -15,6 +15,9 @@ 1.13 BUILD_DEPENDS="atk-dev glibmm-dev" 1.14 SPLIT="$PACKAGE-dev" 1.15 1.16 +DEPENDS_std="atk glib glibmm libsigc++" 1.17 +DEPENDS_dev="atkmm atk-dev glibmm-dev" 1.18 + 1.19 compile_rules() { 1.20 sed -i "/^libdocdir =/ s|\$(book_name)|atkmm-$VERSION|" doc/Makefile.in 1.21 1.22 @@ -23,16 +26,3 @@ 1.23 make && 1.24 make install 1.25 } 1.26 - 1.27 -genpkg_rules() { 1.28 - case $PACKAGE in 1.29 - atkmm) 1.30 - copy @std 1.31 - DEPENDS="atk glib glibmm libsigc++" 1.32 - ;; 1.33 - *-dev) 1.34 - copy @dev 1.35 - DEPENDS="atkmm atk-dev glibmm-dev" 1.36 - ;; 1.37 - esac 1.38 -}
2.1 --- a/cairo/receipt Wed Dec 12 02:29:05 2018 +0200 2.2 +++ b/cairo/receipt Thu Dec 13 00:46:54 2018 +0200 2.3 @@ -1,7 +1,7 @@ 2.4 # SliTaz package receipt v2. 2.5 2.6 PACKAGE="cairo" 2.7 -VERSION="1.14.12" 2.8 +VERSION="1.16.0" 2.9 CATEGORY="x-window" 2.10 SHORT_DESC="2D graphics library" 2.11 MAINTAINER="devel@slitaz.org" 2.12 @@ -17,74 +17,30 @@ 2.13 libspectre-dev poppler-dev librsvg-dev gtk2-dev xorg-pixman-dev" 2.14 SPLIT="$PACKAGE-tools $PACKAGE-dev" 2.15 2.16 -# use --nogl to disable building cairo-gl* packages 2.17 -if [ -z "$nogl" ]; then 2.18 - BUILD_DEPENDS="$BUILD_DEPENDS mesa-dev eudev-dev xorg-libXxf86vm-dev \ 2.19 - libdrm-dev mesa-libegl xorg-libxshmfence-dev" 2.20 - SPLIT="$SPLIT cairo-gl:gl cairo-gl-tools:gl cairo-gl-dev:gl" 2.21 -fi 2.22 COOKOPTS="skip-log-errors" 2.23 2.24 +COPY_std="libcairo.so* libcairo-gobject.so* libcairo-script-interpreter.so*" 2.25 +COPY_tools="bin/ cairo-fdr.so* cairo-sphinx.so* libcairo-trace.so*" 2.26 + 2.27 +CAT_tools="development|development tools" 2.28 + 2.29 +DEPENDS_std="fontconfig freetype glib libpng16 xorg-libX11 xorg-libxcb \ 2.30 +xorg-pixman zlib" 2.31 +DEPENDS_tools="cairo glib xorg-libX11 xorg-libXrender xorg-libxcb xorg-pixman \ 2.32 +zlib" 2.33 +DEPENDS_dev="cairo cairo-tools \ 2.34 +fontconfig-dev freetype-dev glib-dev libpng16-dev xorg-libX11-dev \ 2.35 +xorg-libXext-dev xorg-libXrender-dev xorg-libxcb-dev xorg-pixman-dev zlib-dev" 2.36 + 2.37 compile_rules() { 2.38 - case "$SET" in 2.39 - gl) SET_ARGS='--enable-gl';; 2.40 - *) SET_ARGS='--disable-gl';; 2.41 - esac 2.42 - 2.43 ./configure \ 2.44 --enable-xcb \ 2.45 --enable-xlib-xcb \ 2.46 --enable-tee \ 2.47 --disable-static \ 2.48 - $SET_ARGS \ 2.49 + --disable-gl \ 2.50 $CONFIGURE_ARGS && 2.51 fix libtool && 2.52 make $MAKEFLAGS && 2.53 make DESTDIR=$install install 2.54 } 2.55 - 2.56 -genpkg_rules() { 2.57 - case $PACKAGE in 2.58 - cairo) 2.59 - copy libcairo.so* libcairo-gobject.so* libcairo-script-interpreter.so* 2.60 - DEPENDS="fontconfig freetype glib libpng16 xorg-libX11 xorg-libxcb \ 2.61 - xorg-pixman zlib" 2.62 - ;; 2.63 - cairo-tools) 2.64 - copy bin/ cairo-fdr.so* cairo-sphinx.so* libcairo-trace.so* 2.65 - CAT="development|development tools" 2.66 - DEPENDS="cairo glib xorg-libX11 xorg-libXrender xorg-libxcb \ 2.67 - xorg-pixman zlib" 2.68 - ;; 2.69 - cairo-dev) 2.70 - copy @dev 2.71 - DEPENDS="cairo cairo-tools \ 2.72 - fontconfig-dev freetype-dev glib-dev libpng16-dev xorg-libX11-dev \ 2.73 - xorg-libXext-dev xorg-libXrender-dev xorg-libxcb-dev \ 2.74 - xorg-pixman-dev zlib-dev" 2.75 - ;; 2.76 - 2.77 - cairo-gl) 2.78 - copy usr/lib/*.so* 2.79 - CAT="x-window|with GL support" 2.80 - DEPENDS="fontconfig freetype glib libpng16 mesa mesa-libegl \ 2.81 - xorg-libX11 xorg-libxcb xorg-pixman zlib" 2.82 - PROVIDE="cairo:mesa" 2.83 - ;; 2.84 - cairo-gl-tools) 2.85 - copy usr/bin/ usr/lib/cairo/*.so* 2.86 - CAT="development|development tools with GL support" 2.87 - DEPENDS="cairo-gl glib mesa mesa-libegl xorg-libX11 \ 2.88 - xorg-libXrender xorg-libxcb xorg-pixman zlib" 2.89 - PROVIDE="cairo-tools:mesa cairo-tools:cairo-gl" 2.90 - ;; 2.91 - cairo-gl-dev) 2.92 - copy @dev 2.93 - CAT="development|development files with GL support" 2.94 - DEPENDS="cairo-gl cairo-gl-tools \ 2.95 - fontconfig-dev freetype-dev glib-dev libpng16-dev mesa-dev \ 2.96 - xorg-libX11-dev xorg-libXext-dev xorg-libXrender-dev \ 2.97 - xorg-libxcb-dev xorg-pixman-dev zlib-dev" 2.98 - ;; 2.99 - esac 2.100 -}
3.1 --- a/cmake/receipt Wed Dec 12 02:29:05 2018 +0200 3.2 +++ b/cmake/receipt Thu Dec 13 00:46:54 2018 +0200 3.3 @@ -1,7 +1,7 @@ 3.4 # SliTaz package receipt v2. 3.5 3.6 PACKAGE="cmake" 3.7 -VERSION="3.12.4" 3.8 +VERSION="3.13.1" 3.9 CATEGORY="development" 3.10 SHORT_DESC="Cross-platform build system generator" 3.11 MAINTAINER="devel@slitaz.org" 3.12 @@ -12,10 +12,22 @@ 3.13 TARBALL="$PACKAGE-$VERSION.tar.gz" 3.14 WGET_URL="http://www.cmake.org/files/v${VERSION%.*}/$TARBALL" 3.15 3.16 -BUILD_DEPENDS="zlib-dev curl-dev bzip2-dev xz-dev libarchive-dev \ 3.17 -expat-dev ncurses-dev gfortran libuv-dev jsoncpp-dev" 3.18 +BUILD_DEPENDS="zlib-dev curl-dev bzip2-dev xz-dev libarchive-dev expat-dev \ 3.19 +ncurses-dev gfortran libuv-dev jsoncpp-dev" 3.20 SPLIT="$PACKAGE-common" 3.21 3.22 +COPY_std="bin/" 3.23 +COPY_common="@std @dev @rm" 3.24 + 3.25 +DEPENDS_std="cmake-common expat jsoncpp libarchive libcurl libuv ncurses \ 3.26 +ncurses-libform zlib" 3.27 +DEPENDS_common=" " 3.28 + 3.29 +CAT_common="development|common files" 3.30 + 3.31 +# CMake should be updated both with Boost: 3.32 +# https://stackoverflow.com/questions/42123509/cmake-finds-boost-but-the-imported-targets-not-available-for-boost-version 3.33 + 3.34 compile_rules() { 3.35 sed -i '/"lib64"/s/64//' Modules/GNUInstallDirs.cmake 3.36 fix math 3.37 @@ -29,20 +41,3 @@ 3.38 make && 3.39 make DESTDIR=$install install 3.40 } 3.41 - 3.42 -genpkg_rules() { 3.43 - case $PACKAGE in 3.44 - cmake) 3.45 - copy bin/ 3.46 - DEPENDS="cmake-common expat jsoncpp libarchive libcurl libuv \ 3.47 - ncurses ncurses-libform zlib" 3.48 - ;; 3.49 - cmake-common) 3.50 - copy @std @dev @rm 3.51 - CAT="development|common files" 3.52 - ;; 3.53 - esac 3.54 -} 3.55 - 3.56 -# CMake should be updated both with Boost: 3.57 -# https://stackoverflow.com/questions/42123509/cmake-finds-boost-but-the-imported-targets-not-available-for-boost-version
4.1 --- a/db/receipt Wed Dec 12 02:29:05 2018 +0200 4.2 +++ b/db/receipt Thu Dec 13 00:46:54 2018 +0200 4.3 @@ -1,18 +1,34 @@ 4.4 # SliTaz package receipt v2. 4.5 4.6 PACKAGE="db" 4.7 -VERSION="6.2.23" 4.8 +VERSION="6.2.32" 4.9 CATEGORY="misc" 4.10 SHORT_DESC="Berkeley database system" 4.11 MAINTAINER="pascal.bellard@slitaz.org" 4.12 LICENSE="BSD" 4.13 WEB_SITE="https://www.oracle.com/database/berkeley-db/db.html" 4.14 +LFS="http://www.linuxfromscratch.org/blfs/view/svn/server/db.html" 4.15 +REPOLOGY="db6" 4.16 4.17 TARBALL="$PACKAGE-$VERSION.tar.gz" 4.18 -WGET_URL="http://download.oracle.com/berkeley-db/$TARBALL" 4.19 +WGET_URL="https://download.oracle.com/berkeley-db/$TARBALL" 4.20 4.21 SPLIT="libdb libdb-cxx $PACKAGE-dev" 4.22 4.23 +COPY_std="bin/" 4.24 +COPY_libdb="libdb-*so libdb.so" 4.25 +COPY_libdb_cxx="libdb_cxx-*so libdb_cxx.so" 4.26 + 4.27 +DEPENDS_std="libdb" 4.28 +DEPENDS_libdb="glibc-base" 4.29 +DEPENDS_libdb_cxx="glibc-base" 4.30 +DEPENDS_dev="db libdb libdb-cxx" 4.31 + 4.32 +CAT_libdb="libs|libraries" 4.33 +CAT_libdb_cxx="libs|libraries for C++ support" 4.34 + 4.35 +TAGS_std="database" 4.36 + 4.37 compile_rules() { 4.38 cd $src/build_unix 4.39 ../dist/configure \ 4.40 @@ -22,29 +38,9 @@ 4.41 --disable-static \ 4.42 $CONFIGURE_ARGS && 4.43 make && 4.44 - make docdir=/usr/share/doc/$PACKAGE-$VERSION install 4.45 + make docdir=/usr/share/doc/$PACKAGE-$VERSION install || return 1 4.46 + 4.47 + find $install -type f -exec chmod u+w '{}' \; # 444->644, 555->755 4.48 + find $install -type d -exec chmod g-w '{}' \; # 775->755 4.49 + chown -R 0:0 $install 4.50 } 4.51 - 4.52 -genpkg_rules() { 4.53 - case $PACKAGE in 4.54 - db) 4.55 - copy bin/ 4.56 - DEPENDS="libdb" 4.57 - TAGS="database" 4.58 - ;; 4.59 - libdb) 4.60 - copy libdb-*so libdb.so 4.61 - CAT="libs|libraries" 4.62 - DEPENDS="glibc-base" 4.63 - ;; 4.64 - libdb-cxx) 4.65 - copy libdb_cxx-*so libdb_cxx.so 4.66 - CAT="libs|libraries for C++ support" 4.67 - DEPENDS="glibc-base" 4.68 - ;; 4.69 - db-dev) 4.70 - copy @dev 4.71 - DEPENDS="db libdb libdb-cxx" 4.72 - ;; 4.73 - esac 4.74 -}
5.1 --- a/elfutils/receipt Wed Dec 12 02:29:05 2018 +0200 5.2 +++ b/elfutils/receipt Thu Dec 13 00:46:54 2018 +0200 5.3 @@ -1,7 +1,7 @@ 5.4 # SliTaz package receipt v2. 5.5 5.6 PACKAGE="elfutils" 5.7 -VERSION="0.174" 5.8 +VERSION="0.175" 5.9 CATEGORY="development" 5.10 SHORT_DESC="ELF object file access library" 5.11 MAINTAINER="pascal.bellard@slitaz.org" 5.12 @@ -10,8 +10,8 @@ 5.13 5.14 TARBALL="$PACKAGE-$VERSION.tar.bz2" 5.15 WGET_URL="https://sourceware.org/elfutils/ftp/$VERSION/$TARBALL" 5.16 -TARBALL_MD5="48bec24c0c8b2c16820326956dff9378" 5.17 -TARBALL_SHA512="696708309c2a9a076099748809ecdc0490f4a8a842b2efc1aae0d746e7c5a8b203743f5626739eff837216b0c052696516b2821f5d3cc3f2eef86597c96d42df" 5.18 +TARBALL_MD5="9a02b0382b78cc2d515fb950275d4c02" 5.19 +TARBALL_SHA512="2c3168a34bbc8f22425faa263fc24ec50df39258a4f9ace4e6cd88e9764c435fee70c1a82db8273dbab70a75e5216a200bebf05af1d3ea77e444e35d71a4ed84" 5.20 5.21 BUILD_DEPENDS="gettext zlib-dev bzip2-dev xz-dev" 5.22 SPLIT="$PACKAGE-dev" 5.23 @@ -21,10 +21,3 @@ 5.24 make && 5.25 make install 5.26 } 5.27 - 5.28 -genpkg_rules() { 5.29 - case $PACKAGE in 5.30 - elfutils) copy @std;; 5.31 - *-dev) copy @dev;; 5.32 - esac 5.33 -}
6.1 Binary file emacs/.icon.png has changed
7.1 --- a/emacs/receipt Wed Dec 12 02:29:05 2018 +0200 7.2 +++ b/emacs/receipt Thu Dec 13 00:46:54 2018 +0200 7.3 @@ -1,7 +1,7 @@ 7.4 # SliTaz package receipt v2. 7.5 7.6 PACKAGE="emacs" 7.7 -VERSION="25.3" 7.8 +VERSION="26.1" 7.9 CATEGORY="editors" 7.10 SHORT_DESC="The GNU Emacs editor" 7.11 MAINTAINER="devel@slitaz.org" 7.12 @@ -12,15 +12,33 @@ 7.13 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" 7.14 7.15 BUILD_DEPENDS="atk-dev cairo-dev expat-dev dbus-dev freetype-dev \ 7.16 -fontconfig-dev glib-dev gnutls-dev gtk2-dev jpeg-dev \ 7.17 -libpng16-dev librsvg-dev ncurses-dev pango-dev tiff-dev xorg-dev \ 7.18 -xorg-dev-proto" # giflib-dev: version 4 needed, add --with-gif=no) 7.19 -SPLIT="$PACKAGE-help $PACKAGE-lisp-sources $PACKAGE" 7.20 +fontconfig-dev glib-dev gnutls-dev gtk2-dev libjpeg-turbo-dev libpng16-dev \ 7.21 +librsvg-dev ncurses-dev pango-dev tiff-dev xorg-dev xorg-dev-proto lcms2-dev" 7.22 +# giflib-dev: version 4 needed, add --with-gif=no) 7.23 +SPLIT="$PACKAGE-help $PACKAGE-lisp-sources $PACKAGE $PACKAGE-common" 7.24 + 7.25 +COPY_help="info/ tutorials/ refcards/*.pdf etc/[A-Z]* etc/*.txt" 7.26 +COPY_lisp_sources="*.el.gz refcards/*.tex" 7.27 +COPY_std="bin/ libexec/" 7.28 +COPY_common="@std @rm" 7.29 + 7.30 +DEPENDS_help="emacs" 7.31 +DEPENDS_lisp_sources="emacs" 7.32 +DEPENDS_std="dbus fontconfig freetype gdk-pixbuf glib gtk2 lcms2 libgnutls \ 7.33 +libpng16 librsvg libxml2 ncurses tiff xorg-libICE xorg-libSM xorg-libX11 \ 7.34 +xorg-libXext xorg-libXfixes xorg-libXft xorg-libXpm xorg-libXrender \ 7.35 +xorg-libxcb zlib" 7.36 +DEPENDS_common=" " 7.37 + 7.38 +CAT_help="development|help files" 7.39 +CAT_lisp_sources="development|Lisp source files" 7.40 +CAT_common="editors|architecture independent part" 7.41 + 7.42 +SUGGESTED_std="alsa-lib" 7.43 +TAGS_std="text-editor" 7.44 7.45 compile_rules() { 7.46 ./configure \ 7.47 - --infodir=/usr/share/info \ 7.48 - --mandir=/usr/share/man \ 7.49 --without-makeinfo \ 7.50 --without-gconf \ 7.51 --with-gif=no --with-jpeg=no \ 7.52 @@ -28,9 +46,6 @@ 7.53 --with-x \ 7.54 --with-toolkit-scroll-bars \ 7.55 --with-xpm=yes \ 7.56 - --libexecdir=/usr/lib \ 7.57 - --localstatedir=/var/lib \ 7.58 - --sharedstatedir=/var/lib \ 7.59 $CONFIGURE_ARGS && 7.60 make $MAKEFLAGS && 7.61 make DESTDIR=$install install || return 1 7.62 @@ -44,48 +59,6 @@ 7.63 # Use default site-lisp 7.64 ln -s ../site-lisp $install/usr/share/emacs/$VERSION/site-lisp 7.65 7.66 - chown -R root:root $install 7.67 + chown -R 0:0 $install 7.68 + find $install -type f -exec chmod g-w '{}' \; # 664->644 7.69 } 7.70 - 7.71 -genpkg_rules() { 7.72 - case $PACKAGE in 7.73 - emacs-help) 7.74 - copy \ 7.75 - info/ \ 7.76 - tutorials/ \ 7.77 - refcards/*.pdf \ 7.78 - etc/[A-Z]* \ 7.79 - etc/*.txt 7.80 - DEPENDS="emacs" 7.81 - CAT="development|help files" 7.82 - ;; 7.83 - emacs-lisp-sources) 7.84 - copy \ 7.85 - *.el.gz \ 7.86 - refcards/*.tex 7.87 - DEPENDS="emacs" 7.88 - CAT="development|Lisp source files" 7.89 - ;; 7.90 - emacs) 7.91 - copy @std @dev @rm 7.92 - strip -s $fs/usr/lib/emacs/$VERSION/i486-pc-linux-gnu/* 2>/dev/null 7.93 - DEPENDS="atk cairo dbus expat freetype fontconfig giflib glib \ 7.94 - gnutls gtk2 jpeg libpng16 librsvg util-linux-uuid \ 7.95 - ncurses pango tiff xorg-server zlib librsvg libgsf \ 7.96 - libgnutls harfbuzz" 7.97 - SUGGESTED="alsa-lib" 7.98 - TAGS="text-editor" 7.99 - ;; 7.100 - esac 7.101 -} 7.102 - 7.103 -# linking /usr/bin/emacs to new version 7.104 -post_install_emacs() { 7.105 - ln -sf /usr/bin/emacs-$VERSION "$1/usr/bin/emacs" 7.106 -} 7.107 - 7.108 -post_remove_emacs() { 7.109 - rm -rf "$1/usr/share/emacs" 7.110 - rm -rf "$1/usr/lib/emacs" 7.111 - rm -f "$1/usr/bin/emacs" 7.112 -}
8.1 --- a/glib-networking/receipt Wed Dec 12 02:29:05 2018 +0200 8.2 +++ b/glib-networking/receipt Thu Dec 13 00:46:54 2018 +0200 8.3 @@ -1,7 +1,7 @@ 8.4 # SliTaz package receipt v2. 8.5 8.6 PACKAGE="glib-networking" 8.7 -VERSION="2.56.1" 8.8 +VERSION="2.58.0" 8.9 CATEGORY="x-window" 8.10 SHORT_DESC="TLS support for glib" 8.11 MAINTAINER="devel@slitaz.org" 8.12 @@ -15,21 +15,19 @@ 8.13 BUILD_DEPENDS="meson ninja intltool gnutls-dev gsettings-desktop-schemas-dev \ 8.14 glib-dev" 8.15 8.16 +DEPENDS_std="glib libgnutls libp11-kit" 8.17 +CONFIG_FILES_std="/etc/profile.d/gio.sh" 8.18 + 8.19 compile_rules() { 8.20 mkdir build 8.21 cd build 8.22 8.23 meson-wrapper \ 8.24 -Dlibproxy_support=false \ 8.25 - -Dca_certificates_path=/etc/ssl/ca-bundle.crt && 8.26 + -Dpkcs11_support=true \ 8.27 + && 8.28 ninja && 8.29 ninja install || return 1 8.30 8.31 install -Dm644 $stuff/gio.sh $install/etc/profile.d/gio.sh 8.32 } 8.33 - 8.34 -genpkg_rules() { 8.35 - copy @std 8.36 - DEPENDS="glib libgnutls libp11-kit" 8.37 - CONFIG_FILES="/etc/profile.d/gio.sh" 8.38 -}
9.1 --- a/glib/receipt Wed Dec 12 02:29:05 2018 +0200 9.2 +++ b/glib/receipt Thu Dec 13 00:46:54 2018 +0200 9.3 @@ -1,7 +1,7 @@ 9.4 # SliTaz package receipt v2. 9.5 9.6 PACKAGE="glib" 9.7 -VERSION="2.56.1" 9.8 +VERSION="2.58.1" 9.9 CATEGORY="x-window" 9.10 SHORT_DESC="C routines" 9.11 MAINTAINER="devel@slitaz.org" 9.12 @@ -13,46 +13,29 @@ 9.13 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 9.14 9.15 BUILD_DEPENDS="automake libtool zlib-dev libffi-dev gettext-dev \ 9.16 -util-linux-mount-dev pcre-dev glib-dev elfutils-dev gtk-doc libxslt \ 9.17 -docbook-xsl dbus-dev" 9.18 -SPLIT="$PACKAGE-static $PACKAGE-dev" 9.19 +util-linux-mount-dev pcre-dev libxslt docbook-xsl elfutils-dev" 9.20 +SPLIT="$PACKAGE-static $PACKAGE-dev $PACKAGE" 9.21 9.22 -# glib require glib to be built. 9.23 -# And if glib failed to build and not present on the mirror, you will catch 9.24 -# into the dead loop. Be careful! 9.25 +COPY_static="*.a" 9.26 +COPY_dev="gdbus-codegen gobject-query bin/gresource bin/gtester* \ 9.27 +bin/glib-gettextize bin/glib-mkenums gdb/ gettext/ glib-2.0/ @dev @rm" 9.28 + 9.29 +DEPENDS_std="libffi libpcre util-linux-mount zlib" 9.30 +DEPENDS_dev="glib elfutils libffi libpcre pcre-dev python util-linux-mount-dev \ 9.31 +zlib-dev perl" 9.32 + 9.33 +CAT_static="development|static libraries" 9.34 9.35 compile_rules() { 9.36 # --enable-static: desktop-file-validate-static require such lib 9.37 - NOCONFIGURE=1 ./autogen.sh && 9.38 - ./configure \ 9.39 + ./autogen.sh \ 9.40 --enable-debug=no \ 9.41 --enable-static \ 9.42 + --disable-selinux \ 9.43 --disable-fam \ 9.44 + --enable-man \ 9.45 $CONFIGURE_ARGS && 9.46 fix libtool && 9.47 make && 9.48 make install 9.49 } 9.50 - 9.51 -genpkg_rules() { 9.52 - case $PACKAGE in 9.53 - glib) 9.54 - copy @std 9.55 - # Python codegen, tester, Perl mkenums --> glib-dev 9.56 - cd $fs/usr/bin 9.57 - rm gdbus-codegen gtester* glib-mkenums glib-gettextize 9.58 - rm -r $fs/usr/share 9.59 - DEPENDS="elfutils libffi libpcre util-linux-mount zlib" 9.60 - ;; 9.61 - *-static) 9.62 - copy *.a 9.63 - DEPENDS=" " 9.64 - CAT="development|static libraries" 9.65 - ;; 9.66 - *-dev) 9.67 - copy @std @dev @rm 9.68 - DEPENDS="glib libffi-dev pcre-dev python util-linux-mount-dev \ 9.69 - zlib-dev perl" 9.70 - ;; 9.71 - esac 9.72 -}
10.1 --- a/glib/stuff/patches/glib-2.54.3-meson_fixes-1.patch Wed Dec 12 02:29:05 2018 +0200 10.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 10.3 @@ -1,242 +0,0 @@ 10.4 -Submitted by: DJ Lucas (dj_AT_linuxfromscratch_DOT_org) 10.5 -Date: 2017-11-04 10.6 -Initial Package Version: 2.54.2 10.7 -Upstream Status: Not submitted 10.8 -Origin: Based on Arch Linux patches and upstream 10.9 -Description: Fixes several build issue with meson 10.10 - 10.11 -Update: Reset for version 2.54.3 2018-01-12 bdubbs_AT_linuxfromscratch_DOT_org 10.12 - 10.13 -diff -Naurp glib-2.54.2-orig/config.h.meson glib-2.54.2/config.h.meson 10.14 ---- glib-2.54.2-orig/config.h.meson 2017-10-27 17:42:46.000000000 -0500 10.15 -+++ glib-2.54.2/config.h.meson 2017-11-02 20:25:23.523120928 -0500 10.16 -@@ -247,6 +247,9 @@ 10.17 - /* Define if libelf is available */ 10.18 - #mesondefine HAVE_LIBELF 10.19 - 10.20 -+/* Define if libmount is available */ 10.21 -+#mesondefine HAVE_LIBMOUNT 10.22 -+ 10.23 - /* Define to 1 if you have the <linux/magic.h> header file. */ 10.24 - #mesondefine HAVE_LINUX_MAGIC_H 10.25 - 10.26 -diff -Naurp glib-2.54.2-orig/docs/reference/gio/meson.build glib-2.54.2/docs/reference/gio/meson.build 10.27 ---- glib-2.54.2-orig/docs/reference/gio/meson.build 2017-07-14 14:14:02.000000000 -0500 10.28 -+++ glib-2.54.2/docs/reference/gio/meson.build 2017-11-02 20:25:23.523120928 -0500 10.29 -@@ -52,9 +52,12 @@ if get_option('with-docs') != 'no' 10.30 - 'gnetworkmonitorbase.h', 10.31 - 'gnetworkmonitornetlink.h', 10.32 - 'gnetworkmonitornm.h', 10.33 -+ 'gnetworkmonitorportal.h', 10.34 - 'gnotificationbackend.h', 10.35 - 'gnotification-private.h', 10.36 -+ 'gosxappinfo.h', 10.37 - 'gpollfilemonitor.h', 10.38 -+ 'gproxyresolverportal.h', 10.39 - 'gregistrysettingsbackend.h', 10.40 - 'gresourcefile.h', 10.41 - 'gsettingsbackendinternal.h', 10.42 -@@ -95,12 +98,22 @@ if get_option('with-docs') != 'no' 10.43 - configuration: version_conf 10.44 - ) 10.45 - 10.46 -+ # Meson uses paths relative to meson.source_root() in dependencies, 10.47 -+ # which is invalid relative to current_source_dir(), so the compile 10.48 -+ # process fails to find glib headers 10.49 -+ top_build_dir = meson.build_root() 10.50 -+ top_source_dir = meson.source_root() 10.51 -+ glib_top_build_dir = join_paths(top_build_dir, 'glib') 10.52 -+ glib_top_source_dir = join_paths(top_source_dir, 'glib') 10.53 -+ 10.54 -+ scan_dep = declare_dependency(include_directories : [ top_source_dir, glib_top_build_dir, glib_top_source_dir ]) 10.55 -+ 10.56 - gnome.gtkdoc('gio', 10.57 - main_xml : 'gio-docs.xml', 10.58 - namespace : 'g', 10.59 - gobject_typesfile : 'gio.types', 10.60 - mode : 'none', 10.61 -- dependencies : [libgio_dep, libgobject_dep, libglib_dep], 10.62 -+ dependencies : [libgio_dep, libgobject_dep, libglib_dep, scan_dep], 10.63 - src_dir : 'gio', 10.64 - scan_args : [ 10.65 - '--rebuild-types', 10.66 -diff -Naurp glib-2.54.2-orig/docs/reference/gobject/meson.build glib-2.54.2/docs/reference/gobject/meson.build 10.67 ---- glib-2.54.2-orig/docs/reference/gobject/meson.build 2017-07-14 14:14:02.000000000 -0500 10.68 -+++ glib-2.54.2/docs/reference/gobject/meson.build 2017-11-02 20:25:23.523120928 -0500 10.69 -@@ -17,12 +17,23 @@ if get_option('with-docs') != 'no' 10.70 - configuration: version_conf 10.71 - ) 10.72 - 10.73 -+ # Meson uses paths relative to meson.source_root() in dependencies, 10.74 -+ # which is invalid relative to current_source_dir(), so the compile 10.75 -+ # process fails to find glib headers 10.76 -+ doc_source_dir = meson.current_source_dir() 10.77 -+ top_build_dir = meson.build_root() 10.78 -+ top_source_dir = meson.source_root() 10.79 -+ glib_top_build_dir = join_paths(top_build_dir, 'glib') 10.80 -+ glib_top_source_dir = join_paths(top_source_dir, 'glib') 10.81 -+ 10.82 -+ scan_dep = declare_dependency(include_directories : [ doc_source_dir, top_source_dir, glib_top_build_dir, glib_top_source_dir ]) 10.83 -+ 10.84 - gnome.gtkdoc('gobject', 10.85 - main_xml : 'gobject-docs.xml', 10.86 - namespace : 'g', 10.87 - gobject_typesfile : join_paths(meson.current_source_dir(), 'gobject.types'), 10.88 - mode : 'none', 10.89 -- dependencies : [libgobject_dep, libglib_dep], 10.90 -+ dependencies : [libgobject_dep, libglib_dep, scan_dep], 10.91 - src_dir : 'gobject', 10.92 - scan_args : [ 10.93 - '--deprecated-guards=G_DISABLE_DEPRECATED', 10.94 -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 10.95 ---- glib-2.54.2-orig/gio/gdbus-2.0/codegen/meson.build 2017-10-27 17:42:46.000000000 -0500 10.96 -+++ glib-2.54.2/gio/gdbus-2.0/codegen/meson.build 2017-11-02 20:25:23.523120928 -0500 10.97 -@@ -13,7 +13,6 @@ gdbus_codegen_conf.set('VERSION', glib_v 10.98 - gdbus_codegen_conf.set('PYTHON', python.path()) 10.99 - 10.100 - # Install gdbus-codegen executable 10.101 --# FIXME: Set permissions 10.102 - gdbus_codegen = configure_file(input : 'gdbus-codegen.in', 10.103 - output : 'gdbus-codegen', 10.104 - install : true, 10.105 -diff -Naurp glib-2.54.2-orig/gio/meson.build glib-2.54.2/gio/meson.build 10.106 ---- glib-2.54.2-orig/gio/meson.build 2017-10-27 17:42:46.000000000 -0500 10.107 -+++ glib-2.54.2/gio/meson.build 2017-11-02 20:25:23.523120928 -0500 10.108 -@@ -727,7 +727,7 @@ libgio = shared_library('gio-2.0', 10.109 - libgobject_dep, libgmodule_dep] + platform_deps + network_libs, 10.110 - c_args : gio_c_args, 10.111 - # intl.lib is not compatible with SAFESEH 10.112 -- link_args : noseh_link_args, 10.113 -+ link_args : noseh_link_args + library_link_args, 10.114 - ) 10.115 - 10.116 - libgio_dep = declare_dependency(link_with : libgio, 10.117 -diff -Naurp glib-2.54.2-orig/gio/tests/gengiotypefuncs.py glib-2.54.2/gio/tests/gengiotypefuncs.py 10.118 -diff -Naurp glib-2.54.2-orig/glib/meson.build glib-2.54.2/glib/meson.build 10.119 ---- glib-2.54.2-orig/glib/meson.build 2017-10-02 09:17:23.000000000 -0500 10.120 -+++ glib-2.54.2/glib/meson.build 2017-11-02 20:25:23.523120928 -0500 10.121 -@@ -227,7 +227,7 @@ libglib = shared_library('glib-2.0', 10.122 - soversion : soversion, 10.123 - install : true, 10.124 - # intl.lib is not compatible with SAFESEH 10.125 -- link_args : noseh_link_args, 10.126 -+ link_args : noseh_link_args + library_link_args, 10.127 - include_directories : configinc, 10.128 - link_with : [charset_lib, gnulib_lib], 10.129 - dependencies : [pcre, thread_dep, libintl, librt] + libiconv + platform_deps, 10.130 -@@ -283,8 +283,9 @@ configure_file( 10.131 - input: 'libglib-gdb.py.in', 10.132 - output: 'libglib-2.0.so.@0@-gdb.py'.format(library_version), 10.133 - configuration: gdb_conf, 10.134 -- install: true, 10.135 -- install_dir: join_paths(get_option('datadir'), 'gdb/auto-load' + get_option('libdir')) 10.136 -+ # FIXME: Figure out how to install this on Windows 10.137 -+ install: host_system != 'windows', 10.138 -+ install_dir: join_paths(glib_datadir, 'gdb', 'auto-load', './' + glib_libdir) 10.139 - ) 10.140 - 10.141 - if enable_systemtap 10.142 -diff -Naurp glib-2.54.2-orig/gmodule/meson.build glib-2.54.2/gmodule/meson.build 10.143 ---- glib-2.54.2-orig/gmodule/meson.build 2017-07-14 14:14:02.000000000 -0500 10.144 -+++ glib-2.54.2/gmodule/meson.build 2017-11-02 20:25:23.523120928 -0500 10.145 -@@ -37,7 +37,7 @@ elif cc.has_function('NSLinkModule') 10.146 - elif cc.links(dlopen_dlsym_test_code, args : '-ldl', name : 'dlopen() and dlsym() in libdl') 10.147 - g_module_impl = 'G_MODULE_IMPL_DL' 10.148 - libdl_dep = cc.find_library('dl') 10.149 -- g_module_lib_args = '-ldl' 10.150 -+ g_module_lib_args = ['-ldl'] 10.151 - endif 10.152 - 10.153 - # additional checks for G_MODULE_IMPL_DL 10.154 -@@ -72,6 +72,10 @@ if g_module_impl == '' 10.155 - message('WARNING: No suitable GModule implementation found!') 10.156 - endif 10.157 - 10.158 -+# For pc files 10.159 -+glib_conf.set('G_MODULE_SUPPORTED', g_module_impl == '0' ? 'false' : 'true') 10.160 -+glib_conf.set('G_MODULE_LIBS', ' '.join(g_module_lib_args)) 10.161 -+ 10.162 - gmoduleconf_conf.set('G_MODULE_IMPL', g_module_impl) 10.163 - gmoduleconf_conf.set('G_MODULE_SUPPORTED', g_module_impl != '0') 10.164 - gmoduleconf_conf.set('G_MODULE_HAVE_DLERROR', g_module_have_dlerror) 10.165 -@@ -91,6 +95,7 @@ libgmodule = shared_library('gmodule-2.0 10.166 - install : true, 10.167 - include_directories : [configinc, gmoduleinc], 10.168 - dependencies : [libdl_dep, libglib_dep], 10.169 -+ link_args : library_link_args, 10.170 - c_args : ['-DG_LOG_DOMAIN="GModule"', '-DG_DISABLE_DEPRECATED'] + glib_hidden_visibility_args) 10.171 - 10.172 - libgmodule_dep = declare_dependency(link_with : libgmodule, 10.173 -diff -Naurp glib-2.54.2-orig/gobject/meson.build glib-2.54.2/gobject/meson.build 10.174 ---- glib-2.54.2-orig/gobject/meson.build 2017-10-27 17:42:46.000000000 -0500 10.175 -+++ glib-2.54.2/gobject/meson.build 2017-11-02 20:25:23.523120928 -0500 10.176 -@@ -61,6 +61,7 @@ libgobject = shared_library('gobject-2.0 10.177 - install : true, 10.178 - include_directories : [configinc], 10.179 - dependencies : [libintl, libffi_dep, libglib_dep], 10.180 -+ link_args : library_link_args, 10.181 - c_args : ['-DG_LOG_DOMAIN="GLib-GObject"', '-DGOBJECT_COMPILATION'] + glib_hidden_visibility_args) 10.182 - 10.183 - libgobject_dep = declare_dependency(link_with : libgobject, 10.184 -@@ -76,7 +77,6 @@ python_tools_conf.set('VERSION', glib_ve 10.185 - python_tools_conf.set('PYTHON', python.path()) 10.186 - 10.187 - foreach tool: python_tools 10.188 -- # FIXME: Ensure we set the appropriate permissions 10.189 - tool_bin = configure_file( 10.190 - input : tool + '.in', 10.191 - output : tool, 10.192 -@@ -101,8 +101,9 @@ configure_file( 10.193 - input: 'libgobject-gdb.py.in', 10.194 - output: 'libgobject-2.0.so.@0@-gdb.py'.format(library_version), 10.195 - configuration: gdb_conf, 10.196 -- install: true, 10.197 -- install_dir: join_paths(get_option('datadir'), 'gdb/auto-load/' + get_option('libdir')) 10.198 -+ # FIXME: Figure out how to install this on Windows 10.199 -+ install: host_system != 'windows', 10.200 -+ install_dir: join_paths(glib_datadir, 'gdb', 'auto-load', './' + glib_libdir) 10.201 - ) 10.202 - 10.203 - if enable_systemtap 10.204 -diff -Naurp glib-2.54.2-orig/gthread/meson.build glib-2.54.2/gthread/meson.build 10.205 ---- glib-2.54.2-orig/gthread/meson.build 2017-07-14 14:14:02.000000000 -0500 10.206 -+++ glib-2.54.2/gthread/meson.build 2017-11-02 20:25:23.523120928 -0500 10.207 -@@ -6,4 +6,5 @@ libgthread = shared_library('gthread-2.0 10.208 - soversion : soversion, 10.209 - install : true, 10.210 - dependencies : [libglib_dep], 10.211 -+ link_args : library_link_args, 10.212 - c_args : ['-DG_LOG_DOMAIN="GThread"' ] + glib_hidden_visibility_args) 10.213 -diff -Naurp glib-2.54.2-orig/meson.build glib-2.54.2/meson.build 10.214 ---- glib-2.54.2-orig/meson.build 2017-10-27 17:42:46.000000000 -0500 10.215 -+++ glib-2.54.2/meson.build 2017-11-02 20:25:23.523120928 -0500 10.216 -@@ -1484,7 +1484,7 @@ libmount_opt = get_option('enable-libmou 10.217 - if host_system == 'linux' and libmount_opt != 'no' 10.218 - libmount_dep = [dependency('mount', version : '>=2.28', required : false)] 10.219 - if not libmount_dep[0].found() 10.220 -- libmount_dep = [cc.find_library('mount')] 10.221 -+ libmount_dep = [cc.find_library('mount', required : false)] 10.222 - libmount_h = cc.has_header('libmount/libmount.h') 10.223 - libmount_needed = libmount_opt == 'yes' and host_system == 'linux' 10.224 - if libmount_needed and (not libmount_dep[0].found() or not libmount_h) 10.225 -@@ -1527,12 +1527,20 @@ if use_system_pcre 10.226 - endif 10.227 - if libmount_dep.length() == 1 and libmount_dep[0].found() 10.228 - glib_conf.set('LIBMOUNT_LIBS', '-lmount') 10.229 -+ glib_conf.set('HAVE_LIBMOUNT', 1) 10.230 - endif 10.231 - glib_conf.set('GIO_MODULE_DIR', '${libdir}/gio/modules') 10.232 - # FIXME: Missing: 10.233 - # @G_MODULE_LIBS@ @SELINUX_LIBS@ @COCOA_LIBS@ @CARBON_LIBS@ @G_LIBS_EXTRA@ 10.234 - # @PCRE_REQUIRES@ @GLIB_EXTRA_CFLAGS@ @G_THREAD_CFLAGS@ 10.235 - 10.236 -+# HACK 10.237 -+glib_conf.set('G_THREAD_LIBS', '-pthread') 10.238 -+glib_conf.set('G_THREAD_CFLAGS', '-pthread') 10.239 -+glib_conf.set('G_MODULE_LDFLAGS', '-Wl,--export-dynamic') 10.240 -+glib_conf.set('PCRE_REQUIRES', 'libpcre') 10.241 -+library_link_args = [ '-Wl,-z,nodelete' ] 10.242 -+ 10.243 - # Tracing: dtrace 10.244 - want_dtrace = get_option('enable-dtrace') 10.245 - enable_dtrace = false
11.1 --- a/glib/stuff/patches/glib-2.54.3-skip_warnings-1.patch Wed Dec 12 02:29:05 2018 +0200 11.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 11.3 @@ -1,75 +0,0 @@ 11.4 -Submitted By: Bruce dubbs <bdubbs@linuxfromscratch.org> 11.5 -Date: 2017-10-15 11.6 -Initial Package Version: 2.54.0 11.7 -Upstream Status: Not submitted 11.8 -Origin: Self 11.9 -Description: Adds a capabiility to skip printing warning messages using 11.10 - an environment variable: GLIB_LOG_LEVEL. The value 11.11 - of the variable is a digit that correponds to: 11.12 - 1 Alert 11.13 - 2 Critical 11.14 - 3 Error 11.15 - 4 Warning 11.16 - 5 Notice 11.17 - 11.18 - For instance GLIB_LOG_LEVEL=4 will skip output of Waring and 11.19 - Notice messages (and Info/Debug messages if they are turned on). 11.20 - 11.21 ---- glib-2.54.0/glib/gmessages.c 2017-08-19 08:39:20.000000000 -0500 11.22 -+++ glib-2.54.0-new/glib/gmessages.c 2017-10-15 14:45:52.004885278 -0500 11.23 -@@ -523,6 +523,35 @@ 11.24 - 11.25 - /* --- functions --- */ 11.26 - 11.27 -+/* skip_message 11.28 -+ * 11.29 -+ * This internal function queries an optional environment variable, 11.30 -+ * GLIB_LOG_LEVEL and converts it to a value consistent 11.31 -+ * with the type GLogLevelFlags. If the value is equal to 11.32 -+ * or greater than the integer equivalent of the log_level. 11.33 -+ * then the function returns a boolean that indicates that 11.34 -+ * loging the output should be skipped. 11.35 -+ */ 11.36 -+ 11.37 -+static gboolean skip_message( GLogLevelFlags log_level); 11.38 -+ 11.39 -+static gboolean skip_message( GLogLevelFlags log_level) 11.40 -+{ 11.41 -+ char* user_log_level; 11.42 -+ int user_log_int; 11.43 -+ gboolean skip = FALSE; 11.44 -+ 11.45 -+ user_log_level = getenv( "GLIB_LOG_LEVEL" ); 11.46 -+ 11.47 -+ user_log_int = ( user_log_level != NULL ) ? atoi( user_log_level ) : 0; 11.48 -+ user_log_int = ( user_log_int != 0 ) ? 1 << user_log_int : 0; 11.49 -+ 11.50 -+ if ( user_log_int >= log_level ) skip = TRUE; 11.51 -+ 11.52 -+ return skip; 11.53 -+} 11.54 -+ 11.55 -+ 11.56 - static void _g_log_abort (gboolean breakpoint); 11.57 - 11.58 - static void 11.59 -@@ -2496,6 +2525,9 @@ 11.60 - g_return_val_if_fail (fields != NULL, G_LOG_WRITER_UNHANDLED); 11.61 - g_return_val_if_fail (n_fields > 0, G_LOG_WRITER_UNHANDLED); 11.62 - 11.63 -+ /* If the user does not want this message level, just return */ 11.64 -+ if ( skip_message( log_level) ) return G_LOG_WRITER_HANDLED; 11.65 -+ 11.66 - stream = log_level_to_file (log_level); 11.67 - if (!stream || fileno (stream) < 0) 11.68 - return G_LOG_WRITER_UNHANDLED; 11.69 -@@ -2640,6 +2672,9 @@ 11.70 - FILE *stream; 11.71 - gsize i; 11.72 - 11.73 -+ /* If the user does not want this message level, just return */ 11.74 -+ if ( skip_message( log_level) ) return G_LOG_WRITER_HANDLED; 11.75 -+ 11.76 - /* we cannot call _any_ GLib functions in this fallback handler, 11.77 - * which is why we skip UTF-8 conversion, etc. 11.78 - * since we either recursed or ran out of memory, we're in a pretty
12.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 12.2 +++ b/glib/stuff/patches/glib-2.58.1-skip_warnings-1.patch Thu Dec 13 00:46:54 2018 +0200 12.3 @@ -0,0 +1,75 @@ 12.4 +Submitted By: Bruce dubbs <bdubbs@linuxfromscratch.org> 12.5 +Date: 2017-10-15 12.6 +Initial Package Version: 2.54.0 12.7 +Upstream Status: Not submitted 12.8 +Origin: Self 12.9 +Description: Adds a capabiility to skip printing warning messages using 12.10 + an environment variable: GLIB_LOG_LEVEL. The value 12.11 + of the variable is a digit that correponds to: 12.12 + 1 Alert 12.13 + 2 Critical 12.14 + 3 Error 12.15 + 4 Warning 12.16 + 5 Notice 12.17 + 12.18 + For instance GLIB_LOG_LEVEL=4 will skip output of Waring and 12.19 + Notice messages (and Info/Debug messages if they are turned on). 12.20 + 12.21 +--- glib-2.54.0/glib/gmessages.c 2017-08-19 08:39:20.000000000 -0500 12.22 ++++ glib-2.54.0-new/glib/gmessages.c 2017-10-15 14:45:52.004885278 -0500 12.23 +@@ -523,6 +523,35 @@ 12.24 + 12.25 + /* --- functions --- */ 12.26 + 12.27 ++/* skip_message 12.28 ++ * 12.29 ++ * This internal function queries an optional environment variable, 12.30 ++ * GLIB_LOG_LEVEL and converts it to a value consistent 12.31 ++ * with the type GLogLevelFlags. If the value is equal to 12.32 ++ * or greater than the integer equivalent of the log_level. 12.33 ++ * then the function returns a boolean that indicates that 12.34 ++ * loging the output should be skipped. 12.35 ++ */ 12.36 ++ 12.37 ++static gboolean skip_message( GLogLevelFlags log_level); 12.38 ++ 12.39 ++static gboolean skip_message( GLogLevelFlags log_level) 12.40 ++{ 12.41 ++ char* user_log_level; 12.42 ++ int user_log_int; 12.43 ++ gboolean skip = FALSE; 12.44 ++ 12.45 ++ user_log_level = getenv( "GLIB_LOG_LEVEL" ); 12.46 ++ 12.47 ++ user_log_int = ( user_log_level != NULL ) ? atoi( user_log_level ) : 0; 12.48 ++ user_log_int = ( user_log_int != 0 ) ? 1 << user_log_int : 0; 12.49 ++ 12.50 ++ if ( user_log_int >= log_level ) skip = TRUE; 12.51 ++ 12.52 ++ return skip; 12.53 ++} 12.54 ++ 12.55 ++ 12.56 + static void _g_log_abort (gboolean breakpoint); 12.57 + 12.58 + static void 12.59 +@@ -2496,6 +2525,9 @@ 12.60 + g_return_val_if_fail (fields != NULL, G_LOG_WRITER_UNHANDLED); 12.61 + g_return_val_if_fail (n_fields > 0, G_LOG_WRITER_UNHANDLED); 12.62 + 12.63 ++ /* If the user does not want this message level, just return */ 12.64 ++ if ( skip_message( log_level) ) return G_LOG_WRITER_HANDLED; 12.65 ++ 12.66 + stream = log_level_to_file (log_level); 12.67 + if (!stream || fileno (stream) < 0) 12.68 + return G_LOG_WRITER_UNHANDLED; 12.69 +@@ -2640,6 +2672,9 @@ 12.70 + FILE *stream; 12.71 + gsize i; 12.72 + 12.73 ++ /* If the user does not want this message level, just return */ 12.74 ++ if ( skip_message( log_level) ) return G_LOG_WRITER_HANDLED; 12.75 ++ 12.76 + /* we cannot call _any_ GLib functions in this fallback handler, 12.77 + * which is why we skip UTF-8 conversion, etc. 12.78 + * since we either recursed or ran out of memory, we're in a pretty
13.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 13.2 +++ b/glib/stuff/patches/grefcount.patch Thu Dec 13 00:46:54 2018 +0200 13.3 @@ -0,0 +1,36 @@ 13.4 +From 57efb14f0519e0b20a789c274db7777f16c98b35 Mon Sep 17 00:00:00 2001 13.5 +From: Fabrice Fontaine <fontaine.fabrice@gmail.com> 13.6 +Date: Sat, 13 Oct 2018 23:10:33 +0200 13.7 +Subject: [PATCH] grefcount: add missing gatomic.h 13.8 +MIME-Version: 1.0 13.9 +Content-Type: text/plain; charset=UTF-8 13.10 +Content-Transfer-Encoding: 8bit 13.11 + 13.12 +Without gatomic.h, build fails on: 13.13 +In file included from garcbox.c:24:0: 13.14 +garcbox.c: In function ‘g_atomic_rc_box_acquire’: 13.15 +grefcount.h:101:13: error: implicit declaration of function ‘g_atomic_int_get’; did you mean ‘__atomic_store’? [-Werror=implicit-function-declaration] 13.16 + (void) (g_atomic_int_get (rc) == G_MAXINT ? 0 : g_atomic_int_inc ((rc))); \ 13.17 + ^ 13.18 +garcbox.c:292:3: note: in expansion of macro ‘g_atomic_ref_count_inc’ 13.19 + g_atomic_ref_count_inc (&real_box->ref_count); 13.20 + 13.21 +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 13.22 +--- 13.23 + glib/grefcount.h | 1 + 13.24 + 1 file changed, 1 insertion(+) 13.25 + 13.26 +diff --git a/glib/grefcount.h b/glib/grefcount.h 13.27 +index dec9a5ffb..b6eced1b7 100644 13.28 +--- a/glib/grefcount.h 13.29 ++++ b/glib/grefcount.h 13.30 +@@ -23,6 +23,7 @@ 13.31 + #error "Only <glib.h> can be included directly." 13.32 + #endif 13.33 + 13.34 ++#include <glib/gatomic.h> 13.35 + #include <glib/gtypes.h> 13.36 + 13.37 + G_BEGIN_DECLS 13.38 +-- 13.39 +2.18.1
14.1 --- a/glib/stuff/patches/series Wed Dec 12 02:29:05 2018 +0200 14.2 +++ b/glib/stuff/patches/series Thu Dec 13 00:46:54 2018 +0200 14.3 @@ -1,6 +1,8 @@ 14.4 # from BLFS 14.5 -#glib-2.54.3-meson_fixes-1.patch 14.6 -#glib-2.54.3-skip_warnings-1.patch 14.7 +glib-2.58.1-skip_warnings-1.patch 14.8 14.9 # from https://www.archlinux.org/packages/core/x86_64/glib2/ 14.10 noisy-glib-compile-schemas.diff 14.11 + 14.12 +# from https://gitlab.gnome.org/GNOME/glib/commit/57efb14f0519e0b20a789c274db7777f16c98b35 14.13 +grefcount.patch
15.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 15.2 +++ b/glib/stuff/receipt.meson Thu Dec 13 00:46:54 2018 +0200 15.3 @@ -0,0 +1,39 @@ 15.4 +# SliTaz package receipt v2. 15.5 + 15.6 +PACKAGE="glib" 15.7 +VERSION="2.58.1" 15.8 +CATEGORY="x-window" 15.9 +SHORT_DESC="C routines" 15.10 +MAINTAINER="devel@slitaz.org" 15.11 +LICENSE="GPL2" 15.12 +WEB_SITE="https://developer.gnome.org/glib/" 15.13 +LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/glib2.html" 15.14 + 15.15 +TARBALL="$PACKAGE-$VERSION.tar.xz" 15.16 +WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 15.17 + 15.18 +BUILD_DEPENDS="meson ninja cmake pcre-dev libffi-dev zlib-dev gettext-dev \ 15.19 +util-linux-mount-dev libxml2-tools elfutils-dev dbus-dev libxslt" 15.20 +SPLIT="$PACKAGE-static $PACKAGE-dev $PACKAGE" 15.21 + 15.22 +COPY_static="*.a" 15.23 +COPY_dev="gdbus-codegen gobject-query bin/gresource bin/gtester* bin/glib-* \ 15.24 +gdb/ gettext/ glib-2.0/ @dev @rm" 15.25 + 15.26 +DEPENDS_std="elfutils libffi libpcre util-linux-mount zlib" 15.27 +DEPENDS_dev="glib libffi-dev pcre-dev python util-linux-mount-dev zlib-dev perl" 15.28 + 15.29 +CAT_static="development|static libraries" 15.30 + 15.31 +compile_rules() { 15.32 + mkdir build-glib # build/ already exists 15.33 + cd build-glib 15.34 + 15.35 + meson-wrapper \ 15.36 + --default-library=both \ 15.37 + -Dselinux=false \ 15.38 + -Dman=true \ 15.39 + && 15.40 + ninja && 15.41 + ninja install 15.42 +}
16.1 --- a/glibmm/receipt Wed Dec 12 02:29:05 2018 +0200 16.2 +++ b/glibmm/receipt Thu Dec 13 00:46:54 2018 +0200 16.3 @@ -1,7 +1,7 @@ 16.4 # SliTaz package receipt v2. 16.5 16.6 PACKAGE="glibmm" 16.7 -VERSION="2.56.0" 16.8 +VERSION="2.58.0" 16.9 CATEGORY="x-window" 16.10 SHORT_DESC="C++ bindings for GLib" 16.11 MAINTAINER="devel@slitaz.org" 16.12 @@ -15,6 +15,16 @@ 16.13 BUILD_DEPENDS="glib-dev libsigc++-dev" 16.14 SPLIT="libgiomm $PACKAGE-dev" 16.15 16.16 +COPY_std="libglibmm*.so*" 16.17 +COPY_libgiomm="libgiomm*.so*" 16.18 +COPY_dev="@std @rm @dev" # perl and dev 16.19 + 16.20 +DEPENDS="glib libsigc++" 16.21 +DEPENDS_libgiomm="glib glibmm libsigc++" 16.22 +DEPENDS_dev="glibmm libgiomm glib-dev libsigc++-dev perl" 16.23 + 16.24 +CAT_libgiomm="x-window|GIO Framework" 16.25 + 16.26 compile_rules() { 16.27 sed -i "/^libdocdir =/ s|\$(book_name)|glibmm-$VERSION|" docs/Makefile.in 16.28 16.29 @@ -23,22 +33,3 @@ 16.30 make && 16.31 make install 16.32 } 16.33 - 16.34 -genpkg_rules() { 16.35 - case $PACKAGE in 16.36 - glibmm) 16.37 - copy libglibmm*.so* 16.38 - DEPENDS="glib libsigc++" 16.39 - ;; 16.40 - libgiomm) 16.41 - copy libgiomm*.so* 16.42 - DEPENDS="glib glibmm libsigc++" 16.43 - CAT="x-window|GIO Framework" 16.44 - ;; 16.45 - glibmm-dev) 16.46 - copy @dev 16.47 - DEPENDS="glibmm libgiomm \ 16.48 - glib-dev libsigc++-dev perl" 16.49 - ;; 16.50 - esac 16.51 -}
17.1 --- a/gobject-introspection/receipt Wed Dec 12 02:29:05 2018 +0200 17.2 +++ b/gobject-introspection/receipt Thu Dec 13 00:46:54 2018 +0200 17.3 @@ -1,7 +1,7 @@ 17.4 # SliTaz package receipt v2. 17.5 17.6 PACKAGE="gobject-introspection" 17.7 -VERSION="1.52.1" 17.8 +VERSION="1.58.2" 17.9 CATEGORY="development" 17.10 SHORT_DESC="Introspection system for GObject-based libraries" 17.11 MAINTAINER="devel@slitaz.org" 17.12 @@ -12,9 +12,16 @@ 17.13 TARBALL="$PACKAGE-$VERSION.tar.xz" 17.14 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 17.15 17.16 -BUILD_DEPENDS="glib-dev cairo-dev gtk-doc python-dev util-linux-mount-dev openssl-dev" 17.17 +BUILD_DEPENDS="glib-dev cairo-dev gtk-doc python-dev util-linux-mount-dev \ 17.18 +openssl-dev libffi-dev" 17.19 SPLIT="$PACKAGE-dev" 17.20 17.21 +COPY_std="@std *.typelib" 17.22 +COPY_dev="@std @dev @rm" 17.23 + 17.24 +DEPENDS_std="glib libffi python" 17.25 +DEPENDS_dev="gobject-introspection glib-dev libffi-dev" 17.26 + 17.27 compile_rules() { 17.28 ./configure \ 17.29 --disable-static \ 17.30 @@ -23,17 +30,3 @@ 17.31 make && 17.32 make install 17.33 } 17.34 - 17.35 -genpkg_rules() { 17.36 - case $PACKAGE in 17.37 - gobject-introspection) 17.38 - copy @std *.typelib 17.39 - rm -r $fs/usr/share 17.40 - DEPENDS="glib libffi python" 17.41 - ;; 17.42 - *-dev) 17.43 - copy @std @dev @rm 17.44 - DEPENDS="gobject-introspection glib-dev libffi-dev" 17.45 - ;; 17.46 - esac 17.47 -}
18.1 --- a/libsigc++/receipt Wed Dec 12 02:29:05 2018 +0200 18.2 +++ b/libsigc++/receipt Thu Dec 13 00:46:54 2018 +0200 18.3 @@ -1,7 +1,7 @@ 18.4 # SliTaz package receipt v2. 18.5 18.6 PACKAGE="libsigc++" 18.7 -VERSION="2.10.0" 18.8 +VERSION="2.10.1" 18.9 CATEGORY="system-tools" 18.10 SHORT_DESC="Callback Framework for C++" 18.11 MAINTAINER="devel@slitaz.org" 18.12 @@ -24,10 +24,3 @@ 18.13 make && 18.14 make install 18.15 } 18.16 - 18.17 -genpkg_rules() { 18.18 - case $PACKAGE in 18.19 - libsigc++) copy @std;; 18.20 - *-dev) copy @dev;; 18.21 - esac 18.22 -}
19.1 --- a/meson/receipt Wed Dec 12 02:29:05 2018 +0200 19.2 +++ b/meson/receipt Thu Dec 13 00:46:54 2018 +0200 19.3 @@ -1,7 +1,7 @@ 19.4 # SliTaz package receipt v2. 19.5 19.6 PACKAGE="meson" 19.7 -VERSION="0.48.2" 19.8 +VERSION="0.49.0" 19.9 CATEGORY="development" 19.10 SHORT_DESC="A high performance build system" 19.11 MAINTAINER="al.bobylev@gmail.com"
20.1 --- a/openssl/receipt Wed Dec 12 02:29:05 2018 +0200 20.2 +++ b/openssl/receipt Thu Dec 13 00:46:54 2018 +0200 20.3 @@ -1,7 +1,7 @@ 20.4 # SliTaz package receipt v2. 20.5 20.6 PACKAGE="openssl" 20.7 -VERSION="1.1.0h" 20.8 +VERSION="1.1.1a" 20.9 CATEGORY="security" 20.10 SHORT_DESC="Open source Secure Sockets Layer" 20.11 MAINTAINER="pascal.bellard@slitaz.org" 20.12 @@ -12,11 +12,13 @@ 20.13 TARBALL="$PACKAGE-$VERSION.tar.gz" 20.14 WGET_URL="https://www.openssl.org/source/$TARBALL" 20.15 # Integrity check: https://www.openssl.org/source/ 20.16 -TARBALL_SHA256="5835626cde9e99656585fc7aaa2302a73a7e1340bf8c14fd635a62c66802a517" 20.17 +TARBALL_SHA256="fc20130f8b7cbd2fb918b2f14e2f429e109c31ddd0fb38fc5d71d9ffed3f9f41" 20.18 20.19 BUILD_DEPENDS="perl zlib-dev" 20.20 SPLIT="$PACKAGE-dev" 20.21 20.22 +TAGS_std="SSL security" 20.23 + 20.24 compile_rules() { 20.25 # MAKEFLAGS make OpenSSL build fail. 20.26 unset MAKEFLAGS MAKE_ARGS 20.27 @@ -46,15 +48,3 @@ 20.28 testsuite() { 20.29 readelf -h $install/usr/bin/openssl 20.30 } 20.31 - 20.32 -genpkg_rules() { 20.33 - case $PACKAGE in 20.34 - openssl) 20.35 - copy @std 20.36 - TAGS="SSL security" 20.37 - ;; 20.38 - openssl-dev) 20.39 - copy @dev 20.40 - ;; 20.41 - esac 20.42 -}
21.1 Binary file zstd/.icon.png has changed
22.1 --- a/zstd/receipt Wed Dec 12 02:29:05 2018 +0200 22.2 +++ b/zstd/receipt Thu Dec 13 00:46:54 2018 +0200 22.3 @@ -1,7 +1,7 @@ 22.4 # SliTaz package receipt v2. 22.5 22.6 PACKAGE="zstd" 22.7 -VERSION="1.3.3" 22.8 +VERSION="1.3.7" 22.9 CATEGORY="base-system" 22.10 SHORT_DESC="Zstandard - Fast real-time compression algorithm" 22.11 MAINTAINER="pascal.bellard@slitaz.org" 22.12 @@ -11,22 +11,12 @@ 22.13 TARBALL="$PACKAGE-$VERSION.tar.gz" 22.14 WGET_URL="https://github.com/facebook/zstd/archive/v$VERSION.tar.gz" 22.15 22.16 -BUILD_DEPENDS="zlib-dev xz-dev lz4-dev" 22.17 +BUILD_DEPENDS="grep zlib-dev xz-dev lz4-dev" 22.18 SPLIT="$PACKAGE-dev" 22.19 22.20 +TAGS_std="compression" 22.21 + 22.22 compile_rules() { 22.23 make -C lib PREFIX=/usr install && 22.24 make -C programs PREFIX=/usr install 22.25 } 22.26 - 22.27 -genpkg_rules() { 22.28 - case $PACKAGE in 22.29 - zstd) 22.30 - copy @std 22.31 - TAGS="compression" 22.32 - ;; 22.33 - *-dev) 22.34 - copy @dev 22.35 - ;; 22.36 - esac 22.37 -}