Skip to content

Commit 3998f82

Browse files
MehdiChinouneMehdiChinoune
committed
drop 32-bit environments from some leaf packages (4/n)
1 parent aecd886 commit 3998f82

29 files changed

Lines changed: 139 additions & 154 deletions

File tree

‎mingw-w64-adol-c/PKGBUILD‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ pkgver=2.7.2
77
pkgrel=6
88
pkgdesc='Automatic Differentiation of Algorithms written in C/C++ (mingw-w64)'
99
arch=('any')
10-
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
10+
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
11+
url='https://github.com/coin-or/ADOL-C'
12+
license=('spdx:EPL-1.0')
1113
depends=("${MINGW_PACKAGE_PREFIX}-boost"
1214
"${MINGW_PACKAGE_PREFIX}-omp")
13-
makedepends=("${MINGW_PACKAGE_PREFIX}-autotools"
14-
"${MINGW_PACKAGE_PREFIX}-cc")
15-
license=('EPL')
16-
url='https://github.com/coin-or/ADOL-C'
15+
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
16+
"${MINGW_PACKAGE_PREFIX}-autotools")
1717
source=(https://github.com/coin-or/ADOL-C/archive/releases/${pkgver}.tar.gz)
1818
sha256sums=('701E0856BAAE91B98397960D5E0A87A549988DE9D4002D0E9A56FA08F5455F6E')
1919

@@ -23,7 +23,6 @@ prepare() {
2323
}
2424

2525
build() {
26-
[[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
2726
mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
2827

2928
local -a extra_config

‎mingw-w64-cereal/PKGBUILD‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ pkgver=1.3.2
77
pkgrel=1
88
pkgdesc="A C++11 library for serialization (mingw-w64)"
99
arch=('any')
10-
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
10+
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
1111
url="https://uscilab.github.io/cereal/"
1212
license=('spdx:BSD-3-Clause')
1313
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
1414
"${MINGW_PACKAGE_PREFIX}-cmake"
1515
"${MINGW_PACKAGE_PREFIX}-ninja")
1616
depends=("${MINGW_PACKAGE_PREFIX}-boost")
1717
checkdepends=("${MINGW_PACKAGE_PREFIX}-gflags")
18-
source=("${_realname}-${pkgver}.tar.gz::https://github.com/USCiLab/cereal/archive/v${pkgver}.tar.gz"
18+
source=("https://github.com/USCiLab/cereal/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
1919
"${_realname}-1.2.2.patch")
2020
sha256sums=('16a7ad9b31ba5880dac55d62b5d6f243c3ebc8d46a3514149e56b5e7ea81f85f'
2121
'1f82ffd1cac9b171ef4a60612492fef2216c851960f84543742ac4206fcc5a94')
@@ -26,9 +26,7 @@ prepare() {
2626
}
2727

2828
build() {
29-
rm -rf "${srcdir}/build-${MINGW_CHOST}"
30-
mkdir "${srcdir}/build-${MINGW_CHOST}"
31-
cd "${srcdir}/build-${MINGW_CHOST}"
29+
mkdir "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
3230

3331
CFLAGS+=" -Wno-unused-variable"
3432
CXXFLAGS+=" -Wno-unused-variable"
@@ -44,12 +42,12 @@ build() {
4442
}
4543

4644
check() {
47-
cd "${srcdir}/build-${MINGW_CHOST}"
45+
cd "${srcdir}/build-${MSYSTEM}"
4846
${MINGW_PREFIX}/bin/ctest.exe || true
4947
}
5048

5149
package() {
52-
cd "${srcdir}/build-${MINGW_CHOST}"
50+
cd "${srcdir}/build-${MSYSTEM}"
5351
DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install ./
5452

5553
install -Dm644 ${srcdir}/${_realname}-${pkgver}/LICENSE ${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE

‎mingw-w64-cninja/PKGBUILD‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ pkgbase=mingw-w64-${_realname}
55
pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
66
pkgver=3.7.9
77
pkgrel=1
8-
pkgdesc="cninja, an opinionated cmake config manager"
8+
pkgdesc="cninja, an opinionated cmake config manager (mingw-w64)"
99
arch=('any')
10-
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
10+
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
1111
url="https://github.com/jcelerier/cninja"
12-
license=('AGPLv3')
12+
license=('spdx:AGPL-3.o-or-later')
1313
depends=("${MINGW_PACKAGE_PREFIX}-cmake"
1414
"${MINGW_PACKAGE_PREFIX}-clang"
1515
"${MINGW_PACKAGE_PREFIX}-lld"
@@ -20,8 +20,7 @@ source=("https://github.com/jcelerier/cninja/releases/download/v${pkgver}/cninja
2020
sha512sums=('db3b409d0e0c5250134a550fee8658110319d4a795aede757c1399650081c439d36ff5d16dda3643b41c66940cf6e99fc7e5230339bbc55590522ba58f82e92b')
2121

2222
build() {
23-
[[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
24-
mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
23+
mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
2524

2625
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
2726
${MINGW_PREFIX}/bin/cmake \
@@ -31,12 +30,12 @@ build() {
3130
-DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
3231
"$srcdir"
3332

34-
cmake --build .
33+
${MINGW_PREFIX}/bin/cmake --build .
3534
}
3635

3736
package() {
38-
cd "$srcdir/build-${MINGW_CHOST}"
39-
DESTDIR="${pkgdir}" cmake --build . --target install/strip
37+
cd "$srcdir/build-${MSYSTEM}"
38+
DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install .
4039

4140
install -D -m644 "$srcdir/LICENSE.md" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
4241
}

‎mingw-w64-dosbox/PKGBUILD‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pkgver=0.80.1
88
pkgrel=1
99
pkgdesc="Emulator with builtin DOS for running DOS Games (mingw-w64)"
1010
arch=('any')
11-
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
11+
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
1212
url='https://github.com/dosbox-staging/dosbox-staging'
1313
license=('spdx:GPL-2.0-or-later')
1414
depends=(
@@ -24,17 +24,13 @@ depends=(
2424
"${MINGW_PACKAGE_PREFIX}-speexdsp"
2525
"${MINGW_PACKAGE_PREFIX}-iir"
2626
)
27-
makedepends=("${MINGW_PACKAGE_PREFIX}-meson"
27+
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
28+
"${MINGW_PACKAGE_PREFIX}-meson"
2829
"${MINGW_PACKAGE_PREFIX}-ninja"
29-
"${MINGW_PACKAGE_PREFIX}-cc"
3030
"${MINGW_PACKAGE_PREFIX}-pkgconf")
3131
source=("https://github.com/dosbox-staging/dosbox-staging/archive/refs/tags/v${pkgver}.tar.gz")
3232
sha256sums=('2ca69e65e6c181197b63388c60487a3bcea804232a28c44c37704e70d49a0392')
3333

34-
prepare() {
35-
cd "${srcdir}/${_forkname}-${pkgver}"
36-
}
37-
3834
build() {
3935
mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
4036

‎mingw-w64-expresscpp/PKGBUILD‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ pkgver=0.20.0
66
pkgrel=3
77
pkgdesc='Fast, unopinionated, minimalist web framework for C++ Perfect for building REST APIs.(mingw-w64)'
88
arch=('any')
9-
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
9+
mingw_arch=('mingw64' 'ucrt64' 'clang64')
1010
url='https://github.com/expresscpp/expresscpp'
11-
license=(MIT)
11+
license=(spdx:MIT)
1212
depends=("${MINGW_PACKAGE_PREFIX}-fmt"
1313
"${MINGW_PACKAGE_PREFIX}-nlohmann-json"
1414
"${MINGW_PACKAGE_PREFIX}-boost")
15-
makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
16-
"${MINGW_PACKAGE_PREFIX}-ninja"
17-
"${MINGW_PACKAGE_PREFIX}-cc")
18-
source=("expresscpp-${pkgver}.tar.gz::https://github.com/expresscpp/expresscpp/archive/v${pkgver}.tar.gz"
15+
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
16+
"${MINGW_PACKAGE_PREFIX}-cmake"
17+
"${MINGW_PACKAGE_PREFIX}-ninja")
18+
source=("https://github.com/expresscpp/expresscpp/archive/v${pkgver}/expresscpp-${pkgver}.tar.gz"
1919
"0001-Windows-dll-mingw.patch")
2020
sha512sums=('afe554f01d8f43253a23daea086e9b67d9593b057534929e18ead99da5e41cb826374cf8c67b3df8c25e78aa6966fdb3afa0659482f96da67cec460882aa5461'
2121
'a0a9bc22817835ff35c33f8dbf6311bd35d5a6a898fac1fc99427e6212ad376c314c270cf4ac8ac899f35f446ad4b361f12cd43a04b42617263518845fbd2bc7')
@@ -25,20 +25,21 @@ prepare(){
2525
patch -Np1 -i "${srcdir}/0001-Windows-dll-mingw.patch"
2626
}
2727
build() {
28-
cd ${srcdir}/expresscpp-${pkgver}
29-
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
30-
${MINGW_PREFIX}/bin/cmake \
31-
-GNinja \
32-
-DBUILD_SHARED_LIBS=ON \
33-
-DCMAKE_BUILD_TYPE=Release \
34-
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
35-
-B build-${MINGW_CHOST}
3628

37-
cmake --build build-${MINGW_CHOST}
29+
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
30+
${MINGW_PREFIX}/bin/cmake \
31+
-GNinja \
32+
-DBUILD_SHARED_LIBS=ON \
33+
-DCMAKE_BUILD_TYPE=Release \
34+
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
35+
-S expresscpp-${pkgver} \
36+
-B build-${MSYSTEM}
37+
38+
${MINGW_PREFIX}/bin/cmake --build build-${MSYSTEM}
3839
}
3940

4041
package() {
41-
cd ${srcdir}/expresscpp-${pkgver}/build-${MINGW_CHOST}
42+
cd ${srcdir}/build-${MSYSTEM}
4243

43-
DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --build . --target install
44+
DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install .
4445
}

‎mingw-w64-freeimage/PKGBUILD‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pkgrel=13
1111
libver=3
1212
pkgdesc="Library project for developers who would like to support popular graphics image formats (mingw-w64)"
1313
arch=('any')
14-
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
14+
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
1515
license=('spdx:FreeImage OR GPL-2.0-or-later')
1616
url="https://freeimage.sourceforge.io/"
1717
depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
@@ -26,8 +26,9 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
2626
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
2727
"${MINGW_PACKAGE_PREFIX}-iconv"
2828
"${MINGW_PACKAGE_PREFIX}-pkgconf"
29-
"dos2unix" "make" "lndir")
30-
options=('strip' 'staticlibs' '!buildflags')
29+
"dos2unix"
30+
"lndir")
31+
options=('!buildflags')
3132
source=("https://downloads.sourceforge.net/sourceforge/freeimage/${_realname}${pkgver//./}.zip"
3233
'FreeImage-3.18.0_mingw-makefiles.patch'
3334
'FreeImage-3.18.0_unbundle.patch'

‎mingw-w64-highlight/PKGBUILD‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ pkgbase=mingw-w64-${_realname}
55
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
66
pkgver=4.10
77
pkgrel=1
8-
url="http://www.andre-simon.de/doku/highlight/highlight.html"
98
pkgdesc="Fast and flexible source code highlighter (CLI version) (mingw-w64)"
10-
license=('spdx:GPL-3.0-or-later')
119
arch=('any')
12-
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
10+
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
11+
url="http://www.andre-simon.de/doku/highlight/highlight.html"
12+
msys2_repository_url="https://gitlab.com/saalen/highlight/"
1313
msys2_references=(
1414
'archlinux: highlight'
1515
)
16-
msys2_repository_url="https://gitlab.com/saalen/highlight/"
16+
license=('spdx:GPL-3.0-or-later')
1717
depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
1818
"${MINGW_PACKAGE_PREFIX}-lua")
1919
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"

‎mingw-w64-lib2geom/PKGBUILD‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ pkgver=1.3
77
pkgrel=2
88
pkgdesc='Easy to use 2D geometry library in C++ (mingw-w64)'
99
arch=('any')
10-
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
10+
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
1111
url='https://gitlab.com/inkscape/lib2geom'
12-
license=('spdx:LGPL-2.1-or-later' 'spdx:MPL-1.1')
12+
license=('spdx:LGPL-2.1-or-later OR MPL-1.1')
1313
depends=("${MINGW_PACKAGE_PREFIX}-cairo"
1414
"${MINGW_PACKAGE_PREFIX}-double-conversion"
1515
"${MINGW_PACKAGE_PREFIX}-glib2"

‎mingw-w64-libbsdf/PKGBUILD‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,20 @@ pkgbase=mingw-w64-${_realname}
66
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
77
pkgver=0.11.0
88
pkgrel=1
9-
epoch=
109
pkgdesc="Library for handling BSDF files (mingw-w64)"
1110
arch=('any')
12-
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
11+
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
1312
url='https://github.com/KimuraRyo/libbsdf'
1413
license=('spdx:MPL-2.0')
1514
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
1615
"${MINGW_PACKAGE_PREFIX}-cmake"
1716
"${MINGW_PACKAGE_PREFIX}-ninja"
1817
"${MINGW_PACKAGE_PREFIX}-eigen3")
19-
source=(${_realname}-${pkgver}.tar.gz::"https://github.com/KimuraRyo/${_realname}/archive/v${pkgver}.tar.gz")
18+
source=("https://github.com/KimuraRyo/${_realname}/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz")
2019
sha256sums=('1f830d4a28b0c81b77ef4bfd0d8e2dadf46b4369e4d53f43a37d761566387411')
2120

2221
build() {
23-
[[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
24-
mkdir build-${MSYSTEM} && cd build-${MSYSTEM}
22+
mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
2523

2624
declare -a extra_config
2725
if check_option "debug" "n"; then

‎mingw-w64-libodfgen/PKGBUILD‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@ pkgver=0.1.8
77
pkgrel=4
88
pkgdesc="Library to generate ODF documents (mingw-w64)"
99
arch=('any')
10-
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
10+
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
1111
url="https://sourceforge.net/p/libwpd/libodfgen/"
12-
license=("LGPL 2.1")
12+
license=("spdx:LGPL-2.1-or-later OR MPL-2.0")
1313
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
1414
"${MINGW_PACKAGE_PREFIX}-autotools"
1515
"${MINGW_PACKAGE_PREFIX}-doxygen")
1616
depends=("${MINGW_PACKAGE_PREFIX}-libxml2"
1717
"${MINGW_PACKAGE_PREFIX}-librevenge")
18-
options=(staticlibs strip)
1918
source=("https://sourceforge.net/projects/libwpd/files/libodfgen/${_realname}-${pkgver}/${_realname}-${pkgver}.tar.xz")
2019
sha256sums=('55200027fd46623b9bdddd38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625')
2120

@@ -25,9 +24,10 @@ prepare() {
2524
}
2625

2726
build() {
28-
[[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
29-
cp -r ${srcdir}/${_realname}-${pkgver} "${srcdir}/build-${MINGW_CHOST}"
30-
cd "${srcdir}/build-${MINGW_CHOST}"
27+
[[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
28+
cp -r ${srcdir}/${_realname}-${pkgver} "${srcdir}/build-${MSYSTEM}"
29+
cd "${srcdir}/build-${MSYSTEM}"
30+
3131
./configure \
3232
--prefix=${MINGW_PREFIX} \
3333
--build=${MINGW_CHOST} \
@@ -40,7 +40,7 @@ build() {
4040
}
4141

4242
package() {
43-
cd "${srcdir}/build-${MINGW_CHOST}"
43+
cd "${srcdir}/build-${MSYSTEM}"
4444
make DESTDIR="${pkgdir}" install
4545

4646
install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING.LGPL" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING.LGPL"

0 commit comments

Comments
 (0)