Skip to content

Commit 68b84e1

Browse files
kleisaukekleisauke
committed
Dependency version bumps
- Update GLib to 2.69.2. - Update Pango to 1.49.1. - Update ImageMagick to 6.9.12-20. - Update Poppler to 21.09.0. MXE Updates: - Update FreeType to 2.11.0. - Update HarfBuzz to 2.9.0.
1 parent a935810 commit 68b84e1

File tree

10 files changed

+79
-129
lines changed

10 files changed

+79
-129
lines changed

‎README.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
2121
| [cairo] | 1.17.4 | Mozilla Public License 2.0 |
2222
| [expat] | 2.4.1 | MIT Licence |
2323
| [fontconfig] | 2.13.94 | [fontconfig Licence] (BSD-like) |
24-
| [freetype] | 2.10.4 | [freetype Licence] (BSD-like) |
24+
| [freetype] | 2.11.0 | [freetype Licence] (BSD-like) |
2525
| [fribidi] | 1.0.10 | LGPLv3 |
2626
| [gdk-pixbuf] | 2.42.6 | LGPLv3 |
27-
| [glib] | 2.69.1 | LGPLv3 |
28-
| [harfbuzz] | 2.8.2 | MIT Licence |
27+
| [glib] | 2.69.2 | LGPLv3 |
28+
| [harfbuzz] | 2.9.0 | MIT Licence |
2929
| [lcms] | 2.12 | MIT Licence |
3030
| [libexif] | 0.6.22 | LGPLv3 |
3131
| [libffi] | 3.4.2 | MIT Licence |
@@ -41,7 +41,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
4141
| [libxml2] | 2.9.12 | MIT Licence |
4242
| [mozjpeg] | 4.0.3 | [zlib License, IJG License, BSD-3-Clause] |
4343
| [orc] | 0.4.32 | [orc License] (BSD-like) |
44-
| [pango] | 1.48.8 | LGPLv3 |
44+
| [pango] | 1.49.1 | LGPLv3 |
4545
| [pixman] | 0.40.0 | MIT Licence |
4646
| [zlib-ng] | 2.0.5 | [zlib-ng Licence] |
4747

@@ -53,8 +53,8 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
5353
[expat]: https://github.com/libexpat/libexpat
5454
[fontconfig]: https://gitlab.freedesktop.org/fontconfig/fontconfig
5555
[fontconfig Licence]: https://gitlab.freedesktop.org/fontconfig/fontconfig/blob/master/COPYING
56-
[freetype]: https://git.savannah.gnu.org/cgit/freetype/freetype2.git
57-
[freetype Licence]: https://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/FTL.TXT
56+
[freetype]: https://gitlab.freedesktop.org/freetype/freetype
57+
[freetype Licence]: https://gitlab.freedesktop.org/freetype/freetype/blob/master/docs/FTL.TXT
5858
[fribidi]: https://github.com/fribidi/fribidi
5959
[gdk-pixbuf]: https://gitlab.gnome.org/GNOME/gdk-pixbuf
6060
[glib]: https://gitlab.gnome.org/GNOME/glib
@@ -93,15 +93,15 @@ Same as libvips-web + these extra dependencies:
9393
| [cfitsio] | 4.0.0 | BSD-like |
9494
| [fftw] | 3.3.9 | GPLv2 |
9595
| [highway] | 0.14.0 | Apache-2.0 License |
96-
| [imagemagick] | 6.9.12-19 | [ImageMagick License] (Apache-2.0-like) |
96+
| [imagemagick] | 6.9.12-20 | [ImageMagick License] (Apache-2.0-like) |
9797
| [imath] | 3.1.2 | BSD 3-Clause |
9898
| [libjxl] | 0.5 | BSD 3-Clause |
9999
| [matio] | 1.5.21 | BSD 2-Clause |
100100
| [nifticlib] | 2.0.0 | Public domain |
101101
| [openexr] | 3.1.1 | BSD 3-Clause |
102102
| [openjpeg] | 2.4.0 | BSD 2-Clause |
103103
| [openslide] | 3.4.1 | LGPLv3 |
104-
| [poppler] | 21.08.0 | GPLv2 |
104+
| [poppler] | 21.09.0 | GPLv2 |
105105
| [sqlite] | 3.36.0 | Public domain |
106106

