p/fiv
1
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Compare commits

base: p:6a1b851130f0d67069a934baa235cdc0fb0305d4
Branches Tags
p:master
p:v1.0.0
..
compare: p:2869c656c1499d5667d6acdcc557c0810a6eb137
Branches Tags
p:master
p:v1.0.0

No commits in common. "6a1b851130f0d67069a934baa235cdc0fb0305d4" and "2869c656c1499d5667d6acdcc557c0810a6eb137" have entirely different histories.
6a1b851130 ... 2869c656c1

1 changed files with 5 additions and 6 deletions
Show Stats Expand all files Collapse all files

11
msys2-configure.sh
View File

@ -46,8 +46,7 @@ fetch() {
} BEGIN { while ((getline < "db.tsv") > 0) { } BEGIN { while ((getline < "db.tsv") > 0) {
filenames[$1] = $2; deps[$1] = ""; for (i = 3; i <= NF; i++) { filenames[$1] = $2; deps[$1] = ""; for (i = 3; i <= NF; i++) {
gsub(/[<=>].*/, "", $i); deps[$1] = deps[$1] $i FS } gsub(/[<=>].*/, "", $i); deps[$1] = deps[$1] $i FS }
} for (i = 0; i < ARGC; i++) get(ARGV[i]) }' "$@" | tee db.want | \ } for (i = 0; i < ARGC; i++) get(ARGV[i]) }' "$@" | while IFS= read -r name
while IFS= read -r name
do do
status Fetching "$name" status Fetching "$name"
[ -f "packages/$name" ] || curl -#o "packages/$name" "$repo/$name" [ -f "packages/$name" ] || curl -#o "packages/$name" "$repo/$name"
@ -70,10 +69,10 @@ extract() {
for subdir in * for subdir in *
do [ -d "$subdir" -a "$subdir" != packages ] && rm -rf -- "$subdir" do [ -d "$subdir" -a "$subdir" != packages ] && rm -rf -- "$subdir"
done done
while IFS= read -r name for i in packages/*
do bsdtar -xf "packages/$name" --strip-components 1 \ do bsdtar -xf "$i" --strip-components 1 \
--exclude '*/share/man' --exclude '*/share/doc' --exclude '*/share/man' --exclude '*/share/doc'
done < db.want done
bsdtar -xf exiftool.tar.gz bsdtar -xf exiftool.tar.gz
mv Image-ExifTool-*/exiftool bin mv Image-ExifTool-*/exiftool bin
@ -136,7 +135,7 @@ msys2_root=$builddir$prefix
mkdir -p "$msys2_root" mkdir -p "$msys2_root"
cd "$msys2_root" cd "$msys2_root"
dbsync dbsync
fetch $pkg-gtk3 $pkg-lcms2 $pkg-libraw $pkg-libheif $pkg-libjxl $pkg-perl \ fetch $pkg-gtk3 $pkg-lcms2 $pkg-libraw $pkg-libheif $pkg-perl \
$pkg-perl-win32-api $pkg-libwinpthread-git # Because we don't do "provides"? $pkg-perl-win32-api $pkg-libwinpthread-git # Because we don't do "provides"?
verify verify
extract extract