From af21176fc56bbfe520ccf8ca53dee9df1dda78f88e83ddad9e4c412b23ec6a55 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 25 Apr 2011 09:45:51 +0000 Subject: [PATCH 1/2] Accepting request 67380 from GNOME:Next thanks OBS-URL: https://build.opensuse.org/request/show/67380 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-color-manager?expand=0&rev=32 --- fix-i2c-include.patch | 12 ++ gnome-color-manager-2.32.0.tar.bz2 | 3 - gnome-color-manager-3.0.0.tar.bz2 | 3 + gnome-color-manager.changes | 169 +++++++++++++++++++++++++++++ gnome-color-manager.spec | 99 ++++++++++++----- 5 files changed, 254 insertions(+), 32 deletions(-) create mode 100644 fix-i2c-include.patch delete mode 100644 gnome-color-manager-2.32.0.tar.bz2 create mode 100644 gnome-color-manager-3.0.0.tar.bz2 diff --git a/fix-i2c-include.patch b/fix-i2c-include.patch new file mode 100644 index 0000000..f6974c9 --- /dev/null +++ b/fix-i2c-include.patch @@ -0,0 +1,12 @@ +Index: libcolor-glib/gcm-ddc-device.c +=================================================================== +--- gcm/libcolor-glib.orig/gcm-ddc-device.c ++++ gcm/libcolor-glib/gcm-ddc-device.c +@@ -37,7 +37,6 @@ + #include + #include + #include +-#include + #include + #include + #include diff --git a/gnome-color-manager-2.32.0.tar.bz2 b/gnome-color-manager-2.32.0.tar.bz2 deleted file mode 100644 index 5d43362..0000000 --- a/gnome-color-manager-2.32.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fa287ef12d329643d1f01b8f35c2b104dd293cd30e91a012f04929c203da54cf -size 2491525 diff --git a/gnome-color-manager-3.0.0.tar.bz2 b/gnome-color-manager-3.0.0.tar.bz2 new file mode 100644 index 0000000..626677b --- /dev/null +++ b/gnome-color-manager-3.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e030b2a5dd61010bce25c2e3cdfca6e7ab3954fecb74dbf88f6a8e2c70b7207 +size 3704414 diff --git a/gnome-color-manager.changes b/gnome-color-manager.changes index da82df2..56b295d 100644 --- a/gnome-color-manager.changes +++ b/gnome-color-manager.changes @@ -1,3 +1,172 @@ +------------------------------------------------------------------- +Tue Apr 5 09:17:12 UTC 2011 - fcrozat@novell.com + +- Update to version 3.0.0: + + Use /org/gnome as starting path for schemas + + Updated translations. + +------------------------------------------------------------------- +Mon Mar 21 17:36:16 UTC 2011 - fcrozat@novell.com + +- Update to version 2.91.92: + + Add priority for gnome-settings-daemon plugin schema + + Remove the gtk-doc support + + Use plugindir from gnome-settings-daemon pkg-config file +- Remove changes to gcm-prefs .desktop categories, it was breaking + new gnome-control-center (and it is no longer needed). +- Changes from version 2.91.90: + + Do not ask the user whether to strip the alpha channel during + calibration. + + Fix a critical warning when installing the shared-color-targets + data. + + huey: remove the dark current values before scaling for the + calibration matrix. + + huey: the CY7C63001 is paired with a 6.00Mhz crystal and it + takes 6 clock cycles to process a 16bit inc with carry check. + + huey: when reading SENSOR_MEASURE_RGB, READ_GREEN and + READ_BLUE, the data value is 32 bits in size. + + Use gcm-calculate-fudge to calculate a more accurate value of + HUEY_XYZ_POST_MULTIPLY_SCALE_FACTOR. + + Updated translations. +- Changes from version 2.91.5: + + Fix GTK3 API break + + GUdev now requires us to set G_UDEV_API_IS_SUBJECT_TO_CHANGE to + be able to build. +- Changes from version 2.91.3: + + New Features: + - Set 'ICC meta Tag for Monitor Profiles' data for future use. + + Bugfix: + - Do not create auto-profiles for XRandR devices without EDID + data. + - Don't segfault if cmsCreateRGBProfile fails. Fixes rh#653419. + - Never show the 'Fine tuning' section in the control center, + it invalidates the profiles. + - Remove the display tab in the color panel +- Changes from version 2.91.2: + + New Features: + - bgo#632052: Add defines and an attach image for the DTP94 + colorimeter. + - Add functionality for a virtual profile to be generated from + the EDID data. + - Add gcm_profile_get_data() and gcm_profile_set_data() which + can be used with the DICT tag. + - Add gcm_profile_guess_and_add_vcgt() to emulate a VCGT from + an ICC profile. + - Add the color temperature into the profie viewer details. + - At login automatically generate an ICC profile from the EDID + and add it to each display device. + - Show the color XYZ values in gcm-dump-profile + + Bugfix: + - Add and remove profiles from gcm-viewer as they are added and + removed from the store. + - Add the X-GNOME-Settings-Panel category so the control center + panel is not in 'Other'. + - Add whitepoint, rXYZ, and VCGT functionality to + GcmCalibrateNative. + - Apply some smoothing to the generated VCGT curves. + - Do not keep adding the auto-EDID profile if the user + explicitly removes it from the GUI. + - Do the request to PackageKit async, to avoid a 200ms lag in + the GUI at startup. + - Ensure we cancel the PackageKit DBus query if the panel is + unloaded. + - Ensure we write the colorspace back into the raw profile if we + generated it. + - If a profile is deleted, ensure it is removed from the control + center panel listbox. + - If the profile viewer was set modal over the preferences + dialog, then don't show a link back to the control center. + - Install a schema file to launch gcm-apply by default in new + versions of gnome-settings-daemon. + - Migrate away from EggDebug and use the builtin GLib logging + framework. + - Port to libnotify 0.7.0. + - Port to the new GtkApplication API. + - Read the rXYZ, gXYZ and bXYZ tags to get the profile primaries + before using a transform fallback. + - Remove deprecated Encoding key from .desktop file. + - Remove GcmXYZ and use proper boxed GTypes for the color + structures. + - Remove the device-specific labels on the first panel page. + - Remove the loading GtkInfoBox as it just makes the UI resize + at startup. + - Reorganize the first pane to stack the devices above the + profiles. + - Set all the 'Since: ' version numbers to the correct versions. + - Set COLOR_MEASUREMENT_DEVICE to get the correct ACL when + argyllcms is not installed. + - Use the correct icon in the profile viewer when using GNOME + Shell. +- Changes from version 2.91.1: + + New Features: + - Add a gnome-settings-daemon module to fix some hard to fix + bugs. + - Add a QPcard 202 reference image + - Add two more example images to the viewer + - Add another example image to the viewer + - Add a reverse-engineered driver to talk to the HUEY colorimeter + - Add the start of a reverse engineerered ColorMunki driver + - Add a simple command gcm-ddc-util to be able to send custom + DDC packets to a monitor in userspace. + - Add a simple parser that can parse the output of the Beagle + USB capture device. + - Add a status property to GcmSensor to help GUI applications. + - Add a udev prober that makes DDC/CI i2c devices available for + the user to use. + - Add GcmCalibrateNative so we can do a calibration without + argyllcms. + - Add gcm-dump-to-values to discover new values in the register + space. + - Add GcmSampleWindow so we can measure known colors in + gcm-picker. + - Add GcmUsb, a simple object to integrate libusb-1 with the + GLib event loop. + - Add support for 100% gray colorspaces. + - Allow the user to flick between different images in the + profile viewer. + - Drop GcmXserver, GcmScreen and libgnomedesktop3 and make the + X11 code faster and cleaner. + - Make gcm-parse-huey be able to parse argyll -D9 traces. + - Make gcm-picker work with native sensor devices too. + - Split off a library, libcolor-glib for internal use. + + Bugfix: + - Do not crash if gcm_libusb_pollfd_remove_all() is called + without assigning a device. + - Do not install the low-level unitilies, and move them to + 'tools'. + - Do not try to apply devices that are not connected. + - Ensure clicking 'Reset' actually resets the device and saves + settings. + - Ensure EDID strings are printable, and ignore totally junk + strings. + - Ensure we can compile with vte3. + - Fix a crash in gcm-picker if we compiled without VTE support. + - Get rid of the 'Color Profiles' section header to reduce + panel clutter. + - Include the time in the calibration basename as we can + calibrate more than once per day. + - Rename the softproof intent to 'Print Preview'. + - Show the correct copyright notice when a profile has used + markup in the description. +- Add fix-i2c-include.patch: fix incorrect i2c header include. +- Add gcc-c++, i2c-tools, pkgconfig(exiv2), pkgconfig(gtk+-3.0), + pkgconfig(gnome-settings-daemon), pkgconfig(lcms2), + pkgconfig(libcanberra-gtk3), pkgconfig(libexif), + pkgconfig(libgnome-control-center), pkgconfig(libusb-1.0), + pkgconfig(vte-2.0) to BuildRequires. +- Remove pkgconfig(dbus-glib-1), pkgconfig(gconf-2.0), + pkgconfig(gnome-desktop-2.0), pkgconfig(gtk+-2.0), + pkgconfig(lcms), pkgconfig(libcanberra-gtk), + pkgconfig(unique-1.0), pkgconfig(vte) and pkgconfig(xxf86vm) + BuildRequires. +- Replace GConf2 schemas handling with GSettings schemas handling. +- Create -devel and libcolor-glib1 subpackages +- Remove deprecated configure options --enable-hardware-detection + and --disable-schemas-install. +- Ensure static library isn't built +- Fix category for gcm-prefs.desktop for it to appear in the right + GNOME control center category. + ------------------------------------------------------------------- Sun Feb 13 14:20:08 CET 2011 - vuntz@opensuse.org diff --git a/gnome-color-manager.spec b/gnome-color-manager.spec index eb8c0c6..2584755 100644 --- a/gnome-color-manager.spec +++ b/gnome-color-manager.spec @@ -1,7 +1,7 @@ # -# spec file for package gnome-color-manager (Version 2.32.0) +# spec file for package gnome-color-manager # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 Luis Medinas, Portugal # # All modifications and additions to the file contributed by third parties @@ -20,17 +20,21 @@ Name: gnome-color-manager -Version: 2.32.0 -Release: 2 +Version: 3.0.0 +Release: 1 Summary: Color management tools for GNOME License: GPLv2+ Group: System/GUI/GNOME Url: http://projects.gnome.org/gnome-color-manager Source: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM fix-i2c-include.patch fcrozat@novell.com -- fix incorrect i2c header include +Patch0: fix-i2c-include.patch BuildRequires: cups-devel BuildRequires: docbook-utils +BuildRequires: gcc-c++ BuildRequires: gnome-doc-utils-devel BuildRequires: intltool +BuildRequires: i2c-tools BuildRequires: libtiff-devel %if 0%{?suse_version} > 1130 BuildRequires: sane-backends-devel @@ -41,70 +45,88 @@ BuildRequires: translation-update-upstream BuildRequires: update-desktop-files # For directory ownership BuildRequires: polkit -BuildRequires: pkgconfig(dbus-glib-1) -BuildRequires: pkgconfig(gconf-2.0) +BuildRequires: pkgconfig(exiv2) BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gnome-desktop-2.0) -BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(gnome-settings-daemon) +BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gudev-1.0) -BuildRequires: pkgconfig(lcms) -BuildRequires: pkgconfig(libcanberra-gtk) +BuildRequires: pkgconfig(lcms2) +BuildRequires: pkgconfig(libcanberra-gtk3) +BuildRequires: pkgconfig(libexif) +BuildRequires: pkgconfig(libgnome-control-center) BuildRequires: pkgconfig(libnotify) -BuildRequires: pkgconfig(unique-1.0) -BuildRequires: pkgconfig(vte) +BuildRequires: pkgconfig(libusb-1.0) +BuildRequires: pkgconfig(vte-2.90) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xrandr) -BuildRequires: pkgconfig(xxf86vm) Requires: PackageKit Requires: shared-color-profiles Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build -%gconf_schemas_prereq +%glib2_gsettings_schema_requires %description GNOME Color Manager is a session framework that makes it easy to manage, install and generate color profiles in the GNOME desktop. +%package devel +License: GPLv2+ +Group: Development/Libraries/GNOME +Summary: Color management tools for GNOME +Requires: %{name} = %{version} +Requires: libcolor-glib1 = %{version} + +%description devel +GNOME Color Manager is a session framework that makes it easy to manage, +install and generate color profiles in the GNOME desktop. + +%package -n libcolor-glib1 +License: GPLv2+ +Group: System/Libraries +Summary: Color management tools for GNOME + +%description -n libcolor-glib1 +GNOME Color Manager is a session framework that makes it easy to manage, +install and generate color profiles in the GNOME desktop. + %lang_package %prep %setup -q translation-update-upstream +%patch0 -p1 %build -%configure \ - --enable-hardware-detection \ - --disable-schemas-install \ +%configure --disable-static \ --disable-scrollkeeper -%{__make} %{?jobs:-j %jobs} +%{__make} %{?jobs:-j %jobs} V=1 %install %makeinstall -# X-GNOME-SystemSettings is okay upstream, but it makes the item appear misplaced with our menu structure -grep -q X-GNOME-SystemSettings %{buildroot}%{_datadir}/applications/gcm-prefs.desktop -%suse_update_desktop_file -r gcm-prefs GNOME Settings HardwareSettings +find %{buildroot} -type f -name "*.la" -delete -print +%suse_update_desktop_file gcm-prefs GNOME SystemSetup %suse_update_desktop_file gcm-apply %suse_update_desktop_file gcm-import +%suse_update_desktop_file gcm-viewer %find_lang %{name} %{?no_lang_C} -%find_gconf_schemas %clean rm -rf %{buildroot} -%pre -f %{name}.schemas_pre - %post %desktop_database_post %icon_theme_cache_post - -%posttrans -f %{name}.schemas_posttrans - -%preun -f %{name}.schemas_preun +%glib2_gsettings_schema_post %postun %desktop_database_postun %icon_theme_cache_postun +%glib2_gsettings_schema_postun -%files -f %{name}.schemas_list +%post -n libcolor-glib1 -p /sbin/ldconfig + +%postun -n libcolor-glib1 -p /sbin/ldconfig + +%files %defattr(-, root, root) %doc AUTHORS ChangeLog COPYING MAINTAINERS NEWS README %dir %{_datadir}/gnome/ @@ -121,12 +143,31 @@ rm -rf %{buildroot} %{_sbindir}/gcm-install-system-wide %{_datadir}/applications/*.desktop %{_datadir}/dbus-1/services/org.gnome.ColorManager.service +%{_datadir}/dbus-1/interfaces/org.gnome.ColorManager.xml %{_datadir}/gnome-color-manager/ %{_datadir}/icons/hicolor/*/apps/gnome-color-manager.* %{_datadir}/icons/hicolor/*/mimetypes/application-vnd.iccprofile.* %{_datadir}/polkit-1/actions/org.gnome.color.policy %{_mandir}/man?/*.* %{_sysconfdir}/xdg/autostart/*.desktop +%{_datadir}/GConf/gsettings/org.gnome.color-manager.gschema.migrate +%{_datadir}/glib-2.0/schemas/org.gnome.color-manager.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.color.gschema.xml +%{_libdir}/gnome-settings-daemon-3.0/libcolor.so +%{_libdir}/gnome-settings-daemon-3.0/color.gnome-settings-plugin +%{_libexecdir}/gcm-helper-exiv +%{_libdir}/control-center-1/panels/libcolor.so +/lib/udev/gcm-udev-ddc + +%files -n libcolor-glib1 +%defattr(-, root, root) +%{_libdir}/*.so.* + +%files devel +%defattr(-, root, root) +%{_libdir}/*.so +%{_includedir}/libcolor-glib +%{_libdir}/pkgconfig/libcolor-glib.pc %files lang -f %{name}.lang From 8406ad00fa654571e62fc05aa2411a4be132ea68ba882341e7b771cf77e6a54d Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 25 Apr 2011 09:55:52 +0000 Subject: [PATCH 2/2] Accepting request 68299 from home:vuntz:branches:GNOME:Factory ok OBS-URL: https://build.opensuse.org/request/show/68299 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-color-manager?expand=0&rev=33 --- gnome-color-manager.changes | 31 +++++++++++++++---------------- gnome-color-manager.spec | 21 ++++++++++----------- 2 files changed, 25 insertions(+), 27 deletions(-) diff --git a/gnome-color-manager.changes b/gnome-color-manager.changes index 56b295d..76cf18e 100644 --- a/gnome-color-manager.changes +++ b/gnome-color-manager.changes @@ -12,8 +12,6 @@ Mon Mar 21 17:36:16 UTC 2011 - fcrozat@novell.com + Add priority for gnome-settings-daemon plugin schema + Remove the gtk-doc support + Use plugindir from gnome-settings-daemon pkg-config file -- Remove changes to gcm-prefs .desktop categories, it was breaking - new gnome-control-center (and it is no longer needed). - Changes from version 2.91.90: + Do not ask the user whether to strip the alpha channel during calibration. @@ -149,23 +147,24 @@ Mon Mar 21 17:36:16 UTC 2011 - fcrozat@novell.com - Show the correct copyright notice when a profile has used markup in the description. - Add fix-i2c-include.patch: fix incorrect i2c header include. -- Add gcc-c++, i2c-tools, pkgconfig(exiv2), pkgconfig(gtk+-3.0), - pkgconfig(gnome-settings-daemon), pkgconfig(lcms2), - pkgconfig(libcanberra-gtk3), pkgconfig(libexif), - pkgconfig(libgnome-control-center), pkgconfig(libusb-1.0), - pkgconfig(vte-2.0) to BuildRequires. -- Remove pkgconfig(dbus-glib-1), pkgconfig(gconf-2.0), - pkgconfig(gnome-desktop-2.0), pkgconfig(gtk+-2.0), - pkgconfig(lcms), pkgconfig(libcanberra-gtk), - pkgconfig(unique-1.0), pkgconfig(vte) and pkgconfig(xxf86vm) +- Replace pkgconfig() BuildRequires for GNOME 3 port and other + updates: + + Old: gtk+-2.0, lcms, libcanberra-gtk, vte. + + New: gtk+-3.0, lcms2, libcanberra-gtk3, vte-2.0. +- Remove now unneeded pkgconfig() BuildRequires: dbus-glib-1, + gconf-2.0, gnome-desktop-2.0, unique-1.0, xxf86vm. +- Add gcc-c++, i2c-tools, pkgconfig(exiv2), + pkgconfig(gnome-settings-daemon), pkgconfig(libexif), + pkgconfig(libgnome-control-center), pkgconfig(libusb-1.0) BuildRequires. -- Replace GConf2 schemas handling with GSettings schemas handling. -- Create -devel and libcolor-glib1 subpackages +- Replace GConf2 schemas handling with GSettings schemas handling, + with %glib2_gsettings_schema_* macros. +- Create -devel and libcolor-glib1 subpackages. - Remove deprecated configure options --enable-hardware-detection - and --disable-schemas-install. -- Ensure static library isn't built + and --disable-schemas-install, and pass --disable-static. - Fix category for gcm-prefs.desktop for it to appear in the right - GNOME control center category. + GNOME control center category: instead of replacing categories, + just add some to make our checks happy. ------------------------------------------------------------------- Sun Feb 13 14:20:08 CET 2011 - vuntz@opensuse.org diff --git a/gnome-color-manager.spec b/gnome-color-manager.spec index 2584755..b1699a3 100644 --- a/gnome-color-manager.spec +++ b/gnome-color-manager.spec @@ -27,7 +27,7 @@ License: GPLv2+ Group: System/GUI/GNOME Url: http://projects.gnome.org/gnome-color-manager Source: %{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM fix-i2c-include.patch fcrozat@novell.com -- fix incorrect i2c header include +# PATCH-FIX-UPSTREAM fix-i2c-include.patch fcrozat@novell.com -- fix incorrect i2c header include; note that in 3.1/3.2, this won't be needed anymore. Patch0: fix-i2c-include.patch BuildRequires: cups-devel BuildRequires: docbook-utils @@ -72,8 +72,7 @@ install and generate color profiles in the GNOME desktop. %package devel License: GPLv2+ Group: Development/Libraries/GNOME -Summary: Color management tools for GNOME -Requires: %{name} = %{version} +Summary: Color management tools for GNOME -- Development Files Requires: libcolor-glib1 = %{version} %description devel @@ -83,7 +82,7 @@ install and generate color profiles in the GNOME desktop. %package -n libcolor-glib1 License: GPLv2+ Group: System/Libraries -Summary: Color management tools for GNOME +Summary: Color management tools for GNOME -- Library %description -n libcolor-glib1 GNOME Color Manager is a session framework that makes it easy to manage, @@ -141,22 +140,22 @@ rm -rf %{buildroot} /lib/udev/rules.d/*.rules %{_bindir}/gcm-* %{_sbindir}/gcm-install-system-wide +%{_datadir}/GConf/gsettings/org.gnome.color-manager.gschema.migrate %{_datadir}/applications/*.desktop -%{_datadir}/dbus-1/services/org.gnome.ColorManager.service %{_datadir}/dbus-1/interfaces/org.gnome.ColorManager.xml +%{_datadir}/dbus-1/services/org.gnome.ColorManager.service +%{_datadir}/glib-2.0/schemas/org.gnome.color-manager.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.color.gschema.xml %{_datadir}/gnome-color-manager/ %{_datadir}/icons/hicolor/*/apps/gnome-color-manager.* %{_datadir}/icons/hicolor/*/mimetypes/application-vnd.iccprofile.* %{_datadir}/polkit-1/actions/org.gnome.color.policy %{_mandir}/man?/*.* %{_sysconfdir}/xdg/autostart/*.desktop -%{_datadir}/GConf/gsettings/org.gnome.color-manager.gschema.migrate -%{_datadir}/glib-2.0/schemas/org.gnome.color-manager.gschema.xml -%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.color.gschema.xml -%{_libdir}/gnome-settings-daemon-3.0/libcolor.so -%{_libdir}/gnome-settings-daemon-3.0/color.gnome-settings-plugin %{_libexecdir}/gcm-helper-exiv %{_libdir}/control-center-1/panels/libcolor.so +%{_libdir}/gnome-settings-daemon-3.0/libcolor.so +%{_libdir}/gnome-settings-daemon-3.0/color.gnome-settings-plugin /lib/udev/gcm-udev-ddc %files -n libcolor-glib1 @@ -166,7 +165,7 @@ rm -rf %{buildroot} %files devel %defattr(-, root, root) %{_libdir}/*.so -%{_includedir}/libcolor-glib +%{_includedir}/libcolor-glib/ %{_libdir}/pkgconfig/libcolor-glib.pc %files lang -f %{name}.lang