Attachment 255954 Details for Bug 283373 – updated patch

[patch] updated patch

libfilezilla-0.49.0.diff (text/plain), 3.57 KB, created by Martin Neubauer on 2024-12-19 16:21:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Neubauer

Created: 2024-12-19 16:21:54 UTC

Size: 3.57 KB

patch

obsolete

>diff --git a/ftp/libfilezilla/Makefile b/ftp/libfilezilla/Makefile
>index 87306506b97f..a45a18c8e7d8 100644
>--- a/ftp/libfilezilla/Makefile
>+++ b/ftp/libfilezilla/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	libfilezilla
>-PORTVERSION=	0.47.0
>+PORTVERSION=	0.49.0
> CATEGORIES=	ftp
> MASTER_SITES=	https://download.filezilla-project.org/${PORTNAME}/
> 
>@@ -20,4 +20,11 @@ USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.pre.mk>
>+
>+.if ${CHOSEN_COMPILER_TYPE} == clang && \
>+	${COMPILER_VERSION} >= 191
>+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-lib_libfilezilla_string.hpp
>+.endif
>+
>+.include <bsd.port.post.mk>
>diff --git a/ftp/libfilezilla/distinfo b/ftp/libfilezilla/distinfo
>index b142fd53f8af..b3fca8c4eebf 100644
>--- a/ftp/libfilezilla/distinfo
>+++ b/ftp/libfilezilla/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1713540004
>-SHA256 (libfilezilla-0.47.0.tar.xz) = 618a586b613bef710a633c42bfdda61666cbb0fc8a92ad490361d0bc91c58341
>-SIZE (libfilezilla-0.47.0.tar.xz) = 551484
>+TIMESTAMP = 1734369263
>+SHA256 (libfilezilla-0.49.0.tar.xz) = 79ff30e5124068c116c8dc8fc4581922afa2d3720f7b6bee9c8f8fe419617488
>+SIZE (libfilezilla-0.49.0.tar.xz) = 554000
>diff --git a/ftp/libfilezilla/pkg-plist b/ftp/libfilezilla/pkg-plist
>index 0aba8a734d84..7cebbcd4b688 100644
>--- a/ftp/libfilezilla/pkg-plist
>+++ b/ftp/libfilezilla/pkg-plist
>@@ -60,10 +60,9 @@ include/libfilezilla/util.hpp
> include/libfilezilla/version.hpp
> include/libfilezilla/visibility_helper.hpp
> include/libfilezilla/xml.hpp
>-lib/libfilezilla.a
> lib/libfilezilla.so
>-lib/libfilezilla.so.43
>-lib/libfilezilla.so.43.0.0
>+lib/libfilezilla.so.46
>+lib/libfilezilla.so.46.0.0
> libdata/pkgconfig/libfilezilla.pc
> share/locale/an/LC_MESSAGES/libfilezilla.mo
> share/locale/ar/LC_MESSAGES/libfilezilla.mo
>diff --git a/ftp/libfilezilla/files/extra-patch-lib_libfilezilla_string.hpp b/ftp/libfilezilla/files/extra-patch-lib_libfilezilla_string.hpp
>new file mode 100644
>index 000000000000..87880be3e807
>--- /dev/null
>+++ b/ftp/libfilezilla/files/extra-patch-lib_libfilezilla_string.hpp
>@@ -0,0 +1,42 @@
>+--- lib/libfilezilla/string.hpp.orig	2024-10-15 12:59:21 UTC
>++++ lib/libfilezilla/string.hpp
>+@@ -11,6 +11,39 @@
>+ #include <string_view>
>+ #include <vector>
>+ 
>++template<class CharT, class BaseT>
>++class traits_cloner
>++{
>++public:
>++	using char_type = CharT;
>++
>++	using base_type = BaseT;
>++	using base_traits = std::char_traits<base_type>;
>++
>++	static std::size_t length(char_type const* s) {
>++		return base_traits::length(reinterpret_cast<base_type const*>(s));
>++	}
>++	static int compare(char_type const* s1, char_type const* s2, std::size_t count) {
>++		return base_traits::compare(reinterpret_cast<base_type const*>(s1), reinterpret_cast<base_type const*>(s2), count);
>++	}
>++	static char_type* copy(char_type* dest, char_type const* src, std::size_t count) {
>++		return reinterpret_cast<char_type*>(base_traits::copy(reinterpret_cast<base_type*>(dest), reinterpret_cast<base_type const*>(src), count));
>++	}
>++	static void assign( char_type& c1, char_type const& c2 ) noexcept {
>++	c1 = c2;
>++	}
>++	static char_type const* find(char_type const* ptr, std::size_t count, char_type const& ch) {
>++		return reinterpret_cast<char_type const*>(base_traits::find(reinterpret_cast<base_type const*>(ptr), count, reinterpret_cast<base_type const&>(ch)));
>++	}
>++	static bool eq(char_type a, char_type b) {
>++		return base_traits::eq(static_cast<base_type>(a), static_cast<base_type>(b));
>++	}
>++};
>++
>++template<>
>++class std::char_traits<uint8_t> : public traits_cloner<uint8_t, char>
>++{};
>++
>+ /** \file
>+  * \brief String types and assorted functions.
>+  *

Flags:

m.ne: maintainer-approval?

Actions: View | Diff

Attachments on bug 283373: 255906 | 255954