Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[glib up to gtk] update and make it work with meson #13100

Merged
merged 221 commits into from
Apr 26, 2021
Merged
Show file tree
Hide file tree
Changes from 216 commits
Commits
Show all changes
221 commits
Select commit Hold shift + click to select a range
3c68c5c
update glib to meson
Neumann-A Nov 18, 2020
a197123
update ci baseline
Neumann-A Nov 18, 2020
a0de825
update glib to 2.66.3
Neumann-A Nov 19, 2020
1d263f5
fix some minor meson issue but meson is still a mess
Neumann-A Nov 19, 2020
fe1e62a
Merge remote-tracking branch 'upstream/master' into update_glib
Neumann-A Jan 14, 2021
c46c7b1
add_bin_to_path to vcpkg_install_meson
Neumann-A Jan 14, 2021
0ca265c
regen docs
Neumann-A Jan 14, 2021
3c5b915
try fixing/touching all glib dependent ports
Neumann-A Jan 14, 2021
9a58e70
fix libsigcpp-3 version
Neumann-A Jan 14, 2021
f71c91e
fix glibmm
Neumann-A Jan 14, 2021
ce1612a
fix gmime
Neumann-A Jan 14, 2021
3ff6e48
fix libcroco
Neumann-A Jan 14, 2021
459728e
update libnice
Neumann-A Jan 14, 2021
477651d
fix atk build
Neumann-A Jan 14, 2021
39bc1c7
update harfbuzz
Neumann-A Jan 14, 2021
216dd4b
Merge remote-tracking branch 'upstream/master' into update_glib
Neumann-A Jan 15, 2021
eafe6ee
Merge branch 'update_glib' of https://github.com/Neumann-A/vcpkg into…
Neumann-A Jan 15, 2021
ddd02bf
fix few builds
Neumann-A Jan 15, 2021
f36ad39
update libxmlpp
Neumann-A Jan 15, 2021
9b57da5
fix gdk-pixbuf
Neumann-A Jan 15, 2021
f4ebfff
fix gts
Neumann-A Jan 15, 2021
cff4127
gts add patch
Neumann-A Jan 15, 2021
a46ccac
remove old libsigcpp
Neumann-A Jan 15, 2021
a1b1145
add missing comma
Neumann-A Jan 15, 2021
77243e8
fix supports logic
Neumann-A Jan 15, 2021
1338c73
fix name mismatch
Neumann-A Jan 15, 2021
6aafece
restore original ci baseline.
Neumann-A Jan 15, 2021
75f65fd
fix a lot of small details.
Neumann-A Jan 15, 2021
1932342
fix harfbuzz & glib
Neumann-A Jan 15, 2021
02df19a
bump port version
Neumann-A Jan 15, 2021
f231f4f
update port_versions
Neumann-A Jan 15, 2021
734bb6f
fix version field
Neumann-A Jan 15, 2021
2351f47
update versions
Neumann-A Jan 15, 2021
0bab287
fix glib in harfbuzz
Neumann-A Jan 15, 2021
f0dfae9
update port versions
Neumann-A Jan 15, 2021
6468b23
silly uppercase type
Neumann-A Jan 15, 2021
9994a99
update port-versions
Neumann-A Jan 15, 2021
cd431ae
fix cairo build
Neumann-A Jan 15, 2021
68c889c
update version
Neumann-A Jan 15, 2021
3eade91
fix atk
Neumann-A Jan 15, 2021
ef9b396
update atk port-verisons
Neumann-A Jan 15, 2021
3dd2bb2
fix gts public includes
Neumann-A Jan 15, 2021
1d3b21f
update versions
Neumann-A Jan 15, 2021
6962976
fix cairomm
Neumann-A Jan 15, 2021
b572fe4
fix pango
Neumann-A Jan 15, 2021
50f6236
fix ignition
Neumann-A Jan 15, 2021
07caf5d
update versions.
Neumann-A Jan 15, 2021
57406b6
fix gtk
Neumann-A Jan 15, 2021
880ac5c
fix librsvg
Neumann-A Jan 15, 2021
feccef2
update versions
Neumann-A Jan 15, 2021
566766c
fix atk linux
Neumann-A Jan 15, 2021
5a0c0ad
fix libgpod
Neumann-A Jan 16, 2021
451b5ca
update versions
Neumann-A Jan 16, 2021
ecadca7
Merge remote-tracking branch 'upstream/master' into update_glib
Neumann-A Jan 16, 2021
629e2a3
fix lcm
Neumann-A Jan 16, 2021
1e48144
fix librsvg
Neumann-A Jan 16, 2021
3c2c0d3
update pango and pangomm
Neumann-A Jan 16, 2021
f2b612e
update pango to meson
Neumann-A Jan 16, 2021
4ba5f8c
more updates
Neumann-A Jan 16, 2021
10fa1ad
update pixman
Neumann-A Jan 16, 2021
ab0a898
fix cairo
Neumann-A Jan 16, 2021
5dd8067
fix cairo
Neumann-A Jan 17, 2021
36e2486
Merge remote-tracking branch 'upstream/master' into update_glib
Neumann-A Jan 17, 2021
fc45106
some fixes
Neumann-A Jan 17, 2021
d493189
reorder meson a bit
Neumann-A Jan 17, 2021
8b7c906
add none.txt for meson
Neumann-A Jan 17, 2021
f15040b
fix x86_x64 to x86 "cross" builds
Neumann-A Jan 18, 2021
0e7cb97
add tiff pkgconfig
Neumann-A Jan 18, 2021
68a4331
update gdk-pixbuf
Neumann-A Jan 18, 2021
625edeb
fix tiff and jpeg
Neumann-A Jan 18, 2021
244e8d8
add graphene
Neumann-A Jan 18, 2021
f515bb4
fix gdk-pixbuf
Neumann-A Jan 18, 2021
cfbc8cd
add sassc
Neumann-A Jan 18, 2021
db3352a
update gtk
Neumann-A Jan 18, 2021
a993f1d
fix cairo complete build
Neumann-A Jan 18, 2021
d9b5d2c
add harfbuzz inlcude in pango since meson does not add it into pkgcon…
Neumann-A Jan 18, 2021
4ab5960
fix gtk build. Remaining issue fix install script.
Neumann-A Jan 18, 2021
ede049b
fix gtk build
Neumann-A Jan 18, 2021
ed1e4be
fix io2d
Neumann-A Jan 18, 2021
c4943d0
add supports field
Neumann-A Jan 18, 2021
988cfff
fix cartographer?
Neumann-A Jan 18, 2021
d6c5521
fix librsvg build
Neumann-A Jan 18, 2021
45cddcd
fix gtk build
Neumann-A Jan 18, 2021
b0876dd
fix cartographer
Neumann-A Jan 19, 2021
7d387e9
fix sassc on linux
Neumann-A Jan 19, 2021
97ded1d
fix tiff and libjpeg pc files
Neumann-A Jan 19, 2021
8f25530
fix pixman x86
Neumann-A Jan 19, 2021
ac4a277
_isnanf is undefined on arm-
Neumann-A Jan 19, 2021
41c4ad5
merge fix for make on arm64
Neumann-A Jan 19, 2021
fefb913
fix gdk-pixbuf on arm64-windows
Neumann-A Jan 19, 2021
d6e19c7
pixman remove test/demos.
Neumann-A Jan 19, 2021
1415cf4
[vcpkg_install_meson] add bin to path to run code generators
Neumann-A Jan 19, 2021
0e414ba
[vcpkg_configure_meson]
Neumann-A Jan 19, 2021
86e4fdc
pixman reenable UWP support.
Neumann-A Jan 19, 2021
eaf5658
pixman reenable arm support
Neumann-A Jan 19, 2021
668130d
add pixman:arm-uwp=fail to baseline
Neumann-A Jan 19, 2021
118cab8
update gtkmm
Neumann-A Jan 19, 2021
2e2337f
remove double whitespaces
Neumann-A Jan 19, 2021
c7e0834
gtk baseline
Neumann-A Jan 19, 2021
21e3de3
fix linux build
Neumann-A Jan 19, 2021
ae7e8c8
native none again
Neumann-A Jan 19, 2021
c183334
cairo fix cairo-script.pc
Neumann-A Jan 19, 2021
1aedbcd
comment out patch since the cairo changes should have fixed it.
Neumann-A Jan 20, 2021
9ba63c7
Merge remote-tracking branch 'upstream/master' into update_glib
Neumann-A Jan 20, 2021
1f43130
disable wayland backend in GTK since CI is missing system packages
Neumann-A Jan 20, 2021
9888a02
silly typo in cairo pc file correction
Neumann-A Jan 20, 2021
ea74740
remove double spaces in _FLAGS
Neumann-A Jan 20, 2021
bc24379
actually disabling wayland backend
Neumann-A Jan 20, 2021
24c2895
fix glib codegen issue having the wrong path
Neumann-A Jan 20, 2021
a6b1b65
try to fix paths in glib codegen
Neumann-A Jan 21, 2021
8cabf78
Merge remote-tracking branch 'upstream/master' into update_glib
Neumann-A Jan 21, 2021
d83bf17
integrate changes form #12860
Neumann-A Jan 21, 2021
e78a244
Merge remote-tracking branch 'upstream/master' into update_glib
Neumann-A Jan 21, 2021
40dbe86
add the uwp patch back in
Neumann-A Jan 21, 2021
03f9adb
deactivate extra harfbuzz shapers.
Neumann-A Jan 21, 2021
29dc042
Merge remote-tracking branch 'upstream/master' into update_glib
Neumann-A Jan 21, 2021
fbfb5a8
vcpkg x-add-version --all --overwrite-version
Neumann-A Jan 21, 2021
79ec664
remove patches in tesseract.
Neumann-A Jan 21, 2021
47fd08e
fix version
Neumann-A Jan 21, 2021
8c397d7
rerun add-version
Neumann-A Jan 21, 2021
b09c525
add libgpod:x64-linux=fail to baseline due to missing system tools/li…
Neumann-A Jan 21, 2021
b786caa
Merge remote-tracking branch 'upstream/master' into some_meson_details
Neumann-A Jan 25, 2021
abaf085
change regex to take double - into account.
Neumann-A Jan 25, 2021
df716fa
Merge remote-tracking branch 'upstream/master' into update_glib
Neumann-A Jan 25, 2021
b596484
run x-add-version
Neumann-A Jan 25, 2021
fa7b656
run format-manifest
Neumann-A Jan 25, 2021
db6f17c
add missing removal of multiple spaces back into the regex
Neumann-A Jan 26, 2021
db69b42
remove ws diff change
Neumann-A Jan 26, 2021
9552edb
fix gtkmm the upstream way
Neumann-A Jan 26, 2021
dff02cb
Merge remote-tracking branch 'upstream/master' into some_meson_details
Neumann-A Feb 2, 2021
1da6dce
remove ws to reduce diff
Neumann-A Feb 2, 2021
9dde429
Merge remote-tracking branch 'upstream/master' into update_glib
Neumann-A Feb 2, 2021
8f40c2f
make glib build on osx
Neumann-A Feb 2, 2021
c522852
Merge remote-tracking branch 'upstream/master' into update_glib
Neumann-A Feb 8, 2021
efacdb9
format manifest
Neumann-A Feb 8, 2021
c5d4337
run x-add-version
Neumann-A Feb 8, 2021
d72a322
add pthread dependency
Neumann-A Feb 9, 2021
6a38f37
update baseline due to glib compiling on osx now.
Neumann-A Feb 9, 2021
5d66e98
Merge remote-tracking branch 'upstream/master' into some_meson_details
Neumann-A Feb 11, 2021
949cab5
Merge remote-tracking branch 'origin/some_meson_details' into update_…
Neumann-A Feb 15, 2021
dcbe691
Merge remote-tracking branch 'upstream/master' into update_glib
Neumann-A Feb 15, 2021
d2089c1
add meson as a dep to glib
Neumann-A Feb 15, 2021
eab9254
Merge remote-tracking branch 'upstream/master' into some_meson_details
Neumann-A Feb 23, 2021
410eb94
Merge remote-tracking branch 'origin/some_meson_details' into update_…
Neumann-A Mar 4, 2021
5c72c3f
Merge remote-tracking branch 'upstream/master' into update_glib
Neumann-A Mar 4, 2021
79fd14b
- add glib host dependencies
Neumann-A Mar 4, 2021
c2e814e
switch to manifest.
Neumann-A Mar 4, 2021
852ae30
Merge remote-tracking branch 'upstream/master' into update_glib
Neumann-A Mar 22, 2021
979186d
[libxml2] add gnuinstalldirs
Neumann-A Mar 26, 2021
892e3b0
[libxml2] add missing include of GNUInstallDirs
Neumann-A Mar 26, 2021
93d0f64
add version info
Neumann-A Mar 26, 2021
19a21df
Merge remote-tracking branch 'upstream/master' into update_glib
Neumann-A Mar 26, 2021
e9cfff3
add include dir to pc files ....
Neumann-A Mar 26, 2021
226fe4d
update version
Neumann-A Mar 26, 2021
78ceb89
Merge branch 'fix_libxml2_pc' into update_glib
Neumann-A Mar 26, 2021
fb4057a
add UWP as crosscompiling target
Neumann-A Mar 26, 2021
56f7716
Merge remote-tracking branch 'upstream/master' into update_glib
Neumann-A Mar 29, 2021
d28ed16
Apply suggestions from code review
Neumann-A Mar 29, 2021
89c47cd
trying to fix cairo pthread detection on osx.
Neumann-A Mar 29, 2021
08ff625
Merge remote-tracking branch 'upstream/master' into update_glib
Neumann-A Mar 30, 2021
c79ba2c
fix libmicrohttpd by adding the required system frameworks on osx
Neumann-A Mar 30, 2021
9222098
fix poppler by not removing the CXX standard
Neumann-A Mar 30, 2021
dd3304f
fix missing coretext header from harfbuzz in pano
Neumann-A Mar 30, 2021
45d9167
fix formating issues
Neumann-A Mar 30, 2021
b092044
fix librsvg on osx
Neumann-A Mar 30, 2021
868ca7b
Merge remote-tracking branch 'upstream/master' into update_glib
Neumann-A Mar 30, 2021
2604fbe
revert version changes
Neumann-A Mar 30, 2021
6fde82e
bump version
Neumann-A Mar 30, 2021
28738bf
version stuff.
Neumann-A Mar 30, 2021
19ba7e0
fix graphene version stuff
Neumann-A Mar 31, 2021
771c935
fix version stuff
Neumann-A Mar 31, 2021
e17321f
removing ports from ci baseline to cause me pain
Neumann-A Mar 31, 2021
10e6c87
move cairomm:x64-linux=fail
Neumann-A Mar 31, 2021
efbe092
fix typo
Neumann-A Mar 31, 2021
e5548c0
Merge remote-tracking branch 'upstream/master' into update_glib
Neumann-A Mar 31, 2021
538649b
Merge remote-tracking branch 'upstream/master' into update_glib
Neumann-A Apr 1, 2021
12dbc0f
revert ws changes to vcpkg_install_meson
Neumann-A Apr 1, 2021
9842568
Merge branch 'update_glib' of https://github.com/Neumann-A/vcpkg into…
Neumann-A Apr 2, 2021
892797e
Merge remote-tracking branch 'upstream/master' into update_glib
Neumann-A Apr 2, 2021
d40ec54
Merge remote-tracking branch 'upstream/master' into update_glib
Neumann-A Apr 6, 2021
a53f4c5
Merge remote-tracking branch 'upstream/master' into update_glib
Neumann-A Apr 7, 2021
985003d
update port version after merge
Neumann-A Apr 7, 2021
ad7397e
version stuff
Neumann-A Apr 7, 2021
f39b87c
Merge remote-tracking branch 'upstream/master' into update_glib
Neumann-A Apr 8, 2021
6766a89
Merge remote-tracking branch 'upstream/master' into update_glib
Neumann-A Apr 8, 2021
3a02a98
Merge remote-tracking branch 'upstream/master' into update_glib
Neumann-A Apr 9, 2021
88b986f
fix fluidsynth by adding vcpkg_check_features
Neumann-A Apr 12, 2021
5034e37
move cairo to ci baseline on osx
Neumann-A Apr 12, 2021
2ace825
version stuff
Neumann-A Apr 12, 2021
8776afc
fluidsynth corrections
Neumann-A Apr 12, 2021
bf4d634
more version stuff
Neumann-A Apr 12, 2021
8575e50
apply code review changes
Neumann-A Apr 12, 2021
c600beb
clean version stuff.
Neumann-A Apr 12, 2021
f81be65
update version stuff
Neumann-A Apr 12, 2021
46763ed
code review cleanup
Neumann-A Apr 12, 2021
a3613b1
version stuff
Neumann-A Apr 12, 2021
db5dab6
formating
Neumann-A Apr 12, 2021
caa89f0
update version stuff again
Neumann-A Apr 12, 2021
d1f711c
remove gdi again
Neumann-A Apr 12, 2021
0e00621
version stuff
Neumann-A Apr 12, 2021
c561d79
Merge remote-tracking branch 'upstream/master' into update_glib
Neumann-A Apr 12, 2021
235ff4d
version stuff
Neumann-A Apr 12, 2021
76938c8
version baseline
Neumann-A Apr 12, 2021
b2d72bf
Apply strega-nil suggestions from code review
strega-nil Apr 15, 2021
a222885
run x-add-version
strega-nil Apr 15, 2021
3e84af6
Merge remote-tracking branch 'upstream/master' into update_glib
strega-nil Apr 16, 2021
e064131
Merge remote-tracking branch 'upstream/master' into update_glib
strega-nil Apr 19, 2021
b3a70c7
Merge remote-tracking branch 'upstream/master' into update_glib
Neumann-A Apr 20, 2021
2ccf17e
reset versions to upstream/master
Neumann-A Apr 20, 2021
c7062e7
v8 CONTROL -> json
Neumann-A Apr 20, 2021
f0ae052
reset fluidsynth to upstream/master
Neumann-A Apr 20, 2021
f946179
first batch of version-string -> version conversion
Neumann-A Apr 20, 2021
4f94418
second and last batch of version-string -> version conversions
Neumann-A Apr 20, 2021
4b9983f
update version stuff
Neumann-A Apr 20, 2021
b905094
disable gdi feature in harfbuzz (missing user32 linkage in qt5-base)
Neumann-A Apr 20, 2021
02cb43f
version stuff
Neumann-A Apr 20, 2021
e54449d
Apply suggestions from code review
Neumann-A Apr 21, 2021
a2110b1
Apply suggestions from code review
Neumann-A Apr 21, 2021
8d40686
more CR stuff
Neumann-A Apr 21, 2021
c97b736
update versions
Neumann-A Apr 21, 2021
7930731
back out provision changes so that pr can be merged.
Neumann-A Apr 24, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
155 changes: 0 additions & 155 deletions ports/atk/CMakeLists.txt.in

