commit: abf541897cf28a9bd0a8f2e0914edc4161447b12
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 21 08:10:42 2024 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Oct 21 08:10:42 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abf54189
app-emulation/open-vm-tools: rebase patches
Signed-off-by: David Seifert <soap <AT> gentoo.org>
....0-Werror.patch => open-vm-tools-12.4.5-Werror.patch} | 8 ++++----
.../{11.3.5-icu.patch => open-vm-tools-12.4.5-icu.patch} | 8 ++++----
...c1-pc.patch => open-vm-tools-12.4.5-xmlsec1-pc.patch} | 16 ++++++++--------
app-emulation/open-vm-tools/open-vm-tools-12.4.5.ebuild | 9 ++++-----
4 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/app-emulation/open-vm-tools/files/10.1.0-Werror.patch
b/app-emulation/open-vm-tools/files/open-vm-tools-12.4.5-Werror.patch
similarity index 74%
rename from app-emulation/open-vm-tools/files/10.1.0-Werror.patch
rename to app-emulation/open-vm-tools/files/open-vm-tools-12.4.5-Werror.patch
index b79865e62db6..2593ddb80e5f 100644
--- a/app-emulation/open-vm-tools/files/10.1.0-Werror.patch
+++ b/app-emulation/open-vm-tools/files/open-vm-tools-12.4.5-Werror.patch
@@ -4,13 +4,13 @@ Date: Sat, 26 Nov 2016 11:54:33 -0500
Subject: [PATCH] build: drop -Werror
---
- open-vm-tools/configure.ac | 1 -
+ configure.ac | 1 -
1 file changed, 1 deletion(-)
-diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
+diff --git a/configure.ac b/configure.ac
index 8d4604e8..4d925f22 100644
---- a/open-vm-tools/configure.ac
-+++ b/open-vm-tools/configure.ac
+--- a/configure.ac
++++ b/configure.ac
@@ -1137,7 +1137,6 @@ AC_C_VOLATILE
### General flags / actions
diff --git a/app-emulation/open-vm-tools/files/11.3.5-icu.patch
b/app-emulation/open-vm-tools/files/open-vm-tools-12.4.5-icu.patch
similarity index 73%
rename from app-emulation/open-vm-tools/files/11.3.5-icu.patch
rename to app-emulation/open-vm-tools/files/open-vm-tools-12.4.5-icu.patch
index d51c0cc60a37..ff2731de9481 100644
--- a/app-emulation/open-vm-tools/files/11.3.5-icu.patch
+++ b/app-emulation/open-vm-tools/files/open-vm-tools-12.4.5-icu.patch
@@ -4,13 +4,13 @@ Date: Sat, 25 Sep 2021 21:14:25 -0400
Subject: [PATCH] lib/unicode: add ICU_LIBS to LDADD
---
- open-vm-tools/lib/unicode/Makefile.am | 2 ++
+ lib/unicode/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
-diff --git a/open-vm-tools/lib/unicode/Makefile.am
b/open-vm-tools/lib/unicode/Makefile.am
+diff --git a/lib/unicode/Makefile.am b/lib/unicode/Makefile.am
index 4284c51c..40261fba 100644
---- a/open-vm-tools/lib/unicode/Makefile.am
-+++ b/open-vm-tools/lib/unicode/Makefile.am
+--- a/lib/unicode/Makefile.am
++++ b/lib/unicode/Makefile.am
@@ -25,7 +25,9 @@ libUnicode_la_SOURCES += unicodeSimpleTypes.c
libUnicode_la_SOURCES += unicodeSimpleOperations.c
libUnicode_la_SOURCES += unicodeSimpleTransforms.c
diff --git a/app-emulation/open-vm-tools/files/12.4.5-xmlsec1-pc.patch
b/app-emulation/open-vm-tools/files/open-vm-tools-12.4.5-xmlsec1-pc.patch
similarity index 84%
rename from app-emulation/open-vm-tools/files/12.4.5-xmlsec1-pc.patch
rename to
app-emulation/open-vm-tools/files/open-vm-tools-12.4.5-xmlsec1-pc.patch
index 9dfaad5e200c..2eed3e1f9bab 100644
--- a/app-emulation/open-vm-tools/files/12.4.5-xmlsec1-pc.patch
+++ b/app-emulation/open-vm-tools/files/open-vm-tools-12.4.5-xmlsec1-pc.patch
@@ -8,13 +8,13 @@ Subject: [PATCH 1/2] Also try using pkg-config to detect
xmlsec
The xmlsec1-config script does not help when cross-compiling. pkg-config is
subsequently used for a version detection anyway.
---
- open-vm-tools/configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
+diff --git a/configure.ac b/configure.ac
index 26b2e950..d46a51e2 100644
---- a/open-vm-tools/configure.ac
-+++ b/open-vm-tools/configure.ac
+--- a/configure.ac
++++ b/configure.ac
@@ -879,7 +879,7 @@ if test "$enable_vgauth" = "yes" ; then
AC_VMW_DEFAULT_FLAGS([XMLSEC1])
AC_VMW_CHECK_LIB([xmlsec1],
@@ -36,13 +36,13 @@ Subject: [PATCH 2/2] Respect the $PKG_CONFIG variable when
checking the xmlsec
This particularly helps when cross-compiling.
---
- open-vm-tools/configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
+diff --git a/configure.ac b/configure.ac
index d46a51e2..39b9fa9c 100644
---- a/open-vm-tools/configure.ac
-+++ b/open-vm-tools/configure.ac
+--- a/configure.ac
++++ b/configure.ac
@@ -884,7 +884,7 @@ if test "$enable_vgauth" = "yes" ; then
[],
[xmlsec/xmlsec.h],
diff --git a/app-emulation/open-vm-tools/open-vm-tools-12.4.5.ebuild
b/app-emulation/open-vm-tools/open-vm-tools-12.4.5.ebuild
index 51cbe26ea5a4..d3827b193eee 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-12.4.5.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-12.4.5.ebuild
@@ -62,9 +62,9 @@ BDEPEND="
doc? ( app-text/doxygen )"
PATCHES=(
- "${FILESDIR}"/10.1.0-Werror.patch
- "${FILESDIR}"/11.3.5-icu.patch
- "${FILESDIR}"/12.4.5-xmlsec1-pc.patch
+ "${FILESDIR}"/${PN}-12.4.5-Werror.patch
+ "${FILESDIR}"/${PN}-12.4.5-icu.patch
+ "${FILESDIR}"/${PN}-12.4.5-xmlsec1-pc.patch
)
pkg_setup() {
@@ -75,8 +75,7 @@ pkg_setup() {
}
src_prepare() {
- eapply -p2 "${PATCHES[@]}"
- eapply_user
+ default
eautoreconf
}
