From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DA13C138334 for ; Sat, 3 Nov 2018 21:46:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 68518E0971; Sat, 3 Nov 2018 21:46:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3761DE0971 for ; Sat, 3 Nov 2018 21:46:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9A2D6335CEA for ; Sat, 3 Nov 2018 21:46:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B0953459 for ; Sat, 3 Nov 2018 21:46:26 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1541281544.ae5512fe38ddc0dc9ea3571e4a11ce5e92c2e4bb.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/poppler/files/, app-text/poppler/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/poppler/Manifest app-text/poppler/files/poppler-0.71.0-respect-cflags.patch app-text/poppler/poppler-0.71.0.ebuild app-text/poppler/poppler-9999.ebuild X-VCS-Directories: app-text/poppler/ app-text/poppler/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: ae5512fe38ddc0dc9ea3571e4a11ce5e92c2e4bb X-VCS-Branch: master Date: Sat, 3 Nov 2018 21:46:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: aa5f7363-4ac6-4903-9c6e-9b5b8a966561 X-Archives-Hash: f8d68788835ad077ec0905778f89eca2 commit: ae5512fe38ddc0dc9ea3571e4a11ce5e92c2e4bb Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Nov 3 21:40:42 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Nov 3 21:45:44 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae5512fe app-text/poppler: 0.71.0 version bump Closes: https://bugs.gentoo.org/667150 Signed-off-by: Andreas Sturmlechner gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 app-text/poppler/Manifest | 1 + .../files/poppler-0.71.0-respect-cflags.patch | 31 ++++++++++++++++++++++ .../{poppler-9999.ebuild => poppler-0.71.0.ebuild} | 18 ++++++------- app-text/poppler/poppler-9999.ebuild | 18 ++++++------- 4 files changed, 50 insertions(+), 18 deletions(-) diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index 121cb6807d8..33966583e41 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -1,3 +1,4 @@ DIST poppler-0.62.0.tar.xz 1423372 BLAKE2B 01c8745d0c1fa5b412ec92295a8784f5c1deff8b9fa709d09a3236d630f78fecc6af23fe3302964478d6356562712726db422ef51fe59a8b42e13e08370a77ac SHA512 91f7eae7b05965ae97a34e658bed2a676be8a6e4d34f82148ece6eb58932632dcf9a34d50c66412f93f560ce575abf5c608ed6b1e5184604b96024801886c706 DIST poppler-0.67.0.tar.xz 1459412 BLAKE2B 1c24908839fc9e3b3b2a1e0c014f7b6a1c6cc622157e161437ece91a86a20db0d5ae67b35783a5a4b712ab4ba0e43f141ca516fde10b5a549b9d36a98c5de25b SHA512 36584c62970ae0ae7807687f9c0523560ae92ac323949be8916a0e8dc6e691633e55cdd76c6026253c337aed8a4b43a7759a3de74c9ec606654f65379fb0f206 DIST poppler-0.68.0.tar.xz 1461052 BLAKE2B e95aa872230ff88f2caf9b8fef7da369b3115b1aabef2d57ebba3a13123ffe1cf1e200c6583a6da9e52bdb7708bec30e26f68e582bf99289abd572e42f712a5e SHA512 98449ab96db1d17901ec44b1a71b0375ac83d0f13e059b83afb452939a3ae6375c4667ae029fa333fad3eed2d8315e5f1208f34d3548c5530f0ecc7a5841c27a +DIST poppler-0.71.0.tar.xz 1480852 BLAKE2B be23100e44f73cd024d50727a632b749629b6e36ef41d2aee94f1998a8362dd0fa11e64bfb0f0f04f87265029abec32088ef2dad3b5aeb2733c44447aaeb6817 SHA512 8e0ce95e7b58c37761c36a20f1282e63373a9557bf9f746ce2936562f12648506043d9559cf816944aa238814fc1b3f3a3c0a6cb002fd214b067e399bcc6ab1e diff --git a/app-text/poppler/files/poppler-0.71.0-respect-cflags.patch b/app-text/poppler/files/poppler-0.71.0-respect-cflags.patch new file mode 100644 index 00000000000..e54f7c6390a --- /dev/null +++ b/app-text/poppler/files/poppler-0.71.0-respect-cflags.patch @@ -0,0 +1,31 @@ +--- a/cmake/modules/PopplerMacros.cmake 2018-10-21 18:47:56.000000000 +0200 ++++ b/cmake/modules/PopplerMacros.cmake 2018-11-01 10:43:10.898347039 +0100 +@@ -147,28 +147,6 @@ + endif(GCC_HAS_AS_NEEDED) + endif (CMAKE_COMPILER_IS_GNUCXX) + +-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") +-# set the default compile warnings +- set(_warn "-Wall -Wextra -Wpedantic") +- set(_warn "${_warn} -Wno-unused-parameter") +- set(_warn "${_warn} -Wcast-align") +- set(_warn "${_warn} -Wformat-security") +- set(_warn "${_warn} -Wframe-larger-than=65536") +- set(_warn "${_warn} -Wmissing-format-attribute") +- set(_warn "${_warn} -Wnon-virtual-dtor") +- set(_warn "${_warn} -Woverloaded-virtual") +- set(_warn "${_warn} -Wmissing-declarations") +- set(_warn "${_warn} -Wundef") +- set(_warn "${_warn} -Wzero-as-null-pointer-constant") +- +- # set extra warnings +- set(_warnx "${_warnx} -Wconversion") +- set(_warnx "${_warnx} -Wshadow") +- +- set(DEFAULT_COMPILE_WARNINGS "${_warn}") +- set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") +-endif() +- + if(CMAKE_C_COMPILER MATCHES "icc") + set(_save_cxxflags "${CMAKE_CXX_FLAGS}") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-0.71.0.ebuild similarity index 89% copy from app-text/poppler/poppler-9999.ebuild copy to app-text/poppler/poppler-0.71.0.ebuild index c2f019ea696..a8ae481329a 100644 --- a/app-text/poppler/poppler-9999.ebuild +++ b/app-text/poppler/poppler-0.71.0.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then else SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SLOT="0/80" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION + SLOT="0/82" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION fi DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" @@ -25,17 +25,17 @@ IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt RESTRICT="test" COMMON_DEPEND=" - >=media-libs/fontconfig-2.6.0 - >=media-libs/freetype-2.3.9 + media-libs/fontconfig + media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 - >=x11-libs/cairo-1.10.0 - introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) + x11-libs/cairo + introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( media-libs/openjpeg:2= ) + jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) @@ -51,16 +51,16 @@ DEPEND="${COMMON_DEPEND} virtual/pkgconfig " RDEPEND="${COMMON_DEPEND} - cjk? ( >=app-text/poppler-data-0.4.7 ) + cjk? ( app-text/poppler-data ) " -DOCS=(AUTHORS NEWS README README-XPDF) +DOCS=( AUTHORS NEWS README README-XPDF ) PATCHES=( "${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch" "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch" + "${FILESDIR}/${PN}-0.71.0-respect-cflags.patch" "${FILESDIR}/${PN}-0.61.0-respect-cflags.patch" - #"${FILESDIR}/${PN}-0.62.0-openjpeg2.patch" "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" ) diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild index c2f019ea696..a8ae481329a 100644 --- a/app-text/poppler/poppler-9999.ebuild +++ b/app-text/poppler/poppler-9999.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then else SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SLOT="0/80" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION + SLOT="0/82" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION fi DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" @@ -25,17 +25,17 @@ IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt RESTRICT="test" COMMON_DEPEND=" - >=media-libs/fontconfig-2.6.0 - >=media-libs/freetype-2.3.9 + media-libs/fontconfig + media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 - >=x11-libs/cairo-1.10.0 - introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) + x11-libs/cairo + introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( media-libs/openjpeg:2= ) + jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) @@ -51,16 +51,16 @@ DEPEND="${COMMON_DEPEND} virtual/pkgconfig " RDEPEND="${COMMON_DEPEND} - cjk? ( >=app-text/poppler-data-0.4.7 ) + cjk? ( app-text/poppler-data ) " -DOCS=(AUTHORS NEWS README README-XPDF) +DOCS=( AUTHORS NEWS README README-XPDF ) PATCHES=( "${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch" "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch" + "${FILESDIR}/${PN}-0.71.0-respect-cflags.patch" "${FILESDIR}/${PN}-0.61.0-respect-cflags.patch" - #"${FILESDIR}/${PN}-0.62.0-openjpeg2.patch" "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" )