diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-10-08 19:30:29 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-10-08 19:30:29 +0100 |
| commit | 541eca7cf7b9950f0adaaf9158f94c76ba0aedc9 (patch) | |
| tree | b80d0f20ca0dc04843c819a54cc618cc8baf0479 /x11-libs/wxGTK | |
| parent | 4df758340c38fb7f188a6356561aeb4ed2c3f38c (diff) | |
gentoo auto-resync : 08:10:2022 - 19:30:29
Diffstat (limited to 'x11-libs/wxGTK')
| -rw-r--r-- | x11-libs/wxGTK/Manifest | 3 | ||||
| -rw-r--r-- | x11-libs/wxGTK/files/wxGTK-configure-tests.patch | 28 | ||||
| -rw-r--r-- | x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild | 14 |
3 files changed, 42 insertions, 3 deletions
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest index b13a0bf82531..ba75a713e4a4 100644 --- a/x11-libs/wxGTK/Manifest +++ b/x11-libs/wxGTK/Manifest @@ -1,5 +1,6 @@ AUX wxGTK-3.0-gtk3-translation-domain.patch 454 BLAKE2B fd0b6d6a0c1fe7f1dfbd7692d549dfd6f78c85e25f06e2e44630ca9b3c9dda4c12af2df6e4fcc02de73e75524631b858cc21b9f63b8799b0d157a38bd5541fac SHA512 8cdf57558e8d09e3e0613c25ac7701cce0bf78da13060e2b36167b69b8ae4f265607cb5216a33054f6c0c2f21beba8cc7f8297f4de2b2db1ec9f3f5bb8177ff3 AUX wxGTK-3.0.5-collision.patch 6298 BLAKE2B 711d7b94b6a0de4bdda21caa2bfcfd799c0d57a8d1d4a820e6da397768b075f415b8e438502167446b3be6b948420d1c1a31c401bd5e7bb2b549e3a95dcccad8 SHA512 62bbf952eac4a3485a2cfa3e6908b2272cb6f47632f17e60f413ad34b64e331423189a31c4259c8283120b4b1351f915e226f5c749787a5c69737779cc9edb59 +AUX wxGTK-configure-tests.patch 560 BLAKE2B 86a735c58abc8690cd943ff58a39140a636c56dcde08f47d27dbdcf99790216ebe0f4524f2f7cd67e35748c32adaee377c4e8a4b606975115c666cbc453b5173 SHA512 f02b708e5de66a4a7dce9f1adef1ebd1461ef68acee502b54d514a0ce4e5fe998eaad9a9ec7b1bec9aa4d8803a4042111ea4cddafe8e2f68d3d122faf90465df AUX wxGTK-ignore-c++-abi.patch 1657 BLAKE2B 5d865c83174f2540b798a2930f8d5ae8336f031214691fe7d5cd8c283faf9511fff260735d9dcd293e6377be0e96a6521e84ceae4560f2fef8fc7e7ed5642cd6 SHA512 649551eeacc9915f249ece1c3ed79959f0f0129e54373bfbe84ea5fbf2b8e0ba7778d6a22ac6f165e5d4e85a3ea4320274296b1b2a8e623acb11300fe44478f8 DIST wxGTK-3.0.4_p20190713.tar.xz 53640 BLAKE2B 89eabc44660f8f9b19fc850717eb83244a746f2f8c28bcec89fa9ccd1828f103df114bce24406ff14875220de86276f9e51870d58e716f0c94d310707f7eae4c SHA512 44a4e92ccc9c143a0e70e015116e952b0529001a3a1e23193d501826720a505259ead6feaa08de75b4a7a8753f8b16f5cc14e4bff5d15585870066ccd1de53b9 DIST wxGTK-3.0.5_p20210214.tar.xz 4560 BLAKE2B ac1815e679adfb2c36d74be0a4a9cc32d52e6b0b05a14393334bc5d30a8bc0da1386415a5b59a3f6dc4807d283272d36f033caa55a300c8c30cf0c402554b8bd SHA512 f1e34379b8bf594a68486bb6eccbd93f36dc2aeca37c0a7eb23de81c1c3825396437a65c43ed8d94673131e97414d49449ed51729970bf8b8e4608d36974a335 @@ -8,5 +9,5 @@ DIST wxWidgets-3.0.4.tar.bz2 20204622 BLAKE2B 97b9f3f44f080104cae290bc3e162b51ce DIST wxWidgets-3.0.5-docs-html.tar.bz2 23844256 BLAKE2B f5b5bef129302ae1ded7a651e652b127ad9d548a00a498f06a4d4f868dc3bc33411ded2602c04c8329e927550d032bdbe633c2c7d1a7f89265874685d3cb3d9b SHA512 f839e67660f2b08aa28d1596a3b7af2c35f7c2c0505c6e6d45888845397212b3dd71c8d34115321e9a4347b9d92a0ce767bb76defd14c172e51c2a3df96cc3ac DIST wxWidgets-3.0.5.1.tar.bz2 19739206 BLAKE2B da270cb8e4fc22b8d892ba80fbb4cc71578f642ca07102006f914a80331a254e746de6c91e61b585c0b1ab3abadd17d80a0eaa3efd48a3d412cf7202101abc7a SHA512 0a789fc5e71d414e43f75b5c16076fe8b1bcd7671be0770e4269dcef66d830c1bc74e183f49db270b928862f13472666c283fe2aa98b9006681722e06100725d EBUILD wxGTK-3.0.4-r3.ebuild 3752 BLAKE2B 2ac424c442de6e6174d5607236b27b2c71573a6a74faa3e7186c33b103cbfa1a6b48cae00e1f810225bf76ed4a4d060def5af4bd3369b2fe3101c493c14d384e SHA512 c4209a504c3ac482b27a3fb99f8f8cec5e78671b7b22a6fcb6ad3fdf57bf97a7d6fa39ccb651168014f2482f320b6533b28579929d1c193531d57f10e0099783 -EBUILD wxGTK-3.0.5.1.ebuild 5220 BLAKE2B 65b36dbef222328b5b8505b2c5ff1e615ed0aa4c46558121690f1b0db30fd2fbc685b8457e951502c7e54274b8671d52252e0e921aebe4c9b283c56799426f28 SHA512 b8995dda420a50e63d4a3a54e0be3d21e2cb141ddd666b59e7ee61a71b08f83049b74b8105c37c2d986353223cafff372a33364465baf0b45b722aed9d8cefca +EBUILD wxGTK-3.0.5.1.ebuild 5484 BLAKE2B 8d7dd6be84267427670ee2572c934840c3fbfe009762dafbf3741884ad8df13cf75f674837f7df4f33a776ab0f69e54dfc7f3970aadea0e0af644615d584d080 SHA512 1b811d61ee068d3732de88635ff0aaf6c635ca2f62627b65d44fd671216ee8adc1205084d66585173dc7ac0f589be30f0216ef73ac8b2afa840acc9323e53a26 MISC metadata.xml 760 BLAKE2B e665c57ff50c54f0630ca7d7f78764f81d516cb93c397f6c4e90e57534d18bf54872a291c2c928b57e6b630d7a8ff7b385677de07de970490ad810983d5f61d3 SHA512 7f2e0cfc91d5622ecbe4dd94452ccb130214b68e89e400a7f9ef505f9bb28cac9bd585c1a612c45bd314a8fa0291f74cbf3c31718b1bb11cad584b80bca99d24 diff --git a/x11-libs/wxGTK/files/wxGTK-configure-tests.patch b/x11-libs/wxGTK/files/wxGTK-configure-tests.patch new file mode 100644 index 000000000000..efbb2d7c55bf --- /dev/null +++ b/x11-libs/wxGTK/files/wxGTK-configure-tests.patch @@ -0,0 +1,28 @@ +diff --git a/configure b/configure +index 0f3c4c9..92c84f3 100755 +--- a/configure ++++ b/configure +@@ -1368,6 +1368,7 @@ enable_dependency_tracking + enable_precomp_headers + with_cppunit_prefix + with_cppunit_exec_prefix ++enable_tests + ' + ac_precious_vars='build_alias + host_alias +@@ -40955,8 +40956,13 @@ fi + + fi + +- +- ++# explicit override to enable or disable tests ++if test "${enable_tests+set}" = set; then ++ SUBDIRS="$SUBDIRS tests" ++fi ++if test "${disable_tests+set}" = set; then ++ SUBDIRS="${SUBDIRS% tests}" ++fi + + + for subdir in $SUBDIRS; do diff --git a/x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild b/x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild index a7260ae5a0be..bb964df9baf4 100644 --- a/x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild @@ -21,7 +21,9 @@ S="${WORKDIR}/wxWidgets-${PV}" LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )" SLOT="${WXRELEASE}" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -IUSE="+X doc debug gstreamer libnotify opengl pch sdl tiff webkit" +IUSE="+X doc debug gstreamer libnotify opengl sdl test tiff webkit" +REQUIRED_USE="test? ( tiff ) tiff? ( X )" +RESTRICT="!test? ( test )" RDEPEND=" >=app-eselect/eselect-wxwidgets-20131230 @@ -52,6 +54,7 @@ DEPEND="${RDEPEND} opengl? ( virtual/glu[${MULTILIB_USEDEP}] ) X? ( x11-base/xorg-proto )" BDEPEND=" + test? ( >=dev-util/cppunit-1.8.0 ) >=app-eselect/eselect-wxwidgets-20131230 virtual/pkgconfig" @@ -59,6 +62,7 @@ PATCHES=( "${WORKDIR}"/wxGTK-3.0.5_p20210214/ "${FILESDIR}"/wxGTK-${SLOT}-translation-domain.patch "${FILESDIR}"/wxGTK-ignore-c++-abi.patch #676878 + "${FILESDIR}/${PN}-configure-tests.patch" ) src_prepare() { @@ -72,7 +76,7 @@ src_prepare() { -e "s:aclocal):aclocal/wxwin${WXRELEASE_NODOT}.m4):" \ -e "s:wxstd.mo:wxstd${WXRELEASE_NODOT}.mo:" \ -e "s:wxmsw.mo:wxmsw${WXRELEASE_NODOT}.mo:" \ - Makefile.in || die + Makefile.in tests/Makefile.in || die sed -i \ -e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\ @@ -128,6 +132,7 @@ multilib_src_configure() { $(use_with libnotify) $(use_with opengl) $(use_with tiff libtiff sys) + $(use_enable test tests) ) # wxBase options @@ -136,6 +141,11 @@ multilib_src_configure() { ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" } +multilib_src_test() { + emake -C tests + (cd tests && ./test) || die +} + multilib_src_install_all() { cd docs || die dodoc changes.txt readme.txt |