Hello community, here is the log from the commit of package oyranos for openSUSE:Factory checked in at 2011-12-02 13:21: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 2011-10-28 20:00:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.oyranos.new/oyranos.changes 2011-12-02 13:22:10.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Nov 25 12:00:01 UTC 2011 - Kai-Uwe Behrmann <[email protected]> - 0.3.2 + +- fix for bug sf#3441971 alias bnc#732748 oyranos-monitor crash in oS-12.1 + +------------------------------------------------------------------- New: ---- oyranos-CMMapi_Check-fix.patch oyranos-remove_unused_calls_in_lraw.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oyranos.spec ++++++ --- /var/tmp/diff_new_pack.X4plmn/_old 2011-12-02 13:22:12.000000000 +0100 +++ /var/tmp/diff_new_pack.X4plmn/_new 2011-12-02 13:22:12.000000000 +0100 @@ -42,6 +42,8 @@ Prefix: %{_prefix} Patch0: oyranos_CUPS_fix_wrong_object_passing.patch +Patch1: oyranos-CMMapi_Check-fix.patch +Patch2: oyranos-remove_unused_calls_in_lraw.patch Source1: oyranos-rpmlintrc BuildRequires: color-filesystem desktop-file-utils lcms2 @@ -240,6 +242,8 @@ %prep %setup -q %patch0 -p1 -b .CUPS_fix_wrong_object_passing +%patch1 -p1 -b .CMMapi_Check-fix +%patch2 -p1 -b .remove_unused_calls_in_lraw %build export CFLAGS="%{optflags}" ++++++ oyranos-CMMapi_Check-fix.patch ++++++ --- a/oyranos_alpha.c +++ b/oyranos_alpha.c @@ -2678,15 +2678,20 @@ int oyCMMRelease_ ( const char * cmm ) * @memberof oyCMMapi_s * @brief check for completeness * - * @version Oyranos: 0.1.10 + * @version Oyranos: 0.3.3 * @since 2007/12/06 (Oyranos: 0.1.8) - * @date 2009/09/02 + * @date 2011/11/25 */ oyOBJECT_e oyCMMapi_Check_ ( oyCMMapi_s * api ) { int error = !api; oyOBJECT_e type = oyOBJECT_NONE; - int module_api = api->module_api[0]*10000 + api->module_api[1]*100 + int module_api; + + if(error) + return type; + + module_api = api->module_api[0]*10000 + api->module_api[1]*100 + api->module_api[2]; if(api->type <= oyOBJECT_CMM_API_S || ++++++ oyranos-remove_unused_calls_in_lraw.patch ++++++ --- a/modules/oyranos_cmm_lraw.cpp +++ b/modules/oyranos_cmm_lraw.cpp @@ -152,45 +152,6 @@ int lrawCMMMessageFuncSet ( oyMessage_f message_func ) } -int oyStructList_MoveInName( oyStructList_s * texts, char ** text, int pos ) -{ - int error = !texts || ! text; - oyName_s * name = 0; - oyStruct_s * oy_struct = 0; - if(!error) - { - name = oyName_new(0); - name->name = *text; - *text = 0; - oy_struct = (oyStruct_s*) name; - oyStructList_MoveIn( texts, &oy_struct, pos, 0 ); - } - return error; -} - -int oyStructList_AddName( oyStructList_s * texts, const char * text, int pos ) -{ - int error = !texts; - oyName_s * name = 0; - oyStruct_s * oy_struct = 0; - char * tmp = 0; - if(!error) - { - name = oyName_new(0); - if(!name) return 1; - if(text) - { - tmp = (char*) oyAllocateFunc_( strlen(text) + 1 ); - if(!tmp) return 1; - sprintf( tmp, "%s", text ); - name->name = tmp; - } - oy_struct = (oyStruct_s*) name; - oyStructList_MoveIn( texts, &oy_struct, pos, 0 ); - } - return error; -} - const char * lrawWidget_GetDummy ( const char * func_name, -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