This file was deleted.

7 changes: 0 additions & 7 deletions ports/atk/CONTROL

This file was deleted.

22 changes: 0 additions & 22 deletions ports/atk/fix-linux-config.patch

This file was deleted.

38 changes: 12 additions & 26 deletions ports/atk/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,45 +1,31 @@
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)

set(ATK_VERSION 2.24.0)
set(ATK_VERSION 2.36.0)

vcpkg_download_distfile(ARCHIVE
URLS "https://ftp.gnome.org/pub/GNOME/sources/atk/2.24/atk-${ATK_VERSION}.tar.xz"
URLS "https://ftp.gnome.org/pub/GNOME/sources/atk/2.36/atk-${ATK_VERSION}.tar.xz"
FILENAME "atk-${ATK_VERSION}.tar.xz"
SHA512 3ae0a4d5f28d5619d465135c685161f690732053bcb70a47669c951fbf389b5d2ccc5c7c73d4ee8c5a3b2df14e2f5b082e812a215f10a79b27b412d077f5e962
SHA512 d0f18204eaf96511e8448e3dfbc4b6953a7cf8b816151fb7caf5592cf578572b1cdb16836fe2157b11e3ad018ef171f1ca1bfdf255bb31bb455716d7519fd634
)

vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
PATCHES
fix-linux-config.patch
)

