From dd70319f0a39d6703cfff6b247282435c97db2e9 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Tue, 30 Aug 2011 11:48:56 +0100 Subject: [PATCH 1/8] New upstream version. --- .gitignore | 1 + gnome-color-manager.spec | 9 ++++----- sources | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 4e49438..d254063 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ gnome-color-manager-2.31.4.tar.bz2 /gnome-color-manager-3.0.0.tar.bz2 /gnome-color-manager-3.1.1.tar.bz2 /gnome-color-manager-3.1.2.tar.xz +/gnome-color-manager-3.1.90.tar.xz diff --git a/gnome-color-manager.spec b/gnome-color-manager.spec index 158fcd6..8b8d1eb 100644 --- a/gnome-color-manager.spec +++ b/gnome-color-manager.spec @@ -1,6 +1,6 @@ Summary: Color management tools for GNOME Name: gnome-color-manager -Version: 3.1.2 +Version: 3.1.90 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -96,16 +96,15 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/gnome-color-manager/icons %{_datadir}/gnome-color-manager/figures %{_datadir}/man/man1/*.1.gz -%{_datadir}/gnome/help/gnome-color-manager -%{_datadir}/omf/gnome-color-manager %{_datadir}/icons/hicolor/*/*/*.png %{_datadir}/icons/hicolor/scalable/*/*.svg* %{_datadir}/applications/gcm-*.desktop -%{_sysconfdir}/xdg/autostart/*.desktop %{_datadir}/dbus-1/services/org.gnome.ColorManager.service -%{_datadir}/dbus-1/interfaces/org.gnome.ColorManager.xml %changelog +* Tue Aug 30 2011 Richard Hughes - 3.1.90-1 +- New upstream version. + * Mon Jun 13 2011 Richard Hughes - 3.1.2-1 - New upstream version. diff --git a/sources b/sources index 55f8092..da06a87 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -955d85555d3ce4aef7b739ed3297953c gnome-color-manager-3.1.2.tar.xz +b4348dae9562ff0447316d0d4d75a24b gnome-color-manager-3.1.90.tar.xz From 66622b2652734fd117cf4a37c53efba59cee0f30 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Tue, 30 Aug 2011 15:13:17 +0100 Subject: [PATCH 2/8] BR a high enough colord. --- gnome-color-manager.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnome-color-manager.spec b/gnome-color-manager.spec index 8b8d1eb..a83e004 100644 --- a/gnome-color-manager.spec +++ b/gnome-color-manager.spec @@ -1,7 +1,7 @@ Summary: Color management tools for GNOME Name: gnome-color-manager Version: 3.1.90 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: http://projects.gnome.org/gnome-color-manager/ @@ -32,7 +32,7 @@ BuildRequires: exiv2-devel BuildRequires: libcanberra-devel BuildRequires: glib2-devel >= 2.25.9-2 BuildRequires: docbook-utils -BuildRequires: colord-devel +BuildRequires: colord-devel >= 0.1.12 BuildRequires: libmash-devel BuildRequires: clutter-gtk-devel @@ -102,6 +102,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/dbus-1/services/org.gnome.ColorManager.service %changelog +* Tue Aug 30 2011 Richard Hughes - 3.1.90-2 +- BR a high enough colord. + * Tue Aug 30 2011 Richard Hughes - 3.1.90-1 - New upstream version. From 60e4a29490e017bc089fbb9f993d933ed7a0d5a2 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Mon, 5 Sep 2011 14:42:39 +0100 Subject: [PATCH 3/8] New upstream version. --- .gitignore | 1 + gnome-color-manager.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d254063..3662c4b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ gnome-color-manager-2.31.4.tar.bz2 /gnome-color-manager-3.1.1.tar.bz2 /gnome-color-manager-3.1.2.tar.xz /gnome-color-manager-3.1.90.tar.xz +/gnome-color-manager-3.1.91.tar.xz diff --git a/gnome-color-manager.spec b/gnome-color-manager.spec index a83e004..e77a767 100644 --- a/gnome-color-manager.spec +++ b/gnome-color-manager.spec @@ -1,6 +1,6 @@ Summary: Color management tools for GNOME Name: gnome-color-manager -Version: 3.1.90 +Version: 3.1.91 Release: 2%{?dist} License: GPLv2+ Group: Applications/System @@ -102,6 +102,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/dbus-1/services/org.gnome.ColorManager.service %changelog +* Mon Sep 05 2011 Richard Hughes - 3.1.91-1 +- New upstream version. + * Tue Aug 30 2011 Richard Hughes - 3.1.90-2 - BR a high enough colord. diff --git a/sources b/sources index da06a87..5555225 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b4348dae9562ff0447316d0d4d75a24b gnome-color-manager-3.1.90.tar.xz +f4af1b04698eed208bfbe6ab3a272baf gnome-color-manager-3.1.91.tar.xz From 9f446fb3dcd559cb4c4e9d11cb30b6472c2a10c2 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Fri, 16 Sep 2011 10:37:21 +0100 Subject: [PATCH 4/8] Rebuild for libmash soname update (which for the moment will disable the 3D renderer code). --- gnome-color-manager.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnome-color-manager.spec b/gnome-color-manager.spec index e77a767..29d96bb 100644 --- a/gnome-color-manager.spec +++ b/gnome-color-manager.spec @@ -1,7 +1,7 @@ Summary: Color management tools for GNOME Name: gnome-color-manager Version: 3.1.91 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/System URL: http://projects.gnome.org/gnome-color-manager/ @@ -102,6 +102,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/dbus-1/services/org.gnome.ColorManager.service %changelog +* Fri Sep 16 2011 Richard Hughes - 3.1.91-3 +- Rebuild for libmash soname update (which for the moment will disable + the 3D renderer code). + * Mon Sep 05 2011 Richard Hughes - 3.1.91-1 - New upstream version. From 2a3e9ef351a6d006b10b5be64079dd8c72049c08 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Mon, 19 Sep 2011 20:37:29 +0100 Subject: [PATCH 5/8] New upstream version. --- .gitignore | 1 + gnome-color-manager.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3662c4b..fb97c5d 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ gnome-color-manager-2.31.4.tar.bz2 /gnome-color-manager-3.1.2.tar.xz /gnome-color-manager-3.1.90.tar.xz /gnome-color-manager-3.1.91.tar.xz +/gnome-color-manager-3.1.92.tar.xz diff --git a/gnome-color-manager.spec b/gnome-color-manager.spec index 29d96bb..0f03a8d 100644 --- a/gnome-color-manager.spec +++ b/gnome-color-manager.spec @@ -1,7 +1,7 @@ Summary: Color management tools for GNOME Name: gnome-color-manager -Version: 3.1.91 -Release: 3%{?dist} +Version: 3.1.92 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: http://projects.gnome.org/gnome-color-manager/ @@ -102,6 +102,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/dbus-1/services/org.gnome.ColorManager.service %changelog +* Mon Sep 19 2011 Richard Hughes - 3.1.92-1 +- New upstream version. + * Fri Sep 16 2011 Richard Hughes - 3.1.91-3 - Rebuild for libmash soname update (which for the moment will disable the 3D renderer code). diff --git a/sources b/sources index 5555225..cfe750b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f4af1b04698eed208bfbe6ab3a272baf gnome-color-manager-3.1.91.tar.xz +f4133d2efd75eb573417301054965e95 gnome-color-manager-3.1.92.tar.xz From d5d6e842ced6dd18af2a5bc6cbe8b5e35f8201a0 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Mon, 26 Sep 2011 18:07:24 +0100 Subject: [PATCH 6/8] New upstream version. --- .gitignore | 1 + gnome-color-manager.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fb97c5d..16f1716 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ gnome-color-manager-2.31.4.tar.bz2 /gnome-color-manager-3.1.90.tar.xz /gnome-color-manager-3.1.91.tar.xz /gnome-color-manager-3.1.92.tar.xz +/gnome-color-manager-3.2.0.tar.xz diff --git a/gnome-color-manager.spec b/gnome-color-manager.spec index 0f03a8d..84427da 100644 --- a/gnome-color-manager.spec +++ b/gnome-color-manager.spec @@ -1,11 +1,11 @@ Summary: Color management tools for GNOME Name: gnome-color-manager -Version: 3.1.92 +Version: 3.2.0 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.1/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/gnome-color-manager/3.2/%{name}-%{version}.tar.xz Requires: color-filesystem >= 1-7 Requires: gnome-icon-theme @@ -102,6 +102,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/dbus-1/services/org.gnome.ColorManager.service %changelog +* Mon Sep 26 2011 Richard Hughes - 3.2.0-1 +- New upstream version. + * Mon Sep 19 2011 Richard Hughes - 3.1.92-1 - New upstream version. diff --git a/sources b/sources index cfe750b..a9d1564 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f4133d2efd75eb573417301054965e95 gnome-color-manager-3.1.92.tar.xz +189d51eb28d7b60a95f502b823b297c4 gnome-color-manager-3.2.0.tar.xz From 2d46120054e124d5a32efb405a25cea3db939d4b Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Mon, 26 Sep 2011 22:09:55 +0100 Subject: [PATCH 7/8] Rebuild for libmash API update. --- gnome-color-manager.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-color-manager.spec b/gnome-color-manager.spec index 84427da..a8e6c15 100644 --- a/gnome-color-manager.spec +++ b/gnome-color-manager.spec @@ -1,7 +1,7 @@ Summary: Color management tools for GNOME Name: gnome-color-manager Version: 3.2.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: http://projects.gnome.org/gnome-color-manager/ @@ -102,6 +102,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/dbus-1/services/org.gnome.ColorManager.service %changelog +* Mon Sep 26 2011 Richard Hughes - 3.2.0-2 +- Rebuild for libmash API update. + * Mon Sep 26 2011 Richard Hughes - 3.2.0-1 - New upstream version. From fa7b92dc42b9d121e6158516e9b4564dba4018d7 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 6 Oct 2011 10:25:24 -0400 Subject: [PATCH 8/8] 0001-Initialize-error-pointer-for-gdk_pixbuf_new_from_fil.patch: Backport a crash fix from mainline. --- ...-pointer-for-gdk_pixbuf_new_from_fil.patch | 27 +++++++++++++++++++ gnome-color-manager.spec | 8 +++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 0001-Initialize-error-pointer-for-gdk_pixbuf_new_from_fil.patch diff --git a/0001-Initialize-error-pointer-for-gdk_pixbuf_new_from_fil.patch b/0001-Initialize-error-pointer-for-gdk_pixbuf_new_from_fil.patch new file mode 100644 index 0000000..586193a --- /dev/null +++ b/0001-Initialize-error-pointer-for-gdk_pixbuf_new_from_fil.patch @@ -0,0 +1,27 @@ +From e0c575ea768f2f5bb01cfc02908ddd48e691999d Mon Sep 17 00:00:00 2001 +From: Michael Hamann +Date: Mon, 3 Oct 2011 00:49:55 +0200 +Subject: [PATCH] Initialize error pointer for + gdk_pixbuf_new_from_file_at_size properly + +Signed-off-by: Richard Hughes +--- + src/gcm-calibrate-main.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/gcm-calibrate-main.c b/src/gcm-calibrate-main.c +index b8ef50a..cdf25ac 100644 +--- a/src/gcm-calibrate-main.c ++++ b/src/gcm-calibrate-main.c +@@ -2072,7 +2072,7 @@ gcm_calib_image_changed_cb (GcmCalibrate *calibrate, + { + gchar *path; + GdkPixbuf *pixbuf; +- GError *error; ++ GError *error = NULL; + + if (filename != NULL) { + path = g_build_filename (GCM_DATA, "icons", filename, NULL); +-- +1.7.6.4 + diff --git a/gnome-color-manager.spec b/gnome-color-manager.spec index a8e6c15..37cde44 100644 --- a/gnome-color-manager.spec +++ b/gnome-color-manager.spec @@ -1,11 +1,12 @@ Summary: Color management tools for GNOME Name: gnome-color-manager Version: 3.2.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/System URL: http://projects.gnome.org/gnome-color-manager/ Source0: http://download.gnome.org/sources/gnome-color-manager/3.2/%{name}-%{version}.tar.xz +Patch0: 0001-Initialize-error-pointer-for-gdk_pixbuf_new_from_fil.patch Requires: color-filesystem >= 1-7 Requires: gnome-icon-theme @@ -49,6 +50,7 @@ and generate color profiles in the GNOME desktop. %prep %setup -q +%patch0 -p1 -b .rui %build %configure --disable-scrollkeeper --disable-schemas-install @@ -102,6 +104,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/dbus-1/services/org.gnome.ColorManager.service %changelog +* Thu Oct 06 2011 Adam Jackson 3.2.0-3 +- 0001-Initialize-error-pointer-for-gdk_pixbuf_new_from_fil.patch: Backport + a crash fix from mainline. + * Mon Sep 26 2011 Richard Hughes - 3.2.0-2 - Rebuild for libmash API update.