107107
[brotli]: https://github.com/google/brotli

‎build/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ fi
5151
# Always checkout a particular revision which will successfully build.
5252
# This ensures that it will not suddenly break a build.
5353
# Note: Must be regularly updated.
54-
revision="99d62e454ce805b03aaddcdb6cd209cada503543"
54+
revision="74dd24ca82a5e48ccaf0b549eaef1db07ed382ad"
5555
initialize=false
5656

5757
if [ -f "$mxe_dir/Makefile" ]; then

‎build/overrides.mk‎

Lines changed: 29 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ matio_FILE := matio-$(matio_VERSION).tar.gz
4040
matio_URL := https://github.com/tbeu/matio/releases/download/v$(matio_VERSION)/$(matio_FILE)
4141

4242
# upstream version is 7, we want ImageMagick 6
43-
imagemagick_VERSION := 6.9.12-19
44-
imagemagick_CHECKSUM := 2f184f1f5c3e19849347b2b4acb6dd074290903d36fa5924956ee06c85ddf783
43+
imagemagick_VERSION := 6.9.12-20
44+
imagemagick_CHECKSUM := 8fa7addb7eac2dd417c7fbed46ff9dd5614abf7cefea4d786375306bec2659b1
4545
imagemagick_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/imagemagick-[0-9]*.patch)))
4646
imagemagick_GH_CONF := ImageMagick/ImageMagick6/tags
4747

@@ -54,8 +54,8 @@ librsvg_FILE := librsvg-$(librsvg_VERSION).tar.xz
5454
librsvg_URL := https://download.gnome.org/sources/librsvg/$(call SHORT_PKG_VERSION,librsvg)/$(librsvg_FILE)
5555

5656
# upstream version is 1.37.4
57-
pango_VERSION := 1.48.8
58-
pango_CHECKSUM := 009d9d830ecbe11911d6637e48eec1c51390d3d12eb286035ef7c641f3c87410
57+
pango_VERSION := 1.49.1
58+
pango_CHECKSUM := c4266dc06c01bf0133d3815502426d209de5ea7abd895899e73e7edebaf48f6f
5959
pango_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/pango-[0-9]*.patch)))
6060
pango_SUBDIR := pango-$(pango_VERSION)
6161
pango_FILE := pango-$(pango_VERSION).tar.xz
@@ -71,17 +71,9 @@ fribidi_SUBDIR := fribidi-$(fribidi_VERSION)
7171
fribidi_FILE := fribidi-$(fribidi_VERSION).tar.xz
7272
fribidi_URL := https://github.com/fribidi/fribidi/releases/download/v$(fribidi_VERSION)/$(fribidi_FILE)
7373

74-
# upstream version is 1.2.0
75-
libwebp_VERSION := 1.2.1
76-
libwebp_CHECKSUM := 808b98d2f5b84e9b27fdef6c5372dac769c3bda4502febbfa5031bd3c4d7d018
77-
libwebp_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libwebp-[0-9]*.patch)))
78-
libwebp_SUBDIR := libwebp-$(libwebp_VERSION)
79-
libwebp_FILE := libwebp-$(libwebp_VERSION).tar.gz
80-
libwebp_URL := http://downloads.webmproject.org/releases/webp/$(libwebp_FILE)
81-
8274
# upstream version is 2.50.2
83-
glib_VERSION := 2.69.1
84-
glib_CHECKSUM := f92f34057a091fc8638d91f10cece842cb8618e9a1090b0ddb19cc15a21bf39c
75+
glib_VERSION := 2.69.2
76+
glib_CHECKSUM := a62249e35a8635175a697b3215f1df2b89e0fbb4adb520dcbe21a3ae1ebb8882
8577
glib_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/glib-[0-9]*.patch)))
8678
glib_SUBDIR := glib-$(glib_VERSION)
8779
glib_FILE := glib-$(glib_VERSION).tar.xz
@@ -95,15 +87,6 @@ libgsf_SUBDIR := libgsf-$(libgsf_VERSION)
9587
libgsf_FILE := libgsf-$(libgsf_VERSION).tar.xz
9688
libgsf_URL := https://download.gnome.org/sources/libgsf/$(call SHORT_PKG_VERSION,libgsf)/$(libgsf_FILE)
9789

98-
# Override libjpeg-turbo patch with our own
99-
# upstream version is 2.1.0
100-
libjpeg-turbo_VERSION := 2.1.1
101-
libjpeg-turbo_CHECKSUM := b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
102-
libjpeg-turbo_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libjpeg-turbo-[0-9]*.patch)))
103-
libjpeg-turbo_SUBDIR := libjpeg-turbo-$(libjpeg-turbo_VERSION)
104-
libjpeg-turbo_FILE := libjpeg-turbo-$(libjpeg-turbo_VERSION).tar.gz
105-
libjpeg-turbo_URL := https://$(SOURCEFORGE_MIRROR)/project/libjpeg-turbo/$(libjpeg-turbo_VERSION)/$(libjpeg-turbo_FILE)
106-
10790
# upstream version is 1.16.0
10891
cairo_VERSION := 1.17.4
10992
cairo_CHECKSUM := 74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705
@@ -156,8 +139,8 @@ fftw_FILE := fftw-$(fftw_VERSION).tar.gz
156139
fftw_URL := http://www.fftw.org/$(fftw_FILE)
157140

158141
# upstream version is 21.06.1
159-
poppler_VERSION := 21.08.0
160-
poppler_CHECKSUM := e9cf5dc5964bce4bb0264d1c4f8122706c910588b421cfc30abc97d6b23e602d
142+
poppler_VERSION := 21.09.0
143+
poppler_CHECKSUM := 5a47fef738c2b99471f9b459a8bf8b40aefb7eed92caa4861c3798b2e126d05b
161144
poppler_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/poppler-[0-9]*.patch)))
162145
poppler_SUBDIR := poppler-$(poppler_VERSION)
163146
poppler_FILE := poppler-$(poppler_VERSION).tar.xz
@@ -184,6 +167,9 @@ mingw-w64_URL := https://github.com/mirror/mingw-w64/tarball/$(mingw-w64_VE
184167

185168
## Patches that we override with our own
186169

170+
freetype_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/freetype-[0-9]*.patch)))
171+
freetype-bootstrap_PATCHES := $(freetype_PATCHES)
172+
libjpeg-turbo_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libjpeg-turbo-[0-9]*.patch)))
187173
tiff_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/tiff-[0-9]*.patch)))
188174
lcms_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/lcms-[0-9]*.patch)))
189175

@@ -316,36 +302,27 @@ define harfbuzz_BUILD
316302
ninja -C '$(BUILD_DIR)' install
317303
endef
318304

319-
# TODO(kleisauke): build with the Meson build system once a new version is available
320-
#define freetype_BUILD_COMMON
321-
# '$(TARGET)-meson' \
322-
# -Dharfbuzz=enabled \
323-
# -Dpng=enabled \
324-
# -Dzlib=enabled \
325-
# -Dbrotli=disabled \
326-
# -Dbzip2=disabled \
327-
# '$(SOURCE_DIR)' \
328-
# '$(BUILD_DIR)'
329-
#
330-
# ninja -C '$(BUILD_DIR)' install
331-
#endef
332-
333-
#define freetype-bootstrap_BUILD
334-
# $(subst harfbuzz=enabled,harfbuzz=disabled,$(freetype_BUILD_COMMON))
335-
#endef
305+
# build with the Meson build system
306+
# build without bzip2 and brotli
307+
define freetype_BUILD_COMMON
308+
'$(TARGET)-meson' \
309+
-Dharfbuzz=enabled \
310+
-Dpng=enabled \
311+
-Dzlib=enabled \
312+
-Dbrotli=disabled \
313+
-Dbzip2=disabled \
314+
'$(SOURCE_DIR)' \
315+
'$(BUILD_DIR)'
316+
317+
ninja -C '$(BUILD_DIR)' install
318+
endef
336319

