* [gentoo-commits] repo/gentoo:master commit in: app-pda/libplist/files/, app-pda/libplist/
@ 2020-07-18 14:51 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2020-07-18 14:51 UTC (permalink / raw
To: gentoo-commits
commit: ebd5321aa0f3659ae8d94d78c4fb69ec9e555005
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 18 14:49:28 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jul 18 14:51:37 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebd5321a
app-pda/libplist: fix broken 2.2.0 release on Gentoo
- upstream introduced new way of naming the library, breaking
reverse deps, see
https://github.com/libimobiledevice/libplist/issues/163 and
upstream commit 137716df3f197a7184c1fba88fcb30480dafd6e0. No ABI
change introduced.
Closes: https://bugs.gentoo.org/733082
Closes: https://bugs.gentoo.org/733048
Closes: https://bugs.gentoo.org/733048
Closes: https://bugs.gentoo.org/732910
Closes: https://bugs.gentoo.org/732916
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../files/libplist-2.2.0-pkgconfig-lib.patch | 10 ++
app-pda/libplist/libplist-2.2.0-r2.ebuild | 110 +++++++++++++++++++++
2 files changed, 120 insertions(+)
diff --git a/app-pda/libplist/files/libplist-2.2.0-pkgconfig-lib.patch b/app-pda/libplist/files/libplist-2.2.0-pkgconfig-lib.patch
new file mode 100644
index 00000000000..30ef6779886
--- /dev/null
+++ b/app-pda/libplist/files/libplist-2.2.0-pkgconfig-lib.patch
@@ -0,0 +1,10 @@
+diff -Naur libplist/src/libplist-2.0.pc.in libplist-pcfile/src/libplist-2.0.pc.in
+--- libplist/src/libplist-2.0.pc.in 2020-07-18 17:25:52.156222244 +0300
++++ libplist-pcfile/src/libplist-2.0.pc.in 2020-07-18 17:26:32.752017958 +0300
+@@ -6,5 +6,5 @@
+ Name: @PACKAGE_NAME@
+ Description: A library to handle Apple Property Lists whereas they are binary or XML
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lplist-2.0
++Libs: -L${libdir} -lplist-2.0 -lplist
+ Cflags: -I${includedir}
diff --git a/app-pda/libplist/libplist-2.2.0-r2.ebuild b/app-pda/libplist/libplist-2.2.0-r2.ebuild
new file mode 100644
index 00000000000..d7ac5a7b4a3
--- /dev/null
+++ b/app-pda/libplist/libplist-2.2.0-r2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+inherit autotools python-r1 toolchain-funcs
+
+DESCRIPTION="Support library to deal with Apple Property Lists (Binary & XML)"
+HOMEPAGE="https://www.libimobiledevice.org/"
+SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/2.0-3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="python static-libs"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )
+"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DOCS=( AUTHORS NEWS README.md )
+
+PATCHES=( "${FILESDIR}"/libplist-2.2.0-pkgconfig-lib.patch )
+
+BUILD_DIR="${S}_build"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local ECONF_SOURCE=${S}
+ local myeconfargs=( $(use_enable static-libs static) )
+
+ do_configure() {
+ mkdir -p "${BUILD_DIR}" || die
+ pushd "${BUILD_DIR}" >/dev/null || die
+ econf "${myeconfargs[@]}" "${@}"
+ popd >/dev/null || die
+ }
+
+ do_configure_python() {
+ local -x PYTHON_LDFLAGS="$(python_get_LIBS)"
+ do_configure "$@"
+ }
+
+ # Don't prefer clang.
+ tc-export CC CXX
+
+ do_configure --without-cython
+ use python && python_foreach_impl do_configure_python
+}
+
+src_compile() {
+ #
+ ln -s "${native_builddir}/src/libplist-2.0.la" "${native_builddir}/src/libplist.la"
+ python_compile() {
+ emake -C "${BUILD_DIR}"/cython \
+ VPATH="${S}/cython:${native_builddir}/cython" \
+ plist_la_LIBADD="${native_builddir}/src/libplist-2.0.la"
+ }
+
+ local native_builddir=${BUILD_DIR}
+ pushd "${BUILD_DIR}" >/dev/null || die
+ emake
+ use python && python_foreach_impl python_compile
+ popd >/dev/null || die
+}
+
+src_test() {
+ emake -C "${BUILD_DIR}" check
+}
+
+src_install() {
+ python_install() {
+ emake -C "${BUILD_DIR}/cython" \
+ VPATH="${S}/cython:${native_builddir}/cython" \
+ DESTDIR="${D}" install
+ }
+
+ local native_builddir=${BUILD_DIR}
+ pushd "${BUILD_DIR}" >/dev/null || die
+ emake DESTDIR="${D}" install
+ use python && python_foreach_impl python_install
+ popd >/dev/null || die
+
+ einstalldocs
+
+ if use python ; then
+ insinto /usr/include/plist/cython
+ doins cython/plist.pxd
+ fi
+
+ find "${D}" -name '*.la' -delete || die
+
+ # temporary fix for 2.2.0 release:
+ # b.g.o 733082,
+ # https://github.com/libimobiledevice/libplist/issues/163
+ # upstream commit 137716df3f197a7184c1fba88fcb30480dafd6e0
+ dosym ./libplist-2.0.pc /usr/$(get_libdir)/pkgconfig/libplist.pc
+ dosym ./libplist++-2.0.so.3.3.0 /usr/$(get_libdir)/libplist++.so
+ dosym ./libplist-2.0.so.3.3.0 /usr/$(get_libdir)/libplist.so
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-pda/libplist/files/, app-pda/libplist/
@ 2020-08-13 8:07 Jeroen Roovers
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2020-08-13 8:07 UTC (permalink / raw
To: gentoo-commits
commit: 04014b1e2768aa4d0747c44b7a0c0b473f5a4e04
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 13 07:58:56 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Aug 13 08:06:58 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04014b1e
app-pda/libplist: Simplify configure test for fmin
https://github.com/libimobiledevice/libplist/pull/168
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Bug: https://bugs.gentoo.org/736866
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
app-pda/libplist/files/libplist-2.2.0-fmin.patch | 34 ++++++++++++++++++++++
.../files/libplist-2.2.0-pkgconfig-lib.patch | 5 ++--
app-pda/libplist/libplist-2.2.0-r2.ebuild | 5 +++-
3 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/app-pda/libplist/files/libplist-2.2.0-fmin.patch b/app-pda/libplist/files/libplist-2.2.0-fmin.patch
new file mode 100644
index 00000000000..7b9bdc35326
--- /dev/null
+++ b/app-pda/libplist/files/libplist-2.2.0-fmin.patch
@@ -0,0 +1,34 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -79,19 +79,7 @@
+ esac
+ AM_CONDITIONAL(WIN32, test x$win32 = xtrue)
+
+-# Check if we need libm for fmin
+-CACHED_CFLAGS="$CFLAGS"
+-CFLAGS="-O0"
+-AC_CACHE_CHECK(if fmin is a builtin function, ac_cv_fmin_builtin,
+- AC_TRY_LINK([
+- #include <math.h>
+- #include <float.h>
+- ], [
+- double val = 3.1415f * 0.55555f;
+- double diff = fmin(val, DBL_MAX);
+- if (diff > 0) return 1;
+- ], ac_cv_fmin_builtin=yes, ac_cv_fmin_builtin=no))
+-CFLAGS="$CACHED_CFLAGS"
++AC_SEARCH_LIBS([fmin],[m])
+
+ # Check if struct tm has a tm_gmtoff member
+ AC_CACHE_CHECK(for tm_gmtoff in struct tm, ac_cv_struct_tm_gmtoff,
+@@ -153,10 +141,6 @@
+ AS_COMPILER_FLAGS(GLOBAL_CFLAGS, "-Wall -Wextra -Wredundant-decls -Wshadow -Wpointer-arith -Wwrite-strings -Wswitch-default -Wno-unused-parameter -Wno-strict-aliasing -fvisibility=hidden $PTHREAD_CFLAGS")
+ GLOBAL_LDFLAGS="$PTHREAD_LIBS"
+
+-if test "x$ac_cv_fmin_builtin" != "xyes"; then
+- GLOBAL_LDFLAGS+=" -lm"
+-fi
+-
+ AC_ARG_ENABLE(debug,
+ AS_HELP_STRING([--enable-debug],
+ [build debug message output code (default is no)]),
diff --git a/app-pda/libplist/files/libplist-2.2.0-pkgconfig-lib.patch b/app-pda/libplist/files/libplist-2.2.0-pkgconfig-lib.patch
index 30ef6779886..2a57d06074a 100644
--- a/app-pda/libplist/files/libplist-2.2.0-pkgconfig-lib.patch
+++ b/app-pda/libplist/files/libplist-2.2.0-pkgconfig-lib.patch
@@ -1,6 +1,5 @@
-diff -Naur libplist/src/libplist-2.0.pc.in libplist-pcfile/src/libplist-2.0.pc.in
---- libplist/src/libplist-2.0.pc.in 2020-07-18 17:25:52.156222244 +0300
-+++ libplist-pcfile/src/libplist-2.0.pc.in 2020-07-18 17:26:32.752017958 +0300
+--- a/src/libplist-2.0.pc.in
++++ b/src/libplist-2.0.pc.in
@@ -6,5 +6,5 @@
Name: @PACKAGE_NAME@
Description: A library to handle Apple Property Lists whereas they are binary or XML
diff --git a/app-pda/libplist/libplist-2.2.0-r2.ebuild b/app-pda/libplist/libplist-2.2.0-r2.ebuild
index d7ac5a7b4a3..31d8621f1ce 100644
--- a/app-pda/libplist/libplist-2.2.0-r2.ebuild
+++ b/app-pda/libplist/libplist-2.2.0-r2.ebuild
@@ -26,7 +26,10 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
DOCS=( AUTHORS NEWS README.md )
-PATCHES=( "${FILESDIR}"/libplist-2.2.0-pkgconfig-lib.patch )
+PATCHES=(
+ "${FILESDIR}"/libplist-2.2.0-fmin.patch
+ "${FILESDIR}"/libplist-2.2.0-pkgconfig-lib.patch
+)
BUILD_DIR="${S}_build"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-pda/libplist/files/, app-pda/libplist/
@ 2024-09-08 12:05 Petr Vaněk
0 siblings, 0 replies; 3+ messages in thread
From: Petr Vaněk @ 2024-09-08 12:05 UTC (permalink / raw
To: gentoo-commits
commit: b1fa737716da88b0139b3608cc59d157afd561cd
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 8 12:01:22 2024 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Sun Sep 8 12:05:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1fa7377
app-pda/libplist: drop 2.2.0-r4
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
app-pda/libplist/Manifest | 1 -
app-pda/libplist/files/libplist-2.2.0-fmin.patch | 34 ------
.../files/libplist-2.2.0-strict-aliasing.patch | 32 ------
app-pda/libplist/libplist-2.2.0-r4.ebuild | 114 ---------------------
4 files changed, 181 deletions(-)
diff --git a/app-pda/libplist/Manifest b/app-pda/libplist/Manifest
index 291b0e743b2a..1ac9f02b1f69 100644
--- a/app-pda/libplist/Manifest
+++ b/app-pda/libplist/Manifest
@@ -1,3 +1,2 @@
-DIST libplist-2.2.0.tar.xz 102932 BLAKE2B cca3099d5a2230feb67fd4d54777f2c3d0a083b811d2b7e3365399d2c2d2fff922a3c9f4924400810b71d92668779ede663c9ed2cebc8acd6f3b2c6e09285d90 SHA512 913a8d05239496d8e8e458e1cb974813d8b5ca013df9e0fddb97b1da6006c300f6ba2be2f3826fd157c0ae4ff2d003ecfdc55e2401884be26360ffe0ebdabd79
DIST libplist-2.3.0.tar.xz 123876 BLAKE2B 2e5555eeeed5a7572fcdb98e537af842af1d056bb5fe42ae83b7e71e1a57535ee388fc263c9b7a495feccbe5d2d7c53c89987fb0a81573fe3f5ac9f884144cf7 SHA512 ce86f066ea03d86b3a6dcca5905044e93af46164ab55be167f7804926b7e28c3383a024903986fb273b8c40b07b749f5431048ce76e550674f83388d6cff7542
DIST libplist-2.6.0.tar.bz2 493169 BLAKE2B d022b64a02e30fe7d5f2937e8b6743b0af8f30cf2012e2c19da9f10366200d25968b11a401a62697ce46eb71d08111104115a993e2f578c36e19ccd42d9eb627 SHA512 67b9ef7c1cf1edd9e0a13462cc21a42dba6bb1ff4465edd56c5d4251e4063e71eb8839ed9952ffb8cdab9cd69ebb4ef46e5f804d3a2b4e44b4e04f6c571398a4
diff --git a/app-pda/libplist/files/libplist-2.2.0-fmin.patch b/app-pda/libplist/files/libplist-2.2.0-fmin.patch
deleted file mode 100644
index 7b9bdc353268..000000000000
--- a/app-pda/libplist/files/libplist-2.2.0-fmin.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -79,19 +79,7 @@
- esac
- AM_CONDITIONAL(WIN32, test x$win32 = xtrue)
-
--# Check if we need libm for fmin
--CACHED_CFLAGS="$CFLAGS"
--CFLAGS="-O0"
--AC_CACHE_CHECK(if fmin is a builtin function, ac_cv_fmin_builtin,
-- AC_TRY_LINK([
-- #include <math.h>
-- #include <float.h>
-- ], [
-- double val = 3.1415f * 0.55555f;
-- double diff = fmin(val, DBL_MAX);
-- if (diff > 0) return 1;
-- ], ac_cv_fmin_builtin=yes, ac_cv_fmin_builtin=no))
--CFLAGS="$CACHED_CFLAGS"
-+AC_SEARCH_LIBS([fmin],[m])
-
- # Check if struct tm has a tm_gmtoff member
- AC_CACHE_CHECK(for tm_gmtoff in struct tm, ac_cv_struct_tm_gmtoff,
-@@ -153,10 +141,6 @@
- AS_COMPILER_FLAGS(GLOBAL_CFLAGS, "-Wall -Wextra -Wredundant-decls -Wshadow -Wpointer-arith -Wwrite-strings -Wswitch-default -Wno-unused-parameter -Wno-strict-aliasing -fvisibility=hidden $PTHREAD_CFLAGS")
- GLOBAL_LDFLAGS="$PTHREAD_LIBS"
-
--if test "x$ac_cv_fmin_builtin" != "xyes"; then
-- GLOBAL_LDFLAGS+=" -lm"
--fi
--
- AC_ARG_ENABLE(debug,
- AS_HELP_STRING([--enable-debug],
- [build debug message output code (default is no)]),
diff --git a/app-pda/libplist/files/libplist-2.2.0-strict-aliasing.patch b/app-pda/libplist/files/libplist-2.2.0-strict-aliasing.patch
deleted file mode 100644
index 2771a9f08a69..000000000000
--- a/app-pda/libplist/files/libplist-2.2.0-strict-aliasing.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://bugs.gentoo.org/854837
-https://github.com/libimobiledevice/libplist/pull/212
---- a/src/bplist.c
-+++ b/src/bplist.c
-@@ -998,18 +998,24 @@ static void write_real(bytearray_t * bplist, double val)
- buff[7] = BPLIST_REAL | Log2(size);
- if (size == sizeof(float)) {
- float floatval = (float)val;
-- *(uint32_t*)(buff+8) = float_bswap32(*(uint32_t*)&floatval);
-+ uint32_t intval;
-+ memcpy(&intval, &floatval, sizeof(float));
-+ *(uint32_t*)(buff+8) = float_bswap32(intval);
- } else {
-- *(uint64_t*)(buff+8) = float_bswap64(*(uint64_t*)&val);
-+ uint64_t intval;
-+ memcpy(&intval, &val, sizeof(double));
-+ *(uint64_t*)(buff+8) = float_bswap64(intval);
- }
- byte_array_append(bplist, buff+7, size+1);
- }
-
- static void write_date(bytearray_t * bplist, double val)
- {
-+ uint64_t intval;
-+ memcpy(&intval, &val, sizeof(double));
- uint8_t buff[16];
- buff[7] = BPLIST_DATE | 3;
-- *(uint64_t*)(buff+8) = float_bswap64(*(uint64_t*)&val);
-+ *(uint64_t*)(buff+8) = float_bswap64(intval);
- byte_array_append(bplist, buff+7, 9);
- }
-
diff --git a/app-pda/libplist/libplist-2.2.0-r4.ebuild b/app-pda/libplist/libplist-2.2.0-r4.ebuild
deleted file mode 100644
index d1180010c230..000000000000
--- a/app-pda/libplist/libplist-2.2.0-r4.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit autotools python-r1 toolchain-funcs
-
-DESCRIPTION="Support library to deal with Apple Property Lists (Binary & XML)"
-HOMEPAGE="https://www.libimobiledevice.org/"
-SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/2.0-3"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ~ppc64 ~riscv x86"
-IUSE="python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
- python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )
-"
-
-DOCS=( AUTHORS NEWS README.md )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.2.0-fmin.patch
- "${FILESDIR}"/${PN}-2.2.0-pkgconfig-lib.patch
- "${FILESDIR}"/${PN}-2.2.0-strict-aliasing.patch # bug 854837
-)
-
-BUILD_DIR="${S}_build"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local ECONF_SOURCE="${S}"
-
- do_configure() {
- mkdir -p "${BUILD_DIR}" || die
- pushd "${BUILD_DIR}" >/dev/null || die
- econf --disable-static "${@}"
- popd >/dev/null || die
- }
-
- do_configure_python() {
- local -x PYTHON_LDFLAGS="$(python_get_LIBS)"
- do_configure "$@"
- }
-
- # Don't prefer clang.
- tc-export CC CXX
-
- do_configure --without-cython
- use python && python_foreach_impl do_configure_python
-}
-
-src_compile() {
- local native_builddir=${BUILD_DIR}
- ln -s "${native_builddir}/src/libplist-2.0.la" \
- "${native_builddir}/src/libplist.la" || die
-
- python_compile() {
- emake -C "${BUILD_DIR}"/cython \
- VPATH="${S}/cython:${native_builddir}/cython" \
- plist_la_LIBADD="${native_builddir}/src/libplist-2.0.la"
- }
-
- pushd "${BUILD_DIR}" >/dev/null || die
- emake
- use python && python_foreach_impl python_compile
- popd >/dev/null || die
-}
-
-src_test() {
- emake -C "${BUILD_DIR}" check
-}
-
-src_install() {
- python_install() {
- emake -C "${BUILD_DIR}/cython" \
- VPATH="${S}/cython:${native_builddir}/cython" \
- DESTDIR="${D}" install
- }
-
- local native_builddir=${BUILD_DIR}
- pushd "${BUILD_DIR}" >/dev/null || die
- emake DESTDIR="${D}" install
- use python && python_foreach_impl python_install
- popd >/dev/null || die
-
- einstalldocs
-
- if use python ; then
- insinto /usr/include/plist/cython
- doins cython/plist.pxd
- fi
-
- find "${ED}" -name '*.la' -delete || die
-
- # temporary fix for 2.2.0 release:
- # bug #733082,
- # https://github.com/libimobiledevice/libplist/issues/163
- # upstream commit 137716df3f197a7184c1fba88fcb30480dafd6e0
- dosym ./libplist-2.0.pc /usr/$(get_libdir)/pkgconfig/libplist.pc
- dosym ./libplist++-2.0.so.3.3.0 /usr/$(get_libdir)/libplist++.so
- dosym ./libplist-2.0.so.3.3.0 /usr/$(get_libdir)/libplist.so
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-09-08 12:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-08 12:05 [gentoo-commits] repo/gentoo:master commit in: app-pda/libplist/files/, app-pda/libplist/ Petr Vaněk
-- strict thread matches above, loose matches on Subject: below --
2020-08-13 8:07 Jeroen Roovers
2020-07-18 14:51 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox