Hello community, here is the log from the commit of package fltk for openSUSE:Factory checked in at Thu Apr 1 12:32:37 CEST 2010. -------- --- fltk/fltk.changes 2009-12-18 17:48:20.000000000 +0100 +++ /mounts/work_src_done/STABLE/fltk/fltk.changes 2010-03-31 23:25:28.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Mar 31 21:17:46 UTC 2010 - john@redux.org.uk + +- Added support for building on Fedora, RHEL 5/CentOS 5 and + Mandriva. +- Added patch for use of printf-style varags functions. +- "cast" patch disabled for many build targets, as it caused the + builds to fail. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- fltk-1.1.9.9-varargs.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fltk.spec ++++++ --- /var/tmp/diff_new_pack.7jUE9l/_old 2010-04-01 12:28:22.000000000 +0200 +++ /var/tmp/diff_new_pack.7jUE9l/_new 2010-04-01 12:28:22.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package fltk (Version 1.1.9.9) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -19,12 +19,11 @@ Name: fltk -BuildRequires: Mesa-devel gcc-c++ libjpeg-devel libpng-devel xorg-x11-devel License: LGPLv2.1+ Group: Development/Libraries/X11 AutoReqProv: on Version: 1.1.9.9 -Release: 2 +Release: 3 Summary: Free C++ GUI Toolkit for the X Window System, OpenGL, and WIN32 Url: http://www.fltk.org/ # some of files were updated from CinePaint CVS: @@ -37,9 +36,77 @@ # Took from Gentoo Patch5: %{name}-%{version}-as_needed.patch Patch6: %{name}-%{version}-link_gl.patch +Patch7: %{name}-%{version}-varargs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libfltk1 >= %{version} +BuildRequires: pkgconfig +BuildRequires: gcc-c++ + +%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} +%if 0%{?rhel_version} && 0%{?rhel_version} < 501 +BuildRequires: xorg-x11-devel +BuildRequires: xorg-x11-libs +BuildRequires: xorg-x11-Mesa-libGL +BuildRequires: xorg-x11-Mesa-libGLU +%else +BuildRequires: libX11-devel +BuildRequires: libXext-devel +BuildRequires: libXinerama-devel +BuildRequires: mesa-libGL-devel +BuildRequires: mesa-libGLU-devel +%endif +BuildRequires: libjpeg +BuildRequires: libjpeg-devel +BuildRequires: libpng +BuildRequires: libpng-devel +%endif +%if 0%{?suse_version} +BuildRequires: Mesa-devel +BuildRequires: xorg-x11-devel +%if 0%{?suse_version} > 1120 +BuildRequires: libjpeg8 +%else +BuildRequires: libjpeg +%endif +BuildRequires: libjpeg-devel +BuildRequires: libpng +BuildRequires: libpng-devel +%endif +%if 0%{?mandriva_version} +%ifarch x86_64 +BuildRequires: lib64x11_6-devel +BuildRequires: lib64xext6-devel +BuildRequires: lib64xinerama1-devel +BuildRequires: lib64mesagl1-devel +BuildRequires: lib64mesaglu1-devel +%if 0%{?mandriva_version} < 201000 +BuildRequires: lib64jpeg62 +BuildRequires: lib64jpeg62-devel +%else +BuildRequires: lib64jpeg7 +BuildRequires: lib64jpeg-devel +%endif +BuildRequires: lib64png3 +BuildRequires: lib64png-devel +%else +BuildRequires: libx11_6-devel +BuildRequires: libxext6-devel +BuildRequires: libxinerama1-devel +BuildRequires: libmesagl1-devel +BuildRequires: libmesaglu1-devel +%if 0%{?mandriva_version} < 201000 +BuildRequires: libjpeg62 +BuildRequires: libjpeg62-devel +%else +BuildRequires: libjpeg7 +BuildRequires: libjpeg-devel +%endif +BuildRequires: libpng3 +BuildRequires: libpng-devel +%endif +%endif + %description The Fast Light Tool Kit ("FLTK", pronounced "fulltick") is a C++ graphical user interface toolkit for the X Window System (UNIX(r)), @@ -91,9 +158,13 @@ # renaming on 64bit archs due to fixed libdir in variable called by ranlib mv lib lib64 %endif +%if 0%{?fedora} < 11 || 0%{?rhel_version} || 0%{?centos_version} || 0%{?sles_version} +%else %patch4 +%endif %patch5 -p1 %patch6 +%patch7 %build %{?suse_update_config:%{suse_update_config}} ++++++ fltk-1.1.9.9-varargs.patch ++++++ --- FL/forms.H 2005-04-16 01:13:17.000000000 +0100 +++ FL/forms.H 2010-03-23 17:44:46.000000000 +0000 @@ -651,7 +651,7 @@ FL_EXPORT void fl_show_message(const char *,const char *,const char *); FL_EXPORT void fl_show_alert(const char *,const char *,const char *,int=0); FL_EXPORT int fl_show_question(const char *,const char *,const char *); -inline const char *fl_show_input(const char *l,const char*d=0) {return fl_input(l,d);} +inline const char *fl_show_input(const char *l,const char*d=0) {return fl_input("%s",d,l);} FL_EXPORT /*const*/ char *fl_show_simple_input(const char *label, const char *deflt = 0); FL_EXPORT int fl_show_choice( const char *m1, --- src/Fl_File_Chooser2.cxx 2008-04-11 13:57:37.000000000 +0100 +++ src/Fl_File_Chooser2.cxx 2010-03-23 17:16:44.000000000 +0000 @@ -569,7 +569,7 @@ } } else { // File doesn't exist, so beep at and alert the user... - fl_alert(existing_file_label); + fl_alert("%s", existing_file_label); } } else if (Fl::event_key() != FL_Delete && @@ -757,7 +757,7 @@ // Get a directory name from the user - if ((dir = fl_input(new_directory_label, NULL)) == NULL) + if ((dir = fl_input("%s", NULL, new_directory_label)) == NULL) return; // Make it relative to the current directory as needed... @@ -928,7 +928,7 @@ item = showChoice->text(showChoice->value()); if (strcmp(item, custom_filter_label) == 0) { - if ((item = fl_input(custom_filter_label, pattern_)) != NULL) { + if ((item = fl_input("%s", pattern_, custom_filter_label)) != NULL) { strlcpy(pattern_, item, sizeof(pattern_)); quote_pathname(temp, item, sizeof(temp)); --- src/forms_compatability.cxx 2006-06-09 17:16:34.000000000 +0100 +++ src/forms_compatability.cxx 2010-03-23 17:56:14.000000000 +0000 @@ -202,7 +202,7 @@ } char *fl_show_simple_input(const char *str1, const char *defstr) { - const char *r = fl_input(str1, defstr); + const char *r = fl_input("%s", defstr, str1); return (char *)(r ? r : defstr); } --- fluid/Fl_Function_Type.cxx 2008-01-04 22:18:40.000000000 +0000 +++ fluid/Fl_Function_Type.cxx 2010-03-23 20:46:56.419278181 +0000 @@ -181,7 +181,7 @@ function_panel->show(); const char* message = 0; for (;;) { // repeat as long as there are errors - if (message) fl_alert(message); + if (message) fl_alert("%s", message); for (;;) { Fl_Widget* w = Fl::readqueue(); if (w == f_panel_cancel) goto BREAK2; @@ -412,7 +412,7 @@ code_panel->show(); const char* message = 0; for (;;) { // repeat as long as there are errors - if (message) fl_alert(message); + if (message) fl_alert("%s", message); for (;;) { Fl_Widget* w = Fl::readqueue(); if (w == code_panel_cancel) goto BREAK2; @@ -479,7 +479,7 @@ codeblock_panel->show(); const char* message = 0; for (;;) { // repeat as long as there are errors - if (message) fl_alert(message); + if (message) fl_alert("%s", message); for (;;) { Fl_Widget* w = Fl::readqueue(); if (w == codeblock_panel_cancel) goto BREAK2; @@ -573,7 +573,7 @@ decl_panel->show(); const char* message = 0; for (;;) { // repeat as long as there are errors - if (message) fl_alert(message); + if (message) fl_alert("%s", message); for (;;) { Fl_Widget* w = Fl::readqueue(); if (w == decl_panel_cancel) goto BREAK2; @@ -710,7 +710,7 @@ declblock_panel->show(); const char* message = 0; for (;;) { // repeat as long as there are errors - if (message) fl_alert(message); + if (message) fl_alert("%s", message); for (;;) { Fl_Widget* w = Fl::readqueue(); if (w == declblock_panel_cancel) goto BREAK2; @@ -833,7 +833,7 @@ char itempath[256]; itempath[0] = 0; int last_selected_item = 0; for (;;) { // repeat as long as there are errors - if (message) fl_alert(message); + if (message) fl_alert("%s", message); for (;;) { Fl_Widget* w = Fl::readqueue(); if (w == comment_panel_cancel) goto BREAK2; @@ -1087,7 +1087,7 @@ char *na=0,*pr=0,*p=0; // name and prefix substrings for (;;) { // repeat as long as there are errors - if (message) fl_alert(message); + if (message) fl_alert("%s", message); for (;;) { Fl_Widget* w = Fl::readqueue(); if (w == c_panel_cancel) goto BREAK2; --- fluid/file.cxx 2007-05-10 13:06:31.000000000 +0100 +++ fluid/file.cxx 2010-03-23 21:02:36.948277975 +0000 @@ -159,7 +159,7 @@ if (!fin) { char buffer[1024]; vsnprintf(buffer, sizeof(buffer), format, args); - fl_message(buffer); + fl_message("%s", buffer); } else { fprintf(stderr, "%s:%d: ", fname, lineno); vfprintf(stderr, format, args); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org