* [gentoo-commits] repo/gentoo:master commit in: dev-libs/totem-pl-parser/files/, dev-libs/totem-pl-parser/
@ 2019-05-18 19:59 Mart Raudsepp
0 siblings, 0 replies; 2+ messages in thread
From: Mart Raudsepp @ 2019-05-18 19:59 UTC (permalink / raw
To: gentoo-commits
commit: 9c563cbf9607ceb0d392ff2c20d7260647594377
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat May 18 19:50:07 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat May 18 19:58:49 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c563cbf
dev-libs/totem-pl-parser: remove old
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
dev-libs/totem-pl-parser/Manifest | 1 -
.../totem-pl-parser-3.10.8-gmime-automagic.patch | 98 ----------------------
.../totem-pl-parser/totem-pl-parser-3.10.8.ebuild | 75 -----------------
3 files changed, 174 deletions(-)
diff --git a/dev-libs/totem-pl-parser/Manifest b/dev-libs/totem-pl-parser/Manifest
index b932f3e159e..592dd0eb75b 100644
--- a/dev-libs/totem-pl-parser/Manifest
+++ b/dev-libs/totem-pl-parser/Manifest
@@ -1,2 +1 @@
-DIST totem-pl-parser-3.10.8.tar.xz 1618992 BLAKE2B ab7dc3010afb9a2112f19991ee74c43436962a66fa233162b2d2c6743e5727762102f6f0bfed2a30750c0d4e3cf0fbfdb7fdab8568b0cb827e49d0f99a938c41 SHA512 1692fe6d183838bdfb9125ae2bf9fbf74762333a7ebb6becc755bfdbfb8d2ea1ae257f42aab7b7a1ab419aee2b35902176a731f26736a62015806d1423adae70
DIST totem-pl-parser-3.26.3.tar.xz 1314216 BLAKE2B 24b1c7e111456b454022ba7262a1e1483420dbd97b6ec99c0e2631acbb8057134b51ff991d2619e6bda57da6c133e211f949915b0fd62d497905fcd58738b43d SHA512 f059fd9447627268ce5029ed48551b0a2b6c30ba28c50a360d37808ad63fa8423824eef29c7f4d7a752f24861d4c7a7139f321fa2e19085085446e7ed15130cd
diff --git a/dev-libs/totem-pl-parser/files/totem-pl-parser-3.10.8-gmime-automagic.patch b/dev-libs/totem-pl-parser/files/totem-pl-parser-3.10.8-gmime-automagic.patch
deleted file mode 100644
index 19ab82960fd..00000000000
--- a/dev-libs/totem-pl-parser/files/totem-pl-parser-3.10.8-gmime-automagic.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From b2e7a0b5db67dd276b09a151cf8a4aa3b58409fb Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 13 Aug 2017 11:28:19 +0200
-Subject: [PATCH] Allow selecting specific gmime version
-
----
- configure.ac | 69 ++++++++++++++++++++++++++++++------------------------------
- 1 file changed, 34 insertions(+), 35 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index dda59f7..f92bbf5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -74,47 +74,46 @@ pkg_modules="glib-2.0 >= $GLIB_REQS libxml-2.0 gthread-2.0 gio-2.0 >= $GIO_REQS
- ##################################
- # Checking libgmime dependency
- ##################################
-+GMIME=""
- gmime_message=""
-
--AC_ARG_ENABLE(gmime-i-know-what-im-doing,
-- AS_HELP_STRING([--disable-gmime-i-know-what-im-doing],
-- [Disable libgmime (Unsupported, breaks Podcast support).]),
-- [enable_gmime=no],
-- [enable_gmime=yes])
--
--if test "x$enable_gmime" = "xyes" ; then
-- have_gmime3=no
-- PKG_CHECK_MODULES(GMIME,
-- gmime-3.0,
-- [have_gmime=yes have_gmime3=yes GMIME=gmime-3.0],
-- [have_gmime=no])
--
-- if test "x$have_gmime" = "xno" ; then
-- PKG_CHECK_MODULES(GMIME,
-- gmime-2.6,
-- [have_gmime=yes GMIME=gmime-2.6],
-- [have_gmime=no])
-- fi
--
-- if test "x$have_gmime" = "xyes" ; then
-- AC_SUBST(GMIME, $GMIME)
-- AC_SUBST(USEGMIME, yes)
-- AC_DEFINE(HAVE_GMIME, 1, [GMime available in the system])
-- if test "x$have_gmime3" = xyes ; then
-- AC_DEFINE(HAVE_GMIME3, 1, [GMime 3.0 available in the system])
-- fi
-- pkg_modules="$pkg_modules $GMIME"
-- else
-- AC_MSG_ERROR([libgmime is required to compile totem-pl-parser.])
-- fi
--else
-- AC_SUBST(USEGMIME, no)
-- gmime_message="
-+AC_ARG_ENABLE(gmime,
-+ AS_HELP_STRING([--enable-gmime=2.6|3.0|auto|no],
-+ [Which gmime version to compile against. Disabling libgmime is unsupported and breaks Podcast support.]),
-+ [],
-+ [enable_gmime=auto])
-+
-+AS_IF([test "x$enable_gmime" = "x2.6"],
-+ [PKG_CHECK_MODULES(GMIME, [gmime-2.6], [GMIME=gmime-2.6])],
-+ [test "x$enable_gmime" = "x3.0"],
-+ [PKG_CHECK_MODULES(GMIME, [gmime-3.0], [GMIME=gmime-3.0])],
-+ [test "x$enable_gmime" = "xauto" -o "x$enable_gmime" = "xyes"],
-+ [PKG_CHECK_MODULES(GMIME, [gmime-3.0],
-+ [GMIME=gmime-3.0],
-+ [PKG_CHECK_MODULES(GMIME, [gmime-2.6], [GMIME=gmime-2.6])])],
-+ [test "x$enable_gmime" = "xno"],
-+ [],
-+ # else
-+ [AC_MSG_ERROR([invalid gmime version specified])]
-+)
-+
-+AS_IF([test "x$enable_gmime" = "xno"],
-+ [
-+ AC_SUBST(USEGMIME, no)
-+ gmime_message="
- **************************************************************
- Compiling totem-pl-parser without libgmime.
- This will break podcast support and is completely unsupported.
- **************************************************************"
--fi
-+ ], [
-+ AC_SUBST(GMIME, $GMIME)
-+ AC_SUBST(USEGMIME, yes)
-+ AC_DEFINE(HAVE_GMIME, 1, [GMime available in the system])
-+ AS_IF([test "$xGMIME" = "xgmime-3.0"],
-+ [AC_DEFINE(HAVE_GMIME3, 1, [GMime 3.0 available in the system])])
-+ pkg_modules="$pkg_modules $GMIME"
-+ ]
-+)
-
- ##################################
- # Checking quvi dependency
---
-2.14.0
-
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.10.8.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.10.8.ebuild
deleted file mode 100644
index 3ae67778266..00000000000
--- a/dev-libs/totem-pl-parser/totem-pl-parser-3.10.8.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-inherit gnome2
-
-DESCRIPTION="Playlist parsing library"
-HOMEPAGE="https://developer.gnome.org/totem-pl-parser/stable/"
-
-LICENSE="LGPL-2+"
-SLOT="0/18"
-IUSE="archive crypt +introspection +quvi test"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-RDEPEND="
- >=dev-libs/glib-2.36:2
- dev-libs/gmime:2.6
- >=net-libs/libsoup-2.43:2.4
- archive? ( >=app-arch/libarchive-3 )
- crypt? ( dev-libs/libgcrypt:0= )
- introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
- quvi? ( >=media-libs/libquvi-0.9.1:0= )
-"
-DEPEND="${RDEPEND}
- !<media-video/totem-2.21
- dev-libs/gobject-introspection-common
- >=dev-util/intltool-0.35
- dev-util/glib-utils
- >=dev-util/gtk-doc-am-1.14
- sys-devel/autoconf-archive
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- test? (
- gnome-base/gvfs[http]
- sys-apps/dbus )
-"
-# eautoreconf needs:
-# dev-libs/gobject-introspection-common
-# sys-devel/autoconf-archive
-
-PATCHES=(
- # Fix gmime slot automagic, https://bugzilla.gnome.org/786231
- "${FILESDIR}"/${P}-gmime-automagic.patch
-)
-
-src_prepare() {
- # Disable tests requiring network access, bug #346127
- # 3rd test fails on upgrade, not once installed
- sed -e 's:\(g_test_add_func.*/parser/resolution.*\):/*\1*/:' \
- -e 's:\(g_test_add_func.*/parser/parsing/itms_link.*\):/*\1*/:' \
- -e 's:\(g_test_add_func.*/parser/parsability.*\):/*\1/:'\
- -i plparse/tests/parser.c || die "sed failed"
-
- gnome2_src_prepare
-}
-
-src_configure() {
- # uninstalled-tests is abused to switch from loading live FS helper
- # to in-build-tree helper, check on upgrades this is not having other
- # consequences, bug #630242
- gnome2_src_configure \
- --disable-static \
- --enable-gmime=2.6 \
- --enable-uninstalled-tests \
- $(use_enable archive libarchive) \
- $(use_enable crypt libgcrypt) \
- $(use_enable quvi) \
- $(use_enable introspection)
-}
-
-src_test() {
- # This is required as told by upstream in bgo#629542
- GVFS_DISABLE_FUSE=1 dbus-run-session emake check
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/totem-pl-parser/files/, dev-libs/totem-pl-parser/
@ 2024-01-05 6:42 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2024-01-05 6:42 UTC (permalink / raw
To: gentoo-commits
commit: 923df97147be73deedf7c2afaaa8fccb89d8ecab
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 5 06:26:23 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 5 06:26:23 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=923df971
dev-libs/totem-pl-parser: fix modern C issue
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/totem-pl-parser/files/3.26.6-c99.patch | 22 +++++++
.../totem-pl-parser-3.26.6-r1.ebuild | 73 ++++++++++++++++++++++
2 files changed, 95 insertions(+)
diff --git a/dev-libs/totem-pl-parser/files/3.26.6-c99.patch b/dev-libs/totem-pl-parser/files/3.26.6-c99.patch
new file mode 100644
index 000000000000..a991b8ae41c0
--- /dev/null
+++ b/dev-libs/totem-pl-parser/files/3.26.6-c99.patch
@@ -0,0 +1,22 @@
+https://gitlab.gnome.org/GNOME/totem-pl-parser/-/merge_requests/53
+
+From e718dd1fe2476e2a68da4b632f268f404ea951f2 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Wed, 3 Jan 2024 13:24:31 +0100
+Subject: [PATCH] Return FALSE instead of NULL, to match the gboolean return
+ type
+
+Fixes a C type error and compilation error with GCC 14 and Clang.
+--- a/plparse/totem-pl-parser.c
++++ b/plparse/totem-pl-parser.c
+@@ -1338,7 +1338,7 @@ totem_pl_parser_save_finish (TotemPlParser *parser,
+ GAsyncResult *async_result,
+ GError **error)
+ {
+- g_return_val_if_fail (g_task_is_valid (async_result, parser), NULL);
++ g_return_val_if_fail (g_task_is_valid (async_result, parser), FALSE);
+
+ return g_task_propagate_boolean (G_TASK (async_result), error);
+ }
+--
+GitLab
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.6-r1.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.6-r1.ebuild
new file mode 100644
index 000000000000..ff7a94ed5c57
--- /dev/null
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.6-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org meson xdg
+
+DESCRIPTION="Playlist parsing library"
+HOMEPAGE="https://developer.gnome.org/totem-pl-parser/stable/"
+
+LICENSE="LGPL-2+"
+SLOT="0/18"
+IUSE="archive crypt gtk-doc +introspection test +uchardet"
+RESTRICT="!test? ( test )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+ >=dev-libs/glib-2.56:2
+ archive? ( >=app-arch/libarchive-3:0= )
+ dev-libs/libxml2:2
+ crypt? ( dev-libs/libgcrypt:0= )
+ uchardet? ( app-i18n/uchardet )
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/glib-utils
+ gtk-doc? (
+ >=dev-util/gtk-doc-1.14
+ app-text/docbook-xml-dtd:4.3
+ )
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ test? (
+ gnome-base/gvfs[http]
+ sys-apps/dbus
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PV}-plparser-Fix-uninitialized-variable-error.patch
+ "${FILESDIR}"/${PV}-c99.patch
+)
+
+src_prepare() {
+ # Disable tests requiring network access, bug #346127
+ # 3rd test fails on upgrade, not once installed
+ # Leio: I consider network tests important for ensuring full functionality, thus trying with them again */
+ #sed -e 's:\(g_test_add_func.*/parser/resolution.*\):/*\1*/:' \
+ # -e 's:\(g_test_add_func.*/parser/parsing/itms_link.*\):/*\1*/:' \
+ # -e 's:\(g_test_add_func.*/parser/parsability.*\):/*\1*/:'\
+ # -i plparse/tests/parser.c || die "sed failed"
+
+ xdg_src_prepare
+}
+
+src_configure() {
+ # uninstalled-tests is abused to switch from loading live FS helper
+ # to in-build-tree helper, check on upgrades this is not having other
+ # consequences, bug #630242
+ local emesonargs=(
+ -Denable-libarchive=$(usex archive)
+ -Denable-libgcrypt=$(usex crypt)
+ -Denable-uchardet=$(usex uchardet)
+ $(meson_use gtk-doc enable-gtk-doc)
+ $(meson_use introspection)
+ )
+ meson_src_configure
+}
+
+src_test() {
+ # This is required as told by upstream in bgo#629542
+ GVFS_DISABLE_FUSE=1 dbus-run-session meson test -C "${BUILD_DIR}"
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-01-05 6:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-18 19:59 [gentoo-commits] repo/gentoo:master commit in: dev-libs/totem-pl-parser/files/, dev-libs/totem-pl-parser/ Mart Raudsepp
-- strict thread matches above, loose matches on Subject: below --
2024-01-05 6:42 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox