From 0b7e2e9dc42d7b2ced6107e8f5a444d38eec39e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 5 Mar 2021 00:15:05 -0300 Subject: [PATCH] poppler: remove libstdc++-devel from depends and fix versioning. Both compiler packages depend on it already, and its presence makes it easy to accidentally create build cycles by putting gcc in the dependency path when it shouldn't be. Don't use '-' for specifying versions, use '>=', which isn't ambiguous. --- srcpkgs/poppler/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template index a57a5b18e8..ed0db8de7a 100644 --- a/srcpkgs/poppler/template +++ b/srcpkgs/poppler/template @@ -4,7 +4,7 @@ # pkgname=poppler version=20.09.0 -revision=1 +revision=2 build_style=cmake build_helper="gir" configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON @@ -33,7 +33,7 @@ libpoppler102_package() { } poppler-cpp-devel_package() { - depends="libstdc++-devel zlib-devel poppler-devel-${version}_${revision} poppler-cpp-${version}_${revision}" + depends="zlib-devel poppler-devel>=${version}_${revision} poppler-cpp>=${version}_${revision}" short_desc+=" - C++ bindings (development files)" pkg_install() { vmove usr/include/poppler/cpp @@ -64,7 +64,7 @@ poppler-devel_package() { } poppler-glib-devel_package() { - depends="poppler-devel-${version}_${revision} poppler-glib-${version}_${revision}" + depends="poppler-devel>=${version}_${revision} poppler-glib>=${version}_${revision}" short_desc+=" - GLib bindings (development files)" pkg_install() { vmove usr/include/poppler/glib @@ -90,5 +90,5 @@ poppler-glib_package() { poppler-utils_package() { short_desc+=" - utilities (transitional package)" build_style=meta - depends="poppler-${version}_${revision}" + depends="poppler>=${version}_${revision}" }