# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1524768707 -10800
# Node ID 89ae9cf3b2308b5afa49548f9d46d83c221a6bc9
# Parent  917cbaa57ad2edcf3e928aeead401ad4cce0dbe9
Up aalib, babl, exiv2, fontconfig, gnome-themes-standard, json-glib, mousepad

diff -r 917cbaa57ad2 -r 89ae9cf3b230 aalib/receipt
--- a/aalib/receipt	Thu Apr 26 16:25:04 2018 +0300
+++ b/aalib/receipt	Thu Apr 26 21:51:47 2018 +0300
@@ -7,6 +7,7 @@
 MAINTAINER="slaxemulator@gmail.com"
 LICENSE="LGPL2"
 WEB_SITE="http://aa-project.sourceforge.net/aalib/"
+LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/aalib.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/aa-project/$TARBALL"
@@ -15,7 +16,9 @@
 SPLIT="aalib-dev"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS &&
+	./configure \
+		--disable-static \
+		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
@@ -25,7 +28,7 @@
 	case $PACKAGE in
 		aalib)
 			copy @std
-			DEPENDS="ncurses xorg-libXt xorg-libX11"
+			DEPENDS="ncurses xorg-libX11"
 			;;
 		*-dev) copy @dev;;
 	esac
diff -r 917cbaa57ad2 -r 89ae9cf3b230 babl/receipt
--- a/babl/receipt	Thu Apr 26 16:25:04 2018 +0300
+++ b/babl/receipt	Thu Apr 26 21:51:47 2018 +0300
@@ -1,12 +1,13 @@
 # SliTaz package receipt v2.
 
 PACKAGE="babl"
-VERSION="0.1.26"
+VERSION="0.1.42"
 CATEGORY="system-tools"
 SHORT_DESC="Pixel format translation library"
 MAINTAINER="erjo@slitaz.org"
 LICENSE="LGPL3"
 WEB_SITE="http://gegl.org/babl/"
+LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/babl.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://download.gimp.org/pub/babl/${VERSION%.*}/$TARBALL"
diff -r 917cbaa57ad2 -r 89ae9cf3b230 exiv2/receipt
--- a/exiv2/receipt	Thu Apr 26 16:25:04 2018 +0300
+++ b/exiv2/receipt	Thu Apr 26 21:51:47 2018 +0300
@@ -7,6 +7,7 @@
 MAINTAINER="jozee@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.exiv2.org/"
+LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/exiv2.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.exiv2.org/builds/exiv2-$VERSION-trunk.tar.gz"
diff -r 917cbaa57ad2 -r 89ae9cf3b230 fontconfig/receipt
--- a/fontconfig/receipt	Thu Apr 26 16:25:04 2018 +0300
+++ b/fontconfig/receipt	Thu Apr 26 21:51:47 2018 +0300
@@ -1,15 +1,16 @@
 # SliTaz package receipt v2.
 
 PACKAGE="fontconfig"
-VERSION="2.12.4"
+VERSION="2.12.6"
 CATEGORY="x-window"
 SHORT_DESC="Font configuration utilities and library"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.freedesktop.org/wiki/Software/fontconfig/"
+LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/fontconfig.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="http://www.freedesktop.org/software/fontconfig/release/$TARBALL"
+WGET_URL="https://www.freedesktop.org/software/fontconfig/release/$TARBALL"
 
 BUILD_DEPENDS="libxml2-dev freetype-dev gperf"
 SPLIT="fontconfig-dev"
@@ -17,6 +18,7 @@
 compile_rules() {
 	rm -f src/fcobjshash.h
 
+#	aclocal
 	./configure \
 		--with-arch=$ARCH \
 		--disable-static \
@@ -26,42 +28,18 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$install install || return 1
-
-
-	# FIXME: Which the app uses the next?
-	# FIXME: There are 10-hinting-{full,medium,none,slight}.conf already exists...
-	cd $install/usr/share/fontconfig/conf.avail
-	for h in hintslight hintmedium hintfull; do
-		cat > 10-hintstyle-$h.conf <<EOT
-<match target="font">
-	<edit mode="append" name="hintstyle">
-		<const>${h}</const>
-	</edit>
-</match>
-EOT
-	done
-
-	ln -s /usr/share/fontconfig/conf.avail/11-lcdfilter-default.conf \
-		$install/etc/fonts/conf.d
-
-	# Fontconfig warning: "/etc/fonts/conf.d/50-user.conf", line 14: reading
-	# configurations from ~/.fonts.conf is deprecated.
-	sed -i '/~\/\.fonts\.conf</d' \
-		$install/usr/share/fontconfig/conf.avail/50-user.conf
-
-	# chown -R root.root $fs
+	make install
 }
 
 genpkg_rules() {
 	case $PACKAGE in
 		fontconfig)
 			copy @std
-			DEPENDS="bzlib freetype liblzma liblzma libpng16 libxml2 zlib"
+			DEPENDS="freetype libxml2"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="fontconfig freetype-dev libpng16-dev libxml2-dev"
+			DEPENDS="fontconfig freetype-dev libxml2-dev"
 			;;
 	esac
 }
