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.

Sign up for GitHub

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

[font-util, xtrans, libe57] fix release only builds. #27336

Merged
merged 6 commits into from
Oct 20, 2022
Merged

[font-util, xtrans, libe57] fix release only builds. #27336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d7072ed
single config fixes
Neumann-A Oct 19, 2022
523d19a
v db
Neumann-A Oct 19, 2022
ba99f2d
fix font-util
Neumann-A Oct 19, 2022
808959c
v db
Neumann-A Oct 19, 2022
f861934
add newline
Neumann-A Oct 20, 2022
fac4414
v db
Neumann-A Oct 20, 2022
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
15 changes: 8 additions & 7 deletions ports/font-util/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,13 @@ string(REPLACE "datarootdir=\${prefix}/share/${PORT}" "datarootdir=\${prefix}/sh
string(REPLACE "exec_prefix=\${prefix}" "exec_prefix=\${prefix}/tools/${PORT}" _contents "${_contents}")
file(WRITE "${_file}" "${_contents}")

set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/fontutil.pc")
file(READ "${_file}" _contents)
string(REPLACE "datarootdir=\${prefix}/share/${PORT}" "datarootdir=\${prefix}/../share/xorg" _contents "${_contents}")
string(REPLACE "exec_prefix=\${prefix}" "exec_prefix=\${prefix}/../tools/${PORT}" _contents "${_contents}")
file(WRITE "${_file}" "${_contents}")

if(NOT VCPKG_BUILD_TYPE)
set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/fontutil.pc")
file(READ "${_file}" _contents)
string(REPLACE "datarootdir=\${prefix}/share/${PORT}" "datarootdir=\${prefix}/../share/xorg" _contents "${_contents}")
string(REPLACE "exec_prefix=\${prefix}" "exec_prefix=\${prefix}/../tools/${PORT}" _contents "${_contents}")
file(WRITE "${_file}" "${_contents}")
endif()
# Handle copyright
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright")
endif()
endif()
1 change: 1 addition & 0 deletions ports/font-util/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "font-util",
"version": "1.3.2",
"port-version": 1,
"description": "X.Org font package creation/installation utilities",
"homepage": "https://gitlab.freedesktop.org/xorg/font/util",
"license": null,
Expand Down
4 changes: 3 additions & 1 deletion ports/libe57/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
)

file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/share/libe57")
if(NOT VCPKG_BUILD_TYPE)
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/share/libe57")
endif()

vcpkg_cmake_install()
vcpkg_cmake_config_fixup()
Expand Down
2 changes: 1 addition & 1 deletion ports/libe57/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "libe57",
"version-semver": "1.1.332",
"port-version": 2,
"port-version": 3,
"description": "An open source implementation of the ASTM E2807 Standard Specification for 3D Imaging Data Exchange in the C++ language.",
"homepage": "http://www.libe57.org/",
"license": "BSL-1.0",
Expand Down
9 changes: 6 additions & 3 deletions ports/xtrans/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,15 @@ if(NOT WIN32)
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/include")
endif()
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib")
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib")
if(NOT VCPKG_BUILD_TYPE)
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib")
endif()
file(RENAME "${CURRENT_PACKAGES_DIR}/include/" "${CURRENT_PACKAGES_DIR}/share/${PORT}/include/")
# the include folder is moved since it contains source files. It is not meant as a traditional include folder but as a shared files folder for different x libraries.
file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/pkgconfig/" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/aclocal/" "${CURRENT_PACKAGES_DIR}/share/xorg/aclocal")

if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/share/${PORT}/pkgconfig")
if(NOT VCPKG_BUILD_TYPE)
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/${PORT}/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/" "${CURRENT_PACKAGES_DIR}/share/xorg/debug")
endif()
Expand All @@ -48,8 +50,9 @@ file(READ "${_file}" _contents)
string(REPLACE "includedir=\${prefix}/include" "includedir=\${prefix}/share/xtrans/include" _contents "${_contents}")
file(WRITE "${_file}" "${_contents}")


set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/xtrans.pc" )
if(EXISTS "${_file}")
if(NOT VCPKG_BUILD_TYPE)
file(READ "${_file}" _contents)
string(REPLACE "includedir=\${prefix}/../include" "includedir=\${prefix}/../share/xtrans/include" _contents "${_contents}")
file(WRITE "${_file}" "${_contents}")
Expand Down
1 change: 1 addition & 0 deletions ports/xtrans/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "xtrans",
"version": "1.4.0",
"port-version": 1,
"description": "xtrans - X Network Transport layer shared code",
"homepage": "https://gitlab.freedesktop.org/xorg/lib/libxtrans",
"license": null,
Expand Down
6 changes: 3 additions & 3 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2386,7 +2386,7 @@
},
"font-util": {
"baseline": "1.3.2",
"port-version": 0
"port-version": 1
},
"fontconfig": {
"baseline": "2.14.0",
Expand Down Expand Up @@ -3670,7 +3670,7 @@
},
"libe57": {
"baseline": "1.1.332",
"port-version": 2
"port-version": 3
},
"libe57format": {
"baseline": "2.2.0",
Expand Down Expand Up @@ -8070,7 +8070,7 @@
},
"xtrans": {
"baseline": "1.4.0",
"port-version": 0
"port-version": 1
},
"xxhash": {
"baseline": "0.8.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/f-/font-util.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "67faf30776c5600c8cfe00f9def5143b5e36eb08",
"version": "1.3.2",
"port-version": 1
},
{
"git-tree": "752c6b7df7c1181d4c27b64da1c20c03137ed3c6",
"version": "1.3.2",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libe57.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ecdcbb16ecd99e8d8a25b7dde4b2b1f040c5c3ed",
"version-semver": "1.1.332",
"port-version": 3
},
{
"git-tree": "e53fb4c480d35feeeb67361182d4d630ac3834ca",
"version-semver": "1.1.332",
Expand Down
5 changes: 5 additions & 0 deletions versions/x-/xtrans.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f270ddca7ea9e55a992a4923b373c4e47ad24ebd",
"version": "1.4.0",
"port-version": 1
},
{
"git-tree": "ef94e0330a53876e074a09a3cd9c311c4ca0aa28",
"version": "1.4.0",
Expand Down