Diff poco-1.12.4 with a poco-1.14.0-r1

/usr/portage/dev-libs/poco/poco-1.14.0-r1.ebuild 2025-02-03 17:39:32.846666984 +0300
1
# Copyright 1999-2024 Gentoo Authors
1
# Copyright 1999-2025 Gentoo Authors
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4 4
EAPI=8
......
12 12

  
13 13
LICENSE="Boost-1.0"
14 14
# SHARED_LIBRARY_VERSION -> "${S}"/libversion
15
SLOT="0/94"
16
KEYWORDS="amd64 arm arm64 ppc64 x86"
17
IUSE="7z activerecord cppparser +data examples +file2pagecompiler iodbc +json jwt mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc postgres prometheus sqlite +ssl test +util +xml +zip"
15
SLOT="0/110"
16
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
17
IUSE="7z activerecord avahi cppparser +crypt +data examples +file2pagecompiler iodbc mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc postgres prometheus sqlite test +util +xml +zip"
18 18
RESTRICT="!test? ( test )"
19 19
REQUIRED_USE="
20 20
	activerecord? ( util xml )
21 21
	7z? ( xml )
22 22
	file2pagecompiler? ( pagecompiler )
23 23
	iodbc? ( odbc )
24
	jwt? ( json ssl )
25 24
	mongodb? ( data )
26 25
	mysql? ( data )
27 26
	odbc? ( data )
28 27
	postgres? ( data )
29
	pagecompiler? ( json net util xml )
28
	pagecompiler? ( net util xml )
30 29
	pocodoc? ( cppparser util xml )
31 30
	sqlite? ( data )
32
	ssl? ( util )
33
	test? ( data? ( sqlite ) json util xml )
31
	crypt? ( util )
32
	test? ( data? ( sqlite ) activerecord cppparser crypt pdf prometheus xml )
33
"
34

  
35
BDEPEND="
36
	virtual/pkgconfig
34 37
"
35 38

  
36
BDEPEND="virtual/pkgconfig"
37 39
RDEPEND="
38
	>=dev-libs/libpcre2-10.40
40
	>=dev-libs/libpcre2-10.40:=
41
	dev-libs/libutf8proc:=
42

  
39 43
	activerecord? ( !app-arch/arc )
44
	avahi? ( net-dns/avahi:= )
40 45
	mysql? ( dev-db/mysql-connector-c:= )
41 46
	mariadb? ( dev-db/mariadb-connector-c:= )
42 47
	postgres? ( dev-db/postgresql:= )
......
44 49
		iodbc? ( dev-db/libiodbc )
45 50
		!iodbc? ( dev-db/unixODBC )
46 51
	)
52
	pdf? ( media-libs/libpng:= )
47 53
	sqlite? ( dev-db/sqlite:3 )
48
	ssl? (
54
	crypt? (
49 55
		dev-libs/openssl:=
50 56
	)
51 57
	xml? ( dev-libs/expat )
......
53 59
"
54 60
DEPEND="${RDEPEND}"
55 61

  
56
PATCHES=( "${FILESDIR}/${PN}-1.10.1-iodbc-incdir.patch" )
62
PATCHES=(
63
	"${FILESDIR}/${P}-missing-utf8proc.patch"
64
)
57 65

  
58 66
src_prepare() {
59 67
	cmake_src_prepare
......
66 74
		# ignore missing tests on experimental library
67 75
		# and tests requiring running DB-servers, internet connections, etc.
68 76
		sed -i -e '/testsuite/d' \
69
			{Data/{MySQL,ODBC},MongoDB,Net,NetSSL_OpenSSL,PDF,Redis}/CMakeLists.txt || die
77
			{Data/{,MySQL,ODBC},MongoDB,Net,NetSSL_OpenSSL,Redis}/CMakeLists.txt || die
78

  
70 79
		# Poco expands ~ using passwd, which does not match $HOME in the build environment
71 80
		sed -i -e '/CppUnit_addTest.*testExpand/d' \
72 81
			Foundation/testsuite/src/PathTest.cpp || die
73
		# ignore failing Crypto test since upstream does not seem to care,
74
		# see https://github.com/pocoproject/poco/issues/1209
75
		sed -i -e '/RSATest, testRSACipherLarge/d' \
76
			Crypto/testsuite/src/RSATest.cpp || die
77 82
	fi
78 83

  
79
	# Fix MariaDB and MySQL detection
80
	sed -i -e 's~/usr/include/mysql~~' \
81
		-e 's/mysqlclient_r/mysqlclient/' \
82
		-e 's/STATUS "Couldn/FATAL_ERROR "Couldn/' \
83
		cmake/FindMySQL.cmake || die
84

  
85
	# Add missing directory that breaks the build
86
	mkdir -p Encodings/testsuite/data || die
87

  
88
	if ! use iodbc ; then
89
		sed -i -e 's|iodbc||' cmake/FindODBC.cmake || die
90
	fi
84
	sed -i 's/ENABLE_DNSSD_AVHAI/ENABLE_DNSSD_AVAHI/' DNSSD/CMakeLists.txt || die
91 85
}
92 86

  
93 87
src_configure() {
......
98 92
		-DENABLE_ACTIVERECORD="$(usex activerecord)"
99 93
		-DENABLE_ACTIVERECORD_COMPILER="$(usex activerecord)"
100 94
		-DENABLE_CPPPARSER="$(usex cppparser)"
101
		-DENABLE_CRYPTO="$(usex ssl)"
95
		-DENABLE_CRYPTO="$(usex crypt)"
102 96
		-DENABLE_DATA="$(usex data)"
103 97
		-DENABLE_DATA_MYSQL="$(usex mysql)"
104 98
		-DENABLE_DATA_ODBC="$(usex odbc)"
105 99
		-DENABLE_DATA_POSTGRESQL="$(usex postgres)"
106 100
		-DENABLE_DATA_SQLITE="$(usex sqlite)"
101
		-DENABLE_DNSSD="$(usex avahi)"
102
		-DENABLE_DNSSD_AVAHI="$(usex avahi)"
107 103
		-DENABLE_JSON="$(usex util)"
108
		-DENABLE_JWT="$(usex jwt)"
104
		-DENABLE_JWT="$(usex crypt)"
109 105
		-DENABLE_MONGODB="$(usex mongodb)"
110 106
		-DENABLE_NET="$(usex net)"
111
		-DENABLE_NETSSL="$(usex ssl)"
107
		-DENABLE_NETSSL="$(usex crypt)"
112 108
		-DENABLE_NETSSL_WIN=OFF
113 109
		-DENABLE_PAGECOMPILER="$(usex pagecompiler)"
114 110
		-DENABLE_PAGECOMPILER_FILE2PAGE="$(usex file2pagecompiler)"
Thank you!