Update to 1.9.1. Drop upstreamed patches
This commit is contained in:
Yanko Kaneti
parent
06d93ae3ff
commit
e008e14a7f
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,3 +4,4 @@
|
||||
/libmediaart-0.6.0.tar.xz
|
||||
/libmediaart-0.7.0.tar.xz
|
||||
/libmediaart-1.9.0.tar.xz
|
||||
/libmediaart-1.9.1.tar.xz
|
||||
|
||||
@ -1,101 +0,0 @@
|
||||
From 00d577a74fd97af66a81a42020b70240dac43c19 Mon Sep 17 00:00:00 2001
|
||||
From: Yanko Kaneti <yaneti@declera.com>
|
||||
Date: Thu, 13 Nov 2014 11:34:33 +0200
|
||||
Subject: [PATCH 1/2] tests: Make mediarttest work as both installed and built
|
||||
test
|
||||
|
||||
---
|
||||
tests/Makefile.am | 11 +++--------
|
||||
tests/mediaarttest.c | 13 +++++++------
|
||||
2 files changed, 10 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
||||
index 152887a..90aad3f 100644
|
||||
--- a/tests/Makefile.am
|
||||
+++ b/tests/Makefile.am
|
||||
@@ -1,12 +1,11 @@
|
||||
include $(top_srcdir)/Makefile.decl
|
||||
|
||||
-noinst_PROGRAMS += $(test_programs)
|
||||
-
|
||||
test_programs = mediaarttest
|
||||
+dist_test_data = \
|
||||
+ 543249_King-Kilo---Radium.mp3 \
|
||||
+ cover.png
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
- -DTOP_SRCDIR=\"$(abs_top_srcdir)\" \
|
||||
- -DTOP_BUILDDIR=\"$(abs_top_builddir)\" \
|
||||
$(BUILD_CFLAGS) \
|
||||
-I$(top_srcdir) \
|
||||
$(LIBMEDIAART_CFLAGS)
|
||||
@@ -17,7 +16,3 @@ LDADD = \
|
||||
$(LIBMEDIAART_LIBS)
|
||||
|
||||
mediaarttest_SOURCES = mediaarttest.c
|
||||
-
|
||||
-EXTRA_DIST += \
|
||||
- 543249_King-Kilo---Radium.mp3 \
|
||||
- cover.png
|
||||
diff --git a/tests/mediaarttest.c b/tests/mediaarttest.c
|
||||
index ff22991..696b6de 100644
|
||||
--- a/tests/mediaarttest.c
|
||||
+++ b/tests/mediaarttest.c
|
||||
@@ -269,7 +269,7 @@ test_mediaart_process_file (void)
|
||||
GFile *file = NULL;
|
||||
gchar *path;
|
||||
|
||||
- path = g_build_filename (G_DIR_SEPARATOR_S, TOP_SRCDIR, "tests", "543249_King-Kilo---Radium.mp3", NULL);
|
||||
+ path = g_test_build_filename (G_TEST_DIST, "543249_King-Kilo---Radium.mp3", NULL);
|
||||
file = g_file_new_for_path (path);
|
||||
g_free (path);
|
||||
|
||||
@@ -315,7 +315,7 @@ test_mediaart_process_buffer_cb (GObject *source_object,
|
||||
g_assert_true (success);
|
||||
|
||||
/* Check cache exists */
|
||||
- path = g_build_filename (G_DIR_SEPARATOR_S, TOP_SRCDIR, "tests", "cover.png", NULL);
|
||||
+ path = g_test_build_filename (G_TEST_DIST, "cover.png", NULL);
|
||||
file = g_file_new_for_path (path);
|
||||
|
||||
media_art_get_path ("Lanedo", /* artist / title */
|
||||
@@ -361,7 +361,7 @@ test_mediaart_process_buffer (void)
|
||||
|
||||
cancellable = g_cancellable_new ();
|
||||
|
||||
- path = g_build_filename (G_DIR_SEPARATOR_S, TOP_SRCDIR, "tests", "cover.png", NULL);
|
||||
+ path = g_test_build_filename (G_TEST_DIST, "cover.png", NULL);
|
||||
|
||||
/* Check data is not cached currently */
|
||||
media_art_get_path ("Lanedo", /* artist / title */
|
||||
@@ -497,16 +497,16 @@ int
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
const gchar *cache_home_originally;
|
||||
- const gchar *test_dir;
|
||||
+ const gchar *temp_cache_dir;
|
||||
gchar *dir;
|
||||
gint success;
|
||||
gint i;
|
||||
|
||||
g_test_init (&argc, &argv, NULL);
|
||||
|
||||
- test_dir = g_test_get_dir (G_TEST_BUILT);
|
||||
+ temp_cache_dir = g_dir_make_tmp ("libmediaart-tests-XXXXXX", NULL);
|
||||
cache_home_originally = g_getenv ("XDG_CACHE_HOME");
|
||||
- g_setenv ("XDG_CACHE_HOME", test_dir, TRUE);
|
||||
+ g_setenv ("XDG_CACHE_HOME", temp_cache_dir, TRUE);
|
||||
|
||||
for (i = 0; strip_test_cases[i].test_name; i++) {
|
||||
gchar *testpath;
|
||||
@@ -547,6 +547,7 @@ main (int argc, char **argv)
|
||||
} else {
|
||||
g_unsetenv ("XDG_CACHE_HOME");
|
||||
}
|
||||
+ g_rmdir (temp_cache_dir);
|
||||
|
||||
return success;
|
||||
}
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@ -1,53 +0,0 @@
|
||||
From 2664fa72d671c6b15a4e1924272c29179d900025 Mon Sep 17 00:00:00 2001
|
||||
From: Yanko Kaneti <yaneti@declera.com>
|
||||
Date: Thu, 13 Nov 2014 14:07:29 +0200
|
||||
Subject: [PATCH 2/2] tests: No new temporary cache directories for subprocess
|
||||
tests
|
||||
|
||||
Otherwise subprocess tests that assert by design leave those behind
|
||||
---
|
||||
tests/mediaarttest.c | 15 ++++++++++-----
|
||||
1 file changed, 10 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/tests/mediaarttest.c b/tests/mediaarttest.c
|
||||
index 696b6de..cef36c2 100644
|
||||
--- a/tests/mediaarttest.c
|
||||
+++ b/tests/mediaarttest.c
|
||||
@@ -496,17 +496,21 @@ test_mediaart_process_failures_subprocess (void)
|
||||
int
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
- const gchar *cache_home_originally;
|
||||
- const gchar *temp_cache_dir;
|
||||
+ const gchar *cache_home_originally = NULL;
|
||||
+ gchar *temp_cache_dir;
|
||||
gchar *dir;
|
||||
gint success;
|
||||
gint i;
|
||||
|
||||
g_test_init (&argc, &argv, NULL);
|
||||
|
||||
- temp_cache_dir = g_dir_make_tmp ("libmediaart-tests-XXXXXX", NULL);
|
||||
- cache_home_originally = g_getenv ("XDG_CACHE_HOME");
|
||||
- g_setenv ("XDG_CACHE_HOME", temp_cache_dir, TRUE);
|
||||
+ if (!g_test_subprocess ()) {
|
||||
+ temp_cache_dir = g_dir_make_tmp ("libmediaart-tests-XXXXXX", NULL);
|
||||
+ cache_home_originally = g_getenv ("XDG_CACHE_HOME");
|
||||
+ g_setenv ("XDG_CACHE_HOME", temp_cache_dir, TRUE);
|
||||
+ } else {
|
||||
+ temp_cache_dir = g_strdup (g_get_user_cache_dir ());
|
||||
+ }
|
||||
|
||||
for (i = 0; strip_test_cases[i].test_name; i++) {
|
||||
gchar *testpath;
|
||||
@@ -548,6 +552,7 @@ main (int argc, char **argv)
|
||||
g_unsetenv ("XDG_CACHE_HOME");
|
||||
}
|
||||
g_rmdir (temp_cache_dir);
|
||||
+ g_free (temp_cache_dir);
|
||||
|
||||
return success;
|
||||
}
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@ -1,15 +1,12 @@
|
||||
Name: libmediaart
|
||||
Version: 1.9.0
|
||||
Release: 6%{?dist}
|
||||
Version: 1.9.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Library for managing media art caches
|
||||
|
||||
License: LGPLv2+
|
||||
URL: https://github.com/curlybeast/libmediaart
|
||||
Source0: https://download.gnome.org/sources/%{name}/1.9/%{name}-%{version}.tar.xz
|
||||
|
||||
Patch1: 0001-tests-Make-mediarttest-work-as-both-installed-and-bu.patch
|
||||
Patch2: 0002-tests-No-new-temporary-cache-directories-for-subproc.patch
|
||||
|
||||
BuildRequires: pkgconfig(glib-2.0) pkgconfig(gio-2.0) pkgconfig(gio-unix-2.0)
|
||||
BuildRequires: pkgconfig(gdk-pixbuf-2.0)
|
||||
BuildRequires: pkgconfig(gobject-introspection-1.0)
|
||||
@ -20,9 +17,6 @@ BuildRequires: gdk-pixbuf2-modules
|
||||
BuildRequires: vala vala-devel
|
||||
BuildRequires: xorg-x11-server-Xvfb dbus-x11
|
||||
|
||||
# For patch0
|
||||
BuildRequires: autoconf automake libtool
|
||||
|
||||
%description
|
||||
Library tasked with managing, extracting and handling media art caches.
|
||||
|
||||
@ -46,8 +40,6 @@ the functionality of the installed %{name} package.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%autopatch -p1
|
||||
autoreconf -f
|
||||
|
||||
|
||||
%build
|
||||
@ -90,6 +82,10 @@ xvfb-run make check
|
||||
|
||||
|
||||
%changelog
|
||||
* Sun Mar 5 2017 Yanko Kaneti <yaneti@declera.com> - 1.9.1-1
|
||||
- Update to 1.9.1
|
||||
- Drop upstreamed patches
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user