diff --git a/mingw-w64-boost/PKGBUILD b/mingw-w64-boost/PKGBUILD index 0a55e05fd6..e080ee4aee 100644 --- a/mingw-w64-boost/PKGBUILD +++ b/mingw-w64-boost/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.69.0 _boostver=${pkgver//./_} -pkgrel=1 +pkgrel=2 pkgdesc="Free peer-reviewed portable C++ source libraries (mingw-w64)" arch=('any') url="https://www.boost.org/" @@ -29,6 +29,7 @@ source=(https://downloads.sourceforge.net/sourceforge/boost/boost_${_boostver}.t boost-1.57.0-python-abi_letters.patch boost-1.57.0-python-libpython_dep.patch boost-1.60.0-mingw-context.patch + boost-1.69-old-style-names-layout.patch using-mingw-w64-python.patch msys2-mingw-folders-bootstrap.patch) sha256sums=('8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406' @@ -42,6 +43,7 @@ sha256sums=('8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406' 'cf46e9b791b45937d5af26b0f35dcdfa416cd9b62ef6c29e3064464835634628' '01758929643f92530512230d37df9793e6481cd6ce6310e3a79cee5ba287858c' '9ac0fc0306114d709958ae6e17fdd38616fa7c352d10346f099b51ef49d0ec4e' + 'c2508e60bed41471b396875e0289b4b1d4e021f3d01f4294615c72fcd8567439' '0dd6346d369850aad13bf8d9bc2f0abc16d4b0586e34d61fab11f65d3d7fa9d4' '81f74c2eafbe004bcbb863cc3cd74571adcffed1169dde86645db4441be236e1') @@ -86,6 +88,10 @@ prepare() { # https://svn.boost.org/trac/boost/ticket/7262 msg2 "boost-1.60.0-mingw-context.patch" patch -p1 -i ${srcdir}/boost-1.60.0-mingw-context.patch + + # Back old names for libraries (without architecture) + msg2 "boost-1.69-old-style-names-layout.patch" + patch -p1 -i ${srcdir}/boost-1.69-old-style-names-layout.patch # Use our own build Python msg2 "using-mingw-w64-python.patch" diff --git a/mingw-w64-boost/boost-1.69-old-style-names-layout.patch b/mingw-w64-boost/boost-1.69-old-style-names-layout.patch new file mode 100644 index 0000000000..b176dc05b0 --- /dev/null +++ b/mingw-w64-boost/boost-1.69-old-style-names-layout.patch @@ -0,0 +1,11 @@ +--- boost_1_69_0/boostcpp.jam.orig 2018-12-14 08:31:53.950328700 +0300 ++++ boost_1_69_0/boostcpp.jam 2018-12-14 08:32:02.280743300 +0300 +@@ -154,7 +154,7 @@ + ; + case 1.69 : + .format-name-args = +- ; ++ ; + } + } + else if $(layout) = system