mirror of
https://github.com/dguglielmi/sunny-overlay.git
synced 2025-12-06 16:02:39 +01:00
- Bump grilo, grilo-plugins, gom and slot libmediaart.
This commit is contained in:
2
dev-libs/gom/Manifest
Normal file
2
dev-libs/gom/Manifest
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
DIST gom-0.3.1.tar.xz 385836 SHA256 7951eb46ee784cbdbee6e3f2da084ffbf776c11ca1c904404b05feafe37e38f5 SHA512 7596b7be0de6f10ef1fbe8a278d917c07ecc714e9af24f2b61a7d871c6a1b1cf19ea92d5b4fbf7802c9c097dc2ae7a65ac47b8ca8f6689b49a3e4930cff6d54c WHIRLPOOL 9fa3a42411e3892a3648f31614462d43b5a4f52a166e5edd80e97741427a9444c39d2200a4ce1ac3e1e87d3b3e974b9dad6f11ee252ba3d10fa1d63b00a09bde
|
||||||
|
EBUILD gom-0.3.1.ebuild 841 SHA256 f14218aa2f7e67346e7985a538dd7b772f8dc400e9ca7b83fb9d134e43915811 SHA512 1e66ffcb733ebfd4ee39c8bfe522c7de6e62a3f9ca8378d4487158ab7c838a8b8743d1a7fa0adc8039e3ae061e93ffa17423498476a91b3d6a80e897441bc7f8 WHIRLPOOL e4e941b1f8f8ce3bbe6160251023374899b5d0b82dc506af38cb7b4610f8a88fea8764c500f578deebcd15bf68e7876687259b86b3d8925da99ed34ff5804b93
|
||||||
37
dev-libs/gom/gom-0.3.1.ebuild
Normal file
37
dev-libs/gom/gom-0.3.1.ebuild
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
# Copyright 1999-2015 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/dev-libs/gom/gom-0.3.0.ebuild,v 1.5 2015/04/11 10:15:38 pacho Exp $
|
||||||
|
|
||||||
|
EAPI="5"
|
||||||
|
GCONF_DEBUG="yes"
|
||||||
|
|
||||||
|
inherit gnome2
|
||||||
|
|
||||||
|
DESCRIPTION="GObject to SQLite object mapper library"
|
||||||
|
HOMEPAGE="https://wiki.gnome.org/Projects/Gom"
|
||||||
|
|
||||||
|
LICENSE="LGPL-2+"
|
||||||
|
SLOT="0"
|
||||||
|
|
||||||
|
IUSE="+introspection test"
|
||||||
|
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
|
||||||
|
|
||||||
|
RDEPEND="
|
||||||
|
>=dev-db/sqlite-3.7:3
|
||||||
|
>=dev-libs/glib-2.36:2
|
||||||
|
introspection? ( >=dev-libs/gobject-introspection-1.30.0 )
|
||||||
|
"
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
>=dev-util/gtk-doc-am-1.14
|
||||||
|
>=dev-util/intltool-0.40.0
|
||||||
|
sys-devel/gettext
|
||||||
|
virtual/pkgconfig
|
||||||
|
test? ( x11-libs/gdk-pixbuf )
|
||||||
|
"
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
gnome2_src_configure \
|
||||||
|
--disable-static \
|
||||||
|
$(use_enable introspection) \
|
||||||
|
$(use_enable test glibtest)
|
||||||
|
}
|
||||||
2
media-libs/grilo/Manifest
Normal file
2
media-libs/grilo/Manifest
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
DIST grilo-0.2.12.tar.xz 617284 SHA256 55b4663550bc8185f8db232e96b9ba99fbfa9175e31e7321fa5ccaacf3617b85 SHA512 a8102dc66e30676a3fcf2be1c96b4c461b78095c03d7566216bb6c04f875b3be6a305d81464058a11f92dee00e68b2abdcb8d5c5f2a0d95732ac7dbb473820f4 WHIRLPOOL fece087c8003138e9b6a977cb3c9d60dd41364dd6b7cb2efe98efab863e38ea360daf44b90ec7a970810a8b4a980221ef73e8a4606dca8e26e52f36980ba9ffc
|
||||||
|
EBUILD grilo-0.2.12.ebuild 2279 SHA256 7bf4a867401260f327c6937f93ca12c7c6f57405e9f0989791c5a97675948992 SHA512 eb962a610155bbed3c4559384932f48054fd98b4d0ff22bd79659b8559f421c8dc27200da59bbddf177badab2e30c913b48fafe8e61548fe5949e43dcfa41fb4 WHIRLPOOL 0c491473c37653f70dcfef2cf30a6a73a416422ad92494b517d3b5d7e57c20995def19c2547dec59eca35ac856b32e8cb1a8b02cdac5c4d8e5f9b9573f9a973d
|
||||||
87
media-libs/grilo/grilo-0.2.12.ebuild
Normal file
87
media-libs/grilo/grilo-0.2.12.ebuild
Normal file
@@ -0,0 +1,87 @@
|
|||||||
|
# Copyright 1999-2015 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/media-libs/grilo/grilo-0.2.11.ebuild,v 1.4 2015/04/08 17:59:35 mgorny Exp $
|
||||||
|
|
||||||
|
EAPI="5"
|
||||||
|
GCONF_DEBUG="no" # --enable-debug only changes CFLAGS
|
||||||
|
GNOME2_LA_PUNT="yes"
|
||||||
|
PYTHON_COMPAT=( python2_7 )
|
||||||
|
VALA_MIN_API_VERSION="0.12"
|
||||||
|
VALA_USE_DEPEND="vapigen"
|
||||||
|
|
||||||
|
inherit gnome2 python-any-r1 vala
|
||||||
|
|
||||||
|
DESCRIPTION="A framework for easy media discovery and browsing"
|
||||||
|
HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
|
||||||
|
|
||||||
|
LICENSE="LGPL-2.1+"
|
||||||
|
SLOT="0.2/1" # subslot is libgrilo-0.2 soname suffix
|
||||||
|
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||||
|
|
||||||
|
IUSE="gtk examples +introspection +network playlist test vala"
|
||||||
|
REQUIRED_USE="test? ( introspection )"
|
||||||
|
|
||||||
|
RDEPEND="
|
||||||
|
>=dev-libs/glib-2.34:2
|
||||||
|
dev-libs/libxml2:2
|
||||||
|
net-libs/liboauth
|
||||||
|
gtk? ( >=x11-libs/gtk+-3:3 )
|
||||||
|
introspection? ( >=dev-libs/gobject-introspection-0.9 )
|
||||||
|
network? ( >=net-libs/libsoup-2.41.3:2.4 )
|
||||||
|
playlist? ( >=dev-libs/totem-pl-parser-3.4.1 )
|
||||||
|
"
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
>=dev-util/gtk-doc-am-1.10
|
||||||
|
>=dev-util/intltool-0.40
|
||||||
|
virtual/pkgconfig
|
||||||
|
vala? ( $(vala_depend) )
|
||||||
|
test? (
|
||||||
|
$(python_gen_any_dep '
|
||||||
|
dev-python/pygobject:2[${PYTHON_USEDEP}]
|
||||||
|
dev-python/pygobject:3[${PYTHON_USEDEP}]')
|
||||||
|
media-plugins/grilo-plugins:0.2 )
|
||||||
|
"
|
||||||
|
# eautoreconf requires gnome-common
|
||||||
|
|
||||||
|
python_check_deps() {
|
||||||
|
has_version "dev-python/pygobject:2[${PYTHON_USEDEP}]" && \
|
||||||
|
has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_setup() {
|
||||||
|
use test && python-any-r1_pkg_setup
|
||||||
|
}
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
# Don't build examples
|
||||||
|
sed -e '/SUBDIRS/s/examples//' \
|
||||||
|
-i Makefile.am -i Makefile.in || die
|
||||||
|
|
||||||
|
use vala && vala_src_prepare
|
||||||
|
gnome2_src_prepare
|
||||||
|
}
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
# --enable-debug only changes CFLAGS, useless for us
|
||||||
|
gnome2_src_configure \
|
||||||
|
--disable-static \
|
||||||
|
--disable-debug \
|
||||||
|
$(use_enable gtk test-ui) \
|
||||||
|
$(use_enable introspection) \
|
||||||
|
$(use_enable network grl-net) \
|
||||||
|
$(use_enable playlist grl-pls) \
|
||||||
|
$(use_enable test tests) \
|
||||||
|
$(use_enable vala)
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
gnome2_src_install
|
||||||
|
# Upstream made this conditional on gtk-doc build...
|
||||||
|
emake -C doc install DESTDIR="${ED}"
|
||||||
|
|
||||||
|
if use examples; then
|
||||||
|
# Install example code
|
||||||
|
insinto /usr/share/doc/${PF}/examples
|
||||||
|
doins "${S}"/examples/*.c
|
||||||
|
fi
|
||||||
|
}
|
||||||
3
media-libs/libmediaart/Manifest
Normal file
3
media-libs/libmediaart/Manifest
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
AUX libmediaart-qt-version-automagic-fix.patch 1776 SHA256 97f5b5e052e41689147406e6a22de122b1003f90baec7db78ddf204c0a6d6dd9 SHA512 6c9b0b34ad7ac640e8c43657c45793a4fadb1bac0b0a67d2ad01c3cf5db3ef0d07707ae71b57489b83879295f8c15e03a2ff4b5e1dc559b7d5b8882fef28b784 WHIRLPOOL 63257ae08744e9501a8ed00dc7bde86a4d628b1877272142542a394726b121bf422b438c63fb41381b4c0ec21cb0c504d08729a1a45b748e7636c97bd1f11d8a
|
||||||
|
DIST libmediaart-1.9.0.tar.xz 5814844 SHA256 94668adb29d4dc3115b0fd105942ebd5ca6f5f9dbb2afa8a191a73a747dd506f SHA512 fcfdad1d62710a39ea21daf23b13eb0b6d64a521f359153bb79247bae8e91fde3d879f807ed2528f3476425f5214cae755b117b4d06d78ee3af41bcc9a3b3ab4 WHIRLPOOL a78cf905853873d5f778b7ae157b2b260a55e3b07ff59d93fa7f95efb53f2b2adb918bb1a5eecc8a66e6d59ee172e9dea04bbadca4bdc20766d710127b1fef79
|
||||||
|
EBUILD libmediaart-1.9.0.ebuild 1614 SHA256 af03e9a9063f1f069ef027543d2304809f386865e2e6abd1bbeff98fc70e0cbf SHA512 d96127603712d3b501c33a93c28b61825d655b8db707aa9eceecdd290372011e10615401cf9e231690693b20ee0b4e2e3b0f0471cff247411bba57f5ea9c6479 WHIRLPOOL 547b592557caa327d495c31daf2a3338126e1b138027da34b76a2ac2cd7a0cc6f6cf0a587ece6833204925d2acd365dbd835f07f6d03571a5bd5bf1ae76375f5
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
Solves automagic selection of Qt version.
|
||||||
|
|
||||||
|
https://bugs.gentoo.org/show_bug.cgi?id=523122
|
||||||
|
https://bugzilla.gnome.org/show_bug.cgi?id=737174
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index e9ead09..3ee710a 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -206,6 +206,10 @@ AC_ARG_ENABLE(qt,
|
||||||
|
AS_HELP_STRING([--enable-qt],
|
||||||
|
[enable Qt support, (MP3 album art) [[default=auto]]]),,
|
||||||
|
[enable_qt=auto])
|
||||||
|
+AC_ARG_WITH(qt-version,
|
||||||
|
+ AS_HELP_STRING([--with-qt-version=major],
|
||||||
|
+ [Force specific Qt version [[default=auto]]]),,
|
||||||
|
+ [with_qt_version=auto])
|
||||||
|
|
||||||
|
selected_for_media_art="no (disabled)"
|
||||||
|
|
||||||
|
@@ -218,14 +222,18 @@ if test "x$enable_qt" == "xyes" && test "x$enable_gdkpixbuf" == "xyes"; then
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "x$enable_qt" != "xno" && test "x$enable_gdkpixbuf" != "xyes"; then
|
||||||
|
- PKG_CHECK_MODULES(QT5,
|
||||||
|
- [Qt5Gui >= $QT5_REQUIRED],
|
||||||
|
- [have_qt5=yes],
|
||||||
|
- [have_qt5=no])
|
||||||
|
- PKG_CHECK_MODULES(QT4,
|
||||||
|
- [QtGui >= $QT4_REQUIRED],
|
||||||
|
- [have_qt4=yes],
|
||||||
|
- [have_qt4=no])
|
||||||
|
+ if test "x$with_qt_version" == "xauto" || test "x$with_qt_version" == "x5"; then
|
||||||
|
+ PKG_CHECK_MODULES(QT5,
|
||||||
|
+ [Qt5Gui >= $QT5_REQUIRED],
|
||||||
|
+ [have_qt5=yes],
|
||||||
|
+ [have_qt5=no])
|
||||||
|
+ fi
|
||||||
|
+ if test "x$with_qt_version" == "xauto" || test "x$with_qt_version" == "x4"; then
|
||||||
|
+ PKG_CHECK_MODULES(QT4,
|
||||||
|
+ [QtGui >= $QT4_REQUIRED],
|
||||||
|
+ [have_qt4=yes],
|
||||||
|
+ [have_qt4=no])
|
||||||
|
+ fi
|
||||||
|
|
||||||
|
if test "x$have_qt5" = "xyes"; then
|
||||||
|
BACKEND_CFLAGS="$QT5_CFLAGS -fPIC"
|
||||||
67
media-libs/libmediaart/libmediaart-1.9.0.ebuild
Normal file
67
media-libs/libmediaart/libmediaart-1.9.0.ebuild
Normal file
@@ -0,0 +1,67 @@
|
|||||||
|
# Copyright 1999-2015 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediaart/libmediaart-0.7.0.ebuild,v 1.7 2015/03/15 13:28:53 pacho Exp $
|
||||||
|
|
||||||
|
EAPI="5"
|
||||||
|
GCONF_DEBUG="no"
|
||||||
|
VALA_USE_DEPEND="vapigen"
|
||||||
|
VALA_MIN_API_VERSION="0.16"
|
||||||
|
|
||||||
|
inherit autotools gnome2 vala virtualx
|
||||||
|
|
||||||
|
DESCRIPTION="Manages, extracts and handles media art caches"
|
||||||
|
HOMEPAGE="https://github.com/GNOME/libmediaart"
|
||||||
|
|
||||||
|
LICENSE="LGPL-2.1+"
|
||||||
|
SLOT="2.0"
|
||||||
|
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ppc ppc64 ~sparc ~x86"
|
||||||
|
IUSE="gtk +introspection qt4 qt5 vala"
|
||||||
|
REQUIRED_USE="
|
||||||
|
?? ( gtk qt4 qt5 )
|
||||||
|
vala? ( introspection )
|
||||||
|
"
|
||||||
|
|
||||||
|
RDEPEND="
|
||||||
|
>=dev-libs/glib-2.38.0:2
|
||||||
|
gtk? ( >=x11-libs/gdk-pixbuf-2.12:2 )
|
||||||
|
introspection? ( >=dev-libs/gobject-introspection-1.30 )
|
||||||
|
qt4? ( dev-qt/qtgui:4 )
|
||||||
|
qt5? ( dev-qt/qtgui:5 )
|
||||||
|
"
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
>=dev-util/gtk-doc-am-1.8
|
||||||
|
virtual/pkgconfig
|
||||||
|
vala? ( $(vala_depend) )
|
||||||
|
"
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
|
||||||
|
sed -i 's#DOC_MODULE=libmediaart#DOC_MODULE=libmediaart2#1' ${S}/docs/reference/libmediaart/Makefile.am
|
||||||
|
|
||||||
|
use vala && vala_src_prepare
|
||||||
|
epatch "${FILESDIR}/${PN}-qt-version-automagic-fix.patch" #523122
|
||||||
|
eautoreconf
|
||||||
|
gnome2_src_prepare
|
||||||
|
}
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
local myconf=""
|
||||||
|
if use qt4 ; then
|
||||||
|
myconf="${myconf} --enable-qt --with-qt-version=4"
|
||||||
|
elif use qt5 ; then
|
||||||
|
myconf="${myconf} --enable-qt --with-qt-version=5"
|
||||||
|
else
|
||||||
|
myconf="${myconf} --disable-qt"
|
||||||
|
fi
|
||||||
|
|
||||||
|
gnome2_src_configure \
|
||||||
|
--enable-unit-tests \
|
||||||
|
$(use_enable gtk gdkpixbuf) \
|
||||||
|
$(use_enable introspection) \
|
||||||
|
$(use_enable vala) \
|
||||||
|
${myconf}
|
||||||
|
}
|
||||||
|
|
||||||
|
src_test() {
|
||||||
|
dbus-launch Xemake check #513502
|
||||||
|
}
|
||||||
@@ -1,6 +1,2 @@
|
|||||||
AUX grilo-plugins-0.2.13-0001-fix-thumbnail-url-not-getting-saved.patch 951 SHA256 2dcef59792923b7d7bc38a15663d1aec5422b3a0aac997cf529dad8847f2d5ad SHA512 738ddaded6dd3c94afb8e264e3db74705e33bc77ce23d55c92ccbb04fddaa5c381da7c91e5ebc64031b59625c39351d3dc7f61c25e968df1766703aa699a454b WHIRLPOOL 3a907899d9087e5c86ab4ebb3539217d426b9ac2e55f864173932c5e214a4bd9d1fb16d840e237a68d197d336fab0d4b4c767497b07b86ef75cb8fcbb5e49551
|
DIST grilo-plugins-0.2.14.tar.xz 1036824 SHA256 d0f18116675058c7e8c178b1fe26d6d73998a0452f85a73b1696df740c83d3ab SHA512 d4caddb5a710f19365d1d9e890b1d525b96e78cf2228a886f1b2c66e60601c2bef61791007d0d9cc8d3b306aac3065c0ff618ef522c7971885c95ca2e365c69b WHIRLPOOL 40899069c626a4183a9cf2afe94f8290dd39bd0bed8475b5d0732d3aa2521eb6fb6f275fba38d47b0614a9e16501f63ee0c5180dd88082ceb14bff0867f7cfe5
|
||||||
AUX grilo-plugins-0.2.13-0002-fix-updating-bookmarks.patch 2564 SHA256 37df6f0b71fe7568f0e1d70c3f7255fc8ec1a01fdce2a5b8ee56b99570009c36 SHA512 3aee7600233a0121eaa6374fb1c6d0cf392a389556adcb552b48e1b0c2c057faccb8af530a34f6f4b9eb9a78596ab7b13b1684f65600390a791a5d813b2267e1 WHIRLPOOL ff094806beaa1f872970c2f8b4eaa4b9f7f39a84706ca717895db4a156e32d88ea7b8583c13fef097ec67d324d7d468b53f82a1138793ae03d5403e8cf1e46ca
|
EBUILD grilo-plugins-0.2.14.ebuild 2476 SHA256 4bbd4d257f5bbccb2988b7357623bed6f87a41af145ba89b2331f70c4eadae3a SHA512 b3bcb986c116464e90bc5408132a4afcb880cbc21d0cef54e9bc3bea031d0cf53c143948bac193366ed295c290b9aa57af73d7e64f98f3004555a405bfb874fc WHIRLPOOL 72b6c457da719048090f9775eb3f01a267985ebe731a4de277ad1aa2d340b3cdaca4cf0f4d632daad2eecfe662f85ace576fa43b0b1cd633772cf8acd8dc3491
|
||||||
AUX grilo-plugins-0.2.13-0003-tracker-correctly-set-title-from-filename.patch 3137 SHA256 be6a790a2e471cf19eafc2c342c485a0309f92a6ce5427697e51163235a6ecc8 SHA512 262d38db699383ea20604cf1fb7f9a41de6bdbb15cdc5cc17ef2c51635e6f9b07f443113850898f3aaa96dd0c54c40a472b8c93d1dd53b8a58cdec88234aa1e1 WHIRLPOOL 92fb483c90ee2645baafcbccbecf4dd877e26fca933697635b0144be2ebea1ec4806302adb13fff033637d03753ad010cef489ef08047aae215e476ddd334686
|
|
||||||
AUX grilo-plugins-0.2.13-0004-bookmarks-only-emit-item-removed-if-actually-removed.patch 791 SHA256 4ebb1f7701dc9acaa044e3d0f015ebf77fa1a9b826cd77c201a959edf08af435 SHA512 806ed275a3dbea1470953fa2cacff8a829e894bcd5175b3fbd8ec067a6ffa8ccf01fab3bea13217ddff8621b0b8e158c8c24fc37bb0ad1cab1b45438f86f4e2e WHIRLPOOL 70e62a010a9d351de898a9eeb48f00b4b093b373f4fd0d69286123ce87ee497fb0fb0b1db62b6576042a36fba66db137e51170f44951a8c735a87c602399d5e6
|
|
||||||
DIST grilo-plugins-0.2.13.tar.xz 999896 SHA256 a5544831ba81a4e7caea30da89874fd20142a362d389366e1113d0e64be51201 SHA512 5ec97ea16fc13c13090d58067bc982176967f49b7f996b2ee75fe2c915bfdaf96fb780730b9aeca3ba1e7d566526b7c7423a238b0285b0f60b97ad66b1cb0e03 WHIRLPOOL ef0cadaf229d02083efe6375db2ef335b88b9f46a29d671713957625868a30294952e538cb280de387d5078823ebd2f6d80ddb76d2ebed81008d53b44d3e62f5
|
|
||||||
EBUILD grilo-plugins-0.2.13-r1.ebuild 2834 SHA256 4c296985fb86d5193c6228215fb0d634bb3040f5b5d2443b03322778fe936ff9 SHA512 a24fb0901a627a9730755655e0198a48482edd13224ccb34b879723a534f2a0e4527a68ebed47a8c862587f00601befa3e43193ac068199d20fd26cb8db1e546 WHIRLPOOL 676705cee8a34948a2812d44f8d510aab045d45f38b29ad5210522e46ed1d4634611d3f03a7b8340186cb6d7135de0b7562cebbf799cb686628dda1a50979b85
|
|
||||||
|
|||||||
@@ -1,24 +0,0 @@
|
|||||||
From 734936dbe166526a1e2ebdc1ffebbab64b2216ee Mon Sep 17 00:00:00 2001
|
|
||||||
From: Bastien Nocera <hadess@hadess.net>
|
|
||||||
Date: Tue, 14 Oct 2014 19:30:36 +0200
|
|
||||||
Subject: bookmarks: Fix thumbnail URL not getting saved
|
|
||||||
|
|
||||||
A cut'n'paste error meant that we saved the description instead of
|
|
||||||
the thumbnail URL in that field.
|
|
||||||
|
|
||||||
diff --git a/src/bookmarks/grl-bookmarks.c b/src/bookmarks/grl-bookmarks.c
|
|
||||||
index d2b4797..b6b49f6 100644
|
|
||||||
--- a/src/bookmarks/grl-bookmarks.c
|
|
||||||
+++ b/src/bookmarks/grl-bookmarks.c
|
|
||||||
@@ -718,7 +718,7 @@ store_bookmark (GrlBookmarksSource *bookmarks_source,
|
|
||||||
GRLKEYID_TO_POINTER (GRL_METADATA_KEY_DESCRIPTION));
|
|
||||||
}
|
|
||||||
if (thumb) {
|
|
||||||
- g_object_set (G_OBJECT (resource), "thumbnail-url", desc, NULL);
|
|
||||||
+ g_object_set (G_OBJECT (resource), "thumbnail-url", thumb, NULL);
|
|
||||||
*keylist = g_list_remove (*keylist,
|
|
||||||
GRLKEYID_TO_POINTER (GRL_METADATA_KEY_THUMBNAIL));
|
|
||||||
}
|
|
||||||
--
|
|
||||||
cgit v0.10.2
|
|
||||||
|
|
||||||
@@ -1,76 +0,0 @@
|
|||||||
From a85c242337e90eef5bc9fa272f8f43853deae322 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Bastien Nocera <hadess@hadess.net>
|
|
||||||
Date: Tue, 14 Oct 2014 19:32:10 +0200
|
|
||||||
Subject: bookmarks: Fix updating bookmarks
|
|
||||||
|
|
||||||
Our use of gom meant that we always ended up with a new item instead of
|
|
||||||
updating an existing one. We need to load the item from the DB to be
|
|
||||||
able to offer that.
|
|
||||||
|
|
||||||
diff --git a/src/bookmarks/grl-bookmarks.c b/src/bookmarks/grl-bookmarks.c
|
|
||||||
index b6b49f6..77ff593 100644
|
|
||||||
--- a/src/bookmarks/grl-bookmarks.c
|
|
||||||
+++ b/src/bookmarks/grl-bookmarks.c
|
|
||||||
@@ -635,6 +635,31 @@ remove_bookmark (GrlBookmarksSource *bookmarks_source,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+static GomResource *
|
|
||||||
+find_resource (const gchar *id,
|
|
||||||
+ GomRepository *repository)
|
|
||||||
+{
|
|
||||||
+ GomResource *resource;
|
|
||||||
+ GomFilter *filter;
|
|
||||||
+ GValue value = { 0, };
|
|
||||||
+
|
|
||||||
+ if (id == NULL)
|
|
||||||
+ return NULL;
|
|
||||||
+
|
|
||||||
+ g_value_init(&value, G_TYPE_INT64);
|
|
||||||
+ g_value_set_int64 (&value, g_ascii_strtoll (id, NULL, 0));
|
|
||||||
+ filter = gom_filter_new_eq (BOOKMARKS_TYPE_RESOURCE, "id", &value);
|
|
||||||
+ g_value_unset(&value);
|
|
||||||
+
|
|
||||||
+ resource = gom_repository_find_one_sync (repository,
|
|
||||||
+ BOOKMARKS_TYPE_RESOURCE,
|
|
||||||
+ filter,
|
|
||||||
+ NULL);
|
|
||||||
+ g_object_unref (filter);
|
|
||||||
+
|
|
||||||
+ return resource;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static void
|
|
||||||
store_bookmark (GrlBookmarksSource *bookmarks_source,
|
|
||||||
GList **keylist,
|
|
||||||
@@ -659,6 +684,7 @@ store_bookmark (GrlBookmarksSource *bookmarks_source,
|
|
||||||
|
|
||||||
GRL_DEBUG ("store_bookmark");
|
|
||||||
|
|
||||||
+ str_id = (gchar *) grl_media_get_id (bookmark);
|
|
||||||
title = grl_media_get_title (bookmark);
|
|
||||||
url = grl_media_get_url (bookmark);
|
|
||||||
thumb = grl_media_get_thumbnail (bookmark);
|
|
||||||
@@ -684,11 +710,14 @@ store_bookmark (GrlBookmarksSource *bookmarks_source,
|
|
||||||
type = BOOKMARK_TYPE_STREAM;
|
|
||||||
}
|
|
||||||
|
|
||||||
- resource = g_object_new (BOOKMARKS_TYPE_RESOURCE,
|
|
||||||
- "repository", bookmarks_source->priv->repository,
|
|
||||||
- "parent", parent_id,
|
|
||||||
- "type", type,
|
|
||||||
- NULL);
|
|
||||||
+ resource = find_resource (str_id, bookmarks_source->priv->repository);
|
|
||||||
+ if (!resource) {
|
|
||||||
+ resource = g_object_new (BOOKMARKS_TYPE_RESOURCE,
|
|
||||||
+ "repository", bookmarks_source->priv->repository,
|
|
||||||
+ "parent", parent_id,
|
|
||||||
+ "type", type,
|
|
||||||
+ NULL);
|
|
||||||
+ }
|
|
||||||
|
|
||||||
if (type == BOOKMARK_TYPE_STREAM) {
|
|
||||||
g_object_set (G_OBJECT (resource), "url", url, NULL);
|
|
||||||
--
|
|
||||||
cgit v0.10.2
|
|
||||||
|
|
||||||
@@ -1,85 +0,0 @@
|
|||||||
From ff9afc6bb2d6515c773a77b1d8ed1a985a635b17 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Bastien Nocera <hadess@hadess.net>
|
|
||||||
Date: Wed, 26 Nov 2014 15:45:39 +0100
|
|
||||||
Subject: tracker: Correctly set "title-from-filename"
|
|
||||||
|
|
||||||
Tracker usually provides us with a title that's derived from the
|
|
||||||
filename. Replicate its process to create a title from a filename
|
|
||||||
to check if the title is actually set from the filename.
|
|
||||||
|
|
||||||
This allows the local-metadata plugin to parse it to remove gunk, and
|
|
||||||
other plugins to override its throwaway title.
|
|
||||||
|
|
||||||
https://bugzilla.gnome.org/show_bug.cgi?id=740756
|
|
||||||
|
|
||||||
diff --git a/src/tracker/grl-tracker-source-api.c b/src/tracker/grl-tracker-source-api.c
|
|
||||||
index 8c9fd55..fbc69a3 100644
|
|
||||||
--- a/src/tracker/grl-tracker-source-api.c
|
|
||||||
+++ b/src/tracker/grl-tracker-source-api.c
|
|
||||||
@@ -203,6 +203,39 @@ static GHashTable *grl_tracker_operations;
|
|
||||||
/**/
|
|
||||||
|
|
||||||
static void
|
|
||||||
+set_title_from_filename (GrlMedia *media)
|
|
||||||
+{
|
|
||||||
+ const gchar *url;
|
|
||||||
+ gchar *path, *display_name, *ext, *title;
|
|
||||||
+ guint suffix_len;
|
|
||||||
+
|
|
||||||
+ url = grl_media_get_url (media);
|
|
||||||
+ if (url == NULL)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ path = g_filename_from_uri (url, NULL, NULL);
|
|
||||||
+ if (!path)
|
|
||||||
+ return;
|
|
||||||
+ display_name = g_filename_display_basename (path);
|
|
||||||
+ g_free (path);
|
|
||||||
+ ext = strrchr (display_name, '.');
|
|
||||||
+ if (!ext)
|
|
||||||
+ goto out;
|
|
||||||
+
|
|
||||||
+ suffix_len = strlen (ext);
|
|
||||||
+ if (suffix_len != 4 && suffix_len != 5)
|
|
||||||
+ goto out;
|
|
||||||
+
|
|
||||||
+ title = g_strndup (display_name, ext - display_name);
|
|
||||||
+ if (g_strcmp0 (grl_media_get_title (media), title) == 0)
|
|
||||||
+ grl_data_set_boolean (GRL_DATA (media), GRL_METADATA_KEY_TITLE_FROM_FILENAME, TRUE);
|
|
||||||
+ g_free (title);
|
|
||||||
+
|
|
||||||
+out:
|
|
||||||
+ g_free (display_name);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static void
|
|
||||||
fill_grilo_media_from_sparql (GrlTrackerSource *source,
|
|
||||||
GrlMedia *media,
|
|
||||||
TrackerSparqlCursor *cursor,
|
|
||||||
@@ -402,6 +435,7 @@ get_sparql_type_filter (GrlOperationOptions *options,
|
|
||||||
fill_grilo_media_from_sparql (GRL_TRACKER_SOURCE (spec->source), \
|
|
||||||
media, os->cursor, col); \
|
|
||||||
} \
|
|
||||||
+ set_title_from_filename (media); \
|
|
||||||
\
|
|
||||||
spec->callback (spec->source, \
|
|
||||||
spec->operation_id, \
|
|
||||||
@@ -507,6 +541,7 @@ tracker_resolve_cb (GObject *source_object,
|
|
||||||
fill_grilo_media_from_sparql (GRL_TRACKER_SOURCE (rs->source),
|
|
||||||
rs->media, cursor, col);
|
|
||||||
}
|
|
||||||
+ set_title_from_filename (rs->media);
|
|
||||||
|
|
||||||
rs->callback (rs->source, rs->operation_id, rs->media, rs->user_data, NULL);
|
|
||||||
} else {
|
|
||||||
@@ -565,6 +600,7 @@ tracker_media_from_uri_cb (GObject *source_object,
|
|
||||||
fill_grilo_media_from_sparql (GRL_TRACKER_SOURCE (mfus->source),
|
|
||||||
media, cursor, col);
|
|
||||||
}
|
|
||||||
+ set_title_from_filename (media);
|
|
||||||
|
|
||||||
mfus->callback (mfus->source, mfus->operation_id, media, mfus->user_data, NULL);
|
|
||||||
} else {
|
|
||||||
--
|
|
||||||
cgit v0.10.2
|
|
||||||
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
From ae10b48dff54a07ea638421554cab207b8bb1ced Mon Sep 17 00:00:00 2001
|
|
||||||
From: Bastien Nocera <hadess@hadess.net>
|
|
||||||
Date: Tue, 2 Dec 2014 18:28:39 +0100
|
|
||||||
Subject: bookmarks: Only emit "item removed" if actually removed
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/bookmarks/grl-bookmarks.c b/src/bookmarks/grl-bookmarks.c
|
|
||||||
index 46e9c30..c7f0109 100644
|
|
||||||
--- a/src/bookmarks/grl-bookmarks.c
|
|
||||||
+++ b/src/bookmarks/grl-bookmarks.c
|
|
||||||
@@ -631,7 +631,7 @@ remove_bookmark (GrlBookmarksSource *bookmarks_source,
|
|
||||||
|
|
||||||
g_object_unref (resource);
|
|
||||||
|
|
||||||
- if (bookmarks_source->priv->notify_changes) {
|
|
||||||
+ if (*error != NULL && bookmarks_source->priv->notify_changes) {
|
|
||||||
/* We can improve accuracy computing the parent container of removed
|
|
||||||
element */
|
|
||||||
grl_source_notify_change (GRL_SOURCE (bookmarks_source),
|
|
||||||
--
|
|
||||||
cgit v0.10.2
|
|
||||||
|
|
||||||
@@ -19,7 +19,7 @@ IUSE="daap +dvd flickr freebox gnome-online-accounts lua pocket thetvdb tracker
|
|||||||
RDEPEND="
|
RDEPEND="
|
||||||
>=dev-libs/glib-2.36:2
|
>=dev-libs/glib-2.36:2
|
||||||
>=media-libs/grilo-0.2.11:${SLOT}[network,playlist]
|
>=media-libs/grilo-0.2.11:${SLOT}[network,playlist]
|
||||||
>=media-libs/libmediaart-0.1
|
>=media-libs/libmediaart-1.9:2.0
|
||||||
>=dev-libs/gom-0.2.1
|
>=dev-libs/gom-0.2.1
|
||||||
|
|
||||||
dev-libs/gmime:2.6
|
dev-libs/gmime:2.6
|
||||||
@@ -57,16 +57,6 @@ DEPEND="${RDEPEND}
|
|||||||
virtual/pkgconfig
|
virtual/pkgconfig
|
||||||
"
|
"
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
|
|
||||||
epatch "${FILESDIR}/${P}-0001-fix-thumbnail-url-not-getting-saved.patch"
|
|
||||||
epatch "${FILESDIR}/${P}-0002-fix-updating-bookmarks.patch"
|
|
||||||
epatch "${FILESDIR}/${P}-0003-tracker-correctly-set-title-from-filename.patch"
|
|
||||||
epatch "${FILESDIR}/${P}-0004-bookmarks-only-emit-item-removed-if-actually-removed.patch"
|
|
||||||
|
|
||||||
gnome2_src_prepare
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
src_configure() {
|
||||||
# --enable-debug only changes CFLAGS, useless for us
|
# --enable-debug only changes CFLAGS, useless for us
|
||||||
# Plugins
|
# Plugins
|
||||||
Reference in New Issue
Block a user