package/erlang-fast-xml: renamed from erlang-p1-xml

This package has been renamed to avoid patching other packages that
expect to find its content in a fast_xml/ directory. Remove the
corresponding patch from the erlang-p1-xmpp package.

Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
[yann.morin.1998@free.fr: update .checkpackageignore]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>

.checkpackageignore

@@ -473,7 +473,6 @@ package/elftosb/0001-fixes-includes.patch lib_patch.Upstream
 package/elftosb/0002-force-cxx-compiler.patch lib_patch.Upstream
 package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch lib_patch.Upstream
 package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch lib_patch.Upstream
-package/erlang-p1-xmpp/0001-fix-includes.patch lib_patch.Upstream
 package/erlang-rebar/0001-src-rebar_port_compiler-add-fPIC-to-LDFLAGS-by-defau.patch lib_patch.Upstream
 package/espeak/0001-Fix-build-of-shared-library-on-architectures-needing.patch lib_patch.Upstream
 package/espeak/0002-tr_languages-cast-string_ordinal-init-values.patch lib_patch.Upstream

Config.in.legacy

@@ -146,6 +146,13 @@ endif
 
 comment "Legacy options removed in 2024.11"
 
+config BR2_PACKAGE_ERLANG_P1_XML
+	bool "erlang-p1-xml has been renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_ERLANG_FAST_XML
+	help
+	  The erlang-p1-xml package has been renamed to erlang-fast-xml.
+
 config BR2_PACKAGE_ERLANG_P1_STUN
 	bool "erlang-p1-stun has been renamed"
 	select BR2_LEGACY

DEVELOPERS

@@ -1664,6 +1664,7 @@ N:	Johan Oudinet <johan.oudinet@gmail.com>
 F:	package/ejabberd/
 F:	package/erlang-base64url/
 F:	package/erlang-eimp/
+F:	package/erlang-fast-xml/
 F:	package/erlang-goldrush/
 F:	package/erlang-idna/
 F:	package/erlang-jiffy/
@@ -1678,7 +1679,6 @@ F:	package/erlang-p1-sip/
 F:	package/erlang-p1-stringprep/
 F:	package/erlang-p1-tls/
 F:	package/erlang-p1-utils/
-F:	package/erlang-p1-xml/
 F:	package/erlang-p1-xmpp/
 F:	package/erlang-p1-yaml/
 F:	package/erlang-p1-yconf/

package/Config.in

@@ -673,6 +673,7 @@ if BR2_PACKAGE_ERLANG
 menu "Erlang libraries/modules"
 	source "package/erlang-base64url/Config.in"
 	source "package/erlang-eimp/Config.in"
+	source "package/erlang-fast-xml/Config.in"
 	source "package/erlang-goldrush/Config.in"
 	source "package/erlang-idna/Config.in"
 	source "package/erlang-jiffy/Config.in"
@@ -687,7 +688,6 @@ menu "Erlang libraries/modules"
 	source "package/erlang-p1-stringprep/Config.in"
 	source "package/erlang-p1-tls/Config.in"
 	source "package/erlang-p1-utils/Config.in"
-	source "package/erlang-p1-xml/Config.in"
 	source "package/erlang-p1-xmpp/Config.in"
 	source "package/erlang-p1-yaml/Config.in"
 	source "package/erlang-p1-yconf/Config.in"

package/ejabberd/Config.in

@@ -3,6 +3,7 @@ config BR2_PACKAGE_EJABBERD
 	depends on BR2_PACKAGE_ERLANG
 	depends on BR2_INSTALL_LIBSTDCPP # jiffy, stringprep
 	select BR2_PACKAGE_ERLANG_EIMP
+	select BR2_PACKAGE_ERLANG_FAST_XML
 	select BR2_PACKAGE_ERLANG_IDNA # runtime
 	select BR2_PACKAGE_ERLANG_JIFFY # runtime
 	select BR2_PACKAGE_ERLANG_JOSE # runtime
@@ -16,7 +17,6 @@ config BR2_PACKAGE_EJABBERD
 	select BR2_PACKAGE_ERLANG_P1_STRINGPREP
 	select BR2_PACKAGE_ERLANG_P1_TLS
 	select BR2_PACKAGE_ERLANG_P1_UTILS
-	select BR2_PACKAGE_ERLANG_P1_XML
 	select BR2_PACKAGE_ERLANG_P1_XMPP
 	select BR2_PACKAGE_ERLANG_P1_YAML
 	select BR2_PACKAGE_ERLANG_P1_YCONF # runtime

package/ejabberd/ejabberd.mk

@@ -12,7 +12,7 @@ EJABBERD_CPE_ID_VENDOR = process-one
 EJABBERD_DEPENDENCIES = getent openssl erlang-eimp host-erlang-lager \
 	erlang-lager erlang-p1-cache-tab erlang-p1-sip \
 	erlang-p1-stringprep erlang-stun erlang-p1-tls \
-	erlang-p1-utils erlang-p1-xml erlang-p1-xmpp erlang-p1-yaml \
+	erlang-p1-utils erlang-fast-xml erlang-p1-xmpp erlang-p1-yaml \
 	erlang-p1-zlib host-erlang-p1-utils host-erlang-p1-xmpp
 
 # 0001-Makefile.in-do-not-download-or-compile-dependencies.patch

package/erlang-fast-xml/Config.in

@@ -0,0 +1,8 @@
+config BR2_PACKAGE_ERLANG_FAST_XML
+	bool "erlang-fast-xml"
+	select BR2_PACKAGE_ERLANG_P1_UTILS
+	select BR2_PACKAGE_EXPAT
+	help
+	  XML utilities for Erlang
+
+	  https://github.com/processone/fast_xml

package/erlang-p1-xml/erlang-p1-xml.hash → package/erlang-fast-xml/erlang-fast-xml.hash

@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  02bcdb0a4350080a10b52de85c11de982e5f7cf2150f5b1b888f7a95ccb31265  erlang-p1-xml-1.1.49.tar.gz
+sha256  02bcdb0a4350080a10b52de85c11de982e5f7cf2150f5b1b888f7a95ccb31265  erlang-fast-xml-1.1.49.tar.gz
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE.txt

package/erlang-fast-xml/erlang-fast-xml.mk

@@ -0,0 +1,18 @@
+################################################################################
+#
+# erlang-fast-xml
+#
+################################################################################
+
+ERLANG_FAST_XML_VERSION = 1.1.49
+ERLANG_FAST_XML_SITE = $(call github,processone,fast_xml,$(ERLANG_FAST_XML_VERSION))
+ERLANG_FAST_XML_LICENSE = Apache-2.0
+ERLANG_FAST_XML_LICENSE_FILES = LICENSE.txt
+ERLANG_FAST_XML_DEPENDENCIES = expat erlang-p1-utils
+HOST_ERLANG_FAST_XML_DEPENDENCIES = host-expat host-erlang-p1-utils
+ERLANG_FAST_XML_INSTALL_STAGING = YES
+
+ERLANG_FAST_XML_USE_AUTOCONF = YES
+
+$(eval $(rebar-package))
+$(eval $(host-rebar-package))

package/erlang-p1-xml/Config.in

@@ -1,8 +0,0 @@
-config BR2_PACKAGE_ERLANG_P1_XML
-	bool "erlang-p1-xml"
-	select BR2_PACKAGE_ERLANG_P1_UTILS
-	select BR2_PACKAGE_EXPAT
-	help
-	  XML utilities for Erlang
-
-	  https://github.com/processone/xml

package/erlang-p1-xml/erlang-p1-xml.mk

@@ -1,18 +0,0 @@
-################################################################################
-#
-# erlang-p1-xml
-#
-################################################################################
-
-ERLANG_P1_XML_VERSION = 1.1.49
-ERLANG_P1_XML_SITE = $(call github,processone,fast_xml,$(ERLANG_P1_XML_VERSION))
-ERLANG_P1_XML_LICENSE = Apache-2.0
-ERLANG_P1_XML_LICENSE_FILES = LICENSE.txt
-ERLANG_P1_XML_DEPENDENCIES = expat erlang-p1-utils
-HOST_ERLANG_P1_XML_DEPENDENCIES = host-expat host-erlang-p1-utils
-ERLANG_P1_XML_INSTALL_STAGING = YES
-
-ERLANG_P1_XML_USE_AUTOCONF = YES
-
-$(eval $(rebar-package))
-$(eval $(host-rebar-package))

package/erlang-p1-xmpp/0001-fix-includes.patch

@@ -1,16 +0,0 @@
-Without this patch, rebar fails to find include file fxml.hrl.
-
-Signed-off-by: Christophe Romain <cromain@process-one.net>
-
-diff --git a/include/xmpp.hrl b/include/xmpp.hrl
-index afa5f61..678858e 100644
---- a/include/xmpp.hrl
-+++ b/include/xmpp.hrl
-@@ -25,7 +25,7 @@
- -include("ns.hrl").
- -include("jid.hrl").
- -include("xmpp_codec.hrl").
---include_lib("fast_xml/include/fxml.hrl").
-+-include_lib("p1_xml/include/fxml.hrl").
-
- -type stanza() :: iq() | presence() | message().

package/erlang-p1-xmpp/Config.in

@@ -4,8 +4,8 @@ comment "erlang-p1-xmpp needs a toolchain w/ C++"
 config BR2_PACKAGE_ERLANG_P1_XMPP
 	bool "erlang-p1-xmpp"
 	depends on BR2_INSTALL_LIBSTDCPP # erlang-p1-stringprep
+	select BR2_PACKAGE_ERLANG_FAST_XML
 	select BR2_PACKAGE_ERLANG_IDNA
-	select BR2_PACKAGE_ERLANG_P1_XML
 	select BR2_PACKAGE_ERLANG_P1_STRINGPREP
 	select BR2_PACKAGE_ERLANG_P1_TLS
 	select BR2_PACKAGE_ERLANG_P1_UTILS

package/erlang-p1-xmpp/erlang-p1-xmpp.mk

@@ -9,9 +9,9 @@ ERLANG_P1_XMPP_SITE = $(call github,processone,xmpp,$(ERLANG_P1_XMPP_VERSION))
 ERLANG_P1_XMPP_LICENSE = Apache-2.0
 ERLANG_P1_XMPP_LICENSE_FILES = LICENSE.txt
 ERLANG_P1_XMPP_INSTALL_STAGING = YES
-ERLANG_P1_XMPP_DEPENDENCIES = erlang-p1-xml erlang-p1-stringprep \
-	erlang-p1-tls erlang-p1-utils erlang-p1-zlib host-erlang-p1-xml
-HOST_ERLANG_P1_XMPP_DEPENDENCIES = host-erlang-p1-xml
+ERLANG_P1_XMPP_DEPENDENCIES = erlang-fast-xml erlang-p1-stringprep \
+	erlang-p1-tls erlang-p1-utils erlang-p1-zlib host-erlang-fast-xml
+HOST_ERLANG_P1_XMPP_DEPENDENCIES = host-erlang-fast-xml
 
 $(eval $(rebar-package))
 $(eval $(host-rebar-package))