Skip to content

Commit ab91876

Browse files
dschodscho
committed
2 parents ea0aed0 + 5dc7891 commit ab91876

File tree

83 files changed

+2252
-698
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+2252
-698
lines changed

‎appveyor.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,14 @@ environment:
66
BUILD_URL: https://ci.appveyor.com/project/$(APPVEYOR_ACCOUNT_NAME)/$(APPVEYOR_PROJECT_NAME)/build/$(APPVEYOR_BUILD_VERSION)
77

88
build_script:
9-
# TODO: implement update-core --noconfirm and replace the below command line
10-
- C:\msys64\usr\bin\pacman --sync --refresh --refresh --needed --noconfirm msys2-runtime msys2-runtime-devel bash pacman pacman-mirrors
9+
# TODO: remove the line below once the AppVeyor installation includes a
10+
# newer version of pacman that can perform core updates
11+
- C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh pacman
12+
13+
# Git is required but currently not part of AppVeyor installation
14+
- C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh git
15+
16+
- C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh --sysupgrade --sysupgrade
1117
- C:\msys64\usr\bin\bash --login -c "$(cygpath ${APPVEYOR_BUILD_FOLDER})/ci-build.sh"
1218

1319
artifacts:

‎ci-build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ define_build_order || failure 'Could not determine build order'
2222

2323
# Build
2424
message 'Building packages' "${packages[@]}"
25-
execute 'Upgrading the system' pacman --noconfirm --noprogressbar --sync --refresh --refresh --sysupgrade
25+
execute 'Upgrading the system' pacman --noconfirm --noprogressbar --sync --refresh --refresh --sysupgrade --sysupgrade
2626
for package in "${packages[@]}"; do
2727
execute 'Building binary' makepkg-mingw --noconfirm --noprogressbar --skippgpcheck --nocheck --syncdeps --rmdeps --cleanbuild
2828
execute 'Building source' makepkg --noconfirm --noprogressbar --skippgpcheck --allsource --config '/etc/makepkg_mingw64.conf'

‎mingw-w64-PKGBUILD-common/build-kf5-shared ‎mingw-w64-PKGBUILD-common/build-kf5

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
#!/usr/bin/env bash
22

3+
if [[ "$1" == "shared" ]]; then
4+
echo "Building shared"
5+
elif [[ "$1" == "static" ]]; then
6+
echo "Building static"
7+
else
8+
echo "${0} :: Error :: Please pass static or shared"
9+
exit 1
10+
fi
11+
312
THISDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
413

514
# Listed in tier-order
@@ -28,7 +37,7 @@ solid-qt5
2837

2938
for pkg in "${pkgs[@]}"; do
3039
pushd ${THISDIR}/../mingw-w64-${pkg}
31-
export KF5_VARIANT=shared
40+
export KF5_VARIANT=$1
3241
rm -rf *pkg*xz src pkg
3342
makepkg-mingw -siLf --noconfirm || exit 1
3443
popd

‎mingw-w64-PKGBUILD-templates/PKGBUILD.setup-py-python-pkg