# Here are used API version of library, not the version of library itself
set(ATK_LIB_SUFFIX 1.0)
set(ATK_DLL_SUFFIX 1)

set(GLIB_LIB_VERSION 2.0)
if (WIN32)
set(ATK_API_VERSION ${ATK_LIB_SUFFIX})
else()
set(ATK_API_VERSION ${ATK_DLL_SUFFIX})
endif()
configure_file("${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt.in" "${SOURCE_PATH}/CMakeLists.txt" @ONLY)

vcpkg_configure_cmake(
vcpkg_configure_meson(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DCMAKE_PROGRAM_PATH=${CURRENT_INSTALLED_DIR}/tools/glib
-DGETTEXT_PACKAGE=atk10
-DVERSION=10
OPTIONS_DEBUG
-DATK_SKIP_HEADERS=ON)
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'
Neumann-A marked this conversation as resolved.
Show resolved Hide resolved
glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'
)
vcpkg_install_meson()

vcpkg_install_cmake()
vcpkg_copy_pdbs()

vcpkg_fixup_pkgconfig()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
15 changes: 15 additions & 0 deletions ports/atk/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"name": "atk",
"version": "2.36.0",
"description": "GNOME Accessibility Toolkit",
"homepage": "https://developer.gnome.org/atk/",
"supports": "!(osx | arm)",
"dependencies": [
"gettext",
"glib",
{
"name": "glib",
"host": true
}
]
}
7 changes: 0 additions & 7 deletions ports/atkmm/CONTROL

This file was deleted.

98 changes: 0 additions & 98 deletions ports/atkmm/fix_charset.patch

This file was deleted.

Loading