external/argon2/UnpackedTarball_argon2.mk | 2 --
external/beanshell/UnpackedTarball_beanshell.mk | 2 ++
external/box2d/UnpackedTarball_box2d.mk | 2 --
external/cairo/UnpackedTarball_cairo.mk | 2 ++
external/cairo/UnpackedTarball_pixman.mk | 2 ++
external/cppunit/UnpackedTarball_cppunit.mk | 2 ++
external/curl/UnpackedTarball_curl.mk | 2 --
external/dtoa/UnpackedTarball_dtoa.mk | 2 --
external/expat/UnpackedTarball_expat.mk | 2 ++
external/glm/UnpackedTarball_glm.mk | 2 --
external/hsqldb/UnpackedTarball_hsqldb.mk | 2 ++
external/hunspell/UnpackedTarball_hunspell.mk | 2 --
external/hyphen/UnpackedTarball_hyphen.mk | 2 ++
external/java_websocket/UnpackedTarball_java_websocket.mk | 2 --
external/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk | 2 ++
external/jfreereport/UnpackedTarball_jfreereport_flute.mk | 2 ++
external/jfreereport/UnpackedTarball_jfreereport_libbase.mk | 2 ++
external/jfreereport/UnpackedTarball_jfreereport_libfonts.mk | 2 ++
external/jfreereport/UnpackedTarball_jfreereport_libformula.mk | 2 ++
external/jfreereport/UnpackedTarball_jfreereport_liblayout.mk | 2 ++
external/jfreereport/UnpackedTarball_jfreereport_libloader.mk | 2 ++
external/jfreereport/UnpackedTarball_jfreereport_librepository.mk | 2 ++
external/jfreereport/UnpackedTarball_jfreereport_libserializer.mk | 2 ++
external/jfreereport/UnpackedTarball_jfreereport_libxml.mk | 2 ++
external/jfreereport/UnpackedTarball_jfreereport_sac.mk | 2 ++
external/libcmis/UnpackedTarball_libcmis.mk | 2 --
external/libnumbertext/UnpackedTarball_libnumbertext.mk | 9
++-------
external/liborcus/UnpackedTarball_liborcus.mk | 2 --
external/libtiff/UnpackedTarball_libtiff.mk | 2 --
external/libxml2/UnpackedTarball_libxml2.mk | 2 ++
external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk | 2 --
external/mythes/UnpackedTarball_mythes.mk | 2 ++
external/nss/UnpackedTarball_nss.mk | 2 ++
external/skia/UnpackedTarball_skia.mk | 2 --
external/zxcvbn-c/UnpackedTarball_zxcvbn-c.mk | 2 ++
external/zxing/UnpackedTarball_zxing.mk | 2 --
solenv/gbuild/UnpackedTarball.mk | 4 +---
37 files changed, 47 insertions(+), 36 deletions(-)
New commits:
commit c78d9f48a6b6e59ad2321b35e51e5cb1e4dec6d3
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Mon Apr 7 22:29:56 2025 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Apr 8 09:24:17 2025 +0200
libnumbertext: remove obsolete comment
Since
commit 6064b3382102bcbc153156f5874fbc8dfde97b98
Author: László Németh <nem...@numbertext.org>
Date: Sun Nov 13 13:00:42 2022 +0100
tdf#115007 tdf#148672 bump libnumbertext 1.0.11
Change-Id: Ic87d04946490eb8fefbb9783c54102e38ad7f29f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183819
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/external/libnumbertext/UnpackedTarball_libnumbertext.mk
b/external/libnumbertext/UnpackedTarball_libnumbertext.mk
index e47af3146a17..3e1dc8bd39d8 100644
--- a/external/libnumbertext/UnpackedTarball_libnumbertext.mk
+++ b/external/libnumbertext/UnpackedTarball_libnumbertext.mk
@@ -13,9 +13,6 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,libnumbertext,$(LIBNUMBERTEXT_TARBA
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libnumbertext))
-# EmptyString.patch1 submitted as
-# https://github.com/Numbertext/libnumbertext/pull/95
-
$(eval $(call gb_UnpackedTarball_add_patches,libnumbertext, \
external/libnumbertext/MSVCNonBMPBug.patch \
external/libnumbertext/WinUnicodePath.patch \
commit 3709789a58d6c7df5c15565299bb024c52807c31
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Mon Apr 7 12:15:34 2025 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Apr 8 09:24:08 2025 +0200
gbuild: set default patchlevel to 1
Change-Id: I195dbafff63e21a22edf438f5b9ed5beee4dac03
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183784
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/external/argon2/UnpackedTarball_argon2.mk
b/external/argon2/UnpackedTarball_argon2.mk
index c795a1562974..dc379cca9ac2 100644
--- a/external/argon2/UnpackedTarball_argon2.mk
+++ b/external/argon2/UnpackedTarball_argon2.mk
@@ -11,8 +11,6 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,argon2))
$(eval $(call gb_UnpackedTarball_set_tarball,argon2,$(ARGON2_TARBALL)))
-$(eval $(call gb_UnpackedTarball_set_patchlevel,argon2,1))
-
$(eval $(call gb_UnpackedTarball_add_patches,argon2,\
external/argon2/0001-Fix-possible-compiler-error-due-to-undefined-_MSC_VE.patch
\
$(if $(filter
WNT_AARCH64,$(OS)_$(CPUNAME)),external/argon2/0002-Add-WinARM64-vcxproj-config.patch)
\
diff --git a/external/beanshell/UnpackedTarball_beanshell.mk
b/external/beanshell/UnpackedTarball_beanshell.mk
index 77b45697be77..5248a7da0486 100644
--- a/external/beanshell/UnpackedTarball_beanshell.mk
+++ b/external/beanshell/UnpackedTarball_beanshell.mk
@@ -15,6 +15,8 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,beanshell,\
engine/src/bsh/TestBshScriptEngine.java \
))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,beanshell,2))
+
$(eval $(call gb_UnpackedTarball_add_patches,beanshell,\
external/beanshell/bsh-2.0b1-src.patch \
external/beanshell/beanshell-invoke.patch \
diff --git a/external/box2d/UnpackedTarball_box2d.mk
b/external/box2d/UnpackedTarball_box2d.mk
index 7d7d60e932ad..340a17511711 100644
--- a/external/box2d/UnpackedTarball_box2d.mk
+++ b/external/box2d/UnpackedTarball_box2d.mk
@@ -11,6 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,box2d))
$(eval $(call gb_UnpackedTarball_set_tarball,box2d,$(BOX2D_TARBALL)))
-$(eval $(call gb_UnpackedTarball_set_patchlevel,box2d,1))
-
# vim: set noet sw=4 ts=4:
diff --git a/external/cairo/UnpackedTarball_cairo.mk
b/external/cairo/UnpackedTarball_cairo.mk
index f1697c6d0cc9..0fdc451a205d 100644
--- a/external/cairo/UnpackedTarball_cairo.mk
+++ b/external/cairo/UnpackedTarball_cairo.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cairo))
$(eval $(call gb_UnpackedTarball_set_tarball,cairo,$(CAIRO_TARBALL),,cairo))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,cairo,2))
+
# cairo >= 1.17.6 was probably created in Fedora where
#
https://salsa.debian.org/mckinstry/libtool/-/commit/26c23f951d049241128e5e04a7bbc263e5b145f1
# isn't applied, so add that in to avoid: /usr/bin/ld: unrecognized option
'--gdb-index'
diff --git a/external/cairo/UnpackedTarball_pixman.mk
b/external/cairo/UnpackedTarball_pixman.mk
index 922ed9f24f22..e1955bb0bc9b 100644
--- a/external/cairo/UnpackedTarball_pixman.mk
+++ b/external/cairo/UnpackedTarball_pixman.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,pixman))
$(eval $(call gb_UnpackedTarball_set_tarball,pixman,$(PIXMAN_TARBALL),,cairo))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,pixman,2))
+
$(eval $(call gb_UnpackedTarball_add_patches,pixman,\
external/cairo/pixman/pixman-0.24.4.patch \
external/cairo/pixman/pixman-ubsan.patch \
diff --git a/external/cppunit/UnpackedTarball_cppunit.mk
b/external/cppunit/UnpackedTarball_cppunit.mk
index 207c7e76f283..c9e07bf20546 100644
--- a/external/cppunit/UnpackedTarball_cppunit.mk
+++ b/external/cppunit/UnpackedTarball_cppunit.mk
@@ -13,6 +13,8 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,cppunit,$(CPPUNIT_TARBALL),,cppunit
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,cppunit))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,cppunit,2))
+
# * external/cppunit/order.patch.0 upstreamed at
<https://gerrit.libreoffice.org/c/cppunit/+/123963>
# "Run tests in deterministic order";
# * external/cppunit/propagate-exceptions.patch.0 upstreamed at
diff --git a/external/curl/UnpackedTarball_curl.mk
b/external/curl/UnpackedTarball_curl.mk
index 777e2b576107..76b8b8639df2 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -13,8 +13,6 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,curl,$(CURL_TARBALL),,curl))
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,curl))
-$(eval $(call gb_UnpackedTarball_set_patchlevel,curl,1))
-
$(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\
winbuild/MakefileBuild.vc \
))
diff --git a/external/dtoa/UnpackedTarball_dtoa.mk
b/external/dtoa/UnpackedTarball_dtoa.mk
index d1702085cd6f..fdb5cb98dc49 100644
--- a/external/dtoa/UnpackedTarball_dtoa.mk
+++ b/external/dtoa/UnpackedTarball_dtoa.mk
@@ -11,8 +11,6 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,dtoa))
$(eval $(call gb_UnpackedTarball_set_tarball,dtoa,$(DTOA_TARBALL)))
-$(eval $(call gb_UnpackedTarball_set_patchlevel,dtoa,1))
-
$(eval $(call gb_UnpackedTarball_add_patches,dtoa, \
external/dtoa/include_header.patch \
external/dtoa/coverity.patch \
diff --git a/external/expat/UnpackedTarball_expat.mk
b/external/expat/UnpackedTarball_expat.mk
index 5d4f41f6d147..30d0e935d489 100644
--- a/external/expat/UnpackedTarball_expat.mk
+++ b/external/expat/UnpackedTarball_expat.mk
@@ -13,6 +13,8 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,expat,$(EXPAT_TARBALL)))
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,expat,conftools))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,expat,2))
+
$(eval $(call gb_UnpackedTarball_add_patches,expat,\
external/expat/expat-winapi.patch \
))
diff --git a/external/glm/UnpackedTarball_glm.mk
b/external/glm/UnpackedTarball_glm.mk
index 78226f44cc08..d99934ec940d 100644
--- a/external/glm/UnpackedTarball_glm.mk
+++ b/external/glm/UnpackedTarball_glm.mk
@@ -13,8 +13,6 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,glm,$(GLM_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchflags,glm,$(if $(filter
MSC,$(COM)),--binary)))
-$(eval $(call gb_UnpackedTarball_set_patchlevel,glm,1))
-
$(eval $(call gb_UnpackedTarball_add_patches,glm, \
external/glm/clang-cl.patch.0 \
))
diff --git a/external/hsqldb/UnpackedTarball_hsqldb.mk
b/external/hsqldb/UnpackedTarball_hsqldb.mk
index 0b05b45ba3c3..aebc687c060e 100644
--- a/external/hsqldb/UnpackedTarball_hsqldb.mk
+++ b/external/hsqldb/UnpackedTarball_hsqldb.mk
@@ -17,6 +17,8 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,hsqldb,\
src/org/hsqldb/persist/HsqlDatabaseProperties.java \
))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,hsqldb,2))
+
$(eval $(call gb_UnpackedTarball_add_patches,hsqldb,\
external/hsqldb/patches/i96823.patch \
external/hsqldb/patches/i97032.patch \
diff --git a/external/hunspell/UnpackedTarball_hunspell.mk
b/external/hunspell/UnpackedTarball_hunspell.mk
index 0d5986798265..72a5d2c94d68 100644
--- a/external/hunspell/UnpackedTarball_hunspell.mk
+++ b/external/hunspell/UnpackedTarball_hunspell.mk
@@ -19,8 +19,6 @@ $(eval $(call gb_UnpackedTarball_set_post_action,hunspell,\
))
endif
-$(eval $(call gb_UnpackedTarball_set_patchlevel,hunspell,1))
-
$(eval $(call gb_UnpackedTarball_add_patches,hunspell, \
external/hunspell/0001-fix-LibreOffice-build-problem-with-basic_string-appe.patch
\
external/hunspell/0001-Resolves-rhbz-2158548-allow-longer-words-for-hunspel.patch
\
diff --git a/external/hyphen/UnpackedTarball_hyphen.mk
b/external/hyphen/UnpackedTarball_hyphen.mk
index c4bbb02269dd..21b1f8f7629c 100644
--- a/external/hyphen/UnpackedTarball_hyphen.mk
+++ b/external/hyphen/UnpackedTarball_hyphen.mk
@@ -13,6 +13,8 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,hyphen,$(HYPHEN_TARBALL)))
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,hyphen))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,hyphen,2))
+
$(eval $(call gb_UnpackedTarball_add_patches,hyphen,\
external/hyphen/hyphen-build.patch \
external/hyphen/hyphen-fdo48017-wfopen.patch \
diff --git a/external/java_websocket/UnpackedTarball_java_websocket.mk
b/external/java_websocket/UnpackedTarball_java_websocket.mk
index c0794de9b4a6..1d05361a25f9 100644
--- a/external/java_websocket/UnpackedTarball_java_websocket.mk
+++ b/external/java_websocket/UnpackedTarball_java_websocket.mk
@@ -11,8 +11,6 @@ $(eval $(call
gb_UnpackedTarball_UnpackedTarball,java_websocket))
$(eval $(call
gb_UnpackedTarball_set_tarball,java_websocket,$(JAVA_WEBSOCKET_TARBALL),,java_websocket))
-$(eval $(call gb_UnpackedTarball_set_patchlevel,java_websocket,1))
-
$(eval $(call gb_UnpackedTarball_add_patches,java_websocket,\
external/java_websocket/patches/ant-build.patch \
external/java_websocket/patches/no-slf4j.patch \
diff --git a/external/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk
b/external/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk
index 42e90e1e0bb4..92b827255ca0 100644
--- a/external/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk
+++ b/external/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk
@@ -11,6 +11,8 @@ $(eval $(call
gb_UnpackedTarball_UnpackedTarball,jfreereport_flow_engine))
$(eval $(call
gb_UnpackedTarball_set_tarball,jfreereport_flow_engine,$(JFREEREPORT_FLOW_ENGINE_TARBALL),0))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,jfreereport_flow_engine,2))
+
$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_flow_engine,\
build.xml \
))
diff --git a/external/jfreereport/UnpackedTarball_jfreereport_flute.mk
b/external/jfreereport/UnpackedTarball_jfreereport_flute.mk
index a972e21aabc0..ddf74fe6db77 100644
--- a/external/jfreereport/UnpackedTarball_jfreereport_flute.mk
+++ b/external/jfreereport/UnpackedTarball_jfreereport_flute.mk
@@ -11,6 +11,8 @@ $(eval $(call
gb_UnpackedTarball_UnpackedTarball,jfreereport_flute))
$(eval $(call
gb_UnpackedTarball_set_tarball,jfreereport_flute,$(JFREEREPORT_FLUTE_TARBALL),0))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,jfreereport_flute,2))
+
$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_flute,\
common_build.xml \
))
diff --git a/external/jfreereport/UnpackedTarball_jfreereport_libbase.mk
b/external/jfreereport/UnpackedTarball_jfreereport_libbase.mk
index 46bb438aa58a..4266f279ef1b 100644
--- a/external/jfreereport/UnpackedTarball_jfreereport_libbase.mk
+++ b/external/jfreereport/UnpackedTarball_jfreereport_libbase.mk
@@ -14,6 +14,8 @@ $(eval $(call
gb_UnpackedTarball_UnpackedTarball,jfreereport_libbase))
$(eval $(call
gb_UnpackedTarball_set_tarball,jfreereport_libbase,$(JFREEREPORT_LIBBASE_TARBALL),0))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,jfreereport_libbase,2))
+
$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libbase,\
common_build.xml \
))
diff --git a/external/jfreereport/UnpackedTarball_jfreereport_libfonts.mk
b/external/jfreereport/UnpackedTarball_jfreereport_libfonts.mk
index c45958505e96..160b22fb3d23 100644
--- a/external/jfreereport/UnpackedTarball_jfreereport_libfonts.mk
+++ b/external/jfreereport/UnpackedTarball_jfreereport_libfonts.mk
@@ -14,6 +14,8 @@ $(eval $(call
gb_UnpackedTarball_UnpackedTarball,jfreereport_libfonts))
$(eval $(call
gb_UnpackedTarball_set_tarball,jfreereport_libfonts,$(JFREEREPORT_LIBFONTS_TARBALL),0))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,jfreereport_libfonts,2))
+
$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libfonts,\
common_build.xml \
))
diff --git a/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk
b/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk
index 13e8fcfaf640..4b92f3592083 100644
--- a/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk
+++ b/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk
@@ -11,6 +11,8 @@ $(eval $(call
gb_UnpackedTarball_UnpackedTarball,jfreereport_libformula))
$(eval $(call
gb_UnpackedTarball_set_tarball,jfreereport_libformula,$(JFREEREPORT_LIBFORMULA_TARBALL),0))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,jfreereport_libformula,2))
+
$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libformula,\
common_build.xml \
))
diff --git a/external/jfreereport/UnpackedTarball_jfreereport_liblayout.mk
b/external/jfreereport/UnpackedTarball_jfreereport_liblayout.mk
index a2538c37820b..9e01fcd7699b 100644
--- a/external/jfreereport/UnpackedTarball_jfreereport_liblayout.mk
+++ b/external/jfreereport/UnpackedTarball_jfreereport_liblayout.mk
@@ -11,6 +11,8 @@ $(eval $(call
gb_UnpackedTarball_UnpackedTarball,jfreereport_liblayout))
$(eval $(call
gb_UnpackedTarball_set_tarball,jfreereport_liblayout,$(JFREEREPORT_LIBLAYOUT_TARBALL),0))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,jfreereport_liblayout,2))
+
$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_liblayout,\
build.xml \
))
diff --git a/external/jfreereport/UnpackedTarball_jfreereport_libloader.mk
b/external/jfreereport/UnpackedTarball_jfreereport_libloader.mk
index 6221dfa52b1b..2732f621c6fd 100644
--- a/external/jfreereport/UnpackedTarball_jfreereport_libloader.mk
+++ b/external/jfreereport/UnpackedTarball_jfreereport_libloader.mk
@@ -14,6 +14,8 @@ $(eval $(call
gb_UnpackedTarball_UnpackedTarball,jfreereport_libloader))
$(eval $(call
gb_UnpackedTarball_set_tarball,jfreereport_libloader,$(JFREEREPORT_LIBLOADER_TARBALL),0))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,jfreereport_libloader,2))
+
$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libloader,\
common_build.xml \
))
diff --git a/external/jfreereport/UnpackedTarball_jfreereport_librepository.mk
b/external/jfreereport/UnpackedTarball_jfreereport_librepository.mk
index e1db29d02b3e..d3d65d7ccf31 100644
--- a/external/jfreereport/UnpackedTarball_jfreereport_librepository.mk
+++ b/external/jfreereport/UnpackedTarball_jfreereport_librepository.mk
@@ -14,6 +14,8 @@ $(eval $(call
gb_UnpackedTarball_UnpackedTarball,jfreereport_librepository))
$(eval $(call
gb_UnpackedTarball_set_tarball,jfreereport_librepository,$(JFREEREPORT_LIBREPOSITORY_TARBALL),0))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,jfreereport_librepository,2))
+
$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_librepository,\
common_build.xml \
))
diff --git a/external/jfreereport/UnpackedTarball_jfreereport_libserializer.mk
b/external/jfreereport/UnpackedTarball_jfreereport_libserializer.mk
index fb6f3d60c8da..88a5bf5e5aa3 100644
--- a/external/jfreereport/UnpackedTarball_jfreereport_libserializer.mk
+++ b/external/jfreereport/UnpackedTarball_jfreereport_libserializer.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libserializer))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,jfreereport_libserializer,2))
+
$(eval $(call
gb_UnpackedTarball_set_tarball,jfreereport_libserializer,$(JFREEREPORT_LIBSERIALIZER_TARBALL),0))
$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libserializer,\
diff --git a/external/jfreereport/UnpackedTarball_jfreereport_libxml.mk
b/external/jfreereport/UnpackedTarball_jfreereport_libxml.mk
index 7a920a873d4c..752d3aca1f82 100644
--- a/external/jfreereport/UnpackedTarball_jfreereport_libxml.mk
+++ b/external/jfreereport/UnpackedTarball_jfreereport_libxml.mk
@@ -11,6 +11,8 @@ $(eval $(call
gb_UnpackedTarball_UnpackedTarball,jfreereport_libxml))
$(eval $(call
gb_UnpackedTarball_set_tarball,jfreereport_libxml,$(JFREEREPORT_LIBXML_TARBALL),0))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,jfreereport_libxml,2))
+
$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libxml,\
common_build.xml \
))
diff --git a/external/jfreereport/UnpackedTarball_jfreereport_sac.mk
b/external/jfreereport/UnpackedTarball_jfreereport_sac.mk
index eb951663db4c..acf65b49223e 100644
--- a/external/jfreereport/UnpackedTarball_jfreereport_sac.mk
+++ b/external/jfreereport/UnpackedTarball_jfreereport_sac.mk
@@ -11,6 +11,8 @@ $(eval $(call
gb_UnpackedTarball_UnpackedTarball,jfreereport_sac))
$(eval $(call
gb_UnpackedTarball_set_tarball,jfreereport_sac,$(JFREEREPORT_SAC_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,jfreereport_sac,2))
+
$(eval $(call
gb_UnpackedTarball_add_file,jfreereport_sac,build.xml,external/jfreereport/java/sac/build.xml))
# vim: set noet sw=4 ts=4:
diff --git a/external/libcmis/UnpackedTarball_libcmis.mk
b/external/libcmis/UnpackedTarball_libcmis.mk
index e47c7f81ef63..33f128a41036 100644
--- a/external/libcmis/UnpackedTarball_libcmis.mk
+++ b/external/libcmis/UnpackedTarball_libcmis.mk
@@ -11,8 +11,6 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libcmis))
$(eval $(call gb_UnpackedTarball_set_tarball,libcmis,$(LIBCMIS_TARBALL)))
-$(eval $(call gb_UnpackedTarball_set_patchlevel,libcmis,1))
-
# 0001-cid-1545775-COPY_INSTEAD_OF_MOVE.patch is upstreamed
$(eval $(call gb_UnpackedTarball_add_patches,libcmis,\
diff --git a/external/libnumbertext/MSVCNonBMPBug.patch1
b/external/libnumbertext/MSVCNonBMPBug.patch
similarity index 100%
rename from external/libnumbertext/MSVCNonBMPBug.patch1
rename to external/libnumbertext/MSVCNonBMPBug.patch
diff --git a/external/libnumbertext/UnpackedTarball_libnumbertext.mk
b/external/libnumbertext/UnpackedTarball_libnumbertext.mk
index 162fafdb6a20..e47af3146a17 100644
--- a/external/libnumbertext/UnpackedTarball_libnumbertext.mk
+++ b/external/libnumbertext/UnpackedTarball_libnumbertext.mk
@@ -13,14 +13,12 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,libnumbertext,$(LIBNUMBERTEXT_TARBA
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libnumbertext))
-$(eval $(call gb_UnpackedTarball_set_patchlevel,libnumbertext,1))
-
# EmptyString.patch1 submitted as
# https://github.com/Numbertext/libnumbertext/pull/95
$(eval $(call gb_UnpackedTarball_add_patches,libnumbertext, \
- external/libnumbertext/MSVCNonBMPBug.patch1 \
- external/libnumbertext/WinUnicodePath.patch1 \
+ external/libnumbertext/MSVCNonBMPBug.patch \
+ external/libnumbertext/WinUnicodePath.patch \
external/libnumbertext/deprecated.patch.0 \
))
diff --git a/external/libnumbertext/WinUnicodePath.patch1
b/external/libnumbertext/WinUnicodePath.patch
similarity index 100%
rename from external/libnumbertext/WinUnicodePath.patch1
rename to external/libnumbertext/WinUnicodePath.patch
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk
b/external/liborcus/UnpackedTarball_liborcus.mk
index 24412db28496..346ce67974f2 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -11,8 +11,6 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,liborcus))
$(eval $(call gb_UnpackedTarball_set_tarball,liborcus,$(ORCUS_TARBALL)))
-$(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,1))
-
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus))
$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
diff --git a/external/libtiff/UnpackedTarball_libtiff.mk
b/external/libtiff/UnpackedTarball_libtiff.mk
index f268be5926c6..52b56a498b0a 100644
--- a/external/libtiff/UnpackedTarball_libtiff.mk
+++ b/external/libtiff/UnpackedTarball_libtiff.mk
@@ -11,8 +11,6 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libtiff))
$(eval $(call gb_UnpackedTarball_set_tarball,libtiff,$(LIBTIFF_TARBALL)))
-$(eval $(call gb_UnpackedTarball_set_patchlevel,libtiff,1))
-
$(eval $(call gb_UnpackedTarball_add_patches,libtiff,\
external/libtiff/libtiff.linknolibs.patch \
external/libtiff/0001-ofz-54685-Timeout.patch \
diff --git a/external/libxml2/UnpackedTarball_libxml2.mk
b/external/libxml2/UnpackedTarball_libxml2.mk
index 489fb007572b..df11b69ac6f2 100644
--- a/external/libxml2/UnpackedTarball_libxml2.mk
+++ b/external/libxml2/UnpackedTarball_libxml2.mk
@@ -13,6 +13,8 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,libxml2,$(LIBXML_TARBALL),,libxml2)
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libxml2))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libxml2,2))
+
$(eval $(call gb_UnpackedTarball_add_patches,libxml2,\
$(if $(filter
SOLARIS,$(OS)),external/libxml2/libxml2-global-symbols.patch) \
external/libxml2/libxml2-vc10.patch \
diff --git
a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
index 3ba6bfef583f..bcbbd6f48178 100644
--- a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
@@ -23,8 +23,6 @@ $(eval $(call
gb_UnpackedTarball_add_file,mariadb-connector-c,include/ma_config.
endif
endif # $(OS),WNT
-$(eval $(call gb_UnpackedTarball_set_patchlevel,mariadb-connector-c,1))
-
$(eval $(call gb_UnpackedTarball_add_patches,mariadb-connector-c,\
external/mariadb-connector-c/clang-cl.patch.0 \
external/mariadb-connector-c/c23.patch.0 \
diff --git a/external/mythes/UnpackedTarball_mythes.mk
b/external/mythes/UnpackedTarball_mythes.mk
index cba16fd5698a..8bd75f971795 100644
--- a/external/mythes/UnpackedTarball_mythes.mk
+++ b/external/mythes/UnpackedTarball_mythes.mk
@@ -13,6 +13,8 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,mythes,$(MYTHES_TARBALL)))
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,mythes))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,mythes,2))
+
$(eval $(call gb_UnpackedTarball_add_patches,mythes,\
external/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch \
external/mythes/mythes-fdo48017-wfopen.patch \
diff --git a/external/nss/UnpackedTarball_nss.mk
b/external/nss/UnpackedTarball_nss.mk
index 5915af095a54..a33a293f972d 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -13,6 +13,8 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,nss,$(NSS_TARBALL)))
$(eval $(call
gb_UnpackedTarball_update_autoconf_configs,nss,nspr/build/autoconf))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,nss,2))
+
$(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss.patch \
external/nss/nss_macosx.patch \
diff --git a/external/skia/UnpackedTarball_skia.mk
b/external/skia/UnpackedTarball_skia.mk
index 4483a9d15be1..5bdf7a10a467 100644
--- a/external/skia/UnpackedTarball_skia.mk
+++ b/external/skia/UnpackedTarball_skia.mk
@@ -44,8 +44,6 @@ skia_patches := \
0003-loong64-Fix-missing-rounding-in-loong64-scaled_mult-.patch \
0004-loong64-Fix-the-remaining-implicit-vector-casts.patch \
-$(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))
-
ifneq ($(MSYSTEM),)
# use binary flag so patch from git-bash won't choke on mixed line-endings in
patches
$(eval $(call gb_UnpackedTarball_set_patchflags,skia,--binary))
diff --git a/external/zxcvbn-c/UnpackedTarball_zxcvbn-c.mk
b/external/zxcvbn-c/UnpackedTarball_zxcvbn-c.mk
index b3b76aa3ef1c..c1884e7ea12a 100644
--- a/external/zxcvbn-c/UnpackedTarball_zxcvbn-c.mk
+++ b/external/zxcvbn-c/UnpackedTarball_zxcvbn-c.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,zxcvbn-c))
$(eval $(call gb_UnpackedTarball_set_tarball,zxcvbn-c,$(ZXCVBN_C_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,zxcvbn-c,2))
+
# * external/zxcvbn-c/0001-There-is-no-std-basic_string-int.patch.1 sent
upstream as
# <https://github.com/tsyrogit/zxcvbn-c/pull/31> "There is no
std::basic_string<int>":
$(eval $(call gb_UnpackedTarball_add_patches,zxcvbn-c,\
diff --git a/external/zxing/UnpackedTarball_zxing.mk
b/external/zxing/UnpackedTarball_zxing.mk
index 4bd1943079c4..df4a2bdf811d 100644
--- a/external/zxing/UnpackedTarball_zxing.mk
+++ b/external/zxing/UnpackedTarball_zxing.mk
@@ -11,8 +11,6 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,zxing))
$(eval $(call gb_UnpackedTarball_set_tarball,zxing,$(ZXING_TARBALL)))
-$(eval $(call gb_UnpackedTarball_set_patchlevel,zxing,1))
-
ifneq ($(MSYSTEM),)
# the 2.3.0 tarball contains dangling symlinks (to a submodule
component/experimental backend)
# git-bash/msys tar fails when extracting since MSYS defaults to not create
those
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index dd7317e29ec2..1710bd253073 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -96,9 +96,7 @@ endef
# The unpacked dir is recreated every time one of the patches, copied
# files or the makefile changes.
-# This is what dmake patches use. Once all external modules are
-# converted, it is better to be changed to 1.
-gb_UnpackedTarball_PATCHLEVEL_DEFAULT := 2
+gb_UnpackedTarball_PATCHLEVEL_DEFAULT := 1
gb_UnpackedTarball_CONVERTTODOS = \
$(gb_AWK) 'sub("$$"," ")' $(1) > $(1).TEMP && mv $(1).TEMP $(1)
