Update to 3.11.3
This commit is contained in:
Richard Hughes
parent
7fc2b820ff
commit
1008ea25d7
1
.gitignore
vendored
1
.gitignore
vendored
@ -28,3 +28,4 @@ gnome-color-manager-2.31.4.tar.bz2
|
||||
/gnome-color-manager-3.9.92.tar.xz
|
||||
/gnome-color-manager-3.10.0.tar.xz
|
||||
/gnome-color-manager-3.10.1.tar.xz
|
||||
/gnome-color-manager-3.11.3.tar.xz
|
||||
|
||||
@ -1,70 +0,0 @@
|
||||
From cdf512e4748ba6279e8e5585ad6fd8296f1baa3e Mon Sep 17 00:00:00 2001
|
||||
From: Patryk Zawadzki <patrys@room-303.com>
|
||||
Date: Thu, 5 Dec 2013 16:41:41 +0100
|
||||
Subject: [PATCH] Make it work with dispcal using stderr
|
||||
|
||||
Signed-off-by: Richard Hughes <richard@hughsie.com>
|
||||
---
|
||||
src/gcm-calibrate-argyll.c | 26 +++++++++++++++++++++-----
|
||||
1 file changed, 21 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/gcm-calibrate-argyll.c b/src/gcm-calibrate-argyll.c
|
||||
index 52a4b64..52b8eeb 100644
|
||||
--- a/src/gcm-calibrate-argyll.c
|
||||
+++ b/src/gcm-calibrate-argyll.c
|
||||
@@ -160,7 +160,9 @@ gcm_calibrate_argyll_get_display (const gchar *output_name,
|
||||
{
|
||||
gboolean ret = FALSE;
|
||||
gchar *command = NULL;
|
||||
- gchar *data = NULL;
|
||||
+ const gchar *data;
|
||||
+ gchar *data_stderr = NULL;
|
||||
+ gchar *data_stdout = NULL;
|
||||
gchar *name;
|
||||
gchar **split = NULL;
|
||||
gint exit_status;
|
||||
@@ -178,15 +180,28 @@ gcm_calibrate_argyll_get_display (const gchar *output_name,
|
||||
ret = g_spawn_sync (NULL,
|
||||
(gchar **) argv,
|
||||
NULL,
|
||||
- G_SPAWN_STDERR_TO_DEV_NULL,
|
||||
+ 0,
|
||||
NULL, NULL,
|
||||
- &data,
|
||||
- NULL,
|
||||
+ &data_stdout,
|
||||
+ &data_stderr,
|
||||
&exit_status,
|
||||
error);
|
||||
if (!ret)
|
||||
goto out;
|
||||
|
||||
+ /* recent versions of dispcal switched to stderr output */
|
||||
+ if (data_stdout != NULL && data_stdout[0] != '\0') {
|
||||
+ data = data_stdout;
|
||||
+ } else if (data_stderr != NULL && data_stderr[0] != '\0') {
|
||||
+ data = data_stderr;
|
||||
+ } else {
|
||||
+ g_set_error_literal (error,
|
||||
+ GCM_CALIBRATE_ERROR,
|
||||
+ GCM_CALIBRATE_ERROR_INTERNAL,
|
||||
+ "no sensible output from dispcal");
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
/* split it into lines */
|
||||
split = g_strsplit (data, "\n", -1);
|
||||
for (i=0; split[i] != NULL; i++) {
|
||||
@@ -216,7 +231,8 @@ gcm_calibrate_argyll_get_display (const gchar *output_name,
|
||||
}
|
||||
out:
|
||||
g_free (command);
|
||||
- g_free (data);
|
||||
+ g_free (data_stdout);
|
||||
+ g_free (data_stderr);
|
||||
g_strfreev (split);
|
||||
return display;
|
||||
}
|
||||
--
|
||||
1.8.4.2
|
||||
|
||||
@ -1,20 +1,14 @@
|
||||
Summary: Color management tools for GNOME
|
||||
Name: gnome-color-manager
|
||||
Version: 3.10.1
|
||||
Release: 3%{?dist}
|
||||
Version: 3.11.3
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+
|
||||
Group: Applications/System
|
||||
URL: http://projects.gnome.org/gnome-color-manager/
|
||||
Source0: http://download.gnome.org/sources/gnome-color-manager/3.5/%{name}-%{version}.tar.xz
|
||||
Source0: http://download.gnome.org/sources/gnome-color-manager/3.11/%{name}-%{version}.tar.xz
|
||||
|
||||
# Upstream already
|
||||
Patch0: 0001-Make-it-work-with-dispcal-using-stderr.patch
|
||||
|
||||
Requires: color-filesystem >= 1-7
|
||||
Requires: gnome-icon-theme
|
||||
Requires: shared-mime-info
|
||||
Requires: shared-color-profiles
|
||||
Requires: dconf
|
||||
|
||||
# Not actually a hard requirement; it just sucks to have to install the
|
||||
# package using PackageKit before the user can calibrate
|
||||
@ -23,13 +17,12 @@ Requires: argyllcms
|
||||
%endif
|
||||
|
||||
BuildRequires: gtk3-devel >= 3.0.0
|
||||
BuildRequires: gnome-doc-utils >= 0.3.2
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: gettext
|
||||
BuildRequires: libtool
|
||||
BuildRequires: vte3-devel
|
||||
BuildRequires: gnome-doc-utils
|
||||
BuildRequires: intltool
|
||||
BuildRequires: libgudev1-devel
|
||||
BuildRequires: libXrandr-devel
|
||||
BuildRequires: lcms2-devel
|
||||
BuildRequires: libtiff-devel
|
||||
BuildRequires: libexif-devel
|
||||
@ -38,11 +31,8 @@ BuildRequires: libcanberra-devel
|
||||
BuildRequires: glib2-devel >= 2.25.9-2
|
||||
BuildRequires: docbook-utils
|
||||
BuildRequires: colord-devel >= 0.1.12
|
||||
BuildRequires: libmash-devel
|
||||
BuildRequires: clutter-gtk-devel
|
||||
BuildRequires: gnome-desktop3-devel
|
||||
BuildRequires: colord-gtk-devel >= 0.1.22
|
||||
BuildRequires: itstool
|
||||
BuildRequires: colord-gtk-devel
|
||||
|
||||
Requires(post): /usr/bin/gtk-update-icon-cache
|
||||
Requires(postun): /usr/bin/gtk-update-icon-cache
|
||||
@ -57,21 +47,14 @@ and generate color profiles in the GNOME desktop.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .fix-with-new-argyllcms
|
||||
|
||||
%build
|
||||
%configure --disable-schemas-install
|
||||
%configure
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
|
||||
for i in gcm-calibrate gcm-import ; do
|
||||
desktop-file-install --delete-original \
|
||||
--dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \
|
||||
$RPM_BUILD_ROOT%{_datadir}/applications/$i.desktop
|
||||
done
|
||||
|
||||
%find_lang %name --with-gnome
|
||||
|
||||
%post
|
||||
@ -97,22 +80,25 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
|
||||
%doc AUTHORS COPYING NEWS README
|
||||
%{_bindir}/gcm-*
|
||||
%{_libexecdir}/gcm-*
|
||||
%{_datadir}/appdata/
|
||||
%{_datadir}/appdata/*.appdata.xml
|
||||
%dir %{_datadir}/gnome-color-manager
|
||||
%dir %{_datadir}/gnome-color-manager/targets
|
||||
%dir %{_datadir}/gnome-color-manager/icons
|
||||
%dir %{_datadir}/gnome-color-manager/figures
|
||||
%dir %{_datadir}/gnome-color-manager/ti1
|
||||
%{_datadir}/gnome-color-manager/targets
|
||||
%{_datadir}/gnome-color-manager/icons
|
||||
%{_datadir}/gnome-color-manager/figures
|
||||
%{_datadir}/gnome-color-manager/ti1
|
||||
%{_datadir}/gnome-color-manager/targets/*
|
||||
%{_datadir}/gnome-color-manager/icons/*
|
||||
%{_datadir}/gnome-color-manager/figures/*
|
||||
%{_datadir}/gnome-color-manager/ti1/*
|
||||
%{_datadir}/man/man1/*.1.gz
|
||||
%{_datadir}/icons/hicolor/*/*/*.png
|
||||
%{_datadir}/icons/hicolor/scalable/*/*.svg*
|
||||
%{_datadir}/applications/gcm-*.desktop
|
||||
|
||||
%changelog
|
||||
* Tue Dec 17 2013 Richard Hughes <rhughes@redhat.com> - 3.11.3-1
|
||||
- Update to 3.11.3
|
||||
|
||||
* Thu Dec 05 2013 Richard Hughes <rhughes@redhat.com> - 3.10.1-3
|
||||
- Fix calibration when using new versions of ArgyllCMS
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user