Skip to content

Commit e6d95ed

Browse files
authored
Merge pull request #6286 from BOINC/vko_update_vcpkg_port_from_the_upstream
[linux] update gdk-pixbuf from the vcpkg upstream
2 parents 823d16c + 355814c commit e6d95ed

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

3rdParty/vcpkg_ports/ports/gdk-pixbuf/portfile.cmake

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@ else()
5050
list(APPEND OPTIONS -Dsvg=disabled)
5151
endif()
5252

53+
# Whether to enable application bundle relocation support.
54+
# Limitation cf. gdk-pixbuf/gdk-pixbuf-io.c
55+
if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_WINDOWS)
56+
list(APPEND OPTIONS -Drelocatable=true)
57+
endif()
58+
5359
if(CMAKE_HOST_WIN32 AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
5460
set(GIR_TOOL_DIR ${CURRENT_INSTALLED_DIR})
5561
else()
@@ -65,7 +71,6 @@ vcpkg_configure_meson(
6571
-Dman=false # Whether to generate man pages (requires xlstproc)
6672
-Dgtk_doc=false # Whether to generate the API reference (requires GTK-Doc)
6773
-Ddocs=false
68-
-Drelocatable=true # Whether to enable application bundle relocation support
6974
-Dtests=false
7075
-Dinstalled_tests=false
7176
-Dgio_sniffing=false # Perform file type detection using GIO (Unused on MacOS and Windows)

3rdParty/vcpkg_ports/ports/gdk-pixbuf/vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "gdk-pixbuf",
33
"version": "2.42.12",
4-
"port-version": 2,
4+
"port-version": 3,
55
"description": "Image loading library.",
66
"homepage": "https://gitlab.gnome.org/GNOME/gdk-pixbuf",
77
"license": "LGPL-2.1-or-later",

0 commit comments

Comments
 (0)