-
Notifications
You must be signed in to change notification settings - Fork 6.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[pango,libgd,atk,gtk3,graphviz] Cleanup, fix static windows builds (#…
…28766) * [libgd] Fix static builds on windows * [pango] Cleanup * Use freetype2.pc with msvc * Update CI baseline [skip actions] * [atk] Cleanup, fix static builds * [gtk3] Cleanup, fix static builds * [graphviz] Fix static builds * Update versions * [libgd] Revert bad substitution * [graphviz] Plugins * [graphviz] Plugins * [libgd] Fix static usage * [gtk3] versions
- Loading branch information
Showing
24 changed files
with
227 additions
and
53 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,31 @@ | ||
| set(ATK_VERSION 2.38.0) | ||
| vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} | ||
|
|
||
| vcpkg_from_gitlab( | ||
| GITLAB_URL https://gitlab.gnome.org/ | ||
| OUT_SOURCE_PATH SOURCE_PATH | ||
| REPO GNOME/atk | ||
| REF "${ATK_VERSION}" | ||
| REF "${VERSION}" | ||
| HEAD_REF master | ||
| SHA512 f31951ecbdace6a18fb9f772616137cb8732163b37448fef4daf1af60ba8479c94d498dcdaf4880468c80012c77a446da585926a99704a9a940b80e546080cf3 | ||
| ) | ||
|
|
||
| vcpkg_configure_meson( | ||
| SOURCE_PATH "${SOURCE_PATH}" | ||
| OPTIONS -Dintrospection=false | ||
| ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' | ||
| glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' | ||
| ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' | ||
| glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' | ||
| OPTIONS | ||
| -Dintrospection=false | ||
| ADDITIONAL_BINARIES | ||
| "glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'" | ||
| "glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'" | ||
| ) | ||
| vcpkg_install_meson() | ||
|
|
||
| vcpkg_copy_pdbs() | ||
|
|
||
| vcpkg_fixup_pkgconfig() | ||
|
|
||
| if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") | ||
| vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/atk-1.0/atk/atkmisc.h" "ifdef ATK_STATIC_COMPILATION" "if 1") | ||
| endif() | ||
|
|
||
| file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") | ||
| file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) | ||
|
|
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,5 @@ | ||
| if(MSVC) | ||
| find_package(unofficial-getopt-win32 CONFIG REQUIRED) | ||
| set(GETOPT_LIBRARY "unofficial::getopt-win32::getopt" CACHE INTERNAL "vcpkg") | ||
| set(GETOPT_RUNTIME_LIBRARY "unused" CACHE INTERNAL "vcpkg") | ||
| 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| diff --git a/lib/gvc/CMakeLists.txt b/lib/gvc/CMakeLists.txt | ||
| index b437bde..04fe8e8 100644 | ||
| --- a/lib/gvc/CMakeLists.txt | ||
| +++ b/lib/gvc/CMakeLists.txt | ||
| @@ -1,4 +1,4 @@ | ||
| -add_definitions(-DGVC_EXPORTS -DGVLIBDIR="${LIBRARY_INSTALL_DIR}/graphviz") | ||
| +add_definitions(-DGVC_EXPORTS -DGVLIBDIR="") | ||
|
|
||
| add_library(gvc SHARED | ||
| # Header files |
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,25 @@ | ||
| diff --git a/plugin/gd/gvrender_gd.c b/plugin/gd/gvrender_gd.c | ||
| index 960271c..2494e95 100644 | ||
| --- a/plugin/gd/gvrender_gd.c | ||
| +++ b/plugin/gd/gvrender_gd.c | ||
| @@ -259,7 +259,7 @@ static void gdgen_missingfont(char *fontreq) { | ||
| #else | ||
| #define GD_IMPORT | ||
| #endif | ||
| -GD_IMPORT extern gdFontPtr gdFontTiny, gdFontSmall, gdFontMediumBold, gdFontLarge, gdFontGiant; | ||
| +BGD_EXPORT_DATA_PROT extern gdFontPtr gdFontTiny, gdFontSmall, gdFontMediumBold, gdFontLarge, gdFontGiant; | ||
|
|
||
| void gdgen_text(gdImagePtr im, pointf spf, pointf epf, int fontcolor, double fontsize, int fontdpi, double fontangle, char *fontname, char *str) | ||
| { | ||
| diff --git a/plugin/pango/CMakeLists.txt b/plugin/pango/CMakeLists.txt | ||
| index 26749af..65d77e4 100644 | ||
| --- a/plugin/pango/CMakeLists.txt | ||
| +++ b/plugin/pango/CMakeLists.txt | ||
| @@ -58,6 +58,7 @@ if(CAIRO_FOUND AND PANGOCAIRO_FOUND) | ||
| set_target_properties(gvplugin_pango PROPERTIES | ||
| VERSION ${GRAPHVIZ_PLUGIN_VERSION}.0.0 | ||
| SOVERSION ${GRAPHVIZ_PLUGIN_VERSION} | ||
| + LINKER_LANGUAGE CXX # for cairo | ||
| ) | ||
|
|
||
| if(MINGW) |
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,62 @@ | ||
| diff --git a/gtk/meson.build b/gtk/meson.build | ||
| index 79f4f0d..33a7723 100644 | ||
| --- a/gtk/meson.build | ||
| +++ b/gtk/meson.build | ||
| @@ -1074,6 +1074,7 @@ gtk_query_settings = executable( | ||
| 'gtk-query-settings.c', | ||
| c_args: gtk_cargs, | ||
| dependencies: libgtk_dep, | ||
| + link_language: 'cpp', | ||
| install: true | ||
| ) | ||
| gtk_tools += gtk_query_settings | ||
| @@ -1083,6 +1084,7 @@ gtk_builder_tool = executable( | ||
| 'gtk-builder-tool.c', | ||
| c_args: gtk_cargs, | ||
| dependencies: libgtk_dep, | ||
| + link_language: 'cpp', | ||
| install: true | ||
| ) | ||
| gtk_tools += gtk_builder_tool | ||
| @@ -1115,6 +1117,7 @@ gtk_update_icon_cache = executable( | ||
| extra_update_icon_cache_objs, | ||
| c_args: gtk_cargs, | ||
| dependencies: libgtk_dep, | ||
| + link_language: 'cpp', | ||
| install: true | ||
| ) | ||
| gtk_tools += gtk_update_icon_cache | ||
| @@ -1125,6 +1128,7 @@ gtk_query_immodules = executable( | ||
| 'gtkutils.c', | ||
| c_args: gtk_cargs, | ||
| dependencies: libgtk_dep, | ||
| + link_language: 'cpp', | ||
| install: true | ||
| ) | ||
| gtk_tools += gtk_query_immodules | ||
| @@ -1134,6 +1138,7 @@ gtk_encode_symbolic_svg = executable( | ||
| 'encodesymbolic.c', | ||
| c_args: gtk_cargs, | ||
| dependencies: libgtk_dep, | ||
| + link_language: 'cpp', | ||
| install: true | ||
| ) | ||
| gtk_tools += gtk_encode_symbolic_svg | ||
| @@ -1143,6 +1148,7 @@ gtk_launch = executable( | ||
| 'gtk-launch.c', | ||
| c_args: gtk_cargs, | ||
| dependencies: libgtk_dep, | ||
| + link_language: 'cpp', | ||
| install: true | ||
| ) | ||
| gtk_tools += gtk_launch | ||
| diff --git a/meson.build b/meson.build | ||
| index 287f0cb..d35106f 100644 | ||
| --- a/meson.build | ||
| +++ b/meson.build | ||
| @@ -1,4 +1,4 @@ | ||
| -project('gtk+-3.0', 'c', | ||
| +project('gtk+-3.0', 'c', 'cpp', | ||
| version: '3.24.34', | ||
| default_options: [ | ||
| 'buildtype=debugoptimized', |
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,3 @@ | ||
| if(NOT BUILD_SHARED_LIBS) | ||
| add_definitions(-DNONDLL) | ||
| 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| diff --git a/src/gd.h b/src/gd.h | ||
| index 3056039..8a7608a 100644 | ||
| --- a/src/gd.h | ||
| +++ b/src/gd.h | ||
| @@ -62,6 +62,10 @@ extern "C" { | ||
| # else | ||
| # define BGD_EXPORT_DATA_PROT __declspec(dllimport) | ||
| # endif | ||
| +# ifdef NONDLL | ||
| +# undef BGD_EXPORT_DATA_PROT | ||
| +# define BGD_EXPORT_DATA_PROT | ||
| +# endif | ||
| # endif | ||
| # define BGD_STDCALL __stdcall | ||
| # define BGD_EXPORT_DATA_IMPL |
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,13 @@ | ||
| diff --git a/meson.build b/meson.build | ||
| index 723e0c2..c348730 100644 | ||
| --- a/meson.build | ||
| +++ b/meson.build | ||
| @@ -312,7 +312,7 @@ endif | ||
|
|
||
| # The first version of freetype with a pkg-config file is 2.1.5, | ||
| # CMake uses 'freetype' rather than 'freetype2' for the package name | ||
| -freetype_package_name = cc.get_argument_syntax() == 'msvc' ? \ | ||
| +freetype_package_name = false ? \ | ||
| 'freetype' : 'freetype2' | ||
|
|
||
| freetype_dep = dependency(freetype_package_name, |
Oops, something went wrong.