diff --git a/etc/build.usage b/etc/build.usage index 93f1c20..354fc93 100644 --- a/etc/build.usage +++ b/etc/build.usage @@ -1,5 +1,5 @@ usage: ./build.sh [-a nt32|nt64] [-b debug|release] [-C dir[,..]] [-D kind[,..]] - [-F ipv4|ipv6|offline] [-h] [-P [jobs]] [-r ALL|LAST|name[,..][:step,..]] + [-F ipv4|ipv6|offline] [-h] [-P [jobs]] [-r [*]ALL|LAST|name[,..][:step,..]] [-R] [-v[v[v[v]]]] [--as-needed] [--debug-minipix] [[ ..]] -a nt32|nt64 Selects 32-bit or 64-bit architecture; defaults to nt64. -b debug|release Selects debug or release build; defaults to debug. @@ -20,7 +20,7 @@ usage: ./build.sh [-a nt32|nt64] [-b debug|release] [-C dir[,..]] [-D kind[,..]] processors on the host system. If -R is not specified and at least one (1) package fails to build, all remaining package builds will be forcibly aborted for convenience. - -r ALL[:step,..]|LAST|name[,..][:step,..] + -r [*]ALL[:step,..]|LAST|name[,..][:step,..] Restart all packages/the specified comma-separated package(s) completely or at optionally specified comma-separated step(s) or restart the last failed package and resume build. diff --git a/groups/261.native_packages_x11.group b/groups/261.native_packages_x11.group index da89523..3ddf0e3 100644 --- a/groups/261.native_packages_x11.group +++ b/groups/261.native_packages_x11.group @@ -38,9 +38,10 @@ xterm xtrans xwd xwin"; : ${PKG_FONTCONFIG_URL:=https://www.freedesktop.org/software/fontconfig/release/fontconfig-${PKG_FONTCONFIG_VERSION}.tar.bz2}; : ${PKG_FONTCONFIG_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/freetype2}; : ${PKG_FONTCONFIG_CONFIGURE_ARGS_EXTRA:=--disable-docs}; -: ${PKG_FREETYPE_DEPENDS:="libz"}; +: ${PKG_FREETYPE_DEPENDS:="harfbuzz libz"}; : ${PKG_FREETYPE_SHA256SUM:=e6ffba3c8cef93f557d1f767d7bc3dee860ac7a3aaff588a521e081bc36f4c8a}; : ${PKG_FREETYPE_VERSION:=2.9}; +: ${PKG_FREETYPE_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include/harfbuzz"}; : ${PKG_FREETYPE_URL:=http://download.savannah.gnu.org/releases/freetype/freetype-${PKG_FREETYPE_VERSION}.tar.bz2}; : ${PKG_FRIBIDI_SHA256SUM:=6a64f2a687f5c4f203a46fa659f43dd43d1f8b845df8d723107e8a7e6158e4ce}; : ${PKG_FRIBIDI_VERSION:=1.0.5}; @@ -58,7 +59,7 @@ xterm xtrans xwd xwin"; : ${PKG_GLEW_INSTALL_FILES:="../glew-${PKG_GLEW_VERSION}/lib/libGLEW.lib.a=lib/ ../glew-${PKG_GLEW_VERSION}/lib/libGLEW.so=lib/ ../glew-${PKG_GLEW_VERSION}/lib/libGLEW.so.${PKG_GLEW_VERSION}=lib/ ../glew-${PKG_GLEW_VERSION}/lib/libGLEW.so.${PKG_GLEW_VERSION%.*}=lib/ ../glew-${PKG_GLEW_VERSION}/lib/libGLEW.a=lib/ ../glew-${PKG_GLEW_VERSION}/bin/glewinfo=bin/ ../glew-${PKG_GLEW_VERSION}/bin/visualinfo=bin/"}; : ${PKG_GLEW_IN_TREE:=1}; : ${PKG_GLEW_MAKEFLAGS_BUILD_EXTRA:="SYSTEM=midipix STRIP= LD=${DEFAULT_TARGET}-gcc CC=${DEFAULT_TARGET}-gcc CFLAGS=-isystem${PREFIX_NATIVE}/include LDFLAGS.EXTRA=-L${PREFIX_NATIVE}/lib"}; -: ${PKG_GTK2_DEPENDS:="atk cairo freetype gdk glib pango"}; +: ${PKG_GTK2_DEPENDS:="atk cairo freetype gdk glib libX11 pango Xrender"}; : ${PKG_GTK2_SHA256SUM:=68c1922732c7efc08df4656a5366dcc3afdc8791513400dac276009b40954658}; : ${PKG_GTK2_VERSION:=2.24.31}; : ${PKG_GTK2_URL:=http://ftp.gnome.org/pub/gnome/sources/gtk+/${PKG_GTK2_VERSION%.*}/gtk+-${PKG_GTK2_VERSION}.tar.xz};