+84
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
# Maintainer: Some One <[email protected]>
2+
#This value is here because some python package names have capital letters
3+
#while there is a strong preference for lowercase letters in ArchLinux and
4+
#MSYS packages.
5+
_pyname=SomePackage
6+
_realname=somepackage
7+
pkgbase=mingw-w64-python-${_realname}
8+
pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
9+
pkgver=1.0.0
10+
pkgrel=1
11+
pkgdesc="Some package (mingw-w64)"
12+
arch=('any')
13+
url='https://www.somepackage.org/'
14+
license=('LICENSE')
15+
validpgpkeys=('gpg_KEY')
16+
makedepends=("${MINGW_PACKAGE_PREFIX}-python2"
17+
"${MINGW_PACKAGE_PREFIX}-python3"
18+
"${MINGW_PACKAGE_PREFIX}-python3-setuptools"
19+
"${MINGW_PACKAGE_PREFIX}-python2-setuptools")
20+
options=('staticlibs' 'strip' '!debug')
21+
source=("https://pypi.python.org/packages/source/P/${_realname}/${_realname}-${pkgver}.tar.gz")
22+
"0001-An-important-fix.patch"
23+
"0002-A-less-important-fix.patch")
24+
sha256sums=('SKIP'
25+
'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
26+
'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb')
27+
28+
prepare() {
29+
cd "$srcdir"/
30+
patch -p1 -i ${srcdir}/0001-A-really-important-fix.patch
31+
patch -p1 -i ${srcdir}/0002-A-less-important-fix.patch
32+
for builddir in python{2,3}-build; do
33+
rm -rf $builddir | true
34+
cp -r "${_pyname}-${pkgver}" "${builddir}"
35+
done
36+
}
37+
38+
check() {
39+
for pver in {2,3}; do
40+
msg "Python ${pver} test for ${CARCH}"
41+
cd "${srcdir}/python${pver}-build"
42+
${MINGW_PREFIX}/bin/python${pver} setup.py check
43+
done
44+
}
45+
46+
# Note that build() is sometimes skipped because it's done in
47+
# the packages setup.py install for simplicity if you can do so.
48+
package_python3-somepackage() {
49+
depends=("${MINGW_PACKAGE_PREFIX}-python3")
50+
51+
cd "${srcdir}/python3-build"
52+
MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
53+
${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
54+
--root="${pkgdir}" --optimize=1
55+
56+
install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/COPYING"
57+
}
58+
59+
package_python2-somepackage() {
60+
depends=("${MINGW_PACKAGE_PREFIX}-python2")
61+
62+
cd "${srcdir}/python2-build"
63+
MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
64+
${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} \
65+
--root="${pkgdir}" --optimize=1
66+
67+
install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/COPYING"
68+
}
69+
70+
package_mingw-w64-i686-python2-somepackage() {
71+
package_python2-somepackage
72+
}
73+
74+
package_mingw-w64-i686-python3-somepackage() {
75+
package_python3-somepackage
76+
}
77+
78+
package_mingw-w64-x86_64-python2-somepackage() {
79+
package_python2-somepackage
80+
}
81+
82+
package_mingw-w64-x86_64-python3-somepackage() {
83+
package_python3-somepackage
84+
}

‎mingw-w64-attica-qt5/PKGBUILD

+1-6
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@
22
# Maintainer (ArchLinux): Andrea Scarpino <[email protected]>
33
# Maintainer (MSYS2): Ray Donnelly <[email protected]>
44

5-
if [ -n ${KF5_VARIANT} ]; then
6-
_variant=-${KF5_VARIANT}
7-
else
8-
_variant=-shared
9-
fi
10-
5+
_variant=-${KF5_VARIANT:-shared}
116
source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5
127
_kde_f5_init_package "${_variant}" "attica"
138
pkgver=5.12.0

‎mingw-w64-catch/PKGBUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
_realname=catch
44
pkgbase=mingw-w64-${_realname}
55
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
6-
pkgver=1.4.0
6+
pkgver=1.5.0
77
pkgrel=1
88
pkgdesc="Multi-paradigm automated test framework for C++ and Objective-C (mingw-w64)"
99
arch=('any')
@@ -12,7 +12,7 @@ checkdepends=("${MINGW_PACKAGE_PREFIX}-gcc"
1212
"${MINGW_PACKAGE_PREFIX}-cmake")
1313
license=('custom')
1414
source=(${_realname}-${pkgver}.tar.gz::https://github.com/philsquared/Catch/archive/v${pkgver}.tar.gz)
15-
sha256sums=('b225e9828291636745db75e42cd604b8d755dcad0c5235fc90d7c725c4b49fb1')
15+
sha256sums=('2c668ed9fec133517035f9e7384da8c7cc80f1aa737d777783ff2a44e19d3ad8')
1616

1717
check() {
1818
rm -rf "${srcdir}/test-${MINGW_CHOST}"

‎mingw-w64-ccache/PKGBUILD

+18-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
_realname=ccache
44
pkgbase=mingw-w64-${_realname}
55
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
6-
pkgver=3.2.4
6+
pkgver=3.2.5
77
pkgrel=1
88
pkgdesc="A compiler cache (mingw-w64)"
99
arch=('any')
@@ -15,17 +15,21 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
1515
"${MINGW_PACKAGE_PREFIX}-zlib")
1616
options=('staticlibs' 'strip')
1717
source=(https://samba.org/ftp/ccache/${_realname}-${pkgver}.tar.bz2{,.asc}
18-
"MinGW-add-ifdeds.patch")
19-
sha256sums=('ffeb967edb549e67da0bd5f44f729a2022de9fdde65dfd80d2a7204d7f75332e'
18+
"MinGW-add-ifdeds.patch"
19+
"Revert-Handle-some-more-stale-NFS-file-handle-cases.patch")
20+
sha256sums=('7a553809e90faf9de3a23ee9c5b5f786cfd4836bf502744bedb824a24bee1097'
2021
'SKIP'
21-
'30977bff713a10de0392aeeff86f8aa09f13ccf76823edb985b028790d0da472')
22+
'30977bff713a10de0392aeeff86f8aa09f13ccf76823edb985b028790d0da472'
23+
'c21342e871c1199eb2be9c11904a034566f59dad135a73e4f60a39e925ae6d5c')
2224

2325
prepare() {
2426
cd ${_realname}-${pkgver}
2527
#./autogen.sh
26-
28+
2729
#backported patch from git; fixed in unreleased 3.3
28-
patch -p1 -i "${srcdir}"/MinGW-add-ifdeds.patch
30+
patch -p1 -i ${srcdir}/MinGW-add-ifdeds.patch
31+
#MinGW-w64 errno.h doesn't define "ESTALE", revert upstream patch
32+
patch -p1 -i ${srcdir}/Revert-Handle-some-more-stale-NFS-file-handle-cases.patch
2933
}
3034

3135
build() {
@@ -42,4 +46,12 @@ build() {
4246
package() {
4347
cd "${srcdir}/build-${MINGW_CHOST}"
4448
make DESTDIR="${pkgdir}" install
49+
50+
# hack: use bash scripts as shortcuts since we cannot use symlinks
51+
install -d ${pkgdir}${MINGW_PREFIX}/lib/ccache/bin
52+
cd ${pkgdir}${MINGW_PREFIX}/lib/ccache/bin
53+
scripts=(c++ cc cpp gcc g++ ${MINGW_CHOST}-g++ ${MINGW_CHOST}-c++ ${MINGW_CHOST}-gcc)
54+
for fn in ${scripts[*]}; do
55+
echo -e '#!/bin/bash\n\nccache '${MINGW_PREFIX}'/bin/'$fn' "$@"' > $fn
56+
done
4557
}

‎mingw-w64-ccache/Revert-Handle-some-more-stale-NFS-file-handle-cases.patch

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
diff -urN ccache-3.2.5.orig/ccache.c ccache-3.2.5/ccache.c
2+
--- ccache-3.2.5.orig/ccache.c 2016-04-24 14:29:28.686989000 +0200
3+
+++ ccache-3.2.5/ccache.c 2016-04-24 14:30:57.937014600 +0200
4+
@@ -851,7 +851,7 @@
5+
}
6+
7+
if (ret == -1) {
8+
- if (errno == ENOENT || errno == ESTALE) {
9+
+ if (errno == ENOENT) {
10+
/* Someone removed the file just before we began copying? */
11+
cc_log("Cache file %s just disappeared from cache", source);
12+
stats_update(STATS_MISSING);
13+
diff -urN ccache-3.2.5.orig/cleanup.c ccache-3.2.5/cleanup.c
14+
--- ccache-3.2.5.orig/cleanup.c 2016-04-17 16:44:45.000000000 +0200
15+
+++ ccache-3.2.5/cleanup.c 2016-04-24 14:31:26.269916100 +0200
16+
@@ -108,7 +108,7 @@
17+
if (x_unlink(path) == 0) {
18+
cache_size -= size;
19+
files_in_cache--;
20+
- } else if (errno != ENOENT && errno != ESTALE) {
21+
+ } else if (errno != ENOENT) {
22+
cc_log("Failed to unlink %s (%s)", path, strerror(errno));
23+
}
24+
}
25+
@@ -122,7 +122,7 @@
26+
path = format("%s%s", base, extension);
27+
if (lstat(path, &st) == 0) {
28+
delete_file(path, file_size(&st));
29+
- } else if (errno != ENOENT && errno != ESTALE) {
30+
+ } else if (errno != ENOENT) {
31+
cc_log("Failed to stat %s: %s", path, strerror(errno));
32+
}
33+
free(path);
34+
diff -urN ccache-3.2.5.orig/util.c ccache-3.2.5/util.c
35+
--- ccache-3.2.5.orig/util.c 2016-04-17 16:44:45.000000000 +0200
36+
+++ ccache-3.2.5/util.c 2016-04-24 14:31:45.123663600 +0200
37+
@@ -881,7 +881,7 @@
38+
39+
fname = format("%s/%s", dir, de->d_name);
40+
if (lstat(fname, &st)) {
41+
- if (errno != ENOENT && errno != ESTALE) {
42+
+ if (errno != ENOENT) {
43+
fatal("lstat %s failed: %s", fname, strerror(errno));
44+
}
45+
free(fname);
46+
@@ -1510,7 +1510,7 @@
47+
}
48+
if (unlink(tmp_name) == -1) {
49+
/* If it was released in a race, that's OK. */
50+
- if (errno != ENOENT && errno != ESTALE) {
51+
+ if (errno != ENOENT) {
52+
result = -1;
53+
saved_errno = errno;
54+
}

‎mingw-w64-cego/PKGBUILD

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
_realname=cego
44
pkgbase=mingw-w64-${_realname}
55
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
6-
pkgver=2.30.0
6+
pkgver=2.30.3
77
pkgrel=1
88
pkgdesc="Cego database system (mingw-w64)"
99
arch=('any')
@@ -12,10 +12,10 @@ license=('GPL3')
1212

1313
source=("http://www.lemke-it.com/${_realname}-${pkgver}.tar.gz")
1414

15-
depends=("${MINGW_PACKAGE_PREFIX}-lfcbase")
16-
depends=("${MINGW_PACKAGE_PREFIX}-lfcxml")
15+
depends=("${MINGW_PACKAGE_PREFIX}-lfcbase=1.8.2")
16+
depends=("${MINGW_PACKAGE_PREFIX}-lfcxml=1.2.3")
1717

18-
sha256sums=('855c49c4feec2229600e322313fee035d96f8c31f55c0189535ed100dc1e9cba')
18+
sha256sums=('6e2c0f1a6734ce81608daa548ed02c77a70f8159414e7bb51f36314be4de0432')
1919

2020
prepare() {
2121
cd $srcdir/${_realname}-${pkgver}

‎mingw-w64-creduce-git/PKGBUILD

+3-4
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,15 @@ pkgbase=mingw-w64-${_realname}-git
55
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-git")
66
provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
77
conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
8-
pkgver=creduce.2.3.0.18.g7b3ce38
9-
pkgrel=2
8+
pkgver=2.4.0.r205.gbc92ff4
9+
pkgrel=1
1010
pkgdesc="A C program reducer (mingw-w64)"
1111
depends=('perl-Benchmark-Timer'
1212
'perl-Exporter-Lite'
1313
'perl-File-Which'
1414
'perl-Getopt-Tabular'
1515
'perl-Regexp-Common'
1616
'perl-Sys-CPU'
17-
'delta'
1817
"${MINGW_PACKAGE_PREFIX}-astyle"
1918
"${MINGW_PACKAGE_PREFIX}-indent"
2019
"${MINGW_PACKAGE_PREFIX}-clang")
@@ -29,7 +28,7 @@ sha256sums=('SKIP'
2928

3029
pkgver() {
3130
cd "${srcdir}/${_realname}"
32-
git describe --always | sed 's|-|.|g'
31+
git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g' | sed 's/creduce.//'
3332
}
3433

3534
prepare() {

‎mingw-w64-creduce/0001-Track-member-function-name-capitalization-change.patch

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From 0df87ff60d5c5df528feaeae16d5ad9c2741eeb5 Mon Sep 17 00:00:00 2001
2+
From: Eric Eide <[email protected]>
3+
Date: Mon, 14 Sep 2015 17:35:33 -0600
4+
Subject: [PATCH] Track member-function-name capitalization change.
5+
6+
---
7+
clang_delta/TransformationManager.cpp | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/clang_delta/TransformationManager.cpp b/clang_delta/TransformationManager.cpp
11+
index e677930..dceb497 100644
12+
--- a/clang_delta/TransformationManager.cpp
13+
+++ b/clang_delta/TransformationManager.cpp
14+
@@ -112,7 +112,7 @@ bool TransformationManager::initializeCompilerInstance(std::string &ErrorMsg)
15+
ClangInstance->setASTConsumer(
16+
std::unique_ptr<ASTConsumer>(CurrentTransformationImpl));
17+
Preprocessor &PP = ClangInstance->getPreprocessor();
18+
- PP.getBuiltinInfo().InitializeBuiltins(PP.getIdentifierTable(),
19+
+ PP.getBuiltinInfo().initializeBuiltins(PP.getIdentifierTable(),
20+
PP.getLangOpts());
21+
22+
if (!ClangInstance->InitializeSourceManager(FrontendInputFile(SrcFileName, IK))) {
23+
--
24+
2.8.1
25+

‎mingw-w64-creduce/PKGBUILD

+7-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ _realname=creduce
44
pkgbase=mingw-w64-${_realname}
55
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
66
replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-git")
7-
pkgver=2.3.0
8-
pkgrel=3
7+
pkgver=2.4.0
8+
pkgrel=1
99
pkgdesc="A C program reducer (mingw-w64)"
1010
depends=('perl-Benchmark-Timer'
1111
'perl-Exporter-Lite'
@@ -22,15 +22,19 @@ url='https://github.com/csmith-project/creduce'
2222
license=('custom:University of Illinois/NCSA Open Source License')
2323
makedepends=("flex" "${MINGW_PACKAGE_PREFIX}-clang")
2424
source=(https://github.com/csmith-project/creduce/archive/${_realname}-${pkgver}.tar.gz
25+
"0001-Track-member-function-name-capitalization-change.patch"
2526
"llvm-config-cygpath")
26-
sha256sums=('47a42751aab8b51bc10d8df62f359bdc1b4a644f16feb85b9f7325f0c5bce4a3'
27+
sha256sums=('a3917e37b0c7d77e7f2c2961794ba511f874f78684a7fd944e51c9d43cc5d7c6'
28+
'f345091edbb54a614256dea99c373dd3fd0c1de9d97c27cf58685292c8e2ab8b'
2729
'03a7239d1e26d8a5dd5f405e10826679725cae6c01a9c37e80c6f1c184dad0a9')
2830

2931
prepare() {
3032
cd "${srcdir}"
3133
[[ -d tools ]] && rm -rf tools
3234
mkdir tools
3335
cp -f "${srcdir}"/llvm-config-cygpath tools/llvm-config
36+
cd ${_realname}-${_realname}-${pkgver}
37+
patch -p1 -i "${srcdir}"/0001-Track-member-function-name-capitalization-change.patch
3438
}
3539

3640
build() {

‎mingw-w64-evince/PKGBUILD

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ _realname=evince
44
pkgbase=mingw-w64-${_realname}
55
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
66
pkgver=3.20.0
7-
pkgrel=1
7+
pkgrel=2
88
arch=('any')
99
pkgdesc="Document (PostScript, PDF) viewer (mingw-w64)"
1010
license=("GPL 2")
@@ -18,7 +18,8 @@ depends=("${MINGW_PACKAGE_PREFIX}-glib2"
1818
"${MINGW_PACKAGE_PREFIX}-libgxps"
1919
"${MINGW_PACKAGE_PREFIX}-libspectre"
2020
"${MINGW_PACKAGE_PREFIX}-libtiff"
21-
"${MINGW_PACKAGE_PREFIX}-poppler")
21+
"${MINGW_PACKAGE_PREFIX}-poppler"
22+
"${MINGW_PACKAGE_PREFIX}-nss")
2223
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
2324
"${MINGW_PACKAGE_PREFIX}-pkg-config"
2425
"${MINGW_PACKAGE_PREFIX}-gobject-introspection"

0 commit comments

Comments
 (0)