[gimp/wip/Jehan/native-win64-build] --force has been actually removed from pacman!
- From: Jehan <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/wip/Jehan/native-win64-build] --force has been actually removed from pacman!
- Date: Mon, 3 May 2021 14:27:18 +0000 (UTC)
commit ee0c39a30774471fa4d1ab7cb08b5ef022667339
Author: Jehan <jehan girinstud io>
Date: Mon May 3 16:24:41 2021 +0200
--force has been actually removed from pacman!
Not sure if it's a joke, but msys2 pacman really doesn't work well at
all (completely random).
Anyway removing --force, hoping for it to work miraculously, and
installing babl and GEGL from MSYS2, just for the test (so I temporarily
drop the GEGL dependency as MSYS2 only has the version 0.4.28). I want
to see if GIMP build would at least work and if introspection build
would as well. If not, maybe the autotools logs would actually be more
useful!
build/windows/build-msys2.sh | 24 +++++++++++++-----------
configure.ac | 2 +-
2 files changed, 14 insertions(+), 12 deletions(-)
---
diff --git a/build/windows/build-msys2.sh b/build/windows/build-msys2.sh
index 1d5a1a0dca..cf8ea254c0 100644
--- a/build/windows/build-msys2.sh
+++ b/build/windows/build-msys2.sh
@@ -12,7 +12,7 @@ fi
pacman --noconfirm -Suy
# Install the required packages
-pacman --noconfirm -S --force --needed \
+pacman --noconfirm -S --needed \
base-devel \
mingw-w64-$MSYS2_ARCH-toolchain \
mingw-w64-$MSYS2_ARCH-ccache \
@@ -41,7 +41,9 @@ pacman --noconfirm -S --force --needed \
mingw-w64-$MSYS2_ARCH-gtk-doc \
mingw-w64-$MSYS2_ARCH-gtk3 \
mingw-w64-$MSYS2_ARCH-vala \
- mingw-w64-$MSYS2_ARCH-luajit
+ mingw-w64-$MSYS2_ARCH-luajit \
+ mingw-w64-$MSYS2_ARCH-babl \
+ mingw-w64-$MSYS2_ARCH-gegl
mkdir -p _ccache
export CCACHE_BASEDIR="$(pwd)"
@@ -59,15 +61,15 @@ export ACLOCAL_FLAGS="-I/c/msys64/mingw64/share/aclocal"
git clone --depth=${GIT_DEPTH} --branch BABL_0_1_78 https://gitlab.gnome.org/GNOME/babl.git _babl
git clone --depth=${GIT_DEPTH} https://gitlab.gnome.org/GNOME/gegl.git _gegl
-cd _babl
-meson -Dprefix="${GIMP_PREFIX}" -Dwith-docs=false _build
-ninja -v -C _build
-ninja -C _build install
-cd ../_gegl
-meson --prefix="${GIMP_PREFIX}" -Ddocs=false _build
-ninja -C _build
-ninja -C _build install
-cd ..
+#cd _babl
+#meson -Dprefix="${GIMP_PREFIX}" -Dwith-docs=false _build
+#ninja -v -C _build
+#ninja -C _build install
+#cd ../_gegl
+#meson --prefix="${GIMP_PREFIX}" -Ddocs=false _build
+#ninja -C _build
+#ninja -C _build install
+#cd ..
# Build
ccache --zero-stats
diff --git a/configure.ac b/configure.ac
index d648f47ce1..834b719775 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,7 +60,7 @@ m4_define([fontconfig_required_version], [2.12.4])
m4_define([freetype2_required_version], [2.1.7])
m4_define([gdk_pixbuf_required_version], [2.30.8])
m4_define([gegl_major_minor_version], [0.4])
-m4_define([gegl_micro_version], [30])
+m4_define([gegl_micro_version], [28])
m4_define([gegl_required_version],
[gegl_major_minor_version.gegl_micro_version])
m4_define([gexiv2_required_version], [0.10.6])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]