mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge 721125b883 into 2244f3f528

Browse source
This commit is contained in:
dependabot[bot] 2024-10-21 23:09:59 +00:00 committed by GitHub
commit d19f529abc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/windows-mxe-dockerimage.yml vendored
View file

@ -12,7 +12,7 @@ jobs:
windows-mxe:
runs-on: ubuntu-latest
env:
VERSION: ${{ '3.2.0' }} # 'official' images should have a dot-zero version
VERSION: ${{ '3.3.0' }} # 'official' images should have a dot-zero version
mxe_sha: '974808c2ecb02866764d236fe533ae57ba342e7a'
steps:

8
scripts/docker/mxe-build-container/Dockerfile
View file

@ -1,7 +1,7 @@
# Build the image using the --build-arg option, e.g.:
# docker build -t boret/myimage:0.1 --build-arg=mxe_sha=123ABC456 .
FROM ubuntu:22.04 as base
FROM ubuntu:24.04 as base
# update and set up the packages we need for the build
RUN apt-get update && \
@ -48,13 +48,14 @@ RUN apt-get install -y \
libxml-parser-perl \
python3 \
python3-mako \
python3-setuptools \
python-is-python3 \
ruby \
xz-utils \
scons
# very often master is broken, so we pass in a known good SHA
ARG mxe_sha=master
ARG mxe_sha=d6377b2f2334694dbb040294fd0d848327e63328
ENV _ver=${mxe_sha}
WORKDIR /win
@ -73,9 +74,6 @@ ADD settings.mk .
# backend is not picked
ADD qtconnectivity-1.patch src/
ADD mdbtools_version.patch .
RUN patch -p1 < mdbtools_version.patch 2>&1 | tee mxe-patch.log
# separate download from build so that we can redo the build
RUN make -j download 2>&1 | tee mxe-build.log

52
scripts/docker/mxe-build-container/mdbtools_version.patch
View file

@ -1,52 +0,0 @@
# Temporary patch to apply to MXE's src/mdbtools.mk file while building docker
# image, until it's applied upstream at github's MXE repo.
diff --git a/src/mdbtools.mk b/src/mdbtools.mk
index 42d303c2..d9d0f557 100644
--- a/src/mdbtools.mk
+++ b/src/mdbtools.mk
@@ -1,19 +1,17 @@
# This file is part of MXE. See LICENSE.md for licensing information.
PKG := mdbtools
-$(PKG)_WEBSITE := https://sourceforge.net/projects/mdbtools/
+$(PKG)_WEBSITE := https://github.com/mdbtools/mdbtools
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 0.7.1
-$(PKG)_CHECKSUM := 4eac1bce55066a38d9ea6c52a8e8ecc101b79afe75118ecc16852990472c4721
-$(PKG)_SUBDIR := brianb-mdbtools-f8ce1cc
-$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL := https://github.com/brianb/$(PKG)/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_VERSION := 1.0.0
+$(PKG)_CHECKSUM := 3446e1d71abdeb98d41e252777e67e1909b186496fda59f98f67032f7fbcd955
+$(PKG)_GH_CONF := mdbtools/mdbtools/releases, v
$(PKG)_DEPS := cc glib
define $(PKG)_UPDATE
- $(WGET) -q -O- 'https://github.com/brianb/mdbtools/tags' | \
- grep '<a href="/brianb/mdbtools/archive/' | \
- $(SED) -n 's,.*href="/brianb/mdbtools/archive/\([0-9][^"_]*\)\.tar.*,\1,p' | \
+ $(WGET) -q -O- 'https://github.com/mdbtools/mdbtools/tags' | \
+ grep 'href="/mdbtools/mdbtools/archive/' | \
+ $(SED) -n 's,.*href="/mdbtools/mdbtools/archive/refs/tags/v\([0-9][^"_]*\)\.tar.*,\1,p' | \
head -1
endef
@@ -24,10 +22,11 @@ define $(PKG)_BUILD
--build="`config.guess`" \
--disable-shared \
--disable-man \
+ --without-bash-completion-dir \
--prefix='$(PREFIX)/$(TARGET)' \
PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config'
- $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA= || \
- $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA=
+ $(MAKE) CFLAGS+='-Wno-deprecated-declarations' -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA= || \
+ $(MAKE) CFLAGS+='-Wno-deprecated-declarations' -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA=
endef
$(PKG)_BUILD_SHARED =
--
2.43.0