diff --git a/LFSPkgBuildScripts/admin/GConf/GConf.LFSBuild b/LFSPkgBuildScripts/admin/GConf/GConf.LFSBuild index 791e53ce..f44b69e6 100755 --- a/LFSPkgBuildScripts/admin/GConf/GConf.LFSBuild +++ b/LFSPkgBuildScripts/admin/GConf/GConf.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="dbus-glib-0.104 Intltool-0.50.2 libxml2-2.9.2" +DEPENDS="dbus-glib-0.104 Intltool-0.51.0 libxml2-2.9.2" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/desktop/gegl/gegl.LFSBuild b/LFSPkgBuildScripts/desktop/gegl/gegl.LFSBuild index 9dcd3211..6f93c0c9 100755 --- a/LFSPkgBuildScripts/desktop/gegl/gegl.LFSBuild +++ b/LFSPkgBuildScripts/desktop/gegl/gegl.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="babl-0.1.12 Cairo-1.14.2 gdk-pixbuf-2.31.7 Graphviz-2.38.0 libjpeg-turbo-1.4.1 libpng-1.6.18 Pango-1.36.8 Python-2.7.10 gobject-introspection-1.44.0 Vala-0.28.1" +DEPENDS="babl-0.1.12 Cairo-1.14.2 gdk-pixbuf-2.31.7 Graphviz-2.38.0 libjpeg-turbo-1.4.1 libpng-1.6.18 Pango-1.36.8 Python-2.7.13 gobject-introspection-1.44.0 Vala-0.28.1" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/desktop/obtheme/obtheme.LFSBuild b/LFSPkgBuildScripts/desktop/obtheme/obtheme.LFSBuild index d8a5f0ef..3db2ad2d 100755 --- a/LFSPkgBuildScripts/desktop/obtheme/obtheme.LFSBuild +++ b/LFSPkgBuildScripts/desktop/obtheme/obtheme.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="python-2.7.9 fuse-python-0.2.1" +DEPENDS="python-2.7.13 fuse-python-0.2.1" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/desktop/transmission/transmission.LFSBuild b/LFSPkgBuildScripts/desktop/transmission/transmission.LFSBuild index 0d4d14dd..008ae669 100755 --- a/LFSPkgBuildScripts/desktop/transmission/transmission.LFSBuild +++ b/LFSPkgBuildScripts/desktop/transmission/transmission.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="curl-7.44.0 Intltool-0.50.2 libevent-2.0.22 OpenSSL-1.0.2 qt5-5.5.0" +DEPENDS="curl-7.44.0 Intltool-0.51.0 libevent-2.0.22 OpenSSL-1.0.2 qt5-5.5.0" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/devel/bazaar/bazaar.LFSBuild b/LFSPkgBuildScripts/devel/bazaar/bazaar.LFSBuild index 37a7fc4d..cf1fa3bd 100755 --- a/LFSPkgBuildScripts/devel/bazaar/bazaar.LFSBuild +++ b/LFSPkgBuildScripts/devel/bazaar/bazaar.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="Python-2.7.10" +DEPENDS="Python-2.7.13" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/devel/doxygen/doxygen.LFSBuild b/LFSPkgBuildScripts/devel/doxygen/doxygen.LFSBuild index c1a902b2..b898bcdf 100755 --- a/LFSPkgBuildScripts/devel/doxygen/doxygen.LFSBuild +++ b/LFSPkgBuildScripts/devel/doxygen/doxygen.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="CMake-3.3.1 Graphviz-2.38.0 Python-2.7.10 Xapian-1.2.21" +DEPENDS="CMake-3.3.1 Graphviz-2.38.0 Python-2.7.13 Xapian-1.2.21" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/devel/git/git.LFSBuild b/LFSPkgBuildScripts/devel/git/git.LFSBuild index 691f8a0d..9de96b34 100755 --- a/LFSPkgBuildScripts/devel/git/git.LFSBuild +++ b/LFSPkgBuildScripts/devel/git/git.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="curl-7.44.0 OpenSSL-1.0.2 Python-2.7.10 PCRE-8.37 Subversion-1.9.1" +DEPENDS="curl-7.44.0 OpenSSL-1.0.2 Python-2.7.13 PCRE-8.37 Subversion-1.9.1" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/devel/meld/meld.LFSBuild b/LFSPkgBuildScripts/devel/meld/meld.LFSBuild index 0c83fcd6..92ae14ca 100755 --- a/LFSPkgBuildScripts/devel/meld/meld.LFSBuild +++ b/LFSPkgBuildScripts/devel/meld/meld.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="PyGTK-2.24.0 pygtksourceview-2.10.1 pygobject-2.28.6 Python-2.7.10" +DEPENDS="PyGTK-2.24.0 pygtksourceview-2.10.1 pygobject-2.28.6 Python-2.7.13" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/devel/scons/scons.LFSBuild b/LFSPkgBuildScripts/devel/scons/scons.LFSBuild index 938ef54f..63548981 100755 --- a/LFSPkgBuildScripts/devel/scons/scons.LFSBuild +++ b/LFSPkgBuildScripts/devel/scons/scons.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="Python-2.7.10" +DEPENDS="Python-2.7.13" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/devel/yasm/yasm.LFSBuild b/LFSPkgBuildScripts/devel/yasm/yasm.LFSBuild index 1edf7631..c19304db 100755 --- a/LFSPkgBuildScripts/devel/yasm/yasm.LFSBuild +++ b/LFSPkgBuildScripts/devel/yasm/yasm.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="Python-2.7.10 Cython-0.23.4" +DEPENDS="Python-2.7.13 Cython-0.23.4" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/hware/libevdev/libevdev.LFSBuild b/LFSPkgBuildScripts/hware/libevdev/libevdev.LFSBuild index 7d208b6e..2fc95519 100755 --- a/LFSPkgBuildScripts/hware/libevdev/libevdev.LFSBuild +++ b/LFSPkgBuildScripts/hware/libevdev/libevdev.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="Python-2.7.10" +DEPENDS="Python-2.7.13" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/hware/upower/upower.LFSBuild b/LFSPkgBuildScripts/hware/upower/upower.LFSBuild index dd285269..03cd1d88 100755 --- a/LFSPkgBuildScripts/hware/upower/upower.LFSBuild +++ b/LFSPkgBuildScripts/hware/upower/upower.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="dbus-glib-0.104 Intltool-0.50.2 libusb-1.0.19 Polkit-0.113 gobject-introspection-1.44.0" +DEPENDS="dbus-glib-0.104 Intltool-0.51.0 libusb-1.0.19 Polkit-0.113 gobject-introspection-1.44.0" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/libs/boost/boost.LFSBuild b/LFSPkgBuildScripts/libs/boost/boost.LFSBuild index 56cd7ff7..3211bf7b 100755 --- a/LFSPkgBuildScripts/libs/boost/boost.LFSBuild +++ b/LFSPkgBuildScripts/libs/boost/boost.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="icu-55.1 Python-2.7.10" +DEPENDS="icu-55.1 Python-2.7.13" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/libs/gsettings-desktop-schemas/gsettings-desktop-schemas.LFSBuild b/LFSPkgBuildScripts/libs/gsettings-desktop-schemas/gsettings-desktop-schemas.LFSBuild index fafc3adc..1713f516 100755 --- a/LFSPkgBuildScripts/libs/gsettings-desktop-schemas/gsettings-desktop-schemas.LFSBuild +++ b/LFSPkgBuildScripts/libs/gsettings-desktop-schemas/gsettings-desktop-schemas.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS=" GLib-2.44.1 Intltool-0.50.2 " +DEPENDS=" GLib-2.44.1 Intltool-0.51.0 " if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/net/js/js.LFSBuild b/LFSPkgBuildScripts/net/js/js.LFSBuild index e232fe73..b98ef799 100755 --- a/LFSPkgBuildScripts/net/js/js.LFSBuild +++ b/LFSPkgBuildScripts/net/js/js.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="libffi-3.2.1 NSPR-4.10.9 Python-2.7.10 Zip-3.0 " +DEPENDS="libffi-3.2.1 NSPR-4.10.9 Python-2.7.13 Zip-3.0 " if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/net/samba/samba.LFSBuild b/LFSPkgBuildScripts/net/samba/samba.LFSBuild index 68e8f2f7..9dd30300 100755 --- a/LFSPkgBuildScripts/net/samba/samba.LFSBuild +++ b/LFSPkgBuildScripts/net/samba/samba.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="Python-2.7.10 libtirpc-0.3.2" +DEPENDS="Python-2.7.13 libtirpc-0.3.2" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/net/wicd/wicd.LFSBuild b/LFSPkgBuildScripts/net/wicd/wicd.LFSBuild index 33773402..a112c890 100755 --- a/LFSPkgBuildScripts/net/wicd/wicd.LFSBuild +++ b/LFSPkgBuildScripts/net/wicd/wicd.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="Python-2.7.10 DBus-Python-1.2.0 Wireless-Tools-29 Net-tools-20101030 wpa-supplicant-2.5" +DEPENDS="Python-2.7.13 DBus-Python-1.2.0 Wireless-Tools-29 Net-tools-20101030 wpa-supplicant-2.5" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/python/Cython/Cython.LFSBuild b/LFSPkgBuildScripts/python/Cython/Cython.LFSBuild index 5b7f9c9c..0e0f0b1e 100755 --- a/LFSPkgBuildScripts/python/Cython/Cython.LFSBuild +++ b/LFSPkgBuildScripts/python/Cython/Cython.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="Python-2.7.10" +DEPENDS="Python-2.7.13" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/python/Imaging/Imaging.LFSBuild b/LFSPkgBuildScripts/python/Imaging/Imaging.LFSBuild index 5b379cef..017b52ac 100755 --- a/LFSPkgBuildScripts/python/Imaging/Imaging.LFSBuild +++ b/LFSPkgBuildScripts/python/Imaging/Imaging.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="Python-2.7.10" +DEPENDS="Python-2.7.13" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/python/PyQt/PyQt.LFSBuild b/LFSPkgBuildScripts/python/PyQt/PyQt.LFSBuild index 7dfcebab..a727205d 100755 --- a/LFSPkgBuildScripts/python/PyQt/PyQt.LFSBuild +++ b/LFSPkgBuildScripts/python/PyQt/PyQt.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="Python-2.7.10 Qt5-5.5.0 sip-4.15.5" +DEPENDS="Python-2.7.13 Qt5-5.5.0 sip-4.15.5" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/python/Python/Python.LFSBuild b/LFSPkgBuildScripts/python/Python/Python.LFSBuild index e31e23b2..1c9bd37f 100755 --- a/LFSPkgBuildScripts/python/Python/Python.LFSBuild +++ b/LFSPkgBuildScripts/python/Python/Python.LFSBuild @@ -26,10 +26,10 @@ mkdir -p "$PKG" tar -xvf "${SOURCEARCHIVES}/${SECTION}/${TARBALL}" pushd "${TARNAME}-${VERSION}" - ./configure --prefix=/usr --enable-shared --with-system-expat --with-system-ffi --enable-unicode=ucs4 --libdir=/usr/lib --with-system-expat + ./configure --prefix=/usr --enable-shared --with-system-expat --with-system-ffi --with-ensurepip=yes --enable-unicode=ucs4 --libdir=/usr/lib${LIBDIRSUFFIX} make $MAKEFLAGS||make|| exit 1 make install DESTDIR=$PKG || exit 1 - chmod -v 755 $PKG/usr/lib/libpython2.7.so.1.0||true + chmod -v 755 $PKG/usr/lib${LIBDIRSUFFIX}/libpython2.7.so.1.0||true install -v -dm755 $PKG/usr/share/doc/${PKGNAME}-${VERSION} tar --strip-components=1 -C $PKG/usr/share/doc/${PKGNAME}-${VERSION} --no-same-owner -xvf ${SOURCEARCHIVES}/${SECTION}/${PKGNAME}-${VERSION}-docs-html.tar.bz2 diff --git a/LFSPkgBuildScripts/python/dbus-python/dbus-python.LFSBuild b/LFSPkgBuildScripts/python/dbus-python/dbus-python.LFSBuild index e59a3f4a..c64f70b2 100755 --- a/LFSPkgBuildScripts/python/dbus-python/dbus-python.LFSBuild +++ b/LFSPkgBuildScripts/python/dbus-python/dbus-python.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="dbus-glib-0.104 Python-2.7.10" +DEPENDS="dbus-glib-0.104 Python-2.7.13" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/python/fuse-python/fuse-python.LFSBuild b/LFSPkgBuildScripts/python/fuse-python/fuse-python.LFSBuild index fed7f200..ab8e2180 100755 --- a/LFSPkgBuildScripts/python/fuse-python/fuse-python.LFSBuild +++ b/LFSPkgBuildScripts/python/fuse-python/fuse-python.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="python-2.7.9 fuse-2.9.3" +DEPENDS="python-2.7.13 fuse-2.9.3" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/python/html2text/html2text.LFSBuild b/LFSPkgBuildScripts/python/html2text/html2text.LFSBuild index 6435794a..ff0a0ff9 100755 --- a/LFSPkgBuildScripts/python/html2text/html2text.LFSBuild +++ b/LFSPkgBuildScripts/python/html2text/html2text.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="Python-2.7.10 pysetuptools-18.2" +DEPENDS="Python-2.7.13 pysetuptools-18.2" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/python/py2cairo/py2cairo.LFSBuild b/LFSPkgBuildScripts/python/py2cairo/py2cairo.LFSBuild index 162cd032..082d2f21 100755 --- a/LFSPkgBuildScripts/python/py2cairo/py2cairo.LFSBuild +++ b/LFSPkgBuildScripts/python/py2cairo/py2cairo.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="Python-2.7.10 Cairo-1.14.2" +DEPENDS="Python-2.7.13 Cairo-1.14.2" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/python/pysetuptools/pysetuptools.LFSBuild b/LFSPkgBuildScripts/python/pysetuptools/pysetuptools.LFSBuild index 10f11c10..17f502f8 100755 --- a/LFSPkgBuildScripts/python/pysetuptools/pysetuptools.LFSBuild +++ b/LFSPkgBuildScripts/python/pysetuptools/pysetuptools.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="Python-2.7.10" +DEPENDS="Python-2.7.13" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/python/sip/sip.LFSBuild b/LFSPkgBuildScripts/python/sip/sip.LFSBuild index ec6f5be8..d19451d6 100755 --- a/LFSPkgBuildScripts/python/sip/sip.LFSBuild +++ b/LFSPkgBuildScripts/python/sip/sip.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="Python-2.7.10 Qt5-5.5.0" +DEPENDS="Python-2.7.13 Qt5-5.5.0" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/sys/gparted/gparted.LFSBuild b/LFSPkgBuildScripts/sys/gparted/gparted.LFSBuild index 73285478..39059a99 100755 --- a/LFSPkgBuildScripts/sys/gparted/gparted.LFSBuild +++ b/LFSPkgBuildScripts/sys/gparted/gparted.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="gtkmm-2.24.4 Intltool-0.50.2 parted-3.2" +DEPENDS="gtkmm-2.24.4 Intltool-0.51.0 parted-3.2" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/sys/gvfs/gvfs.LFSBuild b/LFSPkgBuildScripts/sys/gvfs/gvfs.LFSBuild index 235a64fa..4fcec10d 100755 --- a/LFSPkgBuildScripts/sys/gvfs/gvfs.LFSBuild +++ b/LFSPkgBuildScripts/sys/gvfs/gvfs.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="dbus-1.10.0 GLib-2.44.1 Intltool-0.50.2" +DEPENDS="dbus-1.10.0 GLib-2.44.1 Intltool-0.51.0" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/sys/itstool/itstool.LFSBuild b/LFSPkgBuildScripts/sys/itstool/itstool.LFSBuild index 80dad401..7c9470f3 100755 --- a/LFSPkgBuildScripts/sys/itstool/itstool.LFSBuild +++ b/LFSPkgBuildScripts/sys/itstool/itstool.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="docbook-xml-4.5 Python-2.7.10" +DEPENDS="docbook-xml-4.5 Python-2.7.13" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/sys/ntp/ntp.LFSBuild b/LFSPkgBuildScripts/sys/ntp/ntp.LFSBuild index dc7f9edd..4441d8b6 100755 --- a/LFSPkgBuildScripts/sys/ntp/ntp.LFSBuild +++ b/LFSPkgBuildScripts/sys/ntp/ntp.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="libcap-2.24 OpenSSL-1.0.2 libedit-3.1" +DEPENDS="libcap-2.25 OpenSSL-1.0.2 libedit-3.1" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/sys/polkit/polkit.LFSBuild b/LFSPkgBuildScripts/sys/polkit/polkit.LFSBuild index 053a3d54..7458b493 100755 --- a/LFSPkgBuildScripts/sys/polkit/polkit.LFSBuild +++ b/LFSPkgBuildScripts/sys/polkit/polkit.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="GLib-2.44.1 Intltool-0.50.2 JS-17.0.0" +DEPENDS="GLib-2.44.1 Intltool-0.51.0 JS-17.0.0" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/system/system-meta/system-bbinit-meta.LFSBuild b/LFSPkgBuildScripts/system/system-meta/system-bbinit-meta.LFSBuild index 0c500c99..b66ad50a 100755 --- a/LFSPkgBuildScripts/system/system-meta/system-bbinit-meta.LFSBuild +++ b/LFSPkgBuildScripts/system/system-meta/system-bbinit-meta.LFSBuild @@ -10,7 +10,7 @@ export THISTTY DEPENDS="linuxheaders-4.9.9 Man-pages-4.09 -Glibc-2.25 +Glibc-1.06.95 Zlib-1.2.11 File-5.30 Binutils-2.27 diff --git a/LFSPkgBuildScripts/system/system-meta/system-sysvinit-meta.LFSBuild b/LFSPkgBuildScripts/system/system-meta/system-sysvinit-meta.LFSBuild index de9298e2..3907b0b0 100755 --- a/LFSPkgBuildScripts/system/system-meta/system-sysvinit-meta.LFSBuild +++ b/LFSPkgBuildScripts/system/system-meta/system-sysvinit-meta.LFSBuild @@ -10,7 +10,7 @@ export THISTTY DEPENDS="linuxheaders-4.9.9 Man-pages-4.09 -Glibc-2.25 +Glibc-1.06.95 Zlib-1.2.11 File-5.30 Binutils-2.27 @@ -65,7 +65,7 @@ Make-4.2.1 Patch-2.7.5 Sysklogd-1.5.1 Sysvinit-2.88 -eudev-3.2.1 +eudev-3.2.1 Util-linux-2.29.1 Man-DB-2.7.6.1 Tar-1.29 diff --git a/LFSPkgBuildScripts/xfce/libwnck/libwnck.LFSBuild b/LFSPkgBuildScripts/xfce/libwnck/libwnck.LFSBuild index 890da1e7..be325f6b 100755 --- a/LFSPkgBuildScripts/xfce/libwnck/libwnck.LFSBuild +++ b/LFSPkgBuildScripts/xfce/libwnck/libwnck.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="GTK-2.24.28 Intltool-0.50.2 startup-notification-0.12 gobject-introspection-1.44.0 GTK-Doc-1.24" +DEPENDS="GTK-2.24.28 Intltool-0.51.0 startup-notification-0.12 gobject-introspection-1.44.0 GTK-Doc-1.24" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/xfce/libxfce4util/libxfce4util.LFSBuild b/LFSPkgBuildScripts/xfce/libxfce4util/libxfce4util.LFSBuild index 4ba26d83..69a2edbb 100755 --- a/LFSPkgBuildScripts/xfce/libxfce4util/libxfce4util.LFSBuild +++ b/LFSPkgBuildScripts/xfce/libxfce4util/libxfce4util.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="GLib-2.44.1 Intltool-0.50.2" +DEPENDS="GLib-2.44.1 Intltool-0.51.0" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/xfce/tumbler/tumbler.LFSBuild b/LFSPkgBuildScripts/xfce/tumbler/tumbler.LFSBuild index 2bfac61f..c5678f9a 100755 --- a/LFSPkgBuildScripts/xfce/tumbler/tumbler.LFSBuild +++ b/LFSPkgBuildScripts/xfce/tumbler/tumbler.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="dbus-glib-0.104 Intltool-0.50.2" +DEPENDS="dbus-glib-0.104 Intltool-0.51.0" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/xorg/libxcb/libxcb.LFSBuild b/LFSPkgBuildScripts/xorg/libxcb/libxcb.LFSBuild index 87513cb9..211aca1b 100755 --- a/LFSPkgBuildScripts/xorg/libxcb/libxcb.LFSBuild +++ b/LFSPkgBuildScripts/xorg/libxcb/libxcb.LFSBuild @@ -2,19 +2,20 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="libXau-1.0.8 xcb-proto-1.11" +DEPENDS="libXau-1.0.8 xcb-proto-1.12" if ! lfspkg -B "$DEPENDS";then exit 100 fi PKGNAME="libxcb" TARNAME="$PKGNAME" -VERSION="1.11.1" +VERSION="1.12" BUILD=${BUILD:-1} SECTION="XORG" SUFFIX="LFSPKG" TARBALL="${TARNAME}-${VERSION}.tar.bz2" gettar "http://xcb.freedesktop.org/dist/${TARBALL}" $SECTION +gettar "http://www.linuxfromscratch.org/patches/blfs/${LFSVERSION}/${TARNAME}-${VERSION}-python3-1.patch" $SECTION PKG="${OUTPUT}/${PKGNAME}" @@ -24,6 +25,7 @@ mkdir -p "$PKG" tar -xvf "${SOURCEARCHIVES}/${SECTION}/${TARBALL}" pushd "${TARNAME}-${VERSION}" + patch -Np1 -i ../libxcb-1.12-python3-1.patch sed -e "s/pthread-stubs//" -i configure.ac autoreconf -fi ./configure $XORG_CONFIG --docdir='${datadir}'/doc/${PKGNAME}-${VERSION} --enable-xinput --without-doxygen diff --git a/LFSPkgBuildScripts/xorg/proto/proto.LFSBuild b/LFSPkgBuildScripts/xorg/proto/proto.LFSBuild index f7a76355..d7d0c6da 100755 --- a/LFSPkgBuildScripts/xorg/proto/proto.LFSBuild +++ b/LFSPkgBuildScripts/xorg/proto/proto.LFSBuild @@ -2,13 +2,13 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="util-macros-1.19.0" +DEPENDS="util-macros-1.19.1" if ! lfspkg -B "$DEPENDS";then exit 100 fi PKGNAME="proto" -VERSION="7.8" +VERSION="8.0" BUILD=${BUILD:-1} SECTION="XORG" SUFFIX="LFSPKG" diff --git a/LFSPkgBuildScripts/xorg/util-macros/util-macros.LFSBuild b/LFSPkgBuildScripts/xorg/util-macros/util-macros.LFSBuild index 63ce7136..31952adf 100755 --- a/LFSPkgBuildScripts/xorg/util-macros/util-macros.LFSBuild +++ b/LFSPkgBuildScripts/xorg/util-macros/util-macros.LFSBuild @@ -4,7 +4,7 @@ PKGNAME="util-macros" TARNAME="$PKGNAME" -VERSION="1.19.0" +VERSION="1.19.1" BUILD=${BUILD:-1} SECTION="XORG" SUFFIX="LFSPKG" diff --git a/LFSPkgBuildScripts/xorg/xbitmaps/xbitmaps.LFSBuild b/LFSPkgBuildScripts/xorg/xbitmaps/xbitmaps.LFSBuild index 6c3e7bcc..3ac3abc3 100755 --- a/LFSPkgBuildScripts/xorg/xbitmaps/xbitmaps.LFSBuild +++ b/LFSPkgBuildScripts/xorg/xbitmaps/xbitmaps.LFSBuild @@ -2,7 +2,7 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="util-macros-1.19.0" +DEPENDS="util-macros-1.19.1" if ! lfspkg -B "$DEPENDS";then exit 100 fi diff --git a/LFSPkgBuildScripts/xorg/xcb-proto/xcb-proto.LFSBuild b/LFSPkgBuildScripts/xorg/xcb-proto/xcb-proto.LFSBuild index eff2f4ce..fe3a0bc8 100755 --- a/LFSPkgBuildScripts/xorg/xcb-proto/xcb-proto.LFSBuild +++ b/LFSPkgBuildScripts/xorg/xcb-proto/xcb-proto.LFSBuild @@ -2,19 +2,20 @@ . /usr/share/LFSPkg/LFSFunctions -DEPENDS="Python-2.7.10" +DEPENDS="Python-2.7.13" if ! lfspkg -B "$DEPENDS";then exit 100 fi PKGNAME="xcb-proto" TARNAME="${PKGNAME}" -VERSION="1.11" +VERSION="1.12" BUILD=${BUILD:-1} SECTION="XORG" SUFFIX="LFSPKG" TARBALL="${TARNAME}-${VERSION}.tar.bz2" gettar "http://xcb.freedesktop.org/dist/${TARBALL}" $SECTION +gettar "http://www.linuxfromscratch.org/patches/blfs/${LFSVERSION}/${TARNAME}-${VERSION}-schema-1.patch" PKG="${OUTPUT}/${PKGNAME}" @@ -24,6 +25,7 @@ mkdir -p "$PKG" tar -xvf "${SOURCEARCHIVES}/${SECTION}/${TARBALL}" pushd "${TARNAME}-${VERSION}" + patch -Np1 -i ../${TARNAME}-${VERSION}-schema-1.patch CFLAGS="$LFSFLAGS" CXXFLAGS="$LFSFLAGS" ./configure ${XORG_CONFIG} make $MAKEFLAGS||make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/LFSPkgBuildScripts/xorg/xorg-meta/xorg-meta.LFSBuild b/LFSPkgBuildScripts/xorg/xorg-meta/xorg-meta.LFSBuild index 66d3b2f7..3aafbd32 100755 --- a/LFSPkgBuildScripts/xorg/xorg-meta/xorg-meta.LFSBuild +++ b/LFSPkgBuildScripts/xorg/xorg-meta/xorg-meta.LFSBuild @@ -3,7 +3,7 @@ . /usr/share/LFSPkg/LFSFunctions PKGNAME="xorg-meta" -VERSION="7.8" +VERSION="8.0" BUILD=${BUILD:-1} SECTION="XORG" SUFFIX="LFSPKG" @@ -14,11 +14,11 @@ export CHECKETC=0 mkdir -vp ${SOURCEARCHIVES}/${SECTION}||true -DEPENDS="util-macros-1.19.0 -proto-7.8 +DEPENDS="util-macros-1.19.1 +proto-8.0 libXau-1.0.8 libXdmcp-1.1.2 -xcb-proto-1.11 +xcb-proto-1.12 Fontconfig-2.11.1 libxcb-1.11.1 xorg-libs-7.8 diff --git a/Updating/UpdateBuildScripts b/Updating/UpdateBuildScripts index dce2d484..30b2c4ae 100755 --- a/Updating/UpdateBuildScripts +++ b/Updating/UpdateBuildScripts @@ -9,7 +9,7 @@ else exit 1 fi -#(cd ../LFSScripts;./ShowSystemData)||true +(cd ../LFSScripts;./ShowSystemData)||true RED='\e[1;31m' GREEN='\e[1;32m' @@ -24,10 +24,13 @@ INSTALLEDVERSION="" UPDATETOVERSION="" PATHTOSCRIPT="" INLINE=${INLINE:-"-i"} +FORCEVERSION="$2" +CURRENTVERSION="" +UPDATESCRIPT=1 parseArray () { -for ((j=0;j<${#RESULTS};j++)) +for ((j=0;j<${#RESULTS[@]};j++)) do if [ "X${RESULTS[j]}" != "X" ];then case ${RESULTS[j]} in @@ -42,6 +45,13 @@ for ((j=0;j<${#RESULTS};j++)) "Path to script="*) PATHTOSCRIPT=${RESULTS[j]##*=} PATHTOSCRIPT=${LFS}${PATHTOSCRIPT//[$'\t\r\n ']} + ;; + *"is Ok"*) + echo "is ok" + CURRENTVERSION="$PACKAGETOTEST-$(echo ${RESULTS[j]}|awk '{print $4}')" + UPDATETOVERSION=$(echo ${RESULTS[j]}|awk '{print $4}') + UPDATESCRIPT=0 + ;; esac fi done @@ -52,40 +62,51 @@ if [ "X$PACKAGETOTEST" = "X" ];then exit 1 fi -if [ "X$(lfspkg -R $LFS -C $PACKAGETOTEST 2>&1|grep -i 'No version info for')" != "X" ];then - echo "Can't find version info for $PACKAGETOTEST ..." - exit 1 +if [ "X$FORCEVERSION}" = "X" ];then + if [ "X$(lfspkg -R $LFS -C $PACKAGETOTEST 2>&1|grep -i 'No version info for')" != "X" ];then + echo "Can't find version info for $PACKAGETOTEST ..." + exit 1 + fi +else + UPDATETOVERSION=$FORCEVERSION fi -readarray RESULTS < <(lfspkg -R $LFS -C $PACKAGETOTEST 2>/dev/null) -parseArray +if [ "X${FORCEVERSION}" = "X" ];then + readarray RESULTS < <(lfspkg -R $LFS -C $PACKAGETOTEST 2>&1) +else + readarray RESULTS < <(lfspkg -R $LFS -S $PACKAGETOTEST 2>&1) +fi -if [ "X$INSTALLEDVERSION" = "X" ] || [ "X$UPDATETOVERSION" = "X" ] || [ "X$PATHTOSCRIPT" = "X" ];then +parseArray +#echo -e ">>$INSTALLEDVERSION $UPDATETOVERSION $PATHTOSCRIPT $CURRENTVERSION<<" +#exit +if [ "X$INSTALLEDVERSION" = "X" ] || [ "X$UPDATETOVERSION" = "X" ] || [ "X$PATHTOSCRIPT" = "X" ] && [ "X$CURRENTVERSION" = "X" ];then echo -e "${RED}Can't auto-update $PACKAGETOTEST ...${NORMAL}" lfspkg -R $LFS -S $PACKAGETOTEST echo "....." - lfspkg -R $LFS -C $PACKAGETOTEST 2>/dev/null + lfspkg -R $LFS -C $PACKAGETOTEST exit 1 fi echo -e "${GREEN}Auto-update $PACKAGETOTEST $INSTALLEDVERSION to $UPDATETOVERSION${NORMAL}\n" -readarray DEPENDSON < <(lfspkg -R $LFS -O $PACKAGETOTEST 2>/dev/null) -for ((j=1;j<${#DEPENDSON};j++)) +readarray DEPENDSON < <(lfspkg -R $LFS -O $PACKAGETOTEST 2>&1) +for ((j=1;j<${#DEPENDSON[@]};j++)) do if [ "X${DEPENDSON[j]}" != "X" ];then DEPENDFILE=${DEPENDSON[j]##*- } DEPENDFILE=${DEPENDFILE//[$'\t\r\n ']} echo -e "${GREEN}Updating $DEPENDFILE ...${NORMAL}" -# sed $INLINE "s|\(\b${PACKAGETOTEST}\b\)-[0-9].*|\1-$UPDATETOVERSION|gI" $DEPENDFILE - sed $INLINE "s|\(\b${PACKAGETOTEST}\b\)-[0-9][.0-9]*|\1-$UPDATETOVERSION|gI" $DEPENDFILE + sed $INLINE "s|\([^-]\b${PACKAGETOTEST}\b\)-[0-9][.0-9]*|\1-$UPDATETOVERSION|gI;s|^\(\b${PACKAGETOTEST}\b\)-[0-9][.0-9]*|\1-$UPDATETOVERSION|gI" $DEPENDFILE fi done echo echo -e "${GREEN}Please check $PATHTOSCRIPT ...${NORMAL}" -sed $INLINE "s|VERSION=.*|VERSION=\"$UPDATETOVERSION\"|" "$PATHTOSCRIPT" +if [ $UPDATESCRIPT -eq 1 ];then + sed $INLINE "s|VERSION=.*|VERSION=\"$UPDATETOVERSION\"|" "$PATHTOSCRIPT" +fi xdg-open "$PATHTOSCRIPT" &>/dev/null