* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libical/, dev-libs/libical/files/
@ 2017-12-21 20:42 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2017-12-21 20:42 UTC (permalink / raw
To: gentoo-commits
commit: d19987701b8b988b2c2e6ee716339479ad8592f1
Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Tue Dec 19 15:14:02 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 20:41:57 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1998770
dev-libs/libical: fix libical.pc to prevent overlinking
Move pthread and ICU libs to *.private sections in libical.pc. Also
fixes absolute paths to ICU libraries.
Closes: https://bugs.gentoo.org/599244
Closes: https://github.com/gentoo/gentoo/pull/6582
...ical-2.0.0-libical.pc-fix-libdir-location.patch | 28 +++++++++++
...cal-2.0.0-libical.pc-icu-move-to-requires.patch | 47 +++++++++++++++++++
...al-2.0.0-libical.pc-icu-remove-full-paths.patch | 44 ++++++++++++++++++
...libical-2.0.0-libical.pc-set-full-version.patch | 19 ++++++++
dev-libs/libical/libical-2.0.0-r3.ebuild | 54 ++++++++++++++++++++++
5 files changed, 192 insertions(+)
diff --git a/dev-libs/libical/files/libical-2.0.0-libical.pc-fix-libdir-location.patch b/dev-libs/libical/files/libical-2.0.0-libical.pc-fix-libdir-location.patch
new file mode 100644
index 00000000000..6044d133749
--- /dev/null
+++ b/dev-libs/libical/files/libical-2.0.0-libical.pc-fix-libdir-location.patch
@@ -0,0 +1,28 @@
+This is a patch for Gentoo bug 560572, provided by Georgi Georgiev.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 773cf0c..e282ce4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -336,7 +336,7 @@ endif()
+ set(VERSION "${PROJECT_VERSION}")
+ set(prefix "${CMAKE_INSTALL_PREFIX}")
+ set(exec_prefix "\${prefix}")
+-set(libdir "\${exec_prefix}/lib")
++set(libdir "${LIB_INSTALL_DIR}")
+ set(includedir "\${prefix}/include")
+ set(PTHREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}")
+
+diff --git a/libical.pc.in b/libical.pc.in
+index 7774dce..bf88476 100644
+--- a/libical.pc.in
++++ b/libical.pc.in
+@@ -8,8 +8,8 @@ iculib=@ICU_LIBRARIES@ @ICU_I18N_LIBRARIES@
+ Name: libical
+ Description: An implementation of basic iCAL protocols
+ Version: @LIBICAL_LIB_VERSION_STRING@
+-Libs: -L${libdir} -lical -licalss -licalvcal
++Libs: -lical -licalss -licalvcal
+ Libs.private: @PTHREAD_LIBS@
+ @REQUIRES_PRIVATE_ICU@
+ Cflags: -I${includedir}
diff --git a/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-move-to-requires.patch b/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-move-to-requires.patch
new file mode 100644
index 00000000000..e19dc037902
--- /dev/null
+++ b/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-move-to-requires.patch
@@ -0,0 +1,47 @@
+commit f70a26aaf836da0f9e242945151b49190d682d95
+Author: Allen Winter <allen.winter@kdab.com>
+Date: Sat Dec 3 11:11:48 2016 -0500
+
+ CMakeLists.txt, libical.pc.in - ICU must appear as Requires in pkgconfig
+ issue#244
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b3d49d0d..0f6dfc34 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -145,7 +145,7 @@ endif()
+ # RSCALE info at http://tools.ietf.org/html/rfc7529
+ find_package(ICU)
+ if(ICU_FOUND)
+- set(ICUUC_LIBS "-licuuc") #for libical.pc
++ set(REQUIRES_PRIVATE_ICU "Requires.private: icu-i18n") #for libical.pc
+ set(HAVE_LIBICU 1)
+ if(ICU_MAJOR_VERSION VERSION_GREATER 50)
+ set(HAVE_ICU_DANGI TRUE)
+@@ -155,7 +155,6 @@ if(ICU_FOUND)
+ endif()
+ if(ICU_I18N_FOUND)
+ set(HAVE_LIBICU_I18N 1)
+- set(ICUI18N_LIBS "-licui18n") #for libical.pc
+ endif()
+
+ # MSVC specific definitions
+diff --git a/libical.pc.in b/libical.pc.in
+index 8899f430..c07eb52a 100644
+--- a/libical.pc.in
++++ b/libical.pc.in
+@@ -2,11 +2,11 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+-threadslib=@PTHREAD_LIBS@
+-iculibs=@ICUUC_LIBS@ @ICUI18N_LIBS@
+
+ Name: libical
+ Description: An implementation of basic iCAL protocols
+ Version: @LIBICAL_LIB_VERSION_STRING@
+-Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculibs}
++Libs: -L${libdir} -lical -licalss -licalvcal
++Libs.private: @PTHREAD_LIBS@
++@REQUIRES_PRIVATE_ICU@
+ Cflags: -I${includedir}
diff --git a/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-remove-full-paths.patch b/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-remove-full-paths.patch
new file mode 100644
index 00000000000..08cf51f9408
--- /dev/null
+++ b/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-remove-full-paths.patch
@@ -0,0 +1,44 @@
+commit 1a41069c0dc054e59cd76fc3d8cf7cc2a78b5e8d
+Author: Allen Winter <allen.winter@kdab.com>
+Date: Sat Sep 3 16:56:29 2016 -0400
+
+ CMakeLists.txt, libical.pc.in - fix iculibs (remove full path)
+ ISSUE: 227
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0173e1a8..0c903ee5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -145,6 +145,7 @@ endif()
+ # RSCALE info at http://tools.ietf.org/html/rfc7529
+ find_package(ICU)
+ if(ICU_FOUND)
++ set(ICUUC_LIBS "-licuuc") #for libical.pc
+ set(HAVE_LIBICU 1)
+ if(ICU_MAJOR_VERSION VERSION_GREATER 50)
+ set(HAVE_ICU_DANGI TRUE)
+@@ -154,6 +155,7 @@ if(ICU_FOUND)
+ endif()
+ if(ICU_I18N_FOUND)
+ set(HAVE_LIBICU_I18N 1)
++ set(ICUI18N_LIBS "-licui18n") #for libical.pc
+ endif()
+
+ # MSVC specific definitions
+diff --git a/libical.pc.in b/libical.pc.in
+index 5c2debd8..8899f430 100644
+--- a/libical.pc.in
++++ b/libical.pc.in
+@@ -3,10 +3,10 @@ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+ threadslib=@PTHREAD_LIBS@
+-iculib=@ICU_LIBRARIES@ @ICU_I18N_LIBRARIES@
++iculibs=@ICUUC_LIBS@ @ICUI18N_LIBS@
+
+ Name: libical
+ Description: An implementation of basic iCAL protocols
+ Version: @LIBICAL_LIB_VERSION_STRING@
+-Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculib}
++Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculibs}
+ Cflags: -I${includedir}
diff --git a/dev-libs/libical/files/libical-2.0.0-libical.pc-set-full-version.patch b/dev-libs/libical/files/libical-2.0.0-libical.pc-set-full-version.patch
new file mode 100644
index 00000000000..403ee84cd65
--- /dev/null
+++ b/dev-libs/libical/files/libical-2.0.0-libical.pc-set-full-version.patch
@@ -0,0 +1,19 @@
+commit cdc85e9e7a14932808471f823bc974031a0c4842
+Author: Allen Winter <allen.winter@kdab.com>
+Date: Mon Jan 25 14:57:20 2016 -0500
+
+ libical.pc.in - set the version to the full major.minor.patch
+ as requested by Milan.
+
+diff --git a/libical.pc.in b/libical.pc.in
+index 7774dce2..5c2debd8 100644
+--- a/libical.pc.in
++++ b/libical.pc.in
+@@ -7,6 +7,6 @@ iculib=@ICU_LIBRARIES@ @ICU_I18N_LIBRARIES@
+
+ Name: libical
+ Description: An implementation of basic iCAL protocols
+-Version: @VERSION@
++Version: @LIBICAL_LIB_VERSION_STRING@
+ Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculib}
+ Cflags: -I${includedir}
diff --git a/dev-libs/libical/libical-2.0.0-r3.ebuild b/dev-libs/libical/libical-2.0.0-r3.ebuild
new file mode 100644
index 00000000000..d3d88590688
--- /dev/null
+++ b/dev-libs/libical/libical-2.0.0-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="An implementation of basic iCAL protocols"
+HOMEPAGE="https://github.com/libical/libical"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( MPL-1.0 LGPL-2.1 )"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="doc examples static-libs"
+
+# The GOBJECT_INTROSPECTION build is broken, and upstream has given up
+# on it at the moment (it's disabled in Travis). It will probably come
+# back in v2.0.1 or later.
+# This snippet belongs to RDEPEND:
+# introspection? ( dev-libs/gobject-introspection )"
+RDEPEND="dev-libs/icu:="
+DEPEND="${RDEPEND}
+ dev-lang/perl"
+
+DOCS=(
+ AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
+ doc/{AddingOrModifyingComponents,UsingLibical}.txt
+)
+
+PATCHES=(
+ "${FILESDIR}/${P}-libical.pc-set-full-version.patch"
+ "${FILESDIR}/${P}-libical.pc-icu-remove-full-paths.patch"
+ "${FILESDIR}/${P}-libical.pc-icu-move-to-requires.patch"
+ "${FILESDIR}/${P}-libical.pc-fix-libdir-location.patch"
+)
+
+src_configure() {
+ # See above, introspection is disabled for v2.0.0 at least.
+ #local mycmakeargs=(
+ # -DGOBJECT_INTROSPECTION=$(usex introspection true false)
+ #)
+ use static-libs || mycmakeargs+=( -DSHARED_ONLY=ON )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use examples; then
+ rm examples/CMakeLists.txt || die
+ dodoc -r examples
+ fi
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libical/, dev-libs/libical/files/
@ 2018-01-06 21:31 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2018-01-06 21:31 UTC (permalink / raw
To: gentoo-commits
commit: 80e884d2a91e5e3a83def06a41c44bb312f0a45e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 6 21:06:03 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 6 21:31:42 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80e884d2
dev-libs/libical: Fix tests
Reported-by: eroen <gentoo <AT> eroen.eu>
Bug: https://bugs.gentoo.org/532296
Package-Manager: Portage-2.3.19, Repoman-2.3.6
dev-libs/libical/files/libical-2.0.0-tests.patch | 38 ++++++++++++++++++++++++
dev-libs/libical/libical-2.0.0-r2.ebuild | 5 +++-
dev-libs/libical/libical-2.0.0-r3.ebuild | 1 +
3 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/dev-libs/libical/files/libical-2.0.0-tests.patch b/dev-libs/libical/files/libical-2.0.0-tests.patch
new file mode 100644
index 00000000000..a274382b315
--- /dev/null
+++ b/dev-libs/libical/files/libical-2.0.0-tests.patch
@@ -0,0 +1,38 @@
+From b1081cccb90fbe4cd859d3280a0470c30dce5cac Mon Sep 17 00:00:00 2001
+From: Allen Winter <allen.winter@kdab.com>
+Date: Thu, 24 Mar 2016 16:28:02 -0400
+Subject: [PATCH] recur.c, testvcal.c - use TEST_DATADIR to point to the test
+ data thereby fixing in-source building ISSUE#228
+ https://bugs.gentoo.org/show_bug.cgi?id=532296
+
+---
+ src/test/recur.c | 2 +-
+ src/test/testvcal.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/test/recur.c b/src/test/recur.c
+index d427137a..873ec48a 100644
+--- a/src/test/recur.c
++++ b/src/test/recur.c
+@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
+ #endif
+
+ if (argc <= 1) {
+- file = "../../test-data/recur.txt";
++ file = TEST_DATADIR "/recur.txt";
+ } else if (argc == 2) {
+ file = argv[1];
+ } else {
+diff --git a/src/test/testvcal.c b/src/test/testvcal.c
+index feee8147..024bbe99 100644
+--- a/src/test/testvcal.c
++++ b/src/test/testvcal.c
+@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
+ char *file;
+
+ if (argc != 2) {
+- file = "../../test-data/user-cal.vcf";
++ file = TEST_DATADIR "/user-cal.vcf";
+ } else {
+ file = argv[1];
+ }
diff --git a/dev-libs/libical/libical-2.0.0-r2.ebuild b/dev-libs/libical/libical-2.0.0-r2.ebuild
index 591441b014b..c0e34d96a4e 100644
--- a/dev-libs/libical/libical-2.0.0-r2.ebuild
+++ b/dev-libs/libical/libical-2.0.0-r2.ebuild
@@ -27,7 +27,10 @@ DOCS=(
doc/{AddingOrModifyingComponents,UsingLibical}.txt
)
-PATCHES=( "${FILESDIR}/fix-libdir-location.patch" )
+PATCHES=(
+ "${FILESDIR}/fix-libdir-location.patch"
+ "${FILESDIR}/${P}-tests.patch" #bug 532296
+)
src_configure() {
# See above, introspection is disabled for v2.0.0 at least.
diff --git a/dev-libs/libical/libical-2.0.0-r3.ebuild b/dev-libs/libical/libical-2.0.0-r3.ebuild
index 3b8c09f8c43..18915f35433 100644
--- a/dev-libs/libical/libical-2.0.0-r3.ebuild
+++ b/dev-libs/libical/libical-2.0.0-r3.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
"${FILESDIR}/${P}-libical.pc-icu-remove-full-paths.patch"
"${FILESDIR}/${P}-libical.pc-icu-move-to-requires.patch"
"${FILESDIR}/${P}-libical.pc-fix-libdir-location.patch"
+ "${FILESDIR}/${P}-tests.patch" #bug 532296
)
src_configure() {
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libical/, dev-libs/libical/files/
@ 2019-01-06 17:04 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2019-01-06 17:04 UTC (permalink / raw
To: gentoo-commits
commit: e1ec8630451b3e5016cc24fb7af388f65577d7da
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 6 16:23:49 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 6 17:03:48 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1ec8630
dev-libs/libical: 3.0.4 version bump
Closes: https://bugs.gentoo.org/662290
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-libs/libical/Manifest | 1 +
dev-libs/libical/files/libical-3.0.4-tests.patch | 25 +++++++
dev-libs/libical/libical-3.0.4.ebuild | 85 ++++++++++++++++++++++++
3 files changed, 111 insertions(+)
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index f0a4b24c461..f74908e452e 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -1,2 +1,3 @@
DIST libical-2.0.0.tar.gz 699099 BLAKE2B 81c1a12faf4436d1edee4ab3f080137135c2ec7ae05efeee70696b89f2122b8f8ff92f78b6ec5e017d31841adb796d467204c299335743a6a8c15eca667b8182 SHA512 0b80f9aa40e0a485371b5949152c10d7fffb6e0dfe8c2aabc3c6e4e97ba0cdd465ae7093343245be60173bc7b24e80e919c0c0e199ff0bb2b14ed94af7087c4f
DIST libical-3.0.3.tar.gz 866624 BLAKE2B 6d7c11aeb80dbd6b72001484a0ad89ff9b0f892c9400cec3f0d131d1edbabdafa8ef9717d1fed92c4999ba0934e8676e5cc58ebb3cb74fdbb8e5f5c816cc97bb SHA512 319a9e02b34835eb222728cb691b18e4f490b21f7faa55d266f298c07dafb5e15a492fb2105e2c3ab6d60d2affcf430b5b248cc38abc1e3bc29143662676fe70
+DIST libical-3.0.4.tar.gz 871853 BLAKE2B 478589bd60a8cf2cadf3cb7d2a7502810ccea7c553db206135ba3f4d5f4ea28acbe670b76844306957c8a137b381f8d8b885c1fef56fad2afd5c6e8e9c14b28c SHA512 491a1dd0c33bb823a79165eb6e4f86ef048a44642adfe44f8e69c83598b458ddf8e4365b11afc37d0b21bc1367e0a99096fc7887aae29e7ff4e3bd1cdee64dd9
diff --git a/dev-libs/libical/files/libical-3.0.4-tests.patch b/dev-libs/libical/files/libical-3.0.4-tests.patch
new file mode 100644
index 00000000000..7ecf6e1f2d7
--- /dev/null
+++ b/dev-libs/libical/files/libical-3.0.4-tests.patch
@@ -0,0 +1,25 @@
+From 3066463eb407853626277442eba725ddde58b843 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 6 Jan 2019 17:41:10 +0100
+Subject: [PATCH] Try to fix test dir path
+
+---
+ src/test/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
+index b1179c2c..af7ce3fc 100644
+--- a/src/test/CMakeLists.txt
++++ b/src/test/CMakeLists.txt
+@@ -27,7 +27,7 @@ add_definitions(-DTEST_DATADIR=${TEST_DATADIR})
+ macro(setprops _name)
+ if(UNIX)
+ set_tests_properties(${_name} PROPERTIES
+- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
++ WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/src/test"
+ )
+ endif()
+ if(WIN32)
+--
+2.20.1
+
diff --git a/dev-libs/libical/libical-3.0.4.ebuild b/dev-libs/libical/libical-3.0.4.ebuild
new file mode 100644
index 00000000000..9ceeda43c3a
--- /dev/null
+++ b/dev-libs/libical/libical-3.0.4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+inherit cmake-utils python-any-r1
+
+DESCRIPTION="An implementation of basic iCAL protocols"
+HOMEPAGE="https://github.com/libical/libical"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="berkdb doc examples static-libs test"
+
+# TODO: disabled until useful
+# glib? (
+# dev-libs/glib:2
+# dev-libs/libxml2:2
+# )
+# introspection? ( dev-libs/gobject-introspection:= )
+DEPEND="
+ dev-libs/icu:=
+ berkdb? ( sys-libs/db:= )
+"
+BDEPEND="
+ dev-lang/perl
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+ test? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${DEPEND}
+ sys-libs/timezone-data
+"
+
+DOCS=(
+ AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
+ doc/{AddingOrModifyingComponents,UsingLibical}.txt
+)
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.0.1-pkgconfig-libdir.patch"
+ "${FILESDIR}/${P}-tests.patch"
+)
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+ use examples || cmake_comment_add_subdirectory examples
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DICAL_GLIB=OFF
+ -DGOBJECT_INTROSPECTION=OFF
+ $(cmake-utils_use_find_package berkdb BDB)
+ -DICAL_BUILD_DOCS=$(usex doc)
+ -DSHARED_ONLY=$(usex !static-libs)
+ )
+# TODO: disabled until useful
+# -DICAL_GLIB=$(usex glib)
+# -DGOBJECT_INTROSPECTION=$(usex introspection)
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ use doc && cmake-utils_src_compile docs
+}
+
+src_install() {
+ use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
+
+ cmake-utils_src_install
+
+ if use examples; then
+ rm examples/CMakeLists.txt || die
+ dodoc -r examples
+ fi
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libical/, dev-libs/libical/files/
@ 2019-01-06 17:04 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2019-01-06 17:04 UTC (permalink / raw
To: gentoo-commits
commit: 26c986d5418f063a1398b64ed1c7b4c546a945b0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 6 16:55:17 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 6 17:03:48 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26c986d5
dev-libs/libical: Drop 3.0.3
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-libs/libical/Manifest | 1 -
.../files/libical-3.0.3-findicu-pkgconfig.patch | 58 --------------
dev-libs/libical/libical-3.0.3.ebuild | 90 ----------------------
3 files changed, 149 deletions(-)
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index f74908e452e..bcd8bbd027d 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -1,3 +1,2 @@
DIST libical-2.0.0.tar.gz 699099 BLAKE2B 81c1a12faf4436d1edee4ab3f080137135c2ec7ae05efeee70696b89f2122b8f8ff92f78b6ec5e017d31841adb796d467204c299335743a6a8c15eca667b8182 SHA512 0b80f9aa40e0a485371b5949152c10d7fffb6e0dfe8c2aabc3c6e4e97ba0cdd465ae7093343245be60173bc7b24e80e919c0c0e199ff0bb2b14ed94af7087c4f
-DIST libical-3.0.3.tar.gz 866624 BLAKE2B 6d7c11aeb80dbd6b72001484a0ad89ff9b0f892c9400cec3f0d131d1edbabdafa8ef9717d1fed92c4999ba0934e8676e5cc58ebb3cb74fdbb8e5f5c816cc97bb SHA512 319a9e02b34835eb222728cb691b18e4f490b21f7faa55d266f298c07dafb5e15a492fb2105e2c3ab6d60d2affcf430b5b248cc38abc1e3bc29143662676fe70
DIST libical-3.0.4.tar.gz 871853 BLAKE2B 478589bd60a8cf2cadf3cb7d2a7502810ccea7c553db206135ba3f4d5f4ea28acbe670b76844306957c8a137b381f8d8b885c1fef56fad2afd5c6e8e9c14b28c SHA512 491a1dd0c33bb823a79165eb6e4f86ef048a44642adfe44f8e69c83598b458ddf8e4365b11afc37d0b21bc1367e0a99096fc7887aae29e7ff4e3bd1cdee64dd9
diff --git a/dev-libs/libical/files/libical-3.0.3-findicu-pkgconfig.patch b/dev-libs/libical/files/libical-3.0.3-findicu-pkgconfig.patch
deleted file mode 100644
index 7f0ffc4b428..00000000000
--- a/dev-libs/libical/files/libical-3.0.3-findicu-pkgconfig.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 5c682db0dd1cfd7090dd191e89613ad5fb9fc078 Mon Sep 17 00:00:00 2001
-From: Allen Winter <allen.winter@kdab.com>
-Date: Sat, 26 May 2018 09:06:10 -0400
-Subject: [PATCH] cmake/modules/FindICU.cmake - allow pkgconfig to get is a
- hint
-
----
- cmake/modules/FindICU.cmake | 13 ++++++-------
- 1 file changed, 6 insertions(+), 7 deletions(-)
-
-diff --git a/cmake/modules/FindICU.cmake b/cmake/modules/FindICU.cmake
-index 12a1812d..53213efe 100644
---- a/cmake/modules/FindICU.cmake
-+++ b/cmake/modules/FindICU.cmake
-@@ -23,16 +23,12 @@ if(WIN32)
- file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _program_FILES_DIR)
- endif()
-
--if(ICU_INCLUDE_DIR AND ICU_LIBRARY)
-- # Already in cache, be silent
-- set(ICU_FIND_QUIETLY TRUE)
--endif()
--
--#set the root from the ICU_BASE environment
- file(TO_NATIVE_PATH "$ENV{ICU_BASE}" icu_root)
--#override the root from ICU_BASE defined to cmake
- if(DEFINED ICU_BASE)
- file(TO_NATIVE_PATH "${ICU_BASE}" icu_root)
-+else()
-+ find_package(PkgConfig QUIET)
-+ pkg_check_modules(PC_LibICU QUIET icu-i18n)
- endif()
-
- # Look for the header file.
-@@ -42,6 +38,7 @@ find_path(
- HINTS
- ${icu_root}/include
- ${_program_FILES_DIR}/icu/include
-+ ${PC_LibICU_INCLUDEDIR}
- /usr/local/opt/icu4c/include
- DOC "Include directory for the ICU library"
- )
-@@ -56,6 +53,7 @@ find_library(
- ${icu_root}/lib/
- ${_program_FILES_DIR}/icu/lib64/
- ${_program_FILES_DIR}/icu/lib/
-+ ${PC_LibICU_LIBDIR}
- /usr/local/opt/icu4c/lib/
- DOC "Libraries to link against for the common parts of ICU"
- )
-@@ -98,6 +96,7 @@ if(ICU_INCLUDE_DIR AND ICU_LIBRARY)
- HINTS
- ${icu_root}/lib/
- ${_program_FILES_DIR}/icu/lib/
-+ ${PC_LibICU_LIBDIR}
- /usr/local/opt/icu4c/lib/
- DOC "Libraries to link against for ICU internationalization"
- )
diff --git a/dev-libs/libical/libical-3.0.3.ebuild b/dev-libs/libical/libical-3.0.3.ebuild
deleted file mode 100644
index fe0236af8a4..00000000000
--- a/dev-libs/libical/libical-3.0.3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit cmake-utils python-any-r1
-
-DESCRIPTION="An implementation of basic iCAL protocols"
-HOMEPAGE="https://github.com/libical/libical"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
-SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="berkdb doc examples static-libs test"
-
-# TODO: disabled until useful
-# glib? (
-# dev-libs/glib:2
-# dev-libs/libxml2:2
-# )
-# introspection? ( dev-libs/gobject-introspection:= )
-COMMON_DEPEND="
- dev-libs/icu:=
- berkdb? ( sys-libs/db:= )
-"
-DEPEND="${COMMON_DEPEND}
- dev-lang/perl
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- test? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
- sys-libs/timezone-data
-"
-
-DOCS=(
- AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
- doc/{AddingOrModifyingComponents,UsingLibical}.txt
-)
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.0.1-pkgconfig-libdir.patch"
- "${FILESDIR}/${P}-findicu-pkgconfig.patch"
-)
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- cmake-utils_src_prepare
- use examples || cmake_comment_add_subdirectory examples
-}
-
-src_configure() {
- local mycmakeargs=(
- -DICAL_GLIB=OFF
- -DGOBJECT_INTROSPECTION=OFF
- $(cmake-utils_use_find_package berkdb BDB)
- -DICAL_BUILD_DOCS=$(usex doc)
- -DSHARED_ONLY=$(usex !static-libs)
- )
-# TODO: disabled until useful
-# -DICAL_GLIB=$(usex glib)
-# -DGOBJECT_INTROSPECTION=$(usex introspection)
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use doc && cmake-utils_src_compile docs
-}
-
-src_test() {
- local myctestargs=( -j1 )
- cmake-utils_src_test
-}
-
-src_install() {
- use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
-
- cmake-utils_src_install
-
- if use examples; then
- rm examples/CMakeLists.txt || die
- dodoc -r examples
- fi
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libical/, dev-libs/libical/files/
@ 2019-03-30 9:59 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2019-03-30 9:59 UTC (permalink / raw
To: gentoo-commits
commit: b8998a9bbdb89e01d0e0d5bb722ff7b5705f46d6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 29 21:14:40 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 09:58:22 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8998a9b
dev-libs/libical: Drop vulnerable 2.0.0-r3
Bug: https://bugs.gentoo.org/587572
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-libs/libical/Manifest | 1 -
...ical-2.0.0-libical.pc-fix-libdir-location.patch | 28 ----------
...cal-2.0.0-libical.pc-icu-move-to-requires.patch | 47 -----------------
...al-2.0.0-libical.pc-icu-remove-full-paths.patch | 44 ----------------
...libical-2.0.0-libical.pc-set-full-version.patch | 19 -------
dev-libs/libical/files/libical-2.0.0-tests.patch | 38 --------------
dev-libs/libical/libical-2.0.0-r3.ebuild | 60 ----------------------
7 files changed, 237 deletions(-)
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index bcd8bbd027d..d0547e218f6 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -1,2 +1 @@
-DIST libical-2.0.0.tar.gz 699099 BLAKE2B 81c1a12faf4436d1edee4ab3f080137135c2ec7ae05efeee70696b89f2122b8f8ff92f78b6ec5e017d31841adb796d467204c299335743a6a8c15eca667b8182 SHA512 0b80f9aa40e0a485371b5949152c10d7fffb6e0dfe8c2aabc3c6e4e97ba0cdd465ae7093343245be60173bc7b24e80e919c0c0e199ff0bb2b14ed94af7087c4f
DIST libical-3.0.4.tar.gz 871853 BLAKE2B 478589bd60a8cf2cadf3cb7d2a7502810ccea7c553db206135ba3f4d5f4ea28acbe670b76844306957c8a137b381f8d8b885c1fef56fad2afd5c6e8e9c14b28c SHA512 491a1dd0c33bb823a79165eb6e4f86ef048a44642adfe44f8e69c83598b458ddf8e4365b11afc37d0b21bc1367e0a99096fc7887aae29e7ff4e3bd1cdee64dd9
diff --git a/dev-libs/libical/files/libical-2.0.0-libical.pc-fix-libdir-location.patch b/dev-libs/libical/files/libical-2.0.0-libical.pc-fix-libdir-location.patch
deleted file mode 100644
index 6044d133749..00000000000
--- a/dev-libs/libical/files/libical-2.0.0-libical.pc-fix-libdir-location.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-This is a patch for Gentoo bug 560572, provided by Georgi Georgiev.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 773cf0c..e282ce4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -336,7 +336,7 @@ endif()
- set(VERSION "${PROJECT_VERSION}")
- set(prefix "${CMAKE_INSTALL_PREFIX}")
- set(exec_prefix "\${prefix}")
--set(libdir "\${exec_prefix}/lib")
-+set(libdir "${LIB_INSTALL_DIR}")
- set(includedir "\${prefix}/include")
- set(PTHREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}")
-
-diff --git a/libical.pc.in b/libical.pc.in
-index 7774dce..bf88476 100644
---- a/libical.pc.in
-+++ b/libical.pc.in
-@@ -8,8 +8,8 @@ iculib=@ICU_LIBRARIES@ @ICU_I18N_LIBRARIES@
- Name: libical
- Description: An implementation of basic iCAL protocols
- Version: @LIBICAL_LIB_VERSION_STRING@
--Libs: -L${libdir} -lical -licalss -licalvcal
-+Libs: -lical -licalss -licalvcal
- Libs.private: @PTHREAD_LIBS@
- @REQUIRES_PRIVATE_ICU@
- Cflags: -I${includedir}
diff --git a/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-move-to-requires.patch b/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-move-to-requires.patch
deleted file mode 100644
index e19dc037902..00000000000
--- a/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-move-to-requires.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-commit f70a26aaf836da0f9e242945151b49190d682d95
-Author: Allen Winter <allen.winter@kdab.com>
-Date: Sat Dec 3 11:11:48 2016 -0500
-
- CMakeLists.txt, libical.pc.in - ICU must appear as Requires in pkgconfig
- issue#244
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b3d49d0d..0f6dfc34 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -145,7 +145,7 @@ endif()
- # RSCALE info at http://tools.ietf.org/html/rfc7529
- find_package(ICU)
- if(ICU_FOUND)
-- set(ICUUC_LIBS "-licuuc") #for libical.pc
-+ set(REQUIRES_PRIVATE_ICU "Requires.private: icu-i18n") #for libical.pc
- set(HAVE_LIBICU 1)
- if(ICU_MAJOR_VERSION VERSION_GREATER 50)
- set(HAVE_ICU_DANGI TRUE)
-@@ -155,7 +155,6 @@ if(ICU_FOUND)
- endif()
- if(ICU_I18N_FOUND)
- set(HAVE_LIBICU_I18N 1)
-- set(ICUI18N_LIBS "-licui18n") #for libical.pc
- endif()
-
- # MSVC specific definitions
-diff --git a/libical.pc.in b/libical.pc.in
-index 8899f430..c07eb52a 100644
---- a/libical.pc.in
-+++ b/libical.pc.in
-@@ -2,11 +2,11 @@ prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
--threadslib=@PTHREAD_LIBS@
--iculibs=@ICUUC_LIBS@ @ICUI18N_LIBS@
-
- Name: libical
- Description: An implementation of basic iCAL protocols
- Version: @LIBICAL_LIB_VERSION_STRING@
--Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculibs}
-+Libs: -L${libdir} -lical -licalss -licalvcal
-+Libs.private: @PTHREAD_LIBS@
-+@REQUIRES_PRIVATE_ICU@
- Cflags: -I${includedir}
diff --git a/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-remove-full-paths.patch b/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-remove-full-paths.patch
deleted file mode 100644
index 08cf51f9408..00000000000
--- a/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-remove-full-paths.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-commit 1a41069c0dc054e59cd76fc3d8cf7cc2a78b5e8d
-Author: Allen Winter <allen.winter@kdab.com>
-Date: Sat Sep 3 16:56:29 2016 -0400
-
- CMakeLists.txt, libical.pc.in - fix iculibs (remove full path)
- ISSUE: 227
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0173e1a8..0c903ee5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -145,6 +145,7 @@ endif()
- # RSCALE info at http://tools.ietf.org/html/rfc7529
- find_package(ICU)
- if(ICU_FOUND)
-+ set(ICUUC_LIBS "-licuuc") #for libical.pc
- set(HAVE_LIBICU 1)
- if(ICU_MAJOR_VERSION VERSION_GREATER 50)
- set(HAVE_ICU_DANGI TRUE)
-@@ -154,6 +155,7 @@ if(ICU_FOUND)
- endif()
- if(ICU_I18N_FOUND)
- set(HAVE_LIBICU_I18N 1)
-+ set(ICUI18N_LIBS "-licui18n") #for libical.pc
- endif()
-
- # MSVC specific definitions
-diff --git a/libical.pc.in b/libical.pc.in
-index 5c2debd8..8899f430 100644
---- a/libical.pc.in
-+++ b/libical.pc.in
-@@ -3,10 +3,10 @@ exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
- threadslib=@PTHREAD_LIBS@
--iculib=@ICU_LIBRARIES@ @ICU_I18N_LIBRARIES@
-+iculibs=@ICUUC_LIBS@ @ICUI18N_LIBS@
-
- Name: libical
- Description: An implementation of basic iCAL protocols
- Version: @LIBICAL_LIB_VERSION_STRING@
--Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculib}
-+Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculibs}
- Cflags: -I${includedir}
diff --git a/dev-libs/libical/files/libical-2.0.0-libical.pc-set-full-version.patch b/dev-libs/libical/files/libical-2.0.0-libical.pc-set-full-version.patch
deleted file mode 100644
index 403ee84cd65..00000000000
--- a/dev-libs/libical/files/libical-2.0.0-libical.pc-set-full-version.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit cdc85e9e7a14932808471f823bc974031a0c4842
-Author: Allen Winter <allen.winter@kdab.com>
-Date: Mon Jan 25 14:57:20 2016 -0500
-
- libical.pc.in - set the version to the full major.minor.patch
- as requested by Milan.
-
-diff --git a/libical.pc.in b/libical.pc.in
-index 7774dce2..5c2debd8 100644
---- a/libical.pc.in
-+++ b/libical.pc.in
-@@ -7,6 +7,6 @@ iculib=@ICU_LIBRARIES@ @ICU_I18N_LIBRARIES@
-
- Name: libical
- Description: An implementation of basic iCAL protocols
--Version: @VERSION@
-+Version: @LIBICAL_LIB_VERSION_STRING@
- Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculib}
- Cflags: -I${includedir}
diff --git a/dev-libs/libical/files/libical-2.0.0-tests.patch b/dev-libs/libical/files/libical-2.0.0-tests.patch
deleted file mode 100644
index a274382b315..00000000000
--- a/dev-libs/libical/files/libical-2.0.0-tests.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b1081cccb90fbe4cd859d3280a0470c30dce5cac Mon Sep 17 00:00:00 2001
-From: Allen Winter <allen.winter@kdab.com>
-Date: Thu, 24 Mar 2016 16:28:02 -0400
-Subject: [PATCH] recur.c, testvcal.c - use TEST_DATADIR to point to the test
- data thereby fixing in-source building ISSUE#228
- https://bugs.gentoo.org/show_bug.cgi?id=532296
-
----
- src/test/recur.c | 2 +-
- src/test/testvcal.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/test/recur.c b/src/test/recur.c
-index d427137a..873ec48a 100644
---- a/src/test/recur.c
-+++ b/src/test/recur.c
-@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
- #endif
-
- if (argc <= 1) {
-- file = "../../test-data/recur.txt";
-+ file = TEST_DATADIR "/recur.txt";
- } else if (argc == 2) {
- file = argv[1];
- } else {
-diff --git a/src/test/testvcal.c b/src/test/testvcal.c
-index feee8147..024bbe99 100644
---- a/src/test/testvcal.c
-+++ b/src/test/testvcal.c
-@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
- char *file;
-
- if (argc != 2) {
-- file = "../../test-data/user-cal.vcf";
-+ file = TEST_DATADIR "/user-cal.vcf";
- } else {
- file = argv[1];
- }
diff --git a/dev-libs/libical/libical-2.0.0-r3.ebuild b/dev-libs/libical/libical-2.0.0-r3.ebuild
deleted file mode 100644
index f92f67e5d8c..00000000000
--- a/dev-libs/libical/libical-2.0.0-r3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="An implementation of basic iCAL protocols"
-HOMEPAGE="https://github.com/libical/libical"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( MPL-1.0 LGPL-2.1 )"
-SLOT="0/2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc examples static-libs"
-
-# The GOBJECT_INTROSPECTION build is broken, and upstream has given up
-# on it at the moment (it's disabled in Travis). It will probably come
-# back in v2.0.1 or later.
-# This snippet belongs to RDEPEND:
-# introspection? ( dev-libs/gobject-introspection )"
-RDEPEND="dev-libs/icu:="
-DEPEND="${RDEPEND}
- dev-lang/perl"
-
-DOCS=(
- AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
- doc/{AddingOrModifyingComponents,UsingLibical}.txt
-)
-
-PATCHES=(
- "${FILESDIR}/${P}-libical.pc-set-full-version.patch"
- "${FILESDIR}/${P}-libical.pc-icu-remove-full-paths.patch"
- "${FILESDIR}/${P}-libical.pc-icu-move-to-requires.patch"
- "${FILESDIR}/${P}-libical.pc-fix-libdir-location.patch"
- "${FILESDIR}/${P}-tests.patch" #bug 532296
-)
-
-src_configure() {
- # See above, introspection is disabled for v2.0.0 at least.
- #local mycmakeargs=(
- # -DGOBJECT_INTROSPECTION=$(usex introspection true false)
- #)
- use static-libs || mycmakeargs+=( -DSHARED_ONLY=ON )
- cmake-utils_src_configure
-}
-
-src_test() {
- local myctestargs=( -j1 )
- cmake-utils_src_test
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use examples; then
- rm examples/CMakeLists.txt || die
- dodoc -r examples
- fi
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libical/, dev-libs/libical/files/
@ 2020-10-31 9:23 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2020-10-31 9:23 UTC (permalink / raw
To: gentoo-commits
commit: e3f601190368dea81c1f86f75f5b70dccb220129
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 30 16:32:17 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 09:20:31 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3f60119
dev-libs/libical: Fix build with ICU-68
Thanks-to: Lars Wendler <polynomial-c <AT> gentoo.org>
Closes: https://bugs.gentoo.org/751928
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-libs/libical/files/libical-3.0.8-icu-68.patch | 44 +++++++++++++++++++++++
dev-libs/libical/libical-3.0.8.ebuild | 1 +
2 files changed, 45 insertions(+)
diff --git a/dev-libs/libical/files/libical-3.0.8-icu-68.patch b/dev-libs/libical/files/libical-3.0.8-icu-68.patch
new file mode 100644
index 00000000000..1974db76b0a
--- /dev/null
+++ b/dev-libs/libical/files/libical-3.0.8-icu-68.patch
@@ -0,0 +1,44 @@
+From a90657f5bbc5e2eb45fa419e7f43889aeccd4c39 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Fri, 30 Oct 2020 11:24:34 +0100
+Subject: [PATCH] Fix build with icu-68.1
+
+icu-68.1 removed public macro definitions for TRUE and FALSE
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ src/libical/icalrecur.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/libical/icalrecur.c b/src/libical/icalrecur.c
+index 91522161..159163c5 100644
+--- a/src/libical/icalrecur.c
++++ b/src/libical/icalrecur.c
+@@ -143,6 +143,7 @@
+ #include <stdlib.h>
+
+ #if defined(HAVE_LIBICU)
++#include <stdbool.h>
+ #include <unicode/ucal.h>
+ #include <unicode/ustring.h>
+ #else
+@@ -1079,7 +1080,7 @@ icalarray *icalrecurrencetype_rscale_supported_calendars(void)
+
+ calendars = icalarray_new(sizeof(const char **), 20);
+
+- en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status);
++ en = ucal_getKeywordValuesForLocale("calendar", NULL, false, &status);
+ while ((cal = uenum_next(en, NULL, &status))) {
+ cal = icalmemory_tmp_copy(cal);
+ icalarray_append(calendars, &cal);
+@@ -1472,7 +1473,7 @@ static int initialize_rscale(icalrecur_iterator *impl)
+ }
+
+ /* Check if specified calendar is supported */
+- en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status);
++ en = ucal_getKeywordValuesForLocale("calendar", NULL, false, &status);
+ while ((cal = uenum_next(en, NULL, &status))) {
+ if (!strcmp(cal, rule.rscale)) {
+ is_hebrew = !strcmp(rule.rscale, "hebrew");
+--
+2.29.2
diff --git a/dev-libs/libical/libical-3.0.8.ebuild b/dev-libs/libical/libical-3.0.8.ebuild
index fa889a4d229..376befd62e0 100644
--- a/dev-libs/libical/libical-3.0.8.ebuild
+++ b/dev-libs/libical/libical-3.0.8.ebuild
@@ -48,6 +48,7 @@ DOCS=(
PATCHES=(
"${FILESDIR}/${PN}-3.0.4-tests.patch"
"${FILESDIR}/${PN}-3.0.5-pkgconfig-libdir.patch"
+ "${FILESDIR}/${P}-icu-68.patch" # pending upstream PR #448, bug #751928
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libical/, dev-libs/libical/files/
@ 2021-05-15 18:11 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2021-05-15 18:11 UTC (permalink / raw
To: gentoo-commits
commit: 146cefcc9ff2b2aa092083017afc238b19835b4e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 15 18:10:56 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 15 18:11:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=146cefcc
dev-libs/libical: Drop 3.0.8
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-libs/libical/Manifest | 1 -
dev-libs/libical/files/libical-3.0.8-icu-68.patch | 44 ---------
dev-libs/libical/libical-3.0.8.ebuild | 105 ----------------------
3 files changed, 150 deletions(-)
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 86f7efb8be5..bea4b2139f4 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -1,3 +1,2 @@
DIST libical-3.0.10.tar.gz 889470 BLAKE2B 990a37cdb6a00c52bab1a10f5899752dc2f9f0f2c3e0ada9e54803007e3db97dcd600544bf45a9a0646631aaf41839a0818b5d70b3e6e305826db2dd1cc30bdb SHA512 e32ccaff9b8a501f340567a1221c580023e4ed79918519bfa88aee2c0e8b62f5ea37e10907f2eb6fbd346a57408708a74e30aaf9a57a8d711eae30ddc974ddd0
-DIST libical-3.0.8.tar.gz 881462 BLAKE2B e31dd1c823be033abbecd0373af784f1f57e533df56ca91ea467deb02cdda2a719f22882195b639182b85fcf4e59d56229dbf601d2c909c2c91b355c32022622 SHA512 ce015e6d4c1c7cb4af7b45748ce8251c663f80f6a4357ddff6a97796642619abe882f4cadeca10cabeb1b25577869f436da15bca882e032eb3ff0475f6010d8b
DIST libical-3.0.9.tar.gz 886500 BLAKE2B 66810ce13d70f9f1da62ff4d4c9dbff4953a644e939f55770cd4ca367293125b47590297b64a4b755cfb11315dfb4e77ad926390cde1c2d16847d24561288750 SHA512 4a9894d82776437cb2ef16df70bffb52da7b4fd57b52a4f6941430b3b1f9830829f0775fb495411f67393581bda1304b54c9f0031bc3d4ada56d2204900cb268
diff --git a/dev-libs/libical/files/libical-3.0.8-icu-68.patch b/dev-libs/libical/files/libical-3.0.8-icu-68.patch
deleted file mode 100644
index 1974db76b0a..00000000000
--- a/dev-libs/libical/files/libical-3.0.8-icu-68.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From a90657f5bbc5e2eb45fa419e7f43889aeccd4c39 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Fri, 30 Oct 2020 11:24:34 +0100
-Subject: [PATCH] Fix build with icu-68.1
-
-icu-68.1 removed public macro definitions for TRUE and FALSE
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- src/libical/icalrecur.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/libical/icalrecur.c b/src/libical/icalrecur.c
-index 91522161..159163c5 100644
---- a/src/libical/icalrecur.c
-+++ b/src/libical/icalrecur.c
-@@ -143,6 +143,7 @@
- #include <stdlib.h>
-
- #if defined(HAVE_LIBICU)
-+#include <stdbool.h>
- #include <unicode/ucal.h>
- #include <unicode/ustring.h>
- #else
-@@ -1079,7 +1080,7 @@ icalarray *icalrecurrencetype_rscale_supported_calendars(void)
-
- calendars = icalarray_new(sizeof(const char **), 20);
-
-- en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status);
-+ en = ucal_getKeywordValuesForLocale("calendar", NULL, false, &status);
- while ((cal = uenum_next(en, NULL, &status))) {
- cal = icalmemory_tmp_copy(cal);
- icalarray_append(calendars, &cal);
-@@ -1472,7 +1473,7 @@ static int initialize_rscale(icalrecur_iterator *impl)
- }
-
- /* Check if specified calendar is supported */
-- en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status);
-+ en = ucal_getKeywordValuesForLocale("calendar", NULL, false, &status);
- while ((cal = uenum_next(en, NULL, &status))) {
- if (!strcmp(cal, rule.rscale)) {
- is_hebrew = !strcmp(rule.rscale, "hebrew");
---
-2.29.2
diff --git a/dev-libs/libical/libical-3.0.8.ebuild b/dev-libs/libical/libical-3.0.8.ebuild
deleted file mode 100644
index 0c4155a9bb5..00000000000
--- a/dev-libs/libical/libical-3.0.8.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-VALA_USE_DEPEND="vapigen"
-inherit cmake python-any-r1 vala
-
-DESCRIPTION="An implementation of basic iCAL protocols"
-HOMEPAGE="https://github.com/libical/libical"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="berkdb doc examples +glib +introspection static-libs test vala"
-
-REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- dev-lang/perl
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- introspection? ( dev-libs/gobject-introspection )
- test? ( ${PYTHON_DEPS} )
- vala? ( $(vala_depend) )
-"
-COMMON_DEPEND="
- dev-libs/icu:=
- berkdb? ( sys-libs/db:= )
- glib? ( dev-libs/glib:2 )
-"
-DEPEND="${COMMON_DEPEND}
- glib? ( dev-libs/libxml2:2 )
-"
-RDEPEND="${COMMON_DEPEND}
- sys-libs/timezone-data
-"
-
-DOCS=(
- AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
- doc/{AddingOrModifyingComponents,UsingLibical}.txt
-)
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.0.4-tests.patch"
- "${FILESDIR}/${PN}-3.0.5-pkgconfig-libdir.patch"
- "${FILESDIR}/${P}-icu-68.patch" # pending upstream PR #448, bug #751928
-)
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
- use examples || cmake_comment_add_subdirectory examples
- use vala && vala_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package berkdb BDB)
- -DICAL_BUILD_DOCS=$(usex doc)
- -DICAL_GLIB=$(usex glib)
- -DGOBJECT_INTROSPECTION=$(usex introspection)
- -DSHARED_ONLY=$(usex !static-libs)
- -DLIBICAL_BUILD_TESTING=$(usex test)
- -DICAL_GLIB_VAPI=$(usex vala)
- )
- if use vala; then
- mycmakeargs+=(
- -DVALAC="${VALAC}"
- -DVAPIGEN="${VAPIGEN}"
- )
- fi
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- use doc && cmake_src_compile docs
-}
-
-src_test() {
- local myctestargs=(
- -E "(icalrecurtest|icalrecurtest-r)" # bug 660282
- )
-
- cmake_src_test
-}
-
-src_install() {
- use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
-
- cmake_src_install
-
- if use examples; then
- rm examples/CMakeLists.txt || die
- dodoc -r examples
- fi
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libical/, dev-libs/libical/files/
@ 2022-01-20 13:26 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2022-01-20 13:26 UTC (permalink / raw
To: gentoo-commits
commit: 92cd6a2cdca7df563587ca6256557cae41c45eb4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 20 12:58:46 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 20 13:24:22 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92cd6a2c
dev-libs/libical: Drop 3.0.10
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-libs/libical/Manifest | 1 -
.../files/libical-3.0.5-pkgconfig-libdir.patch | 44 --------
dev-libs/libical/libical-3.0.10.ebuild | 114 ---------------------
3 files changed, 159 deletions(-)
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index ef9795f06c6d..0af2bda6d07c 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -1,2 +1 @@
-DIST libical-3.0.10.tar.gz 889470 BLAKE2B 990a37cdb6a00c52bab1a10f5899752dc2f9f0f2c3e0ada9e54803007e3db97dcd600544bf45a9a0646631aaf41839a0818b5d70b3e6e305826db2dd1cc30bdb SHA512 e32ccaff9b8a501f340567a1221c580023e4ed79918519bfa88aee2c0e8b62f5ea37e10907f2eb6fbd346a57408708a74e30aaf9a57a8d711eae30ddc974ddd0
DIST libical-3.0.12.tar.gz 883537 BLAKE2B a67cbf767f5dba7717c80b2ed90f257025544b6fbbd85e4d10712fb63ec5d750c00e9a1d664b0c75f7e833847aeee2fc1412866bf4b599ead663132b3665835f SHA512 e97aec11895d4c51fcb1fe32598f5fc23bbffc26274d1f46e74d1b9a365bea65446563224b852d13a763334eab0375e77cabb5ba535d3b2f89b652bbe24b4517
diff --git a/dev-libs/libical/files/libical-3.0.5-pkgconfig-libdir.patch b/dev-libs/libical/files/libical-3.0.5-pkgconfig-libdir.patch
deleted file mode 100644
index a3a80e9f76f5..000000000000
--- a/dev-libs/libical/files/libical-3.0.5-pkgconfig-libdir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Fix pkgconfig libdir paths.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -336,7 +336,7 @@
- set(VERSION "${PROJECT_VERSION}")
- set(prefix "${CMAKE_INSTALL_PREFIX}")
- set(exec_prefix "\${prefix}")
--set(libdir "\${exec_prefix}/lib")
-+set(libdir "${LIB_INSTALL_DIR}")
- set(includedir "\${prefix}/include")
- set(PTHREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}")
-
---- a/libical.pc.in
-+++ b/libical.pc.in
-@@ -8,7 +8,7 @@
- Name: libical
- Description: An implementation of basic iCAL protocols
- Version: @LIBICAL_LIB_VERSION_STRING@
--Libs: -L${libdir} -lical -licalss -licalvcal
-+Libs: -lical -licalss -licalvcal
- Libs.private: @PTHREAD_LIBS@
- @REQUIRES_PRIVATE_ICU@
- Cflags: -I${includedir}
---- a/src/libical-glib/CMakeLists.txt
-+++ b/src/libical-glib/CMakeLists.txt
-@@ -233,7 +233,7 @@
-
- set(prefix "${CMAKE_INSTALL_PREFIX}")
- set(exec_prefix "\${prefix}")
--set(libdir "\${exec_prefix}/lib")
-+set(libdir "${LIB_INSTALL_DIR}")
- set(includedir "\${prefix}/include")
-
- configure_file(
---- a/src/libical-glib/libical-glib.pc.in
-+++ b/src/libical-glib/libical-glib.pc.in
-@@ -8,4 +8,4 @@
- Version: @LIBICAL_LIB_VERSION_STRING@
- Requires: glib-2.0, gobject-2.0, libical
- Cflags: -I${includedir}
--Libs: -L${libdir} -lical-glib
-+Libs: -lical-glib
-
diff --git a/dev-libs/libical/libical-3.0.10.ebuild b/dev-libs/libical/libical-3.0.10.ebuild
deleted file mode 100644
index 3efd1ffc1495..000000000000
--- a/dev-libs/libical/libical-3.0.10.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-VALA_USE_DEPEND="vapigen"
-inherit cmake python-any-r1 vala
-
-DESCRIPTION="Implementation of basic iCAL protocols"
-HOMEPAGE="https://github.com/libical/libical"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="berkdb doc examples +glib +introspection static-libs test vala"
-
-REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- dev-libs/icu:=
- berkdb? ( sys-libs/db:= )
- glib? ( dev-libs/glib:2 )
-"
-DEPEND="${COMMON_DEPEND}
- glib? ( dev-libs/libxml2:2 )
-"
-RDEPEND="${COMMON_DEPEND}
- sys-libs/timezone-data
-"
-BDEPEND="
- dev-lang/perl
- virtual/pkgconfig
- doc? (
- app-doc/doxygen
- glib? ( dev-util/gtk-doc )
- )
- introspection? ( dev-libs/gobject-introspection )
- test? (
- ${PYTHON_DEPS}
- glib? ( $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') )
- )
- vala? ( $(vala_depend) )
-"
-
-DOCS=(
- AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
- doc/{AddingOrModifyingComponents,UsingLibical}.txt
-)
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.0.4-tests.patch"
- "${FILESDIR}/${PN}-3.0.5-pkgconfig-libdir.patch"
-)
-
-python_check_deps() {
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
- use examples || cmake_comment_add_subdirectory examples
- use vala && vala_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package berkdb BDB)
- -DICAL_BUILD_DOCS=$(usex doc)
- -DICAL_GLIB=$(usex glib)
- -DGOBJECT_INTROSPECTION=$(usex introspection)
- -DSHARED_ONLY=$(usex !static-libs)
- -DLIBICAL_BUILD_TESTING=$(usex test)
- -DICAL_GLIB_VAPI=$(usex vala)
- )
- if use vala; then
- mycmakeargs+=(
- -DVALAC="${VALAC}"
- -DVAPIGEN="${VAPIGEN}"
- )
- fi
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- use doc && cmake_src_compile docs
-}
-
-src_test() {
- local myctestargs=(
- -E "(icalrecurtest|icalrecurtest-r)" # bug 660282
- )
-
- cmake_src_test
-}
-
-src_install() {
- use doc && local HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
-
- cmake_src_install
-
- if use examples; then
- rm examples/CMakeLists.txt || die
- dodoc -r examples
- fi
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libical/, dev-libs/libical/files/
@ 2022-10-10 21:36 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2022-10-10 21:36 UTC (permalink / raw
To: gentoo-commits
commit: 9f829fb9b30d3bd85375fe57279d835abd21869d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 10 21:36:05 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 10 21:36:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f829fb9
dev-libs/libical: backport parsing regression fix; backport F_S=3 fix
Closes: https://bugs.gentoo.org/876625
Closes: https://bugs.gentoo.org/876622
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/libical-3.0.15-fortify-source-3.patch | 43 ++++++++
.../files/libical-3.0.15-revert-bad-fuzz-fix.patch | 36 +++++++
dev-libs/libical/libical-3.0.15-r1.ebuild | 119 +++++++++++++++++++++
3 files changed, 198 insertions(+)
diff --git a/dev-libs/libical/files/libical-3.0.15-fortify-source-3.patch b/dev-libs/libical/files/libical-3.0.15-fortify-source-3.patch
new file mode 100644
index 000000000000..830d646b74d0
--- /dev/null
+++ b/dev-libs/libical/files/libical-3.0.15-fortify-source-3.patch
@@ -0,0 +1,43 @@
+https://github.com/libical/libical/commit/d67034b31cebe0db3ca65342813336b123921a15
+https://github.com/libical/libical/issues/603
+https://bugs.gentoo.org/876625
+
+From: Allen Winter <allen.winter@kdab.com>
+Date: Fri, 7 Oct 2022 09:43:32 -0400
+Subject: [PATCH] fix problem found with gcc fortify builds
+
+fixes: #603
+--- a/src/libical/icaltz-util.c
++++ b/src/libical/icaltz-util.c
+@@ -732,7 +732,7 @@ icalcomponent *icaltzutil_fetch_timezone(const char *location)
+ for (i = 0; i < num_trans; i++) {
+ int by_day = 0;
+ time_t start;
+- enum icalrecurrencetype_weekday dow;
++ enum icalrecurrencetype_weekday dow = ICAL_NO_WEEKDAY;
+
+ prev_idx = idx;
+ idx = trans_idx[i];
+--- a/src/libicalss/icalbdbset.c
++++ b/src/libicalss/icalbdbset.c
+@@ -529,7 +529,7 @@ int icalbdbset_get_key(DBC *dbcp, DBT *key, DBT *data)
+ int icalbdbset_delete(DB *dbp, DBT *key)
+ {
+ DB_TXN *tid;
+- int ret;
++ int ret = 0;
+ int done = 0;
+ int retry = 0;
+
+--- a/src/test/regression.c
++++ b/src/test/regression.c
+@@ -2322,7 +2322,7 @@ void test_fblist()
+ char *strp = out_str;
+
+ for (i = 0; foo[i] != -1; i++) {
+- snprintf(strp, 79, "%1d", foo[i]);
++ snprintf(strp, 79-i, "%1d", foo[i]);
+ strp++;
+ }
+ str_is("Checking freebusy validity", out_str, "1121110");
+
diff --git a/dev-libs/libical/files/libical-3.0.15-revert-bad-fuzz-fix.patch b/dev-libs/libical/files/libical-3.0.15-revert-bad-fuzz-fix.patch
new file mode 100644
index 000000000000..e6f4d33ad286
--- /dev/null
+++ b/dev-libs/libical/files/libical-3.0.15-revert-bad-fuzz-fix.patch
@@ -0,0 +1,36 @@
+https://github.com/libical/libical/commit/eeccee80d0485bdd3951924b294a82e8bc39a5f8
+https://bugs.gentoo.org/876622
+
+From: Allen Winter <allen.winter@kdab.com>
+Date: Mon, 10 Oct 2022 14:58:29 -0400
+Subject: [PATCH] Revert "src/libical/icalparser.c - fix a fuzz issue for
+ integer overflow"
+
+This reverts commit ca3e2ad983771b90da259994b7a6d7de1fd1abdc.
+--- a/src/libical/icalparser.c
++++ b/src/libical/icalparser.c
+@@ -630,7 +630,6 @@ icalcomponent *icalparser_parse(icalparser *parser,
+ icalparser_line_gen_func line_gen_func)
+ {
+ char *line;
+- unsigned int cnt = 0;
+ icalcomponent *c = 0;
+ icalcomponent *root = 0;
+ icalerrorstate es = icalerror_get_error_state(ICAL_MALFORMEDDATA_ERROR);
+@@ -641,7 +640,6 @@ icalcomponent *icalparser_parse(icalparser *parser,
+ icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR, ICAL_ERROR_NONFATAL);
+
+ do {
+- cnt++;
+ line = icalparser_get_line(parser, line_gen_func);
+
+ if ((c = icalparser_add_line(parser, line)) != 0) {
+@@ -681,7 +679,7 @@ icalcomponent *icalparser_parse(icalparser *parser,
+ icalmemory_free_buffer(line);
+ cont = 1;
+ }
+- } while (cont && cnt < TMP_BUF_SIZE);
++ } while (cont);
+
+ icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR, es);
+
diff --git a/dev-libs/libical/libical-3.0.15-r1.ebuild b/dev-libs/libical/libical-3.0.15-r1.ebuild
new file mode 100644
index 000000000000..f3c4f2d2e9b4
--- /dev/null
+++ b/dev-libs/libical/libical-3.0.15-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+VALA_USE_DEPEND="vapigen"
+inherit cmake python-any-r1 vala
+
+DESCRIPTION="Implementation of basic iCAL protocols"
+HOMEPAGE="https://github.com/libical/libical"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="doc examples +glib +introspection static-libs test vala"
+
+REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ dev-libs/icu:=
+ glib? ( dev-libs/glib:2 )
+"
+DEPEND="${COMMON_DEPEND}
+ glib? ( dev-libs/libxml2:2 )
+"
+RDEPEND="${COMMON_DEPEND}
+ sys-libs/timezone-data
+"
+BDEPEND="
+ dev-lang/perl
+ virtual/pkgconfig
+ doc? (
+ app-doc/doxygen[dot]
+ glib? ( dev-util/gtk-doc )
+ )
+ introspection? ( dev-libs/gobject-introspection )
+ test? (
+ ${PYTHON_DEPS}
+ glib? ( $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') )
+ )
+ vala? ( $(vala_depend) )
+"
+
+DOCS=(
+ AUTHORS README.md ReleaseNotes.txt TEST THANKS TODO
+ doc/{AddingOrModifyingComponents.txt,UsingLibical.md}
+)
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.0.4-tests.patch"
+ "${FILESDIR}/${PN}-3.0.11-pkgconfig-libdir.patch"
+ "${FILESDIR}/${P}-fortify-source-3.patch"
+ "${FILESDIR}/${P}-revert-bad-fuzz-fix.patch"
+)
+
+python_check_deps() {
+ python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ use examples || cmake_comment_add_subdirectory examples
+ use vala && vala_setup
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_BerkeleyDB=ON
+ -DICAL_BUILD_DOCS=$(usex doc)
+ -DICAL_GLIB=$(usex glib)
+ -DGOBJECT_INTROSPECTION=$(usex introspection)
+ -DSHARED_ONLY=$(usex !static-libs)
+ -DLIBICAL_BUILD_TESTING=$(usex test)
+ -DICAL_GLIB_VAPI=$(usex vala)
+ )
+ if use vala; then
+ mycmakeargs+=(
+ -DVALAC="${VALAC}"
+ -DVAPIGEN="${VAPIGEN}"
+ )
+ fi
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use doc; then
+ cmake_src_compile docs
+
+ HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
+ fi
+}
+
+src_test() {
+ local myctestargs=(
+ -E "(icalrecurtest|icalrecurtest-r)" # bug 660282
+ )
+
+ cmake_src_test
+}
+
+src_install() {
+ cmake_src_install
+
+ if use examples; then
+ rm examples/CMakeLists.txt || die
+ dodoc -r examples
+ fi
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libical/, dev-libs/libical/files/
@ 2022-12-15 23:29 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2022-12-15 23:29 UTC (permalink / raw
To: gentoo-commits
commit: fc08e9aa4b74a365d1a738c75c6265d28c4d7ce7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 15 23:23:43 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 15 23:29:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc08e9aa
dev-libs/libical: drop 3.0.15-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-libs/libical/Manifest | 1 -
.../files/libical-3.0.15-fortify-source-3.patch | 43 --------
.../files/libical-3.0.15-revert-bad-fuzz-fix.patch | 36 -------
dev-libs/libical/libical-3.0.15-r1.ebuild | 119 ---------------------
4 files changed, 199 deletions(-)
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index baaf5872df5b..9b52aeb4e056 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -1,3 +1,2 @@
DIST libical-3.0.14.tar.gz 887795 BLAKE2B 8c073b77b5e4e6b24e3dfae7ac7a5f88da874bdfa53489cd04afd4d458d2fc963d39c2816691e777003ca9af510ceaf7bab9d7e1021942aa9c3adaad32ca8341 SHA512 36da5516672976c71b049a12af36164d91f9b655f81f1884766558149f25e80c30e64d15da848842f8a629295d708f39ce6fa63a3b0da39b5cbeb91911a4e6d8
-DIST libical-3.0.15.tar.gz 920483 BLAKE2B 9d4c1a84440b2363537f678363f9b7d8061e429c5bf7bf9ae2c9ea33e328f238dc4ce0e79c66d33441a89b6c2e18527fdb7d40e80338dda0086b636b165d5ae2 SHA512 14f0eaabdd8fc56d91d2fff8647b3871439cceae3cb7af31eaae30b3cc29f818b6f9d582dd4770b8b3b0c6fe53684258d30c743a5fd5dd337fda64e3adae35ba
DIST libical-3.0.16.tar.gz 921245 BLAKE2B d6afe96abf32ece87393d85b4e5b0c1c10330ac64bca52bbaef96af45fbc06242cbbb4274fa350cc9a56655de238a85dea6111f381674b7cff44ab67a470e89e SHA512 72659c98f6c98b3e0fa15849df7f80993403100fb5c237e452df714a7be2d1d27f4547c81b399fe7bc6b1fb10c8c7cf9a23f5b969d588d7b05d7fe2e29c86bd4
diff --git a/dev-libs/libical/files/libical-3.0.15-fortify-source-3.patch b/dev-libs/libical/files/libical-3.0.15-fortify-source-3.patch
deleted file mode 100644
index 830d646b74d0..000000000000
--- a/dev-libs/libical/files/libical-3.0.15-fortify-source-3.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://github.com/libical/libical/commit/d67034b31cebe0db3ca65342813336b123921a15
-https://github.com/libical/libical/issues/603
-https://bugs.gentoo.org/876625
-
-From: Allen Winter <allen.winter@kdab.com>
-Date: Fri, 7 Oct 2022 09:43:32 -0400
-Subject: [PATCH] fix problem found with gcc fortify builds
-
-fixes: #603
---- a/src/libical/icaltz-util.c
-+++ b/src/libical/icaltz-util.c
-@@ -732,7 +732,7 @@ icalcomponent *icaltzutil_fetch_timezone(const char *location)
- for (i = 0; i < num_trans; i++) {
- int by_day = 0;
- time_t start;
-- enum icalrecurrencetype_weekday dow;
-+ enum icalrecurrencetype_weekday dow = ICAL_NO_WEEKDAY;
-
- prev_idx = idx;
- idx = trans_idx[i];
---- a/src/libicalss/icalbdbset.c
-+++ b/src/libicalss/icalbdbset.c
-@@ -529,7 +529,7 @@ int icalbdbset_get_key(DBC *dbcp, DBT *key, DBT *data)
- int icalbdbset_delete(DB *dbp, DBT *key)
- {
- DB_TXN *tid;
-- int ret;
-+ int ret = 0;
- int done = 0;
- int retry = 0;
-
---- a/src/test/regression.c
-+++ b/src/test/regression.c
-@@ -2322,7 +2322,7 @@ void test_fblist()
- char *strp = out_str;
-
- for (i = 0; foo[i] != -1; i++) {
-- snprintf(strp, 79, "%1d", foo[i]);
-+ snprintf(strp, 79-i, "%1d", foo[i]);
- strp++;
- }
- str_is("Checking freebusy validity", out_str, "1121110");
-
diff --git a/dev-libs/libical/files/libical-3.0.15-revert-bad-fuzz-fix.patch b/dev-libs/libical/files/libical-3.0.15-revert-bad-fuzz-fix.patch
deleted file mode 100644
index e6f4d33ad286..000000000000
--- a/dev-libs/libical/files/libical-3.0.15-revert-bad-fuzz-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://github.com/libical/libical/commit/eeccee80d0485bdd3951924b294a82e8bc39a5f8
-https://bugs.gentoo.org/876622
-
-From: Allen Winter <allen.winter@kdab.com>
-Date: Mon, 10 Oct 2022 14:58:29 -0400
-Subject: [PATCH] Revert "src/libical/icalparser.c - fix a fuzz issue for
- integer overflow"
-
-This reverts commit ca3e2ad983771b90da259994b7a6d7de1fd1abdc.
---- a/src/libical/icalparser.c
-+++ b/src/libical/icalparser.c
-@@ -630,7 +630,6 @@ icalcomponent *icalparser_parse(icalparser *parser,
- icalparser_line_gen_func line_gen_func)
- {
- char *line;
-- unsigned int cnt = 0;
- icalcomponent *c = 0;
- icalcomponent *root = 0;
- icalerrorstate es = icalerror_get_error_state(ICAL_MALFORMEDDATA_ERROR);
-@@ -641,7 +640,6 @@ icalcomponent *icalparser_parse(icalparser *parser,
- icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR, ICAL_ERROR_NONFATAL);
-
- do {
-- cnt++;
- line = icalparser_get_line(parser, line_gen_func);
-
- if ((c = icalparser_add_line(parser, line)) != 0) {
-@@ -681,7 +679,7 @@ icalcomponent *icalparser_parse(icalparser *parser,
- icalmemory_free_buffer(line);
- cont = 1;
- }
-- } while (cont && cnt < TMP_BUF_SIZE);
-+ } while (cont);
-
- icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR, es);
-
diff --git a/dev-libs/libical/libical-3.0.15-r1.ebuild b/dev-libs/libical/libical-3.0.15-r1.ebuild
deleted file mode 100644
index f3c4f2d2e9b4..000000000000
--- a/dev-libs/libical/libical-3.0.15-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-VALA_USE_DEPEND="vapigen"
-inherit cmake python-any-r1 vala
-
-DESCRIPTION="Implementation of basic iCAL protocols"
-HOMEPAGE="https://github.com/libical/libical"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
-SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc examples +glib +introspection static-libs test vala"
-
-REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- dev-libs/icu:=
- glib? ( dev-libs/glib:2 )
-"
-DEPEND="${COMMON_DEPEND}
- glib? ( dev-libs/libxml2:2 )
-"
-RDEPEND="${COMMON_DEPEND}
- sys-libs/timezone-data
-"
-BDEPEND="
- dev-lang/perl
- virtual/pkgconfig
- doc? (
- app-doc/doxygen[dot]
- glib? ( dev-util/gtk-doc )
- )
- introspection? ( dev-libs/gobject-introspection )
- test? (
- ${PYTHON_DEPS}
- glib? ( $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') )
- )
- vala? ( $(vala_depend) )
-"
-
-DOCS=(
- AUTHORS README.md ReleaseNotes.txt TEST THANKS TODO
- doc/{AddingOrModifyingComponents.txt,UsingLibical.md}
-)
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.0.4-tests.patch"
- "${FILESDIR}/${PN}-3.0.11-pkgconfig-libdir.patch"
- "${FILESDIR}/${P}-fortify-source-3.patch"
- "${FILESDIR}/${P}-revert-bad-fuzz-fix.patch"
-)
-
-python_check_deps() {
- python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-
- use examples || cmake_comment_add_subdirectory examples
- use vala && vala_setup
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_BerkeleyDB=ON
- -DICAL_BUILD_DOCS=$(usex doc)
- -DICAL_GLIB=$(usex glib)
- -DGOBJECT_INTROSPECTION=$(usex introspection)
- -DSHARED_ONLY=$(usex !static-libs)
- -DLIBICAL_BUILD_TESTING=$(usex test)
- -DICAL_GLIB_VAPI=$(usex vala)
- )
- if use vala; then
- mycmakeargs+=(
- -DVALAC="${VALAC}"
- -DVAPIGEN="${VAPIGEN}"
- )
- fi
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-
- if use doc; then
- cmake_src_compile docs
-
- HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
- fi
-}
-
-src_test() {
- local myctestargs=(
- -E "(icalrecurtest|icalrecurtest-r)" # bug 660282
- )
-
- cmake_src_test
-}
-
-src_install() {
- cmake_src_install
-
- if use examples; then
- rm examples/CMakeLists.txt || die
- dodoc -r examples
- fi
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2022-12-15 23:29 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-06 21:31 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libical/, dev-libs/libical/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-12-15 23:29 Andreas Sturmlechner
2022-10-10 21:36 Sam James
2022-01-20 13:26 Andreas Sturmlechner
2021-05-15 18:11 Andreas Sturmlechner
2020-10-31 9:23 Andreas Sturmlechner
2019-03-30 9:59 Andreas Sturmlechner
2019-01-06 17:04 Andreas Sturmlechner
2019-01-06 17:04 Andreas Sturmlechner
2017-12-21 20:42 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox