wok-next rev 20629

Up aalib, babl, exiv2, fontconfig, gnome-themes-standard, json-glib, mousepad
author Aleksej Bobylev <al.bobylev@gmail.com>
date Thu Apr 26 21:51:47 2018 +0300 (2018-04-26)
parents 917cbaa57ad2
children 43798211bff4
files aalib/receipt babl/receipt exiv2/receipt fontconfig/receipt fontconfig/stuff/patches/fontconfig.patch fontconfig/stuff/patches/series fribidi/receipt gnome-themes-standard/receipt json-glib/receipt mousepad/receipt
line diff
     1.1 --- a/aalib/receipt	Thu Apr 26 16:25:04 2018 +0300
     1.2 +++ b/aalib/receipt	Thu Apr 26 21:51:47 2018 +0300
     1.3 @@ -7,6 +7,7 @@
     1.4  MAINTAINER="slaxemulator@gmail.com"
     1.5  LICENSE="LGPL2"
     1.6  WEB_SITE="http://aa-project.sourceforge.net/aalib/"
     1.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/aalib.html"
     1.8  
     1.9  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.10  WGET_URL="$SF_MIRROR/aa-project/$TARBALL"
    1.11 @@ -15,7 +16,9 @@
    1.12  SPLIT="aalib-dev"
    1.13  
    1.14  compile_rules() {
    1.15 -	./configure $CONFIGURE_ARGS &&
    1.16 +	./configure \
    1.17 +		--disable-static \
    1.18 +		$CONFIGURE_ARGS &&
    1.19  	fix libtool &&
    1.20  	make &&
    1.21  	make DESTDIR=$DESTDIR install
    1.22 @@ -25,7 +28,7 @@
    1.23  	case $PACKAGE in
    1.24  		aalib)
    1.25  			copy @std
    1.26 -			DEPENDS="ncurses xorg-libXt xorg-libX11"
    1.27 +			DEPENDS="ncurses xorg-libX11"
    1.28  			;;
    1.29  		*-dev) copy @dev;;
    1.30  	esac
     2.1 --- a/babl/receipt	Thu Apr 26 16:25:04 2018 +0300
     2.2 +++ b/babl/receipt	Thu Apr 26 21:51:47 2018 +0300
     2.3 @@ -1,12 +1,13 @@
     2.4  # SliTaz package receipt v2.
     2.5  
     2.6  PACKAGE="babl"
     2.7 -VERSION="0.1.26"
     2.8 +VERSION="0.1.42"
     2.9  CATEGORY="system-tools"
    2.10  SHORT_DESC="Pixel format translation library"
    2.11  MAINTAINER="erjo@slitaz.org"
    2.12  LICENSE="LGPL3"
    2.13  WEB_SITE="http://gegl.org/babl/"
    2.14 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/babl.html"
    2.15  
    2.16  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    2.17  WGET_URL="https://download.gimp.org/pub/babl/${VERSION%.*}/$TARBALL"
     3.1 --- a/exiv2/receipt	Thu Apr 26 16:25:04 2018 +0300
     3.2 +++ b/exiv2/receipt	Thu Apr 26 21:51:47 2018 +0300
     3.3 @@ -7,6 +7,7 @@
     3.4  MAINTAINER="jozee@slitaz.org"
     3.5  LICENSE="GPL2"
     3.6  WEB_SITE="http://www.exiv2.org/"
     3.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/exiv2.html"
     3.8  
     3.9  TARBALL="$PACKAGE-$VERSION.tar.gz"
    3.10  WGET_URL="http://www.exiv2.org/builds/exiv2-$VERSION-trunk.tar.gz"
     4.1 --- a/fontconfig/receipt	Thu Apr 26 16:25:04 2018 +0300
     4.2 +++ b/fontconfig/receipt	Thu Apr 26 21:51:47 2018 +0300
     4.3 @@ -1,15 +1,16 @@
     4.4  # SliTaz package receipt v2.
     4.5  
     4.6  PACKAGE="fontconfig"
     4.7 -VERSION="2.12.4"
     4.8 +VERSION="2.12.6"
     4.9  CATEGORY="x-window"
    4.10  SHORT_DESC="Font configuration utilities and library"
    4.11  MAINTAINER="pankso@slitaz.org"
    4.12  LICENSE="MIT"
    4.13  WEB_SITE="https://www.freedesktop.org/wiki/Software/fontconfig/"
    4.14 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/fontconfig.html"
    4.15  
    4.16  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    4.17 -WGET_URL="http://www.freedesktop.org/software/fontconfig/release/$TARBALL"
    4.18 +WGET_URL="https://www.freedesktop.org/software/fontconfig/release/$TARBALL"
    4.19  
    4.20  BUILD_DEPENDS="libxml2-dev freetype-dev gperf"
    4.21  SPLIT="fontconfig-dev"
    4.22 @@ -17,6 +18,7 @@
    4.23  compile_rules() {
    4.24  	rm -f src/fcobjshash.h
    4.25  
    4.26 +#	aclocal
    4.27  	./configure \
    4.28  		--with-arch=$ARCH \
    4.29  		--disable-static \
    4.30 @@ -26,42 +28,18 @@
    4.31  		$CONFIGURE_ARGS &&
    4.32  	fix libtool &&
    4.33  	make &&
    4.34 -	make DESTDIR=$install install || return 1
    4.35 -
    4.36 -
    4.37 -	# FIXME: Which the app uses the next?
    4.38 -	# FIXME: There are 10-hinting-{full,medium,none,slight}.conf already exists...
    4.39 -	cd $install/usr/share/fontconfig/conf.avail
    4.40 -	for h in hintslight hintmedium hintfull; do
    4.41 -		cat > 10-hintstyle-$h.conf <<EOT
    4.42 -<match target="font">
    4.43 -	<edit mode="append" name="hintstyle">
    4.44 -		<const>${h}</const>
    4.45 -	</edit>
    4.46 -</match>
    4.47 -EOT
    4.48 -	done
    4.49 -
    4.50 -	ln -s /usr/share/fontconfig/conf.avail/11-lcdfilter-default.conf \
    4.51 -		$install/etc/fonts/conf.d
    4.52 -
    4.53 -	# Fontconfig warning: "/etc/fonts/conf.d/50-user.conf", line 14: reading
    4.54 -	# configurations from ~/.fonts.conf is deprecated.
    4.55 -	sed -i '/~\/\.fonts\.conf</d' \
    4.56 -		$install/usr/share/fontconfig/conf.avail/50-user.conf
    4.57 -
    4.58 -	# chown -R root.root $fs
    4.59 +	make install
    4.60  }
    4.61  
    4.62  genpkg_rules() {
    4.63  	case $PACKAGE in
    4.64  		fontconfig)
    4.65  			copy @std
    4.66 -			DEPENDS="bzlib freetype liblzma liblzma libpng16 libxml2 zlib"
    4.67 +			DEPENDS="freetype libxml2"
    4.68  			;;
    4.69  		*-dev)
    4.70  			copy @dev
    4.71 -			DEPENDS="fontconfig freetype-dev libpng16-dev libxml2-dev"
    4.72 +			DEPENDS="fontconfig freetype-dev libxml2-dev"
    4.73  			;;
    4.74  	esac
    4.75  }
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/fontconfig/stuff/patches/fontconfig.patch	Thu Apr 26 21:51:47 2018 +0300
     5.3 @@ -0,0 +1,36 @@
     5.4 +Fix fontconfig warning: "/etc/fonts/conf.d/50-user.conf", line 14: reading
     5.5 +configurations from ~/.fonts.conf is deprecated.
     5.6 +
     5.7 +--- a/conf.d/50-user.conf
     5.8 ++++ b/conf.d/50-user.conf
     5.9 +@@ -9,7 +9,4 @@
    5.10 + 	-->
    5.11 + 	<include ignore_missing="yes" prefix="xdg">fontconfig/conf.d</include>
    5.12 + 	<include ignore_missing="yes" prefix="xdg">fontconfig/fonts.conf</include>
    5.13 +-	<!-- the following elements will be removed in the future -->
    5.14 +-	<include ignore_missing="yes" deprecated="yes">~/.fonts.conf.d</include>
    5.15 +-	<include ignore_missing="yes" deprecated="yes">~/.fonts.conf</include>
    5.16 + </fontconfig>
    5.17 +
    5.18 +Add default LCD filter by default.
    5.19 +
    5.20 +--- a/conf.d/Makefile.am
    5.21 ++++ b/conf.d/Makefile.am
    5.22 +@@ -28,6 +28,7 @@
    5.23 + CONF_LINKS = \
    5.24 + 	10-hinting-$(PREFERRED_HINTING).conf	\
    5.25 + 	10-scale-bitmap-fonts.conf \
    5.26 ++	11-lcdfilter-default.conf \
    5.27 + 	20-unhint-small-vera.conf \
    5.28 + 	30-metric-aliases.conf \
    5.29 + 	40-nonlatin.conf \
    5.30 +--- a/conf.d/Makefile.in
    5.31 ++++ b/conf.d/Makefile.in
    5.32 +@@ -352,6 +352,7 @@
    5.33 + CONF_LINKS = \
    5.34 + 	10-hinting-$(PREFERRED_HINTING).conf	\
    5.35 + 	10-scale-bitmap-fonts.conf \
    5.36 ++	11-lcdfilter-default.conf \
    5.37 + 	20-unhint-small-vera.conf \
    5.38 + 	30-metric-aliases.conf \
    5.39 + 	40-nonlatin.conf \
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/fontconfig/stuff/patches/series	Thu Apr 26 21:51:47 2018 +0300
     6.3 @@ -0,0 +1,1 @@
     6.4 +fontconfig.patch
     7.1 --- a/fribidi/receipt	Thu Apr 26 16:25:04 2018 +0300
     7.2 +++ b/fribidi/receipt	Thu Apr 26 21:51:47 2018 +0300
     7.3 @@ -1,15 +1,16 @@
     7.4  # SliTaz package receipt v2.
     7.5  
     7.6  PACKAGE="fribidi"
     7.7 -VERSION="0.19.7"
     7.8 +VERSION="1.0.1"
     7.9  CATEGORY="x-window"
    7.10  SHORT_DESC="Implementation of the Unicode Bidirectional Algorithm"
    7.11  MAINTAINER="pankso@slitaz.org"
    7.12  LICENSE="LGPL2.1"
    7.13 -WEB_SITE="https://www.fribidi.org/"
    7.14 +WEB_SITE="https://github.com/fribidi/fribidi/"
    7.15 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/fribidi.html"
    7.16  
    7.17  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    7.18 -WGET_URL="http://fribidi.org/download/$TARBALL"
    7.19 +WGET_URL="https://github.com/fribidi/fribidi/releases/download/v$VERSION/$TARBALL"
    7.20  
    7.21  BUILD_DEPENDS="glib-dev"
    7.22  SPLIT="fribidi-dev"
    7.23 @@ -23,13 +24,7 @@
    7.24  
    7.25  genpkg_rules() {
    7.26  	case $PACKAGE in
    7.27 -		fribidi)
    7.28 -			copy @std
    7.29 -			DEPENDS="glib pcre"
    7.30 -			;;
    7.31 -		*-dev)
    7.32 -			copy @dev
    7.33 -			DEPENDS="fribidi glib-dev pcre-dev"
    7.34 -			;;
    7.35 +		fribidi) copy @std;;
    7.36 +		*-dev)   copy @dev;;
    7.37  	esac
    7.38  }
     8.1 --- a/gnome-themes-standard/receipt	Thu Apr 26 16:25:04 2018 +0300
     8.2 +++ b/gnome-themes-standard/receipt	Thu Apr 26 21:51:47 2018 +0300
     8.3 @@ -15,6 +15,7 @@
     8.4  BUILD_DEPENDS="automake glib-dev intltool gtk+3-dev librsvg-dev gtk+-dev"
     8.5  
     8.6  compile_rules() {
     8.7 +	aclocal
     8.8  	./configure $CONFIGURE_ARGS &&
     8.9  	fix libtool &&
    8.10  	make &&
     9.1 --- a/json-glib/receipt	Thu Apr 26 16:25:04 2018 +0300
     9.2 +++ b/json-glib/receipt	Thu Apr 26 21:51:47 2018 +0300
     9.3 @@ -1,7 +1,7 @@
     9.4  # SliTaz package receipt v2.
     9.5  
     9.6  PACKAGE="json-glib"
     9.7 -VERSION="1.2.8"
     9.8 +VERSION="1.4.2"
     9.9  CATEGORY="development"
    9.10  SHORT_DESC="JSON parser for GLib"
    9.11  MAINTAINER="mallory@sweetpeople.org"
    9.12 @@ -12,28 +12,29 @@
    9.13  TARBALL="$PACKAGE-$VERSION.tar.xz"
    9.14  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
    9.15  
    9.16 -BUILD_DEPENDS="glib-dev gtk-doc libxslt-dev gobject-introspection-dev gettext"
    9.17 +BUILD_DEPENDS="meson ninja glib-dev gobject-introspection-dev gettext"
    9.18  SPLIT="json-glib-dev"
    9.19  
    9.20  compile_rules() {
    9.21 -	./configure $CONFIGURE_ARGS &&
    9.22 -	fix libtool &&
    9.23 -	make &&
    9.24 -	make install
    9.25 +	mkdir build
    9.26 +	cd    build
    9.27 +
    9.28 +	meson-wrapper .. &&
    9.29 +	ninja &&
    9.30 +	ninja install
    9.31  }
    9.32  
    9.33  genpkg_rules() {
    9.34  	case $PACKAGE in
    9.35  		json-glib)
    9.36  			copy @std
    9.37 +			rm -r $fs/usr/lib/installed-tests/ $fs/usr/share/
    9.38  			DEPENDS="glib"
    9.39  			TAGS="javascript"
    9.40  			;;
    9.41  		*-dev)
    9.42 -			copy @dev
    9.43 -			DEPENDS="json-glib glib-dev libffi-dev pcre-dev \
    9.44 -			util-linux-blkid-dev util-linux-mount-dev util-linux-uuid-dev \
    9.45 -			zlib-dev"
    9.46 +			copy @std @rm @dev
    9.47 +			DEPENDS="json-glib glib-dev"
    9.48  			;;
    9.49  	esac
    9.50  }
    10.1 --- a/mousepad/receipt	Thu Apr 26 16:25:04 2018 +0300
    10.2 +++ b/mousepad/receipt	Thu Apr 26 21:51:47 2018 +0300
    10.3 @@ -7,6 +7,7 @@
    10.4  MAINTAINER="erjo@slitaz.org"
    10.5  LICENSE="GPL2"
    10.6  WEB_SITE="http://www.xfce.org/"
    10.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/mousepad.html"
    10.8  
    10.9  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   10.10  WGET_URL="http://archive.xfce.org/src/apps/$PACKAGE/${VERSION%.*}/$TARBALL"