summaryrefslogtreecommitdiff
path: root/dev-java/java-service-wrapper/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-05-31 20:59:14 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-05-31 20:59:14 +0100
commite748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /dev-java/java-service-wrapper/files
parent908778078736bd36f7a60a2d576d415cb8e000fa (diff)
gentoo resync : 31.05.2021
Diffstat (limited to 'dev-java/java-service-wrapper/files')
-rw-r--r--dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch28
-rw-r--r--dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch4
2 files changed, 16 insertions, 16 deletions
diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch
index 85d3d791199e..3eac44c0dc6c 100644
--- a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch
+++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch
@@ -1,7 +1,7 @@
https://bugs.gentoo.org/622806
https://sourceforge.net/p/wrapper/patches/25/
---- src/c/Makefile-linux-armel-32.make.old 2014-07-21 10:48:31.000000000 +0200
-+++ src/c/Makefile-linux-armel-32.make 2014-07-21 10:50:11.000000000 +0200
+--- a/src/c/Makefile-linux-armel-32.make.old 2014-07-21 10:48:31.000000000 +0200
++++ b/src/c/Makefile-linux-armel-32.make 2014-07-21 10:50:11.000000000 +0200
@@ -33,14 +33,14 @@
if test ! -d .deps; then mkdir .deps; fi
@@ -21,8 +21,8 @@ https://sourceforge.net/p/wrapper/patches/25/
@-cp .deps/$(*F).pp .deps/$(*F).P; \
tr ' ' '\012' < .deps/$(*F).pp \
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
---- src/c/Makefile-linux-armhf-32.make.old 2014-07-21 10:48:31.000000000 +0200
-+++ src/c/Makefile-linux-armhf-32.make 2014-07-21 10:51:05.000000000 +0200
+--- a/src/c/Makefile-linux-armhf-32.make.old 2014-07-21 10:48:31.000000000 +0200
++++ b/src/c/Makefile-linux-armhf-32.make 2014-07-21 10:51:05.000000000 +0200
@@ -33,14 +33,14 @@
if test ! -d .deps; then mkdir .deps; fi
@@ -42,8 +42,8 @@ https://sourceforge.net/p/wrapper/patches/25/
@-cp .deps/$(*F).pp .deps/$(*F).P; \
tr ' ' '\012' < .deps/$(*F).pp \
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
---- src/c/Makefile-linux-ia-64.make.old 2014-07-21 10:48:31.000000000 +0200
-+++ src/c/Makefile-linux-ia-64.make 2014-07-21 10:51:37.000000000 +0200
+--- a/src/c/Makefile-linux-ia-64.make.old 2014-07-21 10:48:31.000000000 +0200
++++ b/src/c/Makefile-linux-ia-64.make 2014-07-21 10:51:37.000000000 +0200
@@ -33,14 +33,14 @@
if test ! -d .deps; then mkdir .deps; fi
@@ -63,8 +63,8 @@ https://sourceforge.net/p/wrapper/patches/25/
@-cp .deps/$(*F).pp .deps/$(*F).P; \
tr ' ' '\012' < .deps/$(*F).pp \
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
---- src/c/Makefile-linux-ppc-32.make.old 2014-07-21 10:48:31.000000000 +0200
-+++ src/c/Makefile-linux-ppc-32.make 2014-07-21 10:52:05.000000000 +0200
+--- a/src/c/Makefile-linux-ppc-32.make.old 2014-07-21 10:48:31.000000000 +0200
++++ b/src/c/Makefile-linux-ppc-32.make 2014-07-21 10:52:05.000000000 +0200
@@ -33,14 +33,14 @@
if test ! -d .deps; then mkdir .deps; fi
@@ -84,8 +84,8 @@ https://sourceforge.net/p/wrapper/patches/25/
@-cp .deps/$(*F).pp .deps/$(*F).P; \
tr ' ' '\012' < .deps/$(*F).pp \
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
---- src/c/Makefile-linux-ppc-64.make.old 2014-07-21 10:48:31.000000000 +0200
-+++ src/c/Makefile-linux-ppc-64.make 2014-07-21 10:52:45.000000000 +0200
+--- a/src/c/Makefile-linux-ppc-64.make.old 2014-07-21 10:48:31.000000000 +0200
++++ b/src/c/Makefile-linux-ppc-64.make 2014-07-21 10:52:45.000000000 +0200
@@ -33,14 +33,14 @@
if test ! -d .deps; then mkdir .deps; fi
@@ -105,8 +105,8 @@ https://sourceforge.net/p/wrapper/patches/25/
@-cp .deps/$(*F).pp .deps/$(*F).P; \
tr ' ' '\012' < .deps/$(*F).pp \
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
---- src/c/Makefile-linux-x86-32.make.old 2014-07-21 10:48:31.000000000 +0200
-+++ src/c/Makefile-linux-x86-32.make 2014-07-21 10:53:39.000000000 +0200
+--- a/src/c/Makefile-linux-x86-32.make.old 2014-07-21 10:48:31.000000000 +0200
++++ b/src/c/Makefile-linux-x86-32.make 2014-07-21 10:53:39.000000000 +0200
@@ -36,17 +36,17 @@
if test ! -d .deps; then mkdir .deps; fi
@@ -130,8 +130,8 @@ https://sourceforge.net/p/wrapper/patches/25/
@-cp .deps/$(*F).pp .deps/$(*F).P; \
tr ' ' '\012' < .deps/$(*F).pp \
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
---- src/c/Makefile-linux-x86-64.make.old 2014-07-21 10:48:31.000000000 +0200
-+++ src/c/Makefile-linux-x86-64.make 2014-07-21 10:54:16.000000000 +0200
+--- a/src/c/Makefile-linux-x86-64.make.old 2014-07-21 10:48:31.000000000 +0200
++++ b/src/c/Makefile-linux-x86-64.make 2014-07-21 10:54:16.000000000 +0200
@@ -36,17 +36,17 @@
if test ! -d .deps; then mkdir .deps; fi
diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch
index 34e94bb77ed6..a859a893bd1c 100644
--- a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch
+++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch
@@ -11,8 +11,8 @@
| symbolic link.
|
---- src/c/wrapper.c.old 2014-07-21 09:12:55.000000000 +0200
-+++ src/c/wrapper.c 2014-07-21 09:13:22.000000000 +0200
+--- a/src/c/wrapper.c.old 2014-07-21 09:12:55.000000000 +0200
++++ b/src/c/wrapper.c 2014-07-21 09:13:22.000000000 +0200
@@ -4908,7 +4908,7 @@
if (!path) {
log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_WARN, TEXT("The configured wrapper.java.command could not be found, attempting to launch anyway: %s"), *para);