Upgrade editors/openoffice-devel to git commit d12e928220 on the upstream

AOO420 branch.

patch-configure.ac and patch-icu_makefile.mk have been upstreamed.

Switch from python2 to python3.

2 files changed, 0 insertions, 25 deletions

diff --git a/editors/openoffice-devel/files/patch-configure.ac b/editors/openoffice-devel/files/patch-configure.ac
deleted file mode 100644
index dc51ac969e9b..000000000000
--- a/editors/openoffice-devel/files/patch-configure.ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig	2019-11-07 11:05:12 UTC
-+++ configure.ac
-@@ -2291,7 +2291,7 @@ AC_SUBST(COMNAME)
- 
- if test "$_os" = "FreeBSD"; then
-     FBSD_GCC_RPATH=
--    if "$COM" = "GCC"; then
-+    if test "$COM" = "GCC"; then
-         rpath=`$CC --print-file-name libstdc++.so`
-         rpath=`realpath $rpath`
-         rpath=`dirname $rpath`
diff --git a/editors/openoffice-devel/files/patch-icu_makefile.mk b/editors/openoffice-devel/files/patch-icu_makefile.mk
deleted file mode 100644
index 2e4b7c014a32..000000000000
--- a/editors/openoffice-devel/files/patch-icu_makefile.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- icu/makefile.mk.orig	2019-09-17 22:55:16 UTC
-+++ icu/makefile.mk
-@@ -86,6 +86,11 @@ LDFLAGSADD += -Wl,--hash-style=both
- LDFLAGSADD += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
- .ENDIF
- 
-+# FreeBSD with gcc from ports needs -Wl,-rpath= to find the matching libstdc++ 
-+.IF "$(OS)"=="FREEBSD"
-+LDFLAGSADD+=$(FBSD_GCC_RPATH)
-+.ENDIF
-+
- CONFIGURE_DIR=source
- 
- CONFIGURE_ACTION+=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" ./configure --enable-layout --enable-static --enable-shared=yes $(DISABLE_64BIT)'