337320
define freetype_BUILD
338-
# alias libharfbuzz and libfreetype to satisfy circular dependence
339-
# libfreetype should already have been created by freetype-bootstrap.mk
340-
$(if $(BUILD_STATIC), \
341-
ln -sf libharfbuzz.a '$(PREFIX)/$(TARGET)/lib/libharfbuzz_too.a' \
342-
&& ln -sf libfreetype.a '$(PREFIX)/$(TARGET)/lib/libfreetype_too.a',)
343321
$($(PKG)_BUILD_COMMON)
344-
$(if $(BUILD_STATIC), \
345-
# remove circular dependencies from pc file
346-
$(SED) -i '/^Libs.private:/s/\-lharfbuzz_too -lfreetype_too//g' '$(PREFIX)/$(TARGET)/lib/pkgconfig/freetype2.pc' \
347-
# avoid self-dependence within pc file
348-
$(SED) -i '/^Libs.private:/s/\-lfreetype//g' '$(PREFIX)/$(TARGET)/lib/pkgconfig/freetype2.pc')
322+
endef
323+
324+
define freetype-bootstrap_BUILD
325+
$(subst harfbuzz=enabled,harfbuzz=disabled,$(freetype_BUILD_COMMON))
349326
endef
350327

351328
# exclude bz2 and gdk-pixbuf

‎build/patches/freetype-2-fixes.patch‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Kleis Auke Wolthuizen <[email protected]>
3+
Date: Fri, 3 Sep 2021 15:50:00 +0200
4+
Subject: [PATCH 1/1] Don't use __declspec(dllexport) for static builds
5+
6+
7+
diff --git a/meson.build b/meson.build
8+
index 1111111..2222222 100644
9+
--- a/meson.build
10+
+++ b/meson.build
11+
@@ -308,7 +308,7 @@ ftoption_h = custom_target('ftoption.h',
12+
ft2_sources += ftoption_h
13+
ft2_defines += ['-DFT_CONFIG_OPTIONS_H=<ftoption.h>']
14+
15+
-if host_machine.system() == 'windows'
16+
+if get_option('default_library') != 'static' and host_machine.system() == 'windows'
17+
ft2_defines += ['-DDLL_EXPORT=1']
18+
endif
19+

‎build/patches/glib-2-fixes.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ diff --git a/meson.build b/meson.build
4242
index 1111111..2222222 100644
4343
--- a/meson.build
4444
+++ b/meson.build
45-
@@ -2042,40 +2042,17 @@ endif
45+
@@ -2046,40 +2046,17 @@ endif
4646
# proxy-libintl subproject.
4747
# FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible
4848
# implementations. This could be extended if issues are found in some platforms.
@@ -104,7 +104,7 @@ index 1111111..2222222 100644
104104
test_extra_programs += {
105105
# These three are manual-run tests because they need a session bus but don't bring one up themselves
106106
# FIXME: these build but don't seem to work!
107-
@@ -568,7 +568,7 @@ if installed_tests_enabled
107+
@@ -570,7 +570,7 @@ if installed_tests_enabled
108108
endforeach
109109
endif
110110

‎build/patches/glib-static.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ diff --git a/gio/giomodule.c b/gio/giomodule.c
1212
index 1111111..2222222 100644
1313
--- a/gio/giomodule.c
1414
+++ b/gio/giomodule.c
15-
@@ -1101,28 +1101,6 @@ extern GType _g_win32_network_monitor_get_type (void);
15+
@@ -1102,28 +1102,6 @@ extern GType _g_win32_network_monitor_get_type (void);
1616

1717
static HMODULE gio_dll = NULL;
1818

@@ -45,7 +45,7 @@ diff --git a/gio/meson.build b/gio/meson.build
4545
index 1111111..2222222 100644
4646
--- a/gio/meson.build
4747
+++ b/gio/meson.build
48-
@@ -803,7 +803,7 @@ else
48+
@@ -804,7 +804,7 @@ else
4949
gio_dtrace_hdr = []
5050
endif
5151

‎build/patches/poppler-20-fixes.patch‎

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2,56 +2,10 @@ This file is part of MXE. See LICENSE.md for licensing information.
22

33
Contains ad hoc patches for cross building.
44

5-
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
6-
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]>
7-
Date: Sat, 17 Mar 2018 20:52:10 +0100
8-
Subject: [PATCH 1/2] Do not overwrite all our build flags
9-
10-
11-
diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
12-
index 1111111..2222222 100644
13-
--- a/cmake/modules/PopplerMacros.cmake
14-
+++ b/cmake/modules/PopplerMacros.cmake
15-
@@ -104,14 +104,14 @@ if(CMAKE_COMPILER_IS_GNUCXX)
16-
set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
17-
18-
set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
19-
- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE")
20-
+ set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE ${_save_cxxflags}")
21-
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
22-
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}")
23-
set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}")
24-
set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}")
25-
set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
26-
set(_save_cflags "${CMAKE_C_FLAGS}")
27-
- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE")
28-
+ set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}")
29-
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}")
30-
set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}")
31-
set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}")
32-
@@ -149,7 +149,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
33-
set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
34-
35-
set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
36-
- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
37-
+ set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}")
38-
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
39-
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}")
40-
# clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
41-
@@ -157,7 +157,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
42-
set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}")
43-
set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
44-
set(_save_cflags "${CMAKE_C_FLAGS}")
45-
- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE")
46-
+ set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}")
47-
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}")
48-
set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}")
49-
# clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
50-
515
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
526
From: Kleis Auke Wolthuizen <[email protected]>
537
Date: Fri, 19 Feb 2021 16:00:00 +0100
54-
Subject: [PATCH 2/2] Fix bogus volatiles caught by clang 11
8+
Subject: [PATCH 1/1] Fix bogus volatile caught by clang 11
559

5610

5711
diff --git a/glib/poppler-enums.c.template b/glib/poppler-enums.c.template

‎build/patches/poppler-mingw-std-threads.patch‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cma
1212
index 1111111..2222222 100644
1313
--- a/cmake/modules/PopplerMacros.cmake
1414
+++ b/cmake/modules/PopplerMacros.cmake
15-
@@ -104,7 +104,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
15+
@@ -117,7 +117,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
16+
set(DEFAULT_COMPILE_WARNINGS "${_warn}")
1617
set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
1718

18-
set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
19-
- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE ${_save_cxxflags}")
20-
+ set(CMAKE_CXX_FLAGS "-fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE ${_save_cxxflags}")
21-
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
22-
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}")
23-
set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}")
19+
- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE")
20+
+ set(CMAKE_CXX_FLAGS "-fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE")
21+
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
22+
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
23+
set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
2424
diff --git a/poppler/Annot.h b/poppler/Annot.h
2525
index 1111111..2222222 100644
2626
--- a/poppler/Annot.h

‎build/plugins/llvm-mingw/patches/rust-1-fixes.patch‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ diff --git a/library/unwind/src/libunwind.rs b/library/unwind/src/libunwind.rs
290290
index 1111111..2222222 100644
291291
--- a/library/unwind/src/libunwind.rs
292292
+++ b/library/unwind/src/libunwind.rs
293-
@@ -93,7 +93,7 @@ extern "C" {
293+
@@ -102,7 +102,7 @@ extern "C" {
294294
}
295295

296296
cfg_if::cfg_if! {
@@ -299,12 +299,12 @@ index 1111111..2222222 100644
299299
// Not ARM EHABI
300300
#[repr(C)]
301301
#[derive(Copy, Clone, PartialEq)]
302-
@@ -107,7 +107,7 @@ if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm
302+
@@ -116,7 +116,7 @@ if #[cfg(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm")))
303303
pub use _Unwind_Action::*;
304304

305-
#[cfg_attr(all(feature = "llvm-libunwind",
306-
- any(target_os = "fuchsia", target_os = "linux")),
307-
+ any(target_os = "fuchsia", target_os = "linux", target_os = "windows")),
308-
link(name = "unwind", kind = "static"))]
305+
#[cfg_attr(
306+
- all(feature = "llvm-libunwind", any(target_os = "fuchsia", target_os = "linux")),
307+
+ all(feature = "llvm-libunwind", any(target_os = "fuchsia", target_os = "linux", target_os = "windows")),
308+
link(name = "unwind", kind = "static", modifiers = "-bundle")
309+
)]
309310
extern "C" {
310-
pub fn _Unwind_GetGR(ctx: *mut _Unwind_Context, reg_index: c_int) -> _Unwind_Word;

0 commit comments

Comments
 (0)