From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- dev-libs/miniz/Manifest | 4 ++- dev-libs/miniz/files/miniz-2.2.0-fixincdir.patch | 18 +++++++++++ dev-libs/miniz/files/miniz-2.2.0-fixpcpath.patch | 22 +++++++++++++ dev-libs/miniz/miniz-2.2.0-r1.ebuild | 23 +++++++++++++ dev-libs/miniz/miniz-9999.ebuild | 41 ------------------------ 5 files changed, 66 insertions(+), 42 deletions(-) create mode 100644 dev-libs/miniz/files/miniz-2.2.0-fixincdir.patch create mode 100644 dev-libs/miniz/files/miniz-2.2.0-fixpcpath.patch create mode 100644 dev-libs/miniz/miniz-2.2.0-r1.ebuild delete mode 100644 dev-libs/miniz/miniz-9999.ebuild (limited to 'dev-libs/miniz') diff --git a/dev-libs/miniz/Manifest b/dev-libs/miniz/Manifest index bdcd9ebc5d70..ed0487b081d8 100644 --- a/dev-libs/miniz/Manifest +++ b/dev-libs/miniz/Manifest @@ -1,9 +1,11 @@ AUX Config.cmake.in 65 BLAKE2B 520fd3e379b53671d4bb9cb62567ec0f569c711d18019b428914967c57189b5e5f55aa589d0469f1c2891a68f285626e88395c2fef04f677bdf4a26633651526 SHA512 040e97901dea4890625a5bf80db145af432dcb0aa6159ac35e496b027ab3d35132392f45e734ab74002505148c7f879efc72595c6cce99469b8526786af3e7de AUX miniz-2.1.0-export-cmake-build-targets.patch 6510 BLAKE2B 1622c34af849f7b8818463759f205f71e7b64ba52ecc4cb8a552c457577c95cdea5beb94d5f6ffc986960e5a071b00adb54eda7cd1b34a5aeb692f359d989a2f SHA512 b36377b8d19a8b1d8099e0645d90e9f5778a4947de9da0d0bf04eb344a2ab24a1f84e8410115159e59bdb5569268761944409caecb6bb860aff5f42a57b3d9b1 +AUX miniz-2.2.0-fixincdir.patch 641 BLAKE2B e98354c7898ecff64ee65bdf42229f29315a59e5e10403104fceaf484bee6ede44ed265e50b767bc80ba622140a15ecf8467e1ca43ed7d74f2fa0d0285f5a6de SHA512 17a0f183aa7257e1eb5a8ba044e3e37f7a5903489883c4655b7976996aa85cde9c7d4c25c1487db3fa30cefe0c5adc72641f21185e9eded2d9890a086c485d05 +AUX miniz-2.2.0-fixpcpath.patch 768 BLAKE2B 63f3b6be8be1266b6f3e2db16c0ed42ffefec7b6575a107745775bc1f7c47c463febd6e58e331962b7b2a8aea52379fee1bb6de9fa3921ae470760eb4f0ec9e7 SHA512 049e384397075954a6f581bc8d888e0130a02fda864a79d60f199c77c3305ea5d4bdcd41779985f273fda583e2e9009137eee6133b962041b85b1b08a1d9509c AUX miniz.pc.in 315 BLAKE2B d05cd14a7acb4039e5f0521a68e6e5eeed00849a5b5d639fbbd4de45c1e0eab8ed33a22cc608761ab1dd1e1142021b8e5bfbf8e9bab589bfb2545701828f5f7b SHA512 8c1828759a45c58a96bebaac9fa5196d95be85a76be8d4fdd30eb2b4db5dbe582a7e0156fc9a4249c84426bbe69b30d31b2faf162c8d619810012afe6e1ad0ed DIST miniz-2.1.0.tar.gz 104502 BLAKE2B 9a7b3818b454809cdfec523d98f13bef3a52e27b6d3857d289438978d12997e38c71aa97fffe060a6b765f8fbbdd8fe8cebced4a45d9f1f040dd3e39cf2a8055 SHA512 e0aba16afdf230d1e54d0a9cedd336b0b158b02744839f0547e14ee47a97fc1a6668f3a181bd46e969b01b158af18dc8ed3c0a4210b3b620242338a2788806b3 DIST miniz-2.2.0.tar.gz 113592 BLAKE2B 110a71712396fb22075818f681d2e691b8b361e6c8eb786485f9fd3a1e00fcfc95bae4d470b8b1644a1e9674e69617abdba70e337f318969096db222f7a4c3d2 SHA512 0bb2b0ac627715b90ff9fd69ca8958a0bea387bd7ddf5c200daba953b98ef788092e3009842f4f123234e85570159250c8897a30c1c1f2d4dea9bca9837f6111 EBUILD miniz-2.1.0-r3.ebuild 716 BLAKE2B dbd066b16a5cf7288a9af6b554bc44e0bb10b9259407627f5ecac365dd6ec95047f19386d28a270dda3bcf72e39d7a3af314e17242c79efb712f29491e58e625 SHA512 2956345154f2408dd60cbe472c58605f5f94cc4cea5367ba610af8c2cca78f9df51545483fd8b5fd50533ff97fc48e5a0236127a00c1aee28c7e909f497619b6 +EBUILD miniz-2.2.0-r1.ebuild 617 BLAKE2B 0fe7d970b2b9d495b14704c3d4c11b5d1788e1ee2a0d310f5a89aa8cafda895078afb27e1576a5d888109e27068d8115e9ad4a7c49321826feb5ea32003dfcef SHA512 7fd6662da0168558e7c9b17abd87f271ec6c04b1fcc6c93178924edadf9cef0bb614753e098b983606dc6592100aa61feac5df04a59294c4f772c4ea2a305a7a EBUILD miniz-2.2.0.ebuild 411 BLAKE2B 73164596838b7072b0d6cf1058630981f4930290af9ffc4434058cc8512625021377373be724ef993421b9f5d24d5df4dfc2113a986ebd07302399cd360c910d SHA512 67af664ce10ff44a4b7e01799b94c3468e4493905494f0c3ec0b919ab60752c9c2c8572edb2c2ca827bf71e40da1b52583cf3a053891443a00c6410a28e06c9c -EBUILD miniz-9999.ebuild 868 BLAKE2B 4c35c1ff7de11247e71860fbe61c973b77d456db29a87cf01b3e34a83df0d61b3a2b3d0f5a938081cf1f6f578a97a1489e292ee50b46d1e0ece1bc049b70b7b6 SHA512 9cfb04128eaa89af0a0d005ca8aa03a410addb3953d6522be5c480bbb93e765c1c2b6dbc145c91d57fc9931d7267bca47eb34e711561f4bc2ca7835cf98647bb MISC metadata.xml 1119 BLAKE2B 1524ab132d535eadc17d6897113e61c1f4fe85a693a2f1c7241293e11d7751cb1aa708b227a3afe5c269e6e6cc5d9d4981ef8394cacca00f30b1442a738d90f2 SHA512 8704444d82aa2b7a091b06e6ccf872c477ad9515e860c41f939d628b5b0a7742b8343a50c6e4be202acd9c8cbc98450e7a90ce951a625282dae0beb54420e278 diff --git a/dev-libs/miniz/files/miniz-2.2.0-fixincdir.patch b/dev-libs/miniz/files/miniz-2.2.0-fixincdir.patch new file mode 100644 index 000000000000..e0379baf49e3 --- /dev/null +++ b/dev-libs/miniz/files/miniz-2.2.0-fixincdir.patch @@ -0,0 +1,18 @@ +From 37ea28133d9abea3926248c9517676be9b558ca7 Mon Sep 17 00:00:00 2001 +From: Matthew Smith +Date: Sat, 4 Jun 2022 09:31:06 +0100 +Subject: [PATCH 2/2] build: Set pkgconfig includedir to miniz directory + +Allows users to include instead of which +seems to be the intended behaviour. +--- a/miniz.pc.in ++++ b/miniz.pc.in +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} + libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/miniz + + Name: @PROJECT_NAME@ + Description: @PROJECT_DESCRIPTION@ diff --git a/dev-libs/miniz/files/miniz-2.2.0-fixpcpath.patch b/dev-libs/miniz/files/miniz-2.2.0-fixpcpath.patch new file mode 100644 index 000000000000..37f8c7737819 --- /dev/null +++ b/dev-libs/miniz/files/miniz-2.2.0-fixpcpath.patch @@ -0,0 +1,22 @@ +From 9cd715b3b1f5accc2e7cd0b167808c1a47a08938 Mon Sep 17 00:00:00 2001 +From: Matthew Smith +Date: Sat, 4 Jun 2022 09:22:37 +0100 +Subject: [PATCH 1/2] build: Install .pc file in correct directory + +/usr/share/pkgconfig should be used for architecture independent +libraries (e.g. data or scripts), while an architecture dependent +directory like /usr/lib64/pkgconfig should be used for native +binaries. + +Co-authored-by: Sam James +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -173,7 +173,7 @@ if(NOT BUILD_HEADER_ONLY) + if(INSTALL_PROJECT) + install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/miniz.pc +- DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + endif() + endif() + diff --git a/dev-libs/miniz/miniz-2.2.0-r1.ebuild b/dev-libs/miniz/miniz-2.2.0-r1.ebuild new file mode 100644 index 000000000000..8c58554647c4 --- /dev/null +++ b/dev-libs/miniz/miniz-2.2.0-r1.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="A lossless, high performance data compression library" +HOMEPAGE="https://github.com/richgel999/miniz" +SRC_URI="https://github.com/richgel999/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +PATCHES=( + # https://bugs.gentoo.org/849578 + # https://github.com/richgel999/miniz/pull/239 + "${FILESDIR}"/${PN}-2.2.0-fixpcpath.patch + "${FILESDIR}"/${PN}-2.2.0-fixincdir.patch +) + +DOCS=( ChangeLog.md readme.md ) diff --git a/dev-libs/miniz/miniz-9999.ebuild b/dev-libs/miniz/miniz-9999.ebuild deleted file mode 100644 index 7bdf95f3cf88..000000000000 --- a/dev-libs/miniz/miniz-9999.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="A lossless, high performance data compression library" -HOMEPAGE="https://github.com/richgel999/miniz" -SRC_URI="" - -if [[ ${PV} == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/richgel999/miniz.git" -else - SRC_URI="https://github.com/richgel999/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="examples static-libs" - -DOCS=( ChangeLog.md LICENSE readme.md ) - -src_prepare() { - sed -i -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' CMakeLists.txt - - cmake_src_prepare -} - -src_configure() { - CMAKE_BUILD_TYPE=Release - - local mycmakeargs=( - -DBUILD_EXAMPLES=$(usex examples) - -DBUILD_SHARED_LIBS=$(usex static-libs OFF ON) - ) - - cmake_src_configure -} -- cgit v1.2.3