wok-next rev 20899

fuse3: up (3.2.4); galculator: up (2.1.4); gcr: up (3.28.0); gdk-pixbuf: up (2.36.12)
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sat Jul 21 13:39:12 2018 +0300 (2018-07-21)
parents c200abf4e57f
children 241675069a75
files fuse3/receipt fuse3/stuff/patches/fix-realpath.patch fuse3/stuff/patches/series galculator/.icon.png galculator/receipt gcr/receipt gdk-pixbuf/receipt
line diff
     1.1 --- a/fuse3/receipt	Sat Jul 21 04:56:32 2018 +0300
     1.2 +++ b/fuse3/receipt	Sat Jul 21 13:39:12 2018 +0300
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt v2.
     1.5  
     1.6  PACKAGE="fuse3"
     1.7 -VERSION="3.1.1"		# next releases require 'meson' currently unpackaged
     1.8 +VERSION="3.2.4"
     1.9  CATEGORY="system-tools"
    1.10  SHORT_DESC="FUSE Filsystem in Userspace"
    1.11  MAINTAINER="al.bobylev@gmail.com"
    1.12 @@ -10,28 +10,30 @@
    1.13  LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/fuse.html"
    1.14  REPOLOGY="fuse"
    1.15  
    1.16 -TARBALL="fuse-$VERSION.tar.gz"
    1.17 +TARBALL="fuse-$VERSION.tar.xz"
    1.18  WGET_URL="https://github.com/libfuse/libfuse/releases/download/fuse-$VERSION/$TARBALL"
    1.19  
    1.20 -BUILD_DEPENDS="util-linux-mount"
    1.21 +BUILD_DEPENDS="meson ninja eudev-dev"
    1.22  SPLIT="fuse-common fuse3 fuse3-dev"
    1.23  
    1.24  compile_rules() {
    1.25 -	export MOUNT_FUSE_PATH=/usr/bin
    1.26 -	./configure \
    1.27 -		--disable-static \
    1.28 -		$CONFIGURE_ARGS &&
    1.29 -	fix libtool &&
    1.30 -	make &&
    1.31 -	make install || return 1
    1.32 +	mkdir build
    1.33 +	cd    build
    1.34 +
    1.35 +	# -Db_lto: see https://github.com/libfuse/libfuse/issues/198
    1.36 +	meson-wrapper \
    1.37 +		-Db_lto=false \
    1.38 +		.. &&
    1.39 +	ninja &&
    1.40 +	ninja install || return 1
    1.41  
    1.42  	rm -rf $install/etc/init.d
    1.43  	# handled by udev
    1.44  	rm -rf $install/dev
    1.45  
    1.46 -	cook_pick_docs doc/html/ doc/kernel.txt
    1.47 +	install -Dm644 $stuff/fuse.conf $install/etc/fuse.conf
    1.48  
    1.49 -	cp $stuff/fuse.conf $install/etc
    1.50 +	cook_pick_docs $src/doc/html/ $src/doc/*.txt $src/doc/*.pdf
    1.51  }
    1.52  
    1.53  # packaging notes: https://github.com/libfuse/libfuse/releases/tag/fuse-3.0.0
    1.54 @@ -39,7 +41,7 @@
    1.55  	case $PACKAGE in
    1.56  		fuse-common)
    1.57  			copy fuse.conf *.rules
    1.58 -			DEPENDS="util-linux-mount"
    1.59 +			DEPENDS=" "
    1.60  			CAT="system-tools|common files"
    1.61  			CONFIG_FILES="/etc/fuse.conf"
    1.62  			;;
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/fuse3/stuff/patches/fix-realpath.patch	Sat Jul 21 13:39:12 2018 +0300
     2.3 @@ -0,0 +1,28 @@
     2.4 +--- fuse-3.1.0.orig/util/fusermount.c
     2.5 ++++ fuse-3.1.0/util/fusermount.c
     2.6 +@@ -1200,19 +1200,16 @@
     2.7 + 
     2.8 + 	origmnt = argv[optind];
     2.9 + 
    2.10 +-	drop_privs();
    2.11 + 	mnt = fuse_mnt_resolve_path(progname, origmnt);
    2.12 +-	if (mnt != NULL) {
    2.13 +-		res = chdir("/");
    2.14 +-		if (res == -1) {
    2.15 +-			fprintf(stderr, "%s: failed to chdir to '/'\n", progname);
    2.16 +-			goto err_out;
    2.17 +-		}
    2.18 +-	}
    2.19 +-	restore_privs();
    2.20 + 	if (mnt == NULL)
    2.21 + 		exit(1);
    2.22 + 
    2.23 ++	res = chdir("/");
    2.24 ++	if (res == -1) {
    2.25 ++		fprintf(stderr, "%s: failed to chdir to '/'\n", progname);
    2.26 ++		exit(1);
    2.27 ++	}
    2.28 ++
    2.29 + 	umask(033);
    2.30 + 	if (unmount)
    2.31 + 		goto do_unmount;
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/fuse3/stuff/patches/series	Sat Jul 21 13:39:12 2018 +0300
     3.3 @@ -0,0 +1,3 @@
     3.4 +# from Alpine Linux:
     3.5 +# https://git.alpinelinux.org/cgit/aports/tree/testing/fuse3?h=master
     3.6 +fix-realpath.patch
     4.1 Binary file galculator/.icon.png has changed
     5.1 --- a/galculator/receipt	Sat Jul 21 04:56:32 2018 +0300
     5.2 +++ b/galculator/receipt	Sat Jul 21 13:39:12 2018 +0300
     5.3 @@ -1,41 +1,31 @@
     5.4  # SliTaz package receipt v2.
     5.5  
     5.6  PACKAGE="galculator"
     5.7 -VERSION="2.1.3"
     5.8 +VERSION="2.1.4"
     5.9  CATEGORY="system-tools"
    5.10  SHORT_DESC="Graphical scientific calculator"
    5.11  MAINTAINER="pankso@slitaz.org"
    5.12  LICENSE="GPL2"
    5.13 -WEB_SITE="http://galculator.sourceforge.net/"
    5.14 +WEB_SITE="http://galculator.mnim.org/"
    5.15  
    5.16 -TARBALL="$PACKAGE-$VERSION.tar.gz"
    5.17 -WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    5.18 +TARBALL="$PACKAGE-$VERSION.tar.bz2"
    5.19 +WGET_URL="http://galculator.mnim.org/downloads/$TARBALL"
    5.20  
    5.21 -BUILD_DEPENDS="gtk+-dev flex sdft intltool"
    5.22 +BUILD_DEPENDS="gtk+-dev flex intltool"
    5.23  
    5.24  COOKOPTS="!pixmaps !menus"
    5.25  
    5.26  compile_rules() {
    5.27 -	# Binutils 2.22 break many packages build without LDFLAGS set correctly.
    5.28 -	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries"
    5.29 -
    5.30  	./configure \
    5.31  		--disable-gtk3 \
    5.32 -		--disable-quadmath \
    5.33  		$CONFIGURE_ARGS &&
    5.34  	fix libtool &&
    5.35  	make &&
    5.36  	make install || return 1
    5.37  
    5.38 -	sdft $install/usr/share/applications/galculator.desktop -i -tf \
    5.39 -		-a "Name[fr]=Calculatrice scientifique" \
    5.40 -		-a "Name[pt]=Calculadora Científica" \
    5.41 -		-a "Name[pt_BR]=Calculadora Científica" \
    5.42 -		-a "Name[ru]=Инженерный калькулятор" \
    5.43 -		-a "Name[zh_CN]=科学计算器" \
    5.44 -		-a "Comment[ru]=Выполняйте простые и инженерные вычисления" \
    5.45 -		-s "Icon=accessories-calculator" \
    5.46 -		-s "Categories=Utility;Calculator;"
    5.47 +	sed -i 's|Icon=.*|Icon=accessories-calculator|;
    5.48 +		s|Categories=.*|Categories=Utility;Calculator;|' \
    5.49 +		$install/usr/share/applications/galculator.desktop
    5.50  }
    5.51  
    5.52  genpkg_rules() {
    5.53 @@ -43,5 +33,5 @@
    5.54  	rm -r $fs/usr/share/pixmaps
    5.55  	find $fs -name '*gtk3*' -delete
    5.56  	sed -i 's|^[ ]*||g' $fs/usr/share/galculator/ui/*
    5.57 -	DEPENDS="gtk+"
    5.58 +	DEPENDS="glib gtk+ pango"
    5.59  }
     6.1 --- a/gcr/receipt	Sat Jul 21 04:56:32 2018 +0300
     6.2 +++ b/gcr/receipt	Sat Jul 21 13:39:12 2018 +0300
     6.3 @@ -1,13 +1,13 @@
     6.4  # SliTaz package receipt v2.
     6.5  
     6.6  PACKAGE="gcr"
     6.7 -VERSION="3.20.0"
     6.8 +VERSION="3.28.0"
     6.9  CATEGORY="security"
    6.10  SHORT_DESC="Displaying certificates and accessing key stores"
    6.11  MAINTAINER="al.bobylev@gmail.com"
    6.12  LICENSE="GPL2"
    6.13  WEB_SITE="https://developer.gnome.org/gcr/"
    6.14 -LFS="http://www.linuxfromscratch.org/blfs/view/stable/gnome/gcr.html"
    6.15 +LFS="http://www.linuxfromscratch.org/blfs/view/svn/gnome/gcr.html"
    6.16  
    6.17  TARBALL="$PACKAGE-$VERSION.tar.xz"
    6.18  WGET_URL="$GNOME_MIRROR/gcr/${VERSION%.*}/$TARBALL"
     7.1 --- a/gdk-pixbuf/receipt	Sat Jul 21 04:56:32 2018 +0300
     7.2 +++ b/gdk-pixbuf/receipt	Sat Jul 21 13:39:12 2018 +0300
     7.3 @@ -1,20 +1,22 @@
     7.4  # SliTaz package receipt v2.
     7.5  
     7.6  PACKAGE="gdk-pixbuf"
     7.7 -VERSION="2.36.5"
     7.8 +VERSION="2.36.12"
     7.9  CATEGORY="x-window"
    7.10  SHORT_DESC="An image loading library for GTK+2"
    7.11  MAINTAINER="slaxemulator@gmail.com"
    7.12  LICENSE="GPL2"
    7.13  WEB_SITE="http://www.gtk.org/"
    7.14 +LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/gdk-pixbuf.html"
    7.15  
    7.16  TARBALL="$PACKAGE-$VERSION.tar.xz"
    7.17  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
    7.18  
    7.19  BUILD_DEPENDS_arm="glib-dev gettext tiff-dev libpng16-dev libjpeg-turbo-dev \
    7.20  xorg-libX11-dev gtk-doc"
    7.21 -BUILD_DEPENDS="glib-dev gettext tiff-dev libpng16-dev libjpeg-turbo-dev \
    7.22 -xorg-libX11-dev gobject-introspection-dev gtk-doc util-linux-mount-dev"
    7.23 +BUILD_DEPENDS="glib-dev perl gettext tiff-dev libjpeg-turbo-dev libpng16-dev \
    7.24 +shared-mime-info-dev xorg-libX11-dev gobject-introspection-dev"
    7.25 +
    7.26  SPLIT="gdk-pixbuf-dev"
    7.27  
    7.28  compile_rules() {