Skip to content

Commit 51380fe

Browse files
dg0ytdg0yt
authored
[libgpg-error] Update to 1.51, [libsecret] Fix platforms (microsoft#42984)
1 parent 2be9c63 commit 51380fe

File tree

11 files changed

+82
-14
lines changed

11 files changed

+82
-14
lines changed

‎ports/libgpg-error/android.diff

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/configure.ac b/configure.ac
2+
index ce369af..95cbba2 100644
3+
--- a/configure.ac
4+
+++ b/configure.ac
5+
@@ -633,6 +633,7 @@ if test x"$gl_use_threads" = xno; then
6+
AC_MSG_NOTICE([generated src/lock-obj-pub.native.h for $host])
7+
elif test x$cross_compiling = xyes; then
8+
case $host in
9+
+ *-*-linux-android* | \
10+
*-*-gnu* | *-*-linux-gnu* | *-*-linux-musl*)
11+
AC_CHECK_TOOL(OBJDUMP, [objdump])
12+
if test -n "$OBJDUMP"; then

‎ports/libgpg-error/mingw.diff

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
diff --git a/configure.ac b/configure.ac
2+
index 4de263a..9aa0f69 100644
3+
--- a/configure.ac
4+
+++ b/configure.ac
5+
@@ -200,6 +200,10 @@ esac
6+
AX_CC_FOR_BUILD
7+
8+
AH_BOTTOM([
9+
+#if defined(__MINGW32__) && !defined(_WIN32_WINNT)
10+
+#define _WIN32_WINNT 0x0600 /* for STARTUPINFOEX */
11+
+#endif
12+
+
13+
/* Force using of NLS for W32 even if no libintl has been found. This is
14+
okay because we have our own gettext implementation for W32. */
15+
#if defined(HAVE_W32_SYSTEM) && !defined(ENABLE_NLS)

‎ports/libgpg-error/portfile.cmake

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,18 @@ vcpkg_download_distfile(tarball
44
"https://mirrors.dotsrc.org/gcrypt/libgpg-error/libgpg-error-${VERSION}.tar.bz2"
55
"https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${VERSION}.tar.bz2"
66
FILENAME "libgpg-error-${VERSION}.tar.bz2"
7-
SHA512 bbb4b15dae75856ee5b1253568674b56ad155524ae29a075cb5b0a7e74c4af685131775c3ea2226fff2f84ef80855e77aa661645d002b490a795c7ae57b66a30
7+
SHA512 4489f615c6a0389577a7d1fd7d3917517bb2fe032abd9a6d87dfdbd165dabcf53f8780645934020bf27517b67a064297475888d5b368176cf06bc22f1e735e2b
88
)
99
vcpkg_extract_source_archive(
1010
SOURCE_PATH
1111
ARCHIVE "${tarball}"
1212
PATCHES
13+
android.diff
1314
cross-tools.patch
1415
gpgrt-config.patch
16+
mingw.diff
1517
pkgconfig-libintl.patch
18+
win32-nls.diff
1619
)
1720

1821
vcpkg_list(SET options)
@@ -27,13 +30,17 @@ if(VCPKG_CROSSCOMPILING)
2730
set(ENV{HOST_TOOLS_PREFIX} "${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}")
2831
endif()
2932

33+
if(VCPKG_TARGET_IS_EMSCRIPTEN)
34+
vcpkg_list(APPEND options "--disable-threads")
35+
endif()
36+
3037
vcpkg_configure_make(
3138
AUTOCONFIG
3239
SOURCE_PATH "${SOURCE_PATH}"
3340
OPTIONS
3441
${options}
35-
--disable-tests
3642
--disable-doc
43+
--disable-tests
3744
)
3845

3946
vcpkg_install_make()

‎ports/libgpg-error/vcpkg.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "libgpg-error",
3-
"version": "1.47",
4-
"description": "A common dependency of all GnuPG components",
5-
"homepage": "https://gnupg.org/software/libgpg-error/index.html",
3+
"version": "1.51",
4+
"description": "A runtime library for GnuPG and other software which likes to use it.",
5+
"homepage": "https://gnupg.org/software/libgpg-error/",
66
"license": "LGPL-2.1-or-later",
77
"supports": "!windows | mingw",
88
"dependencies": [

‎ports/libgpg-error/win32-nls.diff

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
diff --git a/Makefile.am b/Makefile.am
2+
index 0f07509..65e058a 100644
3+
--- a/Makefile.am
4+
+++ b/Makefile.am
5+
@@ -105,6 +105,7 @@ gen-ChangeLog:
6+
7+
if HAVE_W32_SYSTEM
8+
install-data-hook:
9+
+install-data-hook-orig:
10+
set -e; \
11+
for i in $$(sed -e '/^#/d' -e 's/#.*//' $(top_srcdir)/po/LINGUAS); do \
12+
$(MKDIR_P) "$(DESTDIR)$(localedir)/$$i/LC_MESSAGES" || true; \
13+
diff --git a/configure.ac b/configure.ac
14+
index 9aa0f69..ce369af 100644
15+
--- a/configure.ac
16+
+++ b/configure.ac
17+
@@ -207,7 +207,7 @@ AH_BOTTOM([
18+
/* Force using of NLS for W32 even if no libintl has been found. This is
19+
okay because we have our own gettext implementation for W32. */
20+
#if defined(HAVE_W32_SYSTEM) && !defined(ENABLE_NLS)
21+
-#define ENABLE_NLS 1
22+
+/* keep NLS controlled by libgpg-error[nls] */
23+
#endif
24+
25+
/* Connect the generic estream-printf.c to our framework. */

‎ports/libsecret/portfile.cmake

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@ vcpkg_configure_meson(
2020
)
2121
vcpkg_install_meson()
2222
vcpkg_fixup_pkgconfig()
23+
vcpkg_copy_tools(TOOL_NAMES secret-tool AUTO_CLEAN)
2324

2425
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
25-
# There is no option to disable building secret-tool, so remove the executable.
26-
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
2726

28-
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
27+
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")

‎ports/libsecret/vcpkg.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
{
22
"name": "libsecret",
33
"version": "0.21.4",
4+
"port-version": 1,
45
"description": "libsecret is a GObject-based library for accessing the Secret Service API of the freedesktop.org project, a cross-desktop effort to access passwords, tokens and other types of secrets. libsecret provides a convenient wrapper for these methods so consumers do not have to call the low-level DBus methods.",
56
"homepage": "https://gitlab.gnome.org/GNOME/libsecret/",
67
"license": "LGPL-2.1-or-later",
7-
"supports": "!(windows | uwp | osx)",
8+
"supports": "!android & !ios & !osx & !windows",
89
"dependencies": [
910
"glib",
1011
{

‎scripts/ci.baseline.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -536,16 +536,15 @@ libdc1394:x64-android=fail
536536
libdc1394:arm64-android=fail
537537
# 32-bit needs android-24
538538
libflac:arm-neon-android=fail
539+
# inline assembly requires more registers than available
540+
libgcrypt:x64-android=fail
539541
# error: call to undeclared function 'mktime_z'
540542
libgnutls:arm-neon-android=fail
541543
libgnutls:arm64-android=fail
542544
libgnutls:x64-android=fail
543545
# Fails to build due to incompatible delcaration of select in macOS 14.2
544546
libgo:x64-osx=fail
545547
libgo:x64-android=fail
546-
libgpg-error:arm-neon-android=fail
547-
libgpg-error:arm64-android=fail
548-
libgpg-error:x64-android=fail
549548
# Missing system libraries on linux to run/prepare autoconf
550549
libgpod:x64-linux=fail
551550
libfreenect2:arm64-windows=fail

‎versions/baseline.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4621,7 +4621,7 @@
46214621
"port-version": 5
46224622
},
46234623
"libgpg-error": {
4624-
"baseline": "1.47",
4624+
"baseline": "1.51",
46254625
"port-version": 0
46264626
},
46274627
"libgpiod": {
@@ -5098,7 +5098,7 @@
50985098
},
50995099
"libsecret": {
51005100
"baseline": "0.21.4",
5101-
"port-version": 0
5101+
"port-version": 1
51025102
},
51035103
"libsercomm": {
51045104
"baseline": "1.3.2",

‎versions/l-/libgpg-error.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "241874200d1c1a5f852359a972a6d00c17275669",
5+
"version": "1.51",
6+
"port-version": 0
7+
},
38
{
49
"git-tree": "4375cd3cc867a96a2d8b5e99a425b9b3efb4f863",
510
"version": "1.47",

‎versions/l-/libsecret.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "bf507b0397b2917c2c12e615f94e577a3f35564d",
5+
"version": "0.21.4",
6+
"port-version": 1
7+
},
38
{
49
"git-tree": "fe57a1ceea0f28f2945dab68cca4e29358ca5e71",
510
"version": "0.21.4",

0 commit comments

Comments
 (0)