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

Jump to bottom

[gettext] Remove SUBPATH, add iconv linking info #20090

Merged
merged 6 commits into from
Sep 16, 2021
Merged

[gettext] Remove SUBPATH, add iconv linking info #20090

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
9cfed8b
Replace SUBPATH argument
dg0yt Sep 10, 2021
9def7b2
Add iconv to libintl link libraries
dg0yt Sep 10, 2021
2da98c0
x-add-version
dg0yt Sep 10, 2021
258b50e
Fix tools build on mingw-dynamic
dg0yt Sep 15, 2021
72cf090
Update versions
dg0yt Sep 16, 2021
9cff5bc
[skip actions] Trigger CI
dg0yt Sep 16, 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
5 changes: 5 additions & 0 deletions ports/gettext/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ install: install-gettext-runtime-intl install-gettext-runtime-po install-gettext
install: install-gettext-tools install-gettext-tools-gnulib install-gettext-tools-its install-gettext-tools-m4 install-gettext-tools-misc install-gettext-tools-po install-gettext-tools-projects install-gettext-tools-styles
install: install-libtextstyle

build-intl:
$(MAKE) -C intl all
install-intl:
$(MAKE) -C intl install

build-gettext-runtime-gnulib: build-gettext-runtime-intl
$(MAKE) -C gettext-runtime/gnulib-lib all
build-gettext-runtime-intl:
Expand Down
14 changes: 14 additions & 0 deletions ports/gettext/gettext-tools_woe32dll_gettextsrc-exports.c.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
X-Git-Url: https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=blobdiff_plain;f=gettext-tools%2Fwoe32dll%2Fgettextsrc-exports.c;h=6d760895961db57e013552b6b3f248bfa8eb17c2;hp=4477ae8d4b2e887592d4019432b91ea31b84ba59;hb=7cf68dffb2adb76375bfb0781e277510523a1f3e;hpb=3564f5f885544514bd2e345c36b74e5d91cad3e8

diff --git a/gettext-tools/woe32dll/gettextsrc-exports.c b/gettext-tools/woe32dll/gettextsrc-exports.c
index 4477ae8..6d76089 100644
--- a/gettext-tools/woe32dll/gettextsrc-exports.c
+++ b/gettext-tools/woe32dll/gettextsrc-exports.c
@@ -50,6 +50,7 @@ VARIABLE(formatstring_python)
VARIABLE(formatstring_python_brace)
VARIABLE(formatstring_qt)
VARIABLE(formatstring_qt_plural)
+VARIABLE(formatstring_ruby)
VARIABLE(formatstring_scheme)
VARIABLE(formatstring_sh)
VARIABLE(formatstring_smalltalk)
7 changes: 6 additions & 1 deletion ports/gettext/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ vcpkg_extract_source_archive_ex(
0003-Fix-win-unicode-paths.patch
rel_path.patch
android.patch
gettext-tools_woe32dll_gettextsrc-exports.c.patch
${PATCHES}
)
vcpkg_find_acquire_program(BISON)
Expand Down Expand Up @@ -87,7 +88,11 @@ function(build_libintl_only)
OPTIONS
${OPTIONS}
)
vcpkg_install_make(SUBPATH "/intl")
vcpkg_install_make(
MAKEFILE "${CMAKE_CURRENT_LIST_DIR}/Makefile"
BUILD_TARGET build-intl
INSTALL_TARGET install-intl
)
endfunction()

if("tools" IN_LIST FEATURES)
Expand Down
6 changes: 5 additions & 1 deletion ports/gettext/vcpkg-cmake-wrapper.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,8 @@ if(Intl_FOUND AND Intl_LIBRARIES)
unset(Intl_LIBRARIES)
unset(Intl_LIBRARIES CACHE)
select_library_configurations(Intl)
endif()
find_package(Iconv) # Since CMake 3.11
BillyONeal marked this conversation as resolved.
Show resolved Hide resolved
if(Iconv_FOUND AND NOT Iconv_IS_BUILT_IN)
list(APPEND Intl_LIBRARIES ${Iconv_LIBRARIES})
JackBoosY marked this conversation as resolved.
Show resolved Hide resolved
endif()
endif()
2 changes: 1 addition & 1 deletion ports/gettext/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "gettext",
"version": "0.21",
"port-version": 5,
"port-version": 6,
"description": "GNU gettext provides libintl and a set of tools to help produce multi-lingual messages.",
"homepage": "https://www.gnu.org/software/gettext/",
"dependencies": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2306,7 +2306,7 @@
},
"gettext": {
"baseline": "0.21",
"port-version": 5
"port-version": 6
},
"gettimeofday": {
"baseline": "2017-10-14",
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/gettext.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "72394a1e7b0ea6333d78849f864c4b7bc8c7e8dc",
"version": "0.21",
"port-version": 6
},
{
"git-tree": "d1089dfcf335a94ca47c5b918c56a7ab6fc0ae92",
"version": "0.21",
Expand Down