diff -r 917cbaa57ad2 -r 89ae9cf3b230 fontconfig/stuff/patches/fontconfig.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fontconfig/stuff/patches/fontconfig.patch	Thu Apr 26 21:51:47 2018 +0300
@@ -0,0 +1,36 @@
+Fix fontconfig warning: "/etc/fonts/conf.d/50-user.conf", line 14: reading
+configurations from ~/.fonts.conf is deprecated.
+
+--- a/conf.d/50-user.conf
++++ b/conf.d/50-user.conf
+@@ -9,7 +9,4 @@
+ 	-->
+ 	<include ignore_missing="yes" prefix="xdg">fontconfig/conf.d</include>
+ 	<include ignore_missing="yes" prefix="xdg">fontconfig/fonts.conf</include>
+-	<!-- the following elements will be removed in the future -->
+-	<include ignore_missing="yes" deprecated="yes">~/.fonts.conf.d</include>
+-	<include ignore_missing="yes" deprecated="yes">~/.fonts.conf</include>
+ </fontconfig>
+
+Add default LCD filter by default.
+
+--- a/conf.d/Makefile.am
++++ b/conf.d/Makefile.am
+@@ -28,6 +28,7 @@
+ CONF_LINKS = \
+ 	10-hinting-$(PREFERRED_HINTING).conf	\
+ 	10-scale-bitmap-fonts.conf \
++	11-lcdfilter-default.conf \
+ 	20-unhint-small-vera.conf \
+ 	30-metric-aliases.conf \
+ 	40-nonlatin.conf \
+--- a/conf.d/Makefile.in
++++ b/conf.d/Makefile.in
+@@ -352,6 +352,7 @@
+ CONF_LINKS = \
+ 	10-hinting-$(PREFERRED_HINTING).conf	\
+ 	10-scale-bitmap-fonts.conf \
++	11-lcdfilter-default.conf \
+ 	20-unhint-small-vera.conf \
+ 	30-metric-aliases.conf \
+ 	40-nonlatin.conf \
diff -r 917cbaa57ad2 -r 89ae9cf3b230 fontconfig/stuff/patches/series
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fontconfig/stuff/patches/series	Thu Apr 26 21:51:47 2018 +0300
@@ -0,0 +1,1 @@
+fontconfig.patch
diff -r 917cbaa57ad2 -r 89ae9cf3b230 fribidi/receipt
--- a/fribidi/receipt	Thu Apr 26 16:25:04 2018 +0300
+++ b/fribidi/receipt	Thu Apr 26 21:51:47 2018 +0300
@@ -1,15 +1,16 @@
 # SliTaz package receipt v2.
 
 PACKAGE="fribidi"
-VERSION="0.19.7"
+VERSION="1.0.1"
 CATEGORY="x-window"
 SHORT_DESC="Implementation of the Unicode Bidirectional Algorithm"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="LGPL2.1"
-WEB_SITE="https://www.fribidi.org/"
+WEB_SITE="https://github.com/fribidi/fribidi/"
+LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/fribidi.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="http://fribidi.org/download/$TARBALL"
+WGET_URL="https://github.com/fribidi/fribidi/releases/download/v$VERSION/$TARBALL"
 
 BUILD_DEPENDS="glib-dev"
 SPLIT="fribidi-dev"
@@ -23,13 +24,7 @@
 
 genpkg_rules() {
 	case $PACKAGE in
-		fribidi)
-			copy @std
-			DEPENDS="glib pcre"
-			;;
-		*-dev)
-			copy @dev
-			DEPENDS="fribidi glib-dev pcre-dev"
-			;;
+		fribidi) copy @std;;
+		*-dev)   copy @dev;;
 	esac
 }
diff -r 917cbaa57ad2 -r 89ae9cf3b230 gnome-themes-standard/receipt
--- a/gnome-themes-standard/receipt	Thu Apr 26 16:25:04 2018 +0300
+++ b/gnome-themes-standard/receipt	Thu Apr 26 21:51:47 2018 +0300
@@ -15,6 +15,7 @@
 BUILD_DEPENDS="automake glib-dev intltool gtk+3-dev librsvg-dev gtk+-dev"
 
 compile_rules() {
+	aclocal
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
diff -r 917cbaa57ad2 -r 89ae9cf3b230 json-glib/receipt
--- a/json-glib/receipt	Thu Apr 26 16:25:04 2018 +0300
+++ b/json-glib/receipt	Thu Apr 26 21:51:47 2018 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="json-glib"
-VERSION="1.2.8"
+VERSION="1.4.2"
 CATEGORY="development"
 SHORT_DESC="JSON parser for GLib"
 MAINTAINER="mallory@sweetpeople.org"
@@ -12,28 +12,29 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="glib-dev gtk-doc libxslt-dev gobject-introspection-dev gettext"
+BUILD_DEPENDS="meson ninja glib-dev gobject-introspection-dev gettext"
 SPLIT="json-glib-dev"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS &&
-	fix libtool &&
-	make &&
-	make install
+	mkdir build
+	cd    build
+
+	meson-wrapper .. &&
+	ninja &&
+	ninja install
 }
 
 genpkg_rules() {
 	case $PACKAGE in
 		json-glib)
 			copy @std
+			rm -r $fs/usr/lib/installed-tests/ $fs/usr/share/
 			DEPENDS="glib"
 			TAGS="javascript"
 			;;
 		*-dev)
-			copy @dev
-			DEPENDS="json-glib glib-dev libffi-dev pcre-dev \
-			util-linux-blkid-dev util-linux-mount-dev util-linux-uuid-dev \
-			zlib-dev"
+			copy @std @rm @dev
+			DEPENDS="json-glib glib-dev"
 			;;
 	esac
 }
diff -r 917cbaa57ad2 -r 89ae9cf3b230 mousepad/receipt
--- a/mousepad/receipt	Thu Apr 26 16:25:04 2018 +0300
+++ b/mousepad/receipt	Thu Apr 26 21:51:47 2018 +0300
@@ -7,6 +7,7 @@
 MAINTAINER="erjo@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.xfce.org/"
+LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/mousepad.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/src/apps/$PACKAGE/${VERSION%.*}/$TARBALL"