Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
dscho committed May 2, 2016
2 parents ea0aed0 + 5dc7891 commit ab91876
Show file tree
Hide file tree
Showing 83 changed files with 2,252 additions and 698 deletions.
10 changes: 8 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,14 @@ environment:
BUILD_URL: https://ci.appveyor.com/project/$(APPVEYOR_ACCOUNT_NAME)/$(APPVEYOR_PROJECT_NAME)/build/$(APPVEYOR_BUILD_VERSION)

build_script:
# TODO: implement update-core --noconfirm and replace the below command line
- C:\msys64\usr\bin\pacman --sync --refresh --refresh --needed --noconfirm msys2-runtime msys2-runtime-devel bash pacman pacman-mirrors
# TODO: remove the line below once the AppVeyor installation includes a
# newer version of pacman that can perform core updates
- C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh pacman

# Git is required but currently not part of AppVeyor installation
- C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh git

- C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh --sysupgrade --sysupgrade
- C:\msys64\usr\bin\bash --login -c "$(cygpath ${APPVEYOR_BUILD_FOLDER})/ci-build.sh"

artifacts:
Expand Down
2 changes: 1 addition & 1 deletion ci-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ define_build_order || failure 'Could not determine build order'

# Build
message 'Building packages' "${packages[@]}"
execute 'Upgrading the system' pacman --noconfirm --noprogressbar --sync --refresh --refresh --sysupgrade
execute 'Upgrading the system' pacman --noconfirm --noprogressbar --sync --refresh --refresh --sysupgrade --sysupgrade
for package in "${packages[@]}"; do
execute 'Building binary' makepkg-mingw --noconfirm --noprogressbar --skippgpcheck --nocheck --syncdeps --rmdeps --cleanbuild
execute 'Building source' makepkg --noconfirm --noprogressbar --skippgpcheck --allsource --config '/etc/makepkg_mingw64.conf'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
#!/usr/bin/env bash

if [[ "$1" == "shared" ]]; then
echo "Building shared"
elif [[ "$1" == "static" ]]; then
echo "Building static"
else
echo "${0} :: Error :: Please pass static or shared"
exit 1
fi

THISDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"

# Listed in tier-order
Expand Down Expand Up @@ -28,7 +37,7 @@ solid-qt5

for pkg in "${pkgs[@]}"; do
pushd ${THISDIR}/../mingw-w64-${pkg}
export KF5_VARIANT=shared
export KF5_VARIANT=$1
rm -rf *pkg*xz src pkg
makepkg-mingw -siLf --noconfirm || exit 1
popd
Expand Down
84 changes: 84 additions & 0 deletions mingw-w64-PKGBUILD-templates/PKGBUILD.setup-py-python-pkg
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
# Maintainer: Some One <[email protected]>
#This value is here because some python package names have capital letters
#while there is a strong preference for lowercase letters in ArchLinux and
#MSYS packages.
_pyname=SomePackage
_realname=somepackage
pkgbase=mingw-w64-python-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
pkgver=1.0.0
pkgrel=1
pkgdesc="Some package (mingw-w64)"
arch=('any')
url='https://www.somepackage.org/'
license=('LICENSE')
validpgpkeys=('gpg_KEY')
makedepends=("${MINGW_PACKAGE_PREFIX}-python2"
"${MINGW_PACKAGE_PREFIX}-python3"
"${MINGW_PACKAGE_PREFIX}-python3-setuptools"
"${MINGW_PACKAGE_PREFIX}-python2-setuptools")
options=('staticlibs' 'strip' '!debug')
source=("https://pypi.python.org/packages/source/P/${_realname}/${_realname}-${pkgver}.tar.gz")
"0001-An-important-fix.patch"
"0002-A-less-important-fix.patch")
sha256sums=('SKIP'
'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb')

prepare() {
cd "$srcdir"/
patch -p1 -i ${srcdir}/0001-A-really-important-fix.patch
patch -p1 -i ${srcdir}/0002-A-less-important-fix.patch
for builddir in python{2,3}-build; do
rm -rf $builddir | true
cp -r "${_pyname}-${pkgver}" "${builddir}"
done
}

check() {
for pver in {2,3}; do
msg "Python ${pver} test for ${CARCH}"
cd "${srcdir}/python${pver}-build"
${MINGW_PREFIX}/bin/python${pver} setup.py check
done
}

# Note that build() is sometimes skipped because it's done in
# the packages setup.py install for simplicity if you can do so.
package_python3-somepackage() {
depends=("${MINGW_PACKAGE_PREFIX}-python3")

cd "${srcdir}/python3-build"
MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
--root="${pkgdir}" --optimize=1

install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/COPYING"
}

package_python2-somepackage() {
depends=("${MINGW_PACKAGE_PREFIX}-python2")

cd "${srcdir}/python2-build"
MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} \
--root="${pkgdir}" --optimize=1

install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/COPYING"
}

package_mingw-w64-i686-python2-somepackage() {
package_python2-somepackage
}

package_mingw-w64-i686-python3-somepackage() {
package_python3-somepackage
}

package_mingw-w64-x86_64-python2-somepackage() {
package_python2-somepackage
}

package_mingw-w64-x86_64-python3-somepackage() {
package_python3-somepackage
}
7 changes: 1 addition & 6 deletions mingw-w64-attica-qt5/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,7 @@
# Maintainer (ArchLinux): Andrea Scarpino <[email protected]>
# Maintainer (MSYS2): Ray Donnelly <[email protected]>

if [ -n ${KF5_VARIANT} ]; then
_variant=-${KF5_VARIANT}
else
_variant=-shared
fi

_variant=-${KF5_VARIANT:-shared}
source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5
_kde_f5_init_package "${_variant}" "attica"
pkgver=5.12.0
Expand Down
4 changes: 2 additions & 2 deletions mingw-w64-catch/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
_realname=catch
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.4.0
pkgver=1.5.0
pkgrel=1
pkgdesc="Multi-paradigm automated test framework for C++ and Objective-C (mingw-w64)"
arch=('any')
Expand All @@ -12,7 +12,7 @@ checkdepends=("${MINGW_PACKAGE_PREFIX}-gcc"
"${MINGW_PACKAGE_PREFIX}-cmake")
license=('custom')
source=(${_realname}-${pkgver}.tar.gz::https://github.com/philsquared/Catch/archive/v${pkgver}.tar.gz)
sha256sums=('b225e9828291636745db75e42cd604b8d755dcad0c5235fc90d7c725c4b49fb1')
sha256sums=('2c668ed9fec133517035f9e7384da8c7cc80f1aa737d777783ff2a44e19d3ad8')

check() {
rm -rf "${srcdir}/test-${MINGW_CHOST}"
Expand Down
24 changes: 18 additions & 6 deletions mingw-w64-ccache/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
_realname=ccache
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=3.2.4
pkgver=3.2.5
pkgrel=1
pkgdesc="A compiler cache (mingw-w64)"
arch=('any')
Expand All @@ -15,17 +15,21 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
"${MINGW_PACKAGE_PREFIX}-zlib")
options=('staticlibs' 'strip')
source=(https://samba.org/ftp/ccache/${_realname}-${pkgver}.tar.bz2{,.asc}
"MinGW-add-ifdeds.patch")
sha256sums=('ffeb967edb549e67da0bd5f44f729a2022de9fdde65dfd80d2a7204d7f75332e'
"MinGW-add-ifdeds.patch"
"Revert-Handle-some-more-stale-NFS-file-handle-cases.patch")
sha256sums=('7a553809e90faf9de3a23ee9c5b5f786cfd4836bf502744bedb824a24bee1097'
'SKIP'
'30977bff713a10de0392aeeff86f8aa09f13ccf76823edb985b028790d0da472')
'30977bff713a10de0392aeeff86f8aa09f13ccf76823edb985b028790d0da472'
'c21342e871c1199eb2be9c11904a034566f59dad135a73e4f60a39e925ae6d5c')

prepare() {
cd ${_realname}-${pkgver}
#./autogen.sh

#backported patch from git; fixed in unreleased 3.3
patch -p1 -i "${srcdir}"/MinGW-add-ifdeds.patch
patch -p1 -i ${srcdir}/MinGW-add-ifdeds.patch
#MinGW-w64 errno.h doesn't define "ESTALE", revert upstream patch
patch -p1 -i ${srcdir}/Revert-Handle-some-more-stale-NFS-file-handle-cases.patch
}

build() {
Expand All @@ -42,4 +46,12 @@ build() {
package() {
cd "${srcdir}/build-${MINGW_CHOST}"
make DESTDIR="${pkgdir}" install

# hack: use bash scripts as shortcuts since we cannot use symlinks
install -d ${pkgdir}${MINGW_PREFIX}/lib/ccache/bin
cd ${pkgdir}${MINGW_PREFIX}/lib/ccache/bin
scripts=(c++ cc cpp gcc g++ ${MINGW_CHOST}-g++ ${MINGW_CHOST}-c++ ${MINGW_CHOST}-gcc)
for fn in ${scripts[*]}; do
echo -e '#!/bin/bash\n\nccache '${MINGW_PREFIX}'/bin/'$fn' "$@"' > $fn
done
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
diff -urN ccache-3.2.5.orig/ccache.c ccache-3.2.5/ccache.c
--- ccache-3.2.5.orig/ccache.c 2016-04-24 14:29:28.686989000 +0200
+++ ccache-3.2.5/ccache.c 2016-04-24 14:30:57.937014600 +0200
@@ -851,7 +851,7 @@
}

if (ret == -1) {
- if (errno == ENOENT || errno == ESTALE) {
+ if (errno == ENOENT) {
/* Someone removed the file just before we began copying? */
cc_log("Cache file %s just disappeared from cache", source);
stats_update(STATS_MISSING);
diff -urN ccache-3.2.5.orig/cleanup.c ccache-3.2.5/cleanup.c
--- ccache-3.2.5.orig/cleanup.c 2016-04-17 16:44:45.000000000 +0200
+++ ccache-3.2.5/cleanup.c 2016-04-24 14:31:26.269916100 +0200
@@ -108,7 +108,7 @@
if (x_unlink(path) == 0) {
cache_size -= size;
files_in_cache--;
- } else if (errno != ENOENT && errno != ESTALE) {
+ } else if (errno != ENOENT) {
cc_log("Failed to unlink %s (%s)", path, strerror(errno));
}
}
@@ -122,7 +122,7 @@
path = format("%s%s", base, extension);
if (lstat(path, &st) == 0) {
delete_file(path, file_size(&st));
- } else if (errno != ENOENT && errno != ESTALE) {
+ } else if (errno != ENOENT) {
cc_log("Failed to stat %s: %s", path, strerror(errno));
}
free(path);
diff -urN ccache-3.2.5.orig/util.c ccache-3.2.5/util.c
--- ccache-3.2.5.orig/util.c 2016-04-17 16:44:45.000000000 +0200
+++ ccache-3.2.5/util.c 2016-04-24 14:31:45.123663600 +0200
@@ -881,7 +881,7 @@

fname = format("%s/%s", dir, de->d_name);
if (lstat(fname, &st)) {
- if (errno != ENOENT && errno != ESTALE) {
+ if (errno != ENOENT) {
fatal("lstat %s failed: %s", fname, strerror(errno));
}
free(fname);
@@ -1510,7 +1510,7 @@
}
if (unlink(tmp_name) == -1) {
/* If it was released in a race, that's OK. */
- if (errno != ENOENT && errno != ESTALE) {
+ if (errno != ENOENT) {
result = -1;
saved_errno = errno;
}
8 changes: 4 additions & 4 deletions mingw-w64-cego/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
_realname=cego
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=2.30.0
pkgver=2.30.3
pkgrel=1
pkgdesc="Cego database system (mingw-w64)"
arch=('any')
Expand All @@ -12,10 +12,10 @@ license=('GPL3')

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

depends=("${MINGW_PACKAGE_PREFIX}-lfcbase")
depends=("${MINGW_PACKAGE_PREFIX}-lfcxml")
depends=("${MINGW_PACKAGE_PREFIX}-lfcbase=1.8.2")
depends=("${MINGW_PACKAGE_PREFIX}-lfcxml=1.2.3")

sha256sums=('855c49c4feec2229600e322313fee035d96f8c31f55c0189535ed100dc1e9cba')
sha256sums=('6e2c0f1a6734ce81608daa548ed02c77a70f8159414e7bb51f36314be4de0432')

prepare() {
cd $srcdir/${_realname}-${pkgver}
Expand Down
7 changes: 3 additions & 4 deletions mingw-w64-creduce-git/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,15 @@ pkgbase=mingw-w64-${_realname}-git
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-git")
provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=creduce.2.3.0.18.g7b3ce38
pkgrel=2
pkgver=2.4.0.r205.gbc92ff4
pkgrel=1
pkgdesc="A C program reducer (mingw-w64)"
depends=('perl-Benchmark-Timer'
'perl-Exporter-Lite'
'perl-File-Which'
'perl-Getopt-Tabular'
'perl-Regexp-Common'
'perl-Sys-CPU'
'delta'
"${MINGW_PACKAGE_PREFIX}-astyle"
"${MINGW_PACKAGE_PREFIX}-indent"
"${MINGW_PACKAGE_PREFIX}-clang")
Expand All @@ -29,7 +28,7 @@ sha256sums=('SKIP'

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

prepare() {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 0df87ff60d5c5df528feaeae16d5ad9c2741eeb5 Mon Sep 17 00:00:00 2001
From: Eric Eide <[email protected]>
Date: Mon, 14 Sep 2015 17:35:33 -0600
Subject: [PATCH] Track member-function-name capitalization change.

---
clang_delta/TransformationManager.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clang_delta/TransformationManager.cpp b/clang_delta/TransformationManager.cpp
index e677930..dceb497 100644
--- a/clang_delta/TransformationManager.cpp
+++ b/clang_delta/TransformationManager.cpp
@@ -112,7 +112,7 @@ bool TransformationManager::initializeCompilerInstance(std::string &ErrorMsg)
ClangInstance->setASTConsumer(
std::unique_ptr<ASTConsumer>(CurrentTransformationImpl));
Preprocessor &PP = ClangInstance->getPreprocessor();
- PP.getBuiltinInfo().InitializeBuiltins(PP.getIdentifierTable(),
+ PP.getBuiltinInfo().initializeBuiltins(PP.getIdentifierTable(),
PP.getLangOpts());

if (!ClangInstance->InitializeSourceManager(FrontendInputFile(SrcFileName, IK))) {
--
2.8.1

10 changes: 7 additions & 3 deletions mingw-w64-creduce/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ _realname=creduce
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-git")
pkgver=2.3.0
pkgrel=3
pkgver=2.4.0
pkgrel=1
pkgdesc="A C program reducer (mingw-w64)"
depends=('perl-Benchmark-Timer'
'perl-Exporter-Lite'
Expand All @@ -22,15 +22,19 @@ url='https://github.com/csmith-project/creduce'
license=('custom:University of Illinois/NCSA Open Source License')
makedepends=("flex" "${MINGW_PACKAGE_PREFIX}-clang")
source=(https://github.com/csmith-project/creduce/archive/${_realname}-${pkgver}.tar.gz
"0001-Track-member-function-name-capitalization-change.patch"
"llvm-config-cygpath")
sha256sums=('47a42751aab8b51bc10d8df62f359bdc1b4a644f16feb85b9f7325f0c5bce4a3'
sha256sums=('a3917e37b0c7d77e7f2c2961794ba511f874f78684a7fd944e51c9d43cc5d7c6'
'f345091edbb54a614256dea99c373dd3fd0c1de9d97c27cf58685292c8e2ab8b'
'03a7239d1e26d8a5dd5f405e10826679725cae6c01a9c37e80c6f1c184dad0a9')

prepare() {
cd "${srcdir}"
[[ -d tools ]] && rm -rf tools
mkdir tools
cp -f "${srcdir}"/llvm-config-cygpath tools/llvm-config
cd ${_realname}-${_realname}-${pkgver}
patch -p1 -i "${srcdir}"/0001-Track-member-function-name-capitalization-change.patch
}

build() {
Expand Down
5 changes: 3 additions & 2 deletions mingw-w64-evince/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ _realname=evince
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=3.20.0
pkgrel=1
pkgrel=2
arch=('any')
pkgdesc="Document (PostScript, PDF) viewer (mingw-w64)"
license=("GPL 2")
Expand All @@ -18,7 +18,8 @@ depends=("${MINGW_PACKAGE_PREFIX}-glib2"
"${MINGW_PACKAGE_PREFIX}-libgxps"
"${MINGW_PACKAGE_PREFIX}-libspectre"
"${MINGW_PACKAGE_PREFIX}-libtiff"
"${MINGW_PACKAGE_PREFIX}-poppler")
"${MINGW_PACKAGE_PREFIX}-poppler"
"${MINGW_PACKAGE_PREFIX}-nss")
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
"${MINGW_PACKAGE_PREFIX}-pkg-config"
"${MINGW_PACKAGE_PREFIX}-gobject-introspection"
Expand Down
Loading

0 comments on commit ab91876

Please sign in to comment.