Bump font-util to 1.1.1

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>

diff --git a/package/x11r7/xfont_font-util/Config.in b/package/x11r7/xfont_font-util/Config.in
index 568fb867a8c6831e7ae2362dc45da60a5b750973..932ba290731af023cd8c1e7b40a740a29200d46d 100644 (file)
--- a/package/x11r7/xfont_font-util/Config.in
+++ b/package/x11r7/xfont_font-util/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_XFONT_FONT_UTIL
        bool "font-util"
        help
-         font-util 1.0.1
+         font-util 1.1.1
          No description available

diff --git a/package/x11r7/xfont_font-util/post-install.sh b/package/x11r7/xfont_font-util/post-install.sh
index c4888e20d9684fa9c598d9ddf39f89746489c446..2cb54da65b5e6518fe815cdc1032c459b3d9b3da 100755 (executable)
--- a/package/x11r7/xfont_font-util/post-install.sh
+++ b/package/x11r7/xfont_font-util/post-install.sh
@@ -3,7 +3,7 @@
        STAGING_DIR=$1
 
        # fix the fontutil pkgconfig file to cross-compile fonts after fontutil is installed
-       sed "s,^mapdir=.*,mapdir=${STAGING_DIR}/usr/lib/X11/fonts/util,g" \
+       sed "s,^mapdir=.*,mapdir=${STAGING_DIR}/usr/share/fonts/X11/util,g" \
                ${STAGING_DIR}/usr/lib/pkgconfig/fontutil.pc > ${STAGING_DIR}/usr/lib/pkgconfig/fontutil.pc.new
        mv ${STAGING_DIR}/usr/lib/pkgconfig/fontutil.pc.new ${STAGING_DIR}/usr/lib/pkgconfig/fontutil.pc
        

diff --git a/package/x11r7/xfont_font-util/xfont_font-util.mk b/package/x11r7/xfont_font-util/xfont_font-util.mk
index cd777af9a4131abf123e373fd3c4615589f64053..3f59b17ab1ffbd90c3bcdcc90e678fc2e04f68c3 100644 (file)
--- a/package/x11r7/xfont_font-util/xfont_font-util.mk
+++ b/package/x11r7/xfont_font-util/xfont_font-util.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFONT_FONT_UTIL_VERSION = 1.0.1
+XFONT_FONT_UTIL_VERSION = 1.1.1
 XFONT_FONT_UTIL_SOURCE = font-util-$(XFONT_FONT_UTIL_VERSION).tar.bz2
 XFONT_FONT_UTIL_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_UTIL_DEPENDENCIES = host-pkg-config