Hello community, here is the log from the commit of package compicc for openSUSE:Factory checked in at 2013-09-13 14:45:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/compicc (Old) and /work/SRC/openSUSE:Factory/.compicc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "compicc" Changes: -------- --- /work/SRC/openSUSE:Factory/compicc/compicc.changes 2012-11-21 15:09:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.compicc.new/compicc.changes 2013-09-13 14:45:36.000000000 +0200 @@ -1,0 +2,22 @@ +Wed Sep 11 10:54:12 UTC 2013 - [email protected] + +- fixed build, added: + * no-striptopt.patch + * strdup.patch + * xcm-is-present.patch + +------------------------------------------------------------------- +Tue Dec 22 12:00:00 UTC 2012 - [email protected] + +- update to 0.8.7 release + * [core]: add ICM attribute to _ICC_COLOR_DESKTOP + * [core]: remove obsolete client message + * [core]: describe our _ICC_COLOR_DESKTOP attributes + * [core]: observe more XRandR events + +------------------------------------------------------------------- +Tue Dec 20 12:00:00 UTC 2012 - [email protected] + +- mark |ICM| attribute in _ICC_COLOR_DESKTOP atom + +------------------------------------------------------------------- @@ -21,0 +44,5 @@ + +------------------------------------------------------------------- +Tue Mar 13 12:00:00 UTC 2012 - [email protected] - 0.8.5 + +- required ccsm, as we need to switch CompICC off and on during profiling Old: ---- compicc-0.8.6.tar.bz2 New: ---- compicc-0.8.7.tar.bz2 compicc-no-stripopt.patch compicc-strdup.patch compicc-xcm-is-present.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compicc.spec ++++++ --- /var/tmp/diff_new_pack.YQMwTQ/_old 2013-09-13 14:45:36.000000000 +0200 +++ /var/tmp/diff_new_pack.YQMwTQ/_new 2013-09-13 14:45:36.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package compicc # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,32 +17,37 @@ Name: compicc -Version: 0.8.6 +Version: 0.8.7 Release: 0 -Source: compicc-0.8.6.tar.bz2 -Url: http://sourceforge.net/projects/compicc +Source: %{name}-%{version}.tar.bz2 +# detect libXcm correctly -- sent to [email protected] +Patch0: compicc-xcm-is-present.patch +# probably suse specific, build with -O2 -- sent to [email protected] +Patch1: compicc-no-stripopt.patch +# make declarartion of strdup visible -- sent to [email protected] +Patch2: compicc-strdup.patch +Url: http://sourceforge.net/projects/compicc/files/Compicc/%{name}-%{version}.tar.bz2 %define icondir /usr/share/ccsm/icons/hicolor/scalable/apps/ Summary: Compiz ICC Colour Management Server License: BSD-3-Clause Group: Productivity/Graphics/Other -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Prefix: %{_prefix} # for mandriva; the compiz-devel package comes not with dependencies, so fit the compiz way %define _disable_ld_no_undefined 1 -BuildRequires: liboyranos-devel -Requires: liboyranos0-monitor +BuildRequires: liboyranos-devel >= 0.9.4 +Requires: liboyranos0-monitor >= 0.9.4 Recommends: oyranos-monitor Recommends: oyranos-monitor-nvidia Recommends: oyranos-qcmsevents BuildRequires: compiz < 0.9 Requires: compiz < 0.9 -Recommends: compizconfig-settings-manager < 0.9 +Requires: compizconfig-settings-manager < 0.9 %if 0%{?suse_version} > 0 BuildRequires: compiz-devel < 0.9 BuildRequires: doxygen +BuildRequires: fltk-devel BuildRequires: gcc-c++ BuildRequires: graphviz BuildRequires: libXcm-devel @@ -105,21 +110,6 @@ BuildRequires: xorg-x11-util-devel BuildRequires: xorg-x11-xtrans-devel %endif -%if 0%{?mandriva_version} > 0 -BuildRequires: Mesa -BuildRequires: compiz-devel -BuildRequires: doxygen -BuildRequires: gcc-c++ -BuildRequires: gettext -BuildRequires: graphviz -BuildRequires: lcms-devel -BuildRequires: libXcm-devel -BuildRequires: libtool-devel -BuildRequires: mesagl-devel -BuildRequires: netpbm -BuildRequires: pkgconfig -BuildRequires: xdg-utils -%endif %if 0%{?fedora_version} > 0 BuildRequires: Mesa BuildRequires: Mesa-devel @@ -139,35 +129,6 @@ BuildRequires: xorg-x11-Mesa-devel BuildRequires: xorg-x11-devel %endif -%if 0%{?debian_version} > 0 -BuildRequires: cairo-devel -BuildRequires: compiz-devel -BuildRequires: cups-devel -BuildRequires: doxygen -BuildRequires: elektra-devel -BuildRequires: fltk -BuildRequires: fltk-devel -BuildRequires: gcc-c++ -BuildRequires: gettext -BuildRequires: graphviz -BuildRequires: libXcm-dev -BuildRequires: libjpeg-devel -BuildRequires: liblcms-devel -BuildRequires: libpng-devel -BuildRequires: libqt4-devel -BuildRequires: libtiff-devel -BuildRequires: libxml2-devel -BuildRequires: netpbm -BuildRequires: pkgconfig -BuildRequires: xdg-utils -BuildRequires: xorg-x11 -BuildRequires: xorg-x11-Mesa-devel -BuildRequires: xorg-x11-devel -BuildRequires: xorg-x11-libXext -BuildRequires: xorg-x11-libXext-devel -BuildRequires: xorg-x11-libXpm -BuildRequires: xorg-x11-libXpm-devel -%endif %description The Compiz ICC colour server, or short compicc, lets you colour manage your @@ -178,12 +139,15 @@ %prep %setup -n %{name}-%{version} +%patch0 +%patch1 +%patch2 %build %configure --enable-debug +make %{?_smp_mflags} %install -make %{_smp_mflags} make DESTDIR=%{buildroot} install-main rm -fr %{buildroot}/%{_datadir}/doc/%{name} ++++++ compicc-0.8.6.tar.bz2 -> compicc-0.8.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compicc-0.8.6/ChangeLog new/compicc-0.8.7/ChangeLog --- old/compicc-0.8.6/ChangeLog 2012-11-02 09:18:32.000000000 +0100 +++ new/compicc-0.8.7/ChangeLog 2012-12-22 21:06:56.000000000 +0100 @@ -1,3 +1,12 @@ +Version 0.8.7 + +Kai-Uwe Behrmann (5): + * [core]: add ICM attribute to _ICC_COLOR_DESKTOP + * [core]: remove obsolete client message + * [core]: describe our _ICC_COLOR_DESKTOP attributes + * [core]: observe more XRandR events + * [conf]: bump version + Version 0.8.6 Kai-Uwe Behrmann (9): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compicc-0.8.6/compicc.c new/compicc-0.8.7/compicc.c --- old/compicc-0.8.6/compicc.c 2012-10-22 13:53:54.000000000 +0200 +++ new/compicc-0.8.7/compicc.c 2012-12-20 14:11:25.000000000 +0100 @@ -143,10 +143,8 @@ } PrivColorContext; /** - * The XserverRegion is dereferenced only when the client sends a - * _ICC_COLOR_MANAGEMENT ClientMessage to its window. This allows clients to - * change the region as the window is resized and later send _N_C_M to tell the - * plugin to re-fetch the region from the server. + * The XserverRegion is dereferenced when the client sets it on a window. + * This allows clients to change the region as the window is resized. * The profile is resolved as soon as the client uploads the regions into the * window. That means clients need to upload profiles first and then the * regions. Otherwise the plugin won't be able to find the profile and no color @@ -190,9 +188,6 @@ HandleEventProc handleEvent; - /* ClientMessage sent by the application */ - Atom iccColorManagement; - /* Window properties */ Atom iccColorProfiles; Atom iccColorRegions; @@ -1574,15 +1569,6 @@ } break; - case ClientMessage: - if (event->xclient.message_type == pd->iccColorManagement) - { - CompWindow *w = findWindowAtDisplay (d, event->xclient.window); - PrivWindow *pw = compObjectGetPrivate((CompObject *) w); - - pw->active = 1; - } - break; default: #ifdef HAVE_XRANDR if (event->type == d->randrEvent + RRNotify) @@ -1940,11 +1926,10 @@ * The second section contains time since epoch GMT as returned by time(NULL). * The thired section contains the bar '|' separated and surrounded * capabilities: - * - ICP _ICC_COLOR_PROFILES - * - ICT _ICC_COLOR_TARGET - * - ICM _ICC_COLOR_MANAGEMENT - * - ICR _ICC_COLOR_REGIONS - * - ICA _ICC_COLOR_DISPLAY_ADVANCED + * - ICP _ICC_COLOR_PROFILES - support per region profiles + * - ICM _ICC_COLOR_MANAGEMENT - color server is active + * - ICR _ICC_COLOR_REGIONS - support regions + * - ICA _ICC_COLOR_DISPLAY_ADVANCED - use CMS advanced settings, e.g. proofing * - _ICC_COLOR_DESKTOP is omitted * - V0.3 indicates version compliance to the _ICC_Profile in X spec * The fourth section contains the server name identifier. @@ -1965,7 +1950,7 @@ time_t cutime; /* Time since epoch */ cutime = time(NULL); /* current user time */ const char * my_id = "compicc", - * my_capabilities = "|ICP|ICR|ICA|V0.3|"; /* _ICC_COLOR_REGIONS + * my_capabilities = "|ICM|ICP|ICR|ICA|V0.3|"; /* _ICC_COLOR_REGIONS * _ICC_COLOR_PROFILES */ unsigned long n = 0; char * data = 0; @@ -2103,8 +2088,6 @@ WRAP(pd, d, handleEvent, pluginHandleEvent); - pd->iccColorManagement = XInternAtom(d->display, "_ICC_COLOR_MANAGEMENT", False); - pd->iccColorProfiles = XInternAtom(d->display, XCM_COLOR_PROFILES, False); pd->iccColorRegions = XInternAtom(d->display, XCM_COLOR_REGIONS, False); pd->iccColorOutputs = XInternAtom(d->display, XCM_COLOR_OUTPUTS, False); @@ -2145,7 +2128,8 @@ #ifdef HAVE_XRANDR XRRSelectInput( s->display->display, XRootWindow( s->display->display, screen ), - RROutputPropertyNotifyMask); + RROutputPropertyNotifyMask | RRCrtcChangeNotifyMask | + RROutputChangeNotifyMask | RROutputPropertyNotifyMask ); #endif /* initialisation is done in pluginHandleEvent() by checking ps->nContexts */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compicc-0.8.6/compicc.spec.in new/compicc-0.8.7/compicc.spec.in --- old/compicc-0.8.6/compicc.spec.in 2012-06-06 21:46:48.000000000 +0200 +++ new/compicc-0.8.7/compicc.spec.in 2012-11-16 15:31:46.000000000 +0100 @@ -3,7 +3,6 @@ License: BSD-3-Clause Group: Productivity/Graphics/Other Url: http://sourceforge.net/projects/compicc -Vendor: Kai-Uwe Behrmann BuildRoot: %{_tmppath}/%{name}-root Prefix: %{_prefix} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compicc-0.8.6/configure new/compicc-0.8.7/configure --- old/compicc-0.8.6/configure 2012-03-08 21:53:05.000000000 +0100 +++ new/compicc-0.8.7/configure 2012-11-16 15:29:17.000000000 +0100 @@ -35,14 +35,14 @@ VERSION_A=0 VERSION_B=8 -VERSION_C=6 +VERSION_C=7 VERSION_ABI_A=1 VERSION_ABI_B=0 RELEASE=0 OY_START_MONTH=04 OY_START_YEAR=2008 -OY_DEVEL_MONTH=02 -COMPICC_DEVEL_MONTH=2 # numeric +OY_DEVEL_MONTH=11 +COMPICC_DEVEL_MONTH=11 # numeric OY_DEVEL_YEAR=2012 OY_GIT_MASTER="`cat $ROOT_DIR/.git/refs/heads/master`" time="`date +%y%m%d.%H%M%S`" ++++++ compicc-no-stripopt.patch ++++++ Index: configure =================================================================== --- configure.orig 2012-11-16 15:29:17.496000021 +0100 +++ configure 2013-09-11 12:08:27.558068932 +0200 @@ -95,7 +95,7 @@ fi IFS=$old_IFS -STRIPOPT="sed s/-O.//" +STRIPOPT="cat" if [ $# -gt 0 ]; then prefix="" Index: configure_tests.sh =================================================================== --- configure_tests.sh.orig 2013-09-11 12:05:58.914231225 +0200 +++ configure_tests.sh 2013-09-11 12:09:42.807996119 +0200 @@ -3,7 +3,7 @@ set > testset.txt ERROR=0 WARNING=0 -STRIPOPT='s/-O.// ; s/-isysroot [[:graph:]]*// ; s/-arch ppc// ; s/-arch i386//' +STRIPOPT='s/-isysroot [[:graph:]]*// ; s/-arch ppc// ; s/-arch i386//' mkdir -p tests ++++++ compicc-strdup.patch ++++++ Index: compicc.c =================================================================== --- compicc.c.orig 2012-12-20 14:11:25.731048035 +0100 +++ compicc.c 2013-09-11 12:49:27.915309705 +0200 @@ -14,6 +14,8 @@ */ +/* strdup needs _BSD_SOURCE */ +#define _BSD_SOURCE #include <assert.h> #include <math.h> // floor() #include <string.h> // http://www.opengroup.org/onlinepubs/009695399/functions/strdup.html @@ -25,7 +27,6 @@ #include <icc34.h> #define GL_GLEXT_PROTOTYPES -#define _BSD_SOURCE #include <X11/Xlib.h> #include <X11/Xatom.h> ++++++ compicc-xcm-is-present.patch ++++++ Index: configure_tests.sh =================================================================== --- configure_tests.sh.orig 2012-01-10 12:37:44.796000007 +0100 +++ configure_tests.sh 2013-09-11 12:53:17.796142276 +0200 @@ -611,11 +611,14 @@ if [ -z "$found" ]; then pkg-config --atleast-version=0.2 $pc_package if [ $? = 0 ]; then + # pkg-config --cflags $pc_package may be empty found=`pkg-config --cflags $pc_package` version=`pkg-config --modversion $pc_package` + else + found="no" fi fi - if [ -n "$found" ]; then + if [ "$found" != "no" ]; then if [ -n "$version" ]; then echo_="X CM $version detected"; echo "$echo_" >> $CONF_LOG; test -n "$ECHO" && $ECHO "$echo_" else -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
