Hello community, here is the log from the commit of package oyranos for openSUSE:Factory checked in at 2012-05-31 17:07:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/oyranos (Old) and /work/SRC/openSUSE:Factory/.oyranos.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "oyranos", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/oyranos/oyranos.changes 2012-03-22 12:38:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.oyranos.new/oyranos.changes 2012-05-31 17:07:47.000000000 +0200 @@ -2 +2,7 @@ -Sat Mar 10 12:00:00 UTC 2012 - Kai-Uwe Behrmann <ku.b@gmx.de> - 0.4.0 +Mon May 28 12:00:00 UTC 2012 - ku.b@gmx.de + +- add compile fix patch +- require libXcm >= 0.5.1 + +------------------------------------------------------------------- +Fri Mar 10 12:00:00 UTC 2012 - ku.b@gmx.de @@ -7 +13 @@ -Fri Mar 09 12:00:00 UTC 2012 - Kai-Uwe Behrmann <ku.b@gmx.de> - 0.4.0 +Fri Mar 09 12:00:00 UTC 2012 - ku.b@gmx.de @@ -9 +15 @@ -- release of 0.4.0 +- Update to 0.4.0 @@ -12 +18 @@ -Mon Mar 05 11:17:55 UTC 2012 - Kai-Uwe Behrmann <ku.b@gmx.de> +Mon Mar 05 11:17:55 UTC 2012 - ku.b@gmx.de @@ -29 +35 @@ -Fri Nov 25 12:00:01 UTC 2011 - Kai-Uwe Behrmann <ku.b@gmx.de> - 0.3.2 +Fri Nov 25 12:00:01 UTC 2011 - ku.b@gmx.de @@ -39 +45 @@ -Fri Sep 30 12:00:01 UTC 2011 - Kai-Uwe Behrmann <ku.b@gmx.de> - 0.3.2 +Fri Sep 30 12:00:01 UTC 2011 - ku.b@gmx.de @@ -44 +50 @@ -Fri Sep 23 12:00:01 UTC 2011 - Kai-Uwe Behrmann <ku.b@gmx.de> - 0.3.2 +Fri Sep 23 12:00:01 UTC 2011 - ku.b@gmx.de @@ -49 +55 @@ -Mon Sep 20 12:00:01 UTC 2011 - Kai-Uwe Behrmann <ku.b@gmx.de> - 0.3.2 +Mon Sep 20 12:00:01 UTC 2011 - ku.b@gmx.de @@ -50,0 +57 @@ +- Update to 0.3.2 @@ -54 +61 @@ -Mon Sep 20 12:00:01 UTC 2011 - Kai-Uwe Behrmann <ku.b@gmx.de> +Mon Sep 20 12:00:01 UTC 2011 - ku.b@gmx.de @@ -60 +67 @@ -Mon Sep 19 12:00:01 UTC 2011 - Kai-Uwe Behrmann <ku.b@gmx.de> +Mon Sep 19 12:00:01 UTC 2011 - ku.b@gmx.de @@ -66 +73 @@ -Mon Sep 19 12:00:01 UTC 2011 - Kai-Uwe Behrmann <ku.b@gmx.de> +Mon Sep 19 12:00:01 UTC 2011 - ku.b@gmx.de @@ -71 +78 @@ -Wed Jul 01 12:00:01 UTC 2011 - Kai-Uwe Behrmann <ku.b@gmx.de> - 0.3.1 +Wed Jul 01 12:00:01 UTC 2011 - ku.b@gmx.de @@ -72,0 +80 @@ +- update to 0.3.1 New: ---- oyranos-example_compile_fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oyranos.spec ++++++ --- /var/tmp/diff_new_pack.kVJxVL/_old 2012-05-31 17:07:48.000000000 +0200 +++ /var/tmp/diff_new_pack.kVJxVL/_new 2012-05-31 17:07:48.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package oyranos # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011-2012 Kai-Uwe Behrmann <ku.b@gmx.de> # # All modifications and additions to the file contributed by third parties @@ -16,9 +16,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Version: 0.4.0 Release: 0 Source: oyranos-0.4.0.tar.bz2 +Patch0: oyranos-example_compile_fix.patch %define syscolordir /usr/share/color %define usercolordir ~/.config/color %define usercolordata ~/.local/share/color @@ -54,7 +56,7 @@ BuildRequires: gcc-c++ BuildRequires: gettext BuildRequires: graphviz -BuildRequires: libXcm-devel >= 0.5.0 +BuildRequires: libXcm-devel >= 0.5.1 BuildRequires: libjpeg-devel BuildRequires: liblcms-devel BuildRequires: libpng-devel @@ -148,7 +150,7 @@ BuildRequires: gettext BuildRequires: graphviz BuildRequires: lcms-devel -BuildRequires: libXcm-devel >= 0.5.0 +BuildRequires: libXcm-devel >= 0.5.1 BuildRequires: libjpeg BuildRequires: libjpeg-devel BuildRequires: libpng-devel @@ -177,7 +179,7 @@ BuildRequires: gcc-c++ BuildRequires: gettext BuildRequires: graphviz -BuildRequires: libXcm-devel >= 0.5.0 +BuildRequires: libXcm-devel >= 0.5.1 BuildRequires: libXmu-devel BuildRequires: libXxf86vm-devel BuildRequires: libjpeg @@ -387,6 +389,7 @@ %prep %setup -q +%patch0 -p1 %build export CFLAGS="%{optflags}" ++++++ oyranos-example_compile_fix.patch ++++++ diff --git a/examples/xcmsevents/qcmsevents.cpp b/examples/xcmsevents/qcmsevents.cpp index bfdab46..abd0e40 100644 --- a/examples/xcmsevents/qcmsevents.cpp +++ b/examples/xcmsevents/qcmsevents.cpp @@ -14,6 +14,8 @@ #include "oyranos_alpha.h" #include "oyranos_i18n.h" +#include <X11/Xcm/Xcm.h> + QcmseDialog * dialog = 0; QcmseDialog::QcmseDialog() @@ -118,8 +120,8 @@ void QcmseDialog::log( const char * text, int code ) else if (XCME_MSG_DISPLAY_STATUS) { int i; - if(strstr(text, "atom: \""XCM_COLOR_DESKTOP"\":")) - sscanf( text, "atom: \""XCM_COLOR_DESKTOP"\": %d %d", &i, &pid ); + if(strstr(text, "atom: \"" XCM_COLOR_DESKTOP "\":")) + sscanf( text, "atom: \"" XCM_COLOR_DESKTOP "\": %d %d", &i, &pid ); if(pid == 0) { colour.setHsvF( 0.6, 0.4, 0.9 ); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org