From 36f117bb6eda5dab3ecc30577395d0279ed3f8f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 30 Apr 2023 23:18:22 +0100 Subject: gentoo auto-resync : 30:04:2023 - 23:18:21 --- media-libs/zxing-cpp/Manifest | 3 -- ...pp-1.4.0-install-required-private-headers.patch | 43 ---------------------- media-libs/zxing-cpp/zxing-cpp-1.4.0.ebuild | 28 -------------- 3 files changed, 74 deletions(-) delete mode 100644 media-libs/zxing-cpp/files/zxing-cpp-1.4.0-install-required-private-headers.patch delete mode 100644 media-libs/zxing-cpp/zxing-cpp-1.4.0.ebuild (limited to 'media-libs/zxing-cpp') diff --git a/media-libs/zxing-cpp/Manifest b/media-libs/zxing-cpp/Manifest index d468fe68342a..ac1a02a29d1d 100644 --- a/media-libs/zxing-cpp/Manifest +++ b/media-libs/zxing-cpp/Manifest @@ -1,7 +1,4 @@ -AUX zxing-cpp-1.4.0-install-required-private-headers.patch 1473 BLAKE2B 8e2445934b118bdaf85b7567ee93fcf370d9e93ae23c2cb35a91e0c32ece380dcde92a0b34b9069805edf96a5f74ad5b20ffc4d8395f6084ed5bae14b961822d SHA512 98a8beaa4fafbc454663b9e8e3553e3859d6639f10a314eb7d668351a247222fb09636a36c68c32de8ffdc283dd3f92ec17cc706a9848099d20e74349d08cb0f AUX zxing-cpp-2.0.0-fix-crash.patch 1042 BLAKE2B 30045a15717fe7d64e9f8cb9769d84fdeeaadd1baa7b47509d32c2a454cef7d16098776db1af6029875f01cd902ed1f5f20818627a296e519cfded31407914ac SHA512 7275fac1ccc230393b1fe8432a3b37c782c8e5966d324054a39f415a51052697559b87fbcfdee8d531e878847d21672a284ad4de176453267dccae33b094da30 -DIST zxing-cpp-1.4.0.tar.gz 1018225 BLAKE2B 98b6badfe0ddfa39650eb4fbfc02bc01f5237cdd5edfafd7b88067997a22caa2e64d067328b534c439d7d89fef5b6d48acf4bc29389142b332123b477f3e3dde SHA512 05c5b9282f13b76fa0897b21e5b73cb7df0c52e62f1a2d9760fe774aa0378fde97f5f9896690b65b28b4b96ba6ad2703bed53ffaf9d3784636d29cbe860d4bad DIST zxing-cpp-2.0.0.tar.gz 856413 BLAKE2B 8069d3e39a7ddf99510777df477a5e3503e5eead7adcbf175123ab59de47c3da75bb8187533dad552a07b1475756ff3981d30eaa3e8088c5c9b991e22a7127bd SHA512 fa22164f834a42194eafd0d3e9c09d953233c69843ac6e79c8d6513314be28d8082382b436c379368e687e0eed05cb5e566d2893ec6eb29233a36643904ae083 -EBUILD zxing-cpp-1.4.0.ebuild 880 BLAKE2B 1e844eddf48251303915800e06fffaa909bc58e1a67848150f710ad58ad55f4bcc751ecd7a223570ef19477f30431ea3c4f428593fae5714e950805b4a028ed4 SHA512 031772c95e8db647cdecbebfe1aeed6121b09501e709d9db58dd215b53772043661a3704196f939fe2ec9f4eb8027e759e9049ba3168b6b82d972e9300bb643b EBUILD zxing-cpp-2.0.0.ebuild 724 BLAKE2B 4a20a7e612d6da852972e680a349885fa2210c82610793e621d84dbda311b014179ec1f60f21fba6540f5194caafb51f06281c451f398e8fcd7a84961d17e22d SHA512 835311b3ae2d8140d4c103b8d1adaac83b3bb2ce0c9d4e912e7348bcf8c57095411b5360627e6a3b46f14e8ecc57ead1382d90c80db3f5b4192bce1b8390342e MISC metadata.xml 332 BLAKE2B f9f865eb6a86bdab5a5d7fe20c01e1ca84bc3977529b2826e1c6b161e31283c8108f57680442096da25a02b961f2f96a7c39458eaf62f654a56f5c17b9552ccc SHA512 f90cb5552e79b1bc3a1f17bd53b9dc756e6825beedf18c0eab5cb44c87c22b9789a19e0ebbfccb529bd935b8b842e48b335d15aab2b80e21a11ea85c1b388be5 diff --git a/media-libs/zxing-cpp/files/zxing-cpp-1.4.0-install-required-private-headers.patch b/media-libs/zxing-cpp/files/zxing-cpp-1.4.0-install-required-private-headers.patch deleted file mode 100644 index 2a85252f5439..000000000000 --- a/media-libs/zxing-cpp/files/zxing-cpp-1.4.0-install-required-private-headers.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 4159a44bdc785b27013bc6be1d32b2e442c73b74 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Thu, 14 Jul 2022 12:04:27 +0200 -Subject: [PATCH] Add INSTALL_PRIVATE_HEADERS switch to unbreak LibreOffice - -Signed-off-by: Andreas Sturmlechner ---- - CMakeLists.txt | 1 + - core/CMakeLists.txt | 6 ++++++ - 2 files changed, 7 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e947ce8d..2e41e773 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -9,6 +9,7 @@ option (BUILD_BLACKBOX_TESTS "Build the black box reader/writer tests" OFF) - option (BUILD_UNIT_TESTS "Build the unit tests (don't enable for production builds)" OFF) - option (BUILD_PYTHON_MODULE "Build the python module" OFF) - set(BUILD_DEPENDENCIES "AUTO" CACHE STRING "Fetch from github or use locally installed (AUTO/GITHUB/LOCAL)") -+option (INSTALL_PRIVATE_HEADERS "Install (some) private headers to unbreak (some) revdeps broken by 1.4.0 cleanup" OFF) - - if (WIN32) - option (BUILD_SHARED_LIBS "Build and link as shared library" OFF) -diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt -index 7382bcae..575e696b 100644 ---- a/core/CMakeLists.txt -+++ b/core/CMakeLists.txt -@@ -174,6 +174,12 @@ if (BUILD_WRITERS) - ) - endif() - # end of public header set -+if (INSTALL_PRIVATE_HEADERS) -+ set (PUBLIC_HEADERS ${PUBLIC_HEADERS} -+ src/BitArray.h -+ ) -+endif() -+# end of 'private' public header set - - set (AZTEC_FILES - ) --- -2.35.1 - diff --git a/media-libs/zxing-cpp/zxing-cpp-1.4.0.ebuild b/media-libs/zxing-cpp/zxing-cpp-1.4.0.ebuild deleted file mode 100644 index d4d127e000be..000000000000 --- a/media-libs/zxing-cpp/zxing-cpp-1.4.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="C++ Multi-format 1D/2D barcode image processing library" -HOMEPAGE="https://github.com/nu-book/zxing-cpp" -SRC_URI="https://github.com/nu-book/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/1.4" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="" - -# Downstream patch until revdeps like LibreOffice are fixed -PATCHES=( "${FILESDIR}/${P}-install-required-private-headers.patch" ) - -src_configure() { - local mycmakeargs=( - -DINSTALL_PRIVATE_HEADERS=ON # required by LibreOffice as of 7.3.5.1 - -DBUILD_EXAMPLES=OFF # nothing is installed - -DBUILD_BLACKBOX_TESTS=OFF # FIXME: FetchContent.cmake module usage - -DBUILD_UNIT_TESTS=OFF # for both tests options. no thanks. bug #793173 - ) - cmake_src_configure -} -- cgit v1.2.3