-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- 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.
- Loading branch information
Showing
10 changed files
with
79 additions
and
129 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Kleis Auke Wolthuizen <[email protected]> | ||
| Date: Fri, 3 Sep 2021 15:50:00 +0200 | ||
| Subject: [PATCH 1/1] Don't use __declspec(dllexport) for static builds | ||
|
|
||
|
|
||
| diff --git a/meson.build b/meson.build | ||
| index 1111111..2222222 100644 | ||
| --- a/meson.build | ||
| +++ b/meson.build | ||
| @@ -308,7 +308,7 @@ ftoption_h = custom_target('ftoption.h', | ||
| ft2_sources += ftoption_h | ||
| ft2_defines += ['-DFT_CONFIG_OPTIONS_H=<ftoption.h>'] | ||
|
|
||
| -if host_machine.system() == 'windows' | ||
| +if get_option('default_library') != 'static' and host_machine.system() == 'windows' | ||
| ft2_defines += ['-DDLL_EXPORT=1'] | ||
| endif | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,56 +2,10 @@ This file is part of MXE. See LICENSE.md for licensing information. | |
|
|
||
| Contains ad hoc patches for cross building. | ||
|
|
||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> | ||
| Date: Sat, 17 Mar 2018 20:52:10 +0100 | ||
| Subject: [PATCH 1/2] Do not overwrite all our build flags | ||
|
|
||
|
|
||
| diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake | ||
| index 1111111..2222222 100644 | ||
| --- a/cmake/modules/PopplerMacros.cmake | ||
| +++ b/cmake/modules/PopplerMacros.cmake | ||
| @@ -104,14 +104,14 @@ if(CMAKE_COMPILER_IS_GNUCXX) | ||
| set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") | ||
|
|
||
| set(_save_cxxflags "${CMAKE_CXX_FLAGS}") | ||
| - set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE") | ||
| + set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE ${_save_cxxflags}") | ||
| set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") | ||
| set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") | ||
| set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}") | ||
| set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}") | ||
| set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}") | ||
| set(_save_cflags "${CMAKE_C_FLAGS}") | ||
| - set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") | ||
| + set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}") | ||
| set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") | ||
| set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") | ||
| set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}") | ||
| @@ -149,7 +149,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") | ||
| set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") | ||
|
|
||
| set(_save_cxxflags "${CMAKE_CXX_FLAGS}") | ||
| - set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE") | ||
| + set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}") | ||
| set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") | ||
| set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") | ||
| # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 | ||
| @@ -157,7 +157,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") | ||
| set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}") | ||
| set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}") | ||
| set(_save_cflags "${CMAKE_C_FLAGS}") | ||
| - set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") | ||
| + set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}") | ||
| set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") | ||
| set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") | ||
| # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 | ||
|
|
||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Kleis Auke Wolthuizen <[email protected]> | ||
| Date: Fri, 19 Feb 2021 16:00:00 +0100 | ||
| Subject: [PATCH 2/2] Fix bogus volatiles caught by clang 11 | ||
| Subject: [PATCH 1/1] Fix bogus volatile caught by clang 11 | ||
|
|
||
|
|
||
| diff --git a/glib/poppler-enums.c.template b/glib/poppler-enums.c.template | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.