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 <xiscofauli@libreoffice.org>

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) \

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 \

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:

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'

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 \

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

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 \
 ))

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 \

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 \
 ))

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 \
 ))

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 \

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 \

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 \

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 \

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 \
 ))

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 \
 ))

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 \
 ))

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 \
 ))

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 \
 ))

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 \
 ))

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 \
 ))

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 \
 ))

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,\

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 \
 ))

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:

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,\

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 \
 ))
 

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,\

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 \

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 \

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 \

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 \

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 \

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))

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,\

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

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("$$","\r")' $(1) > $(1).TEMP && mv $(1).TEMP $(1)