# HG changeset patch # User Aleksej Bobylev # Date 1532169552 -10800 # Node ID 551851c90944ea61b794a0c358f0c292e39a8898 # Parent c200abf4e57f7f208a35caa4bd1514bcadd51ead fuse3: up (3.2.4); galculator: up (2.1.4); gcr: up (3.28.0); gdk-pixbuf: up (2.36.12) diff -r c200abf4e57f -r 551851c90944 fuse3/receipt --- a/fuse3/receipt Sat Jul 21 04:56:32 2018 +0300 +++ b/fuse3/receipt Sat Jul 21 13:39:12 2018 +0300 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="fuse3" -VERSION="3.1.1" # next releases require 'meson' currently unpackaged +VERSION="3.2.4" CATEGORY="system-tools" SHORT_DESC="FUSE Filsystem in Userspace" MAINTAINER="al.bobylev@gmail.com" @@ -10,28 +10,30 @@ LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/fuse.html" REPOLOGY="fuse" -TARBALL="fuse-$VERSION.tar.gz" +TARBALL="fuse-$VERSION.tar.xz" WGET_URL="https://github.com/libfuse/libfuse/releases/download/fuse-$VERSION/$TARBALL" -BUILD_DEPENDS="util-linux-mount" +BUILD_DEPENDS="meson ninja eudev-dev" SPLIT="fuse-common fuse3 fuse3-dev" compile_rules() { - export MOUNT_FUSE_PATH=/usr/bin - ./configure \ - --disable-static \ - $CONFIGURE_ARGS && - fix libtool && - make && - make install || return 1 + mkdir build + cd build + + # -Db_lto: see https://github.com/libfuse/libfuse/issues/198 + meson-wrapper \ + -Db_lto=false \ + .. && + ninja && + ninja install || return 1 rm -rf $install/etc/init.d # handled by udev rm -rf $install/dev - cook_pick_docs doc/html/ doc/kernel.txt + install -Dm644 $stuff/fuse.conf $install/etc/fuse.conf - cp $stuff/fuse.conf $install/etc + cook_pick_docs $src/doc/html/ $src/doc/*.txt $src/doc/*.pdf } # packaging notes: https://github.com/libfuse/libfuse/releases/tag/fuse-3.0.0 @@ -39,7 +41,7 @@ case $PACKAGE in fuse-common) copy fuse.conf *.rules - DEPENDS="util-linux-mount" + DEPENDS=" " CAT="system-tools|common files" CONFIG_FILES="/etc/fuse.conf" ;; diff -r c200abf4e57f -r 551851c90944 fuse3/stuff/patches/fix-realpath.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/fuse3/stuff/patches/fix-realpath.patch Sat Jul 21 13:39:12 2018 +0300 @@ -0,0 +1,28 @@ +--- fuse-3.1.0.orig/util/fusermount.c ++++ fuse-3.1.0/util/fusermount.c +@@ -1200,19 +1200,16 @@ + + origmnt = argv[optind]; + +- drop_privs(); + mnt = fuse_mnt_resolve_path(progname, origmnt); +- if (mnt != NULL) { +- res = chdir("/"); +- if (res == -1) { +- fprintf(stderr, "%s: failed to chdir to '/'\n", progname); +- goto err_out; +- } +- } +- restore_privs(); + if (mnt == NULL) + exit(1); + ++ res = chdir("/"); ++ if (res == -1) { ++ fprintf(stderr, "%s: failed to chdir to '/'\n", progname); ++ exit(1); ++ } ++ + umask(033); + if (unmount) + goto do_unmount; diff -r c200abf4e57f -r 551851c90944 fuse3/stuff/patches/series --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/fuse3/stuff/patches/series Sat Jul 21 13:39:12 2018 +0300 @@ -0,0 +1,3 @@ +# from Alpine Linux: +# https://git.alpinelinux.org/cgit/aports/tree/testing/fuse3?h=master +fix-realpath.patch diff -r c200abf4e57f -r 551851c90944 galculator/.icon.png Binary file galculator/.icon.png has changed diff -r c200abf4e57f -r 551851c90944 galculator/receipt --- a/galculator/receipt Sat Jul 21 04:56:32 2018 +0300 +++ b/galculator/receipt Sat Jul 21 13:39:12 2018 +0300 @@ -1,41 +1,31 @@ # SliTaz package receipt v2. PACKAGE="galculator" -VERSION="2.1.3" +VERSION="2.1.4" CATEGORY="system-tools" SHORT_DESC="Graphical scientific calculator" MAINTAINER="pankso@slitaz.org" LICENSE="GPL2" -WEB_SITE="http://galculator.sourceforge.net/" +WEB_SITE="http://galculator.mnim.org/" -TARBALL="$PACKAGE-$VERSION.tar.gz" -WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" +TARBALL="$PACKAGE-$VERSION.tar.bz2" +WGET_URL="http://galculator.mnim.org/downloads/$TARBALL" -BUILD_DEPENDS="gtk+-dev flex sdft intltool" +BUILD_DEPENDS="gtk+-dev flex intltool" COOKOPTS="!pixmaps !menus" compile_rules() { - # Binutils 2.22 break many packages build without LDFLAGS set correctly. - export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries" - ./configure \ --disable-gtk3 \ - --disable-quadmath \ $CONFIGURE_ARGS && fix libtool && make && make install || return 1 - sdft $install/usr/share/applications/galculator.desktop -i -tf \ - -a "Name[fr]=Calculatrice scientifique" \ - -a "Name[pt]=Calculadora Científica" \ - -a "Name[pt_BR]=Calculadora Científica" \ - -a "Name[ru]=Инженерный калькулятор" \ - -a "Name[zh_CN]=科学计算器" \ - -a "Comment[ru]=Выполняйте простые и инженерные вычисления" \ - -s "Icon=accessories-calculator" \ - -s "Categories=Utility;Calculator;" + sed -i 's|Icon=.*|Icon=accessories-calculator|; + s|Categories=.*|Categories=Utility;Calculator;|' \ + $install/usr/share/applications/galculator.desktop } genpkg_rules() { @@ -43,5 +33,5 @@ rm -r $fs/usr/share/pixmaps find $fs -name '*gtk3*' -delete sed -i 's|^[ ]*||g' $fs/usr/share/galculator/ui/* - DEPENDS="gtk+" + DEPENDS="glib gtk+ pango" } diff -r c200abf4e57f -r 551851c90944 gcr/receipt --- a/gcr/receipt Sat Jul 21 04:56:32 2018 +0300 +++ b/gcr/receipt Sat Jul 21 13:39:12 2018 +0300 @@ -1,13 +1,13 @@ # SliTaz package receipt v2. PACKAGE="gcr" -VERSION="3.20.0" +VERSION="3.28.0" CATEGORY="security" SHORT_DESC="Displaying certificates and accessing key stores" MAINTAINER="al.bobylev@gmail.com" LICENSE="GPL2" WEB_SITE="https://developer.gnome.org/gcr/" -LFS="http://www.linuxfromscratch.org/blfs/view/stable/gnome/gcr.html" +LFS="http://www.linuxfromscratch.org/blfs/view/svn/gnome/gcr.html" TARBALL="$PACKAGE-$VERSION.tar.xz" WGET_URL="$GNOME_MIRROR/gcr/${VERSION%.*}/$TARBALL" diff -r c200abf4e57f -r 551851c90944 gdk-pixbuf/receipt --- a/gdk-pixbuf/receipt Sat Jul 21 04:56:32 2018 +0300 +++ b/gdk-pixbuf/receipt Sat Jul 21 13:39:12 2018 +0300 @@ -1,20 +1,22 @@ # SliTaz package receipt v2. PACKAGE="gdk-pixbuf" -VERSION="2.36.5" +VERSION="2.36.12" CATEGORY="x-window" SHORT_DESC="An image loading library for GTK+2" MAINTAINER="slaxemulator@gmail.com" LICENSE="GPL2" WEB_SITE="http://www.gtk.org/" +LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/gdk-pixbuf.html" TARBALL="$PACKAGE-$VERSION.tar.xz" WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" BUILD_DEPENDS_arm="glib-dev gettext tiff-dev libpng16-dev libjpeg-turbo-dev \ xorg-libX11-dev gtk-doc" -BUILD_DEPENDS="glib-dev gettext tiff-dev libpng16-dev libjpeg-turbo-dev \ -xorg-libX11-dev gobject-introspection-dev gtk-doc util-linux-mount-dev" +BUILD_DEPENDS="glib-dev perl gettext tiff-dev libjpeg-turbo-dev libpng16-dev \ +shared-mime-info-dev xorg-libX11-dev gobject-introspection-dev" + SPLIT="gdk-pixbuf-dev" compile_rules() {