commit fltk

Hello community, here is the log from the commit of package fltk checked in at Fri Oct 6 17:26:40 CEST 2006. -------- --- fltk/fltk.changes 2006-08-07 16:15:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/fltk/fltk.changes 2006-10-05 17:27:40.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Oct 5 17:17:17 CEST 2006 - lmichnovic@suse.cz + +- fixed casting on 64bit arch (intptr_t.patch) +- compiling with no-strict-aliasing +- fixed wrongly called ranlib with fixed libdir in variable + (libdir.patch) + +------------------------------------------------------------------- Old: ---- fltk-delete-fix.diff New: ---- fltk-1.1.7-intptr_t.patch fltk-1.1.7-libdir.patch fltk-delete-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fltk.spec ++++++ --- /var/tmp/diff_new_pack.QnRAxF/_old 2006-10-06 17:26:30.000000000 +0200 +++ /var/tmp/diff_new_pack.QnRAxF/_new 2006-10-06 17:26:30.000000000 +0200 @@ -17,11 +17,13 @@ Group: Development/Libraries/X11 Autoreqprov: on Version: 1.1.7 -Release: 2 +Release: 9 Summary: Free C++ GUI Toolkit for the X Window System, OpenGL, and WIN32 (Windows 95,98,NT) URL: http://www.fltk.org/ Source: %{name}-%{version}-source.tar.bz2 -Patch2: %{name}-delete-fix.diff +Patch1: %{name}-delete-fix.patch +Patch2: %{name}-%{version}-intptr_t.patch +Patch3: %{name}-%{version}-libdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %package devel Summary: Include Files and Libraries mandatory for Development. @@ -71,12 +73,19 @@ %prep %setup -q +%patch1 %patch2 +%if "%{_lib}" == "lib64" +%patch3 +# renaming on 64bit archs due to fixed libdir in variable called by ranlib +mv lib lib64 +%endif %build %{?suse_update_config:%{suse_update_config}} -./configure CFLAGS="$RPM_OPT_FLAGS" \ - CXXFLAGS="$RPM_OPT_FLAGS" \ +echo %{_lib} +./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ + CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ --prefix=%{_xorg7_prefix} \ --bindir=%{_xorg7_prefix}/bin \ --libdir=%{_xorg7_prefix}/%{_lib} \ @@ -96,7 +105,7 @@ mv test test.orig mkdir test cp test.orig/*.c* test.orig/*.h test.orig/*.fl test.orig/*.xbm test -cp -a CHANGES COPYING README test ${RPM_BUILD_ROOT}%{_docdir}/fltk +cp -a CHANGES COPYING README test ${RPM_BUILD_ROOT}%{_docdir}/fltk/ cp makeinclude ${RPM_BUILD_ROOT}/usr/share/doc/packages/fltk %post @@ -132,6 +141,11 @@ %{_xorg7_prefix}/bin/* %changelog -n fltk +* Thu Oct 05 2006 - lmichnovic@suse.cz +- fixed casting on 64bit arch (intptr_t.patch) +- compiling with no-strict-aliasing +- fixed wrongly called ranlib with fixed libdir in variable + (libdir.patch) * Mon Aug 07 2006 - lmichnovic@suse.cz - fixed prefixes accordingly to new X.org 7.x, detecting prefix in X.org * Fri Aug 04 2006 - postadal@suse.cz ++++++ fltk-1.1.7-intptr_t.patch ++++++ --- test/cursor.cxx +++ test/cursor.cxx @@ -25,6 +25,8 @@ // http://www.fltk.org/str.php // +#include + #include #include #include @@ -39,7 +41,7 @@ Fl_Hor_Value_Slider *cursor_slider; void choice_cb(Fl_Widget *, void *v) { - cursor = (Fl_Cursor)(int)v; + cursor = (Fl_Cursor)(intptr_t)v; cursor_slider->value(cursor); fl_cursor(cursor,fg,bg); } --- test/input.cxx +++ test/input.cxx @@ -26,6 +26,7 @@ // #include +#include #include #include #include @@ -61,7 +62,7 @@ void color_cb(Fl_Widget* button, void* v) { Fl_Color c; - switch ((int)v) { + switch ((intptr_t)v) { case 0: c = FL_BACKGROUND2_COLOR; break; case 1: c = FL_SELECTION_COLOR; break; default: c = FL_FOREGROUND_COLOR; break; --- test/keyboard.cxx +++ test/keyboard.cxx @@ -40,6 +40,7 @@ // +#include #include "keyboard_ui.h" // these are used to identify which buttons are which: @@ -105,11 +106,11 @@ for (int i = 0; i < window->children(); i++) { Fl_Widget* b = window->child(i); if (b->callback() == (Fl_Callback*)key_cb) { - int i = int(b->user_data()); + int i = intptr_t(b->user_data()); if (!i) i = b->label()[0]; ((Fl_Button*)b)->value(Fl::event_key(i)); } else if (b->callback() == (Fl_Callback*)shift_cb) { - int i = int(b->user_data()); + int i = intptr_t(b->user_data()); ((Fl_Button*)b)->value(Fl::event_state(i)); } } --- test/line_style.cxx +++ test/line_style.cxx @@ -25,6 +25,7 @@ // http://www.fltk.org/str.php // +#include #include #include #include @@ -54,9 +55,9 @@ buf[3] = char(sliders[7]->value()); buf[4] = 0; fl_line_style( - (int)(choice[0]->mvalue()->user_data()) + - (int)(choice[1]->mvalue()->user_data()) + - (int)(choice[2]->mvalue()->user_data()), + (intptr_t)(choice[0]->mvalue()->user_data()) + + (intptr_t)(choice[1]->mvalue()->user_data()) + + (intptr_t)(choice[2]->mvalue()->user_data()), (int)(sliders[3]->value()), buf); fl_rect(10,10,w()-20,h()-20); --- test/scroll.cxx +++ test/scroll.cxx @@ -25,6 +25,7 @@ // http://www.fltk.org/str.php // +#include #include #include #include @@ -71,7 +72,7 @@ } void type_cb(Fl_Widget*, void* v) { - thescroll->type(int(v)); + thescroll->type(intptr_t(v)); thescroll->redraw(); } @@ -87,7 +88,7 @@ }; void align_cb(Fl_Widget*, void* v) { - thescroll->scrollbar.align(int(v)); + thescroll->scrollbar.align(intptr_t(v)); thescroll->redraw(); } ++++++ fltk-1.1.7-libdir.patch ++++++ --- configure.in +++ configure.in @@ -78,17 +78,17 @@ esac dnl Define the libraries and link options we'll need. -LINKFLTK="../lib/libfltk.a" -LINKFLTKFORMS="../lib/libfltk_forms.a" -LINKFLTKGL="../lib/libfltk_gl.a" -LINKFLTKIMG="../lib/libfltk_images.a" +LINKFLTK="../lib64/libfltk.a" +LINKFLTKFORMS="../lib64/libfltk_forms.a" +LINKFLTKGL="../lib64/libfltk_gl.a" +LINKFLTKIMG="../lib64/libfltk_images.a" GLDEMOS="gldemos" LIBEXT=".a" -LIBNAME="../lib/libfltk.a" -FLLIBNAME="../lib/libfltk_forms.a" -GLLIBNAME="../lib/libfltk_gl.a" -IMGLIBNAME="../lib/libfltk_images.a" +LIBNAME="../lib64/libfltk.a" +FLLIBNAME="../lib64/libfltk_forms.a" +GLLIBNAME="../lib64/libfltk_gl.a" +IMGLIBNAME="../lib64/libfltk_images.a" AC_SUBST(FLLIBNAME) AC_SUBST(GLDEMOS) @@ -220,7 +220,7 @@ PICFLAG=0 SHAREDSUFFIX="" FLUID="fluid" - LINKSHARED="../lib/libfltk_images.a ../lib/libfltk_forms.a ../lib/libfltk.a" + LINKSHARED="../lib64/libfltk_images.a ../lib64/libfltk_forms.a ../lib64/libfltk.a" fi AC_SUBST(DSOCOMMAND) --- fluid/Makefile +++ fluid/Makefile @@ -54,8 +54,8 @@ all: $(FLUID) fluid$(EXEEXT) -fluid$(EXEEXT): $(OBJECTS) ../lib/$(LIBNAME) ../lib/$(FLLIBNAME) \ - ../lib/$(IMGLIBNAME) +fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \ + $(IMGLIBNAME) echo Linking $@... $(CXX) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS) $(POSTBUILD) $@ ../FL/mac.r --- src/Makefile +++ src/Makefile @@ -339,56 +339,56 @@ $(CHMOD) +x libfltk_images_s.a cygfltknox-1.1.dll: - echo $(DSOCOMMAND) ../lib/libfltk.a ... - $(DSOCOMMAND) ../lib/libfltk.a -Wl,--no-whole-archive \ + echo $(DSOCOMMAND) ../lib64/libfltk.a ... + $(DSOCOMMAND) ../lib64/libfltk.a -Wl,--no-whole-archive \ -Wl,--out-implib=libfltk.dll.a $(LDLIBS) cygfltknox_forms-1.1.dll: - echo $(DSOCOMMAND) ../lib/libfltk_forms.a ... - $(DSOCOMMAND) ../lib/libfltk_forms.a -Wl,--no-whole-archive \ + echo $(DSOCOMMAND) ../lib64/libfltk_forms.a ... + $(DSOCOMMAND) ../lib64/libfltk_forms.a -Wl,--no-whole-archive \ -Wl,--out-implib=libfltk_forms.dll.a \ - -L../lib -lfltk $(LDLIBS) + -L../lib64 -lfltk $(LDLIBS) cygfltknox_gl-1.1.dll: - echo $(DSOCOMMAND) ../lib/libfltk_gl.a ... - $(DSOCOMMAND) ../lib/libfltk_gl.a -Wl,--no-whole-archive \ + echo $(DSOCOMMAND) ../lib64/libfltk_gl.a ... + $(DSOCOMMAND) ../lib64/libfltk_gl.a -Wl,--no-whole-archive \ -Wl,--out-implib=libfltk_gl.dll.a \ - -L../lib -lfltk $(GLDLIBS) + -L../lib64 -lfltk $(GLDLIBS) cygfltknox_images-1.1.dll: - echo $(DSOCOMMAND) ../lib/libfltk_images ... - $(DSOCOMMAND) ../lib/libfltk_images.a -Wl,--no-whole-archive \ + echo $(DSOCOMMAND) libfltk_images ... + $(DSOCOMMAND) libfltk_images.a -Wl,--no-whole-archive \ -Wl,--out-implib=libfltk_images.dll.a \ - -L../lib -lfltk -ljpeg -lpng -lz $(LDLIBS) + -L../lib64 -lfltk -ljpeg -lpng -lz $(LDLIBS) mgwfltknox-1.1.dll: - echo $(DSOCOMMAND) ../lib/libfltk.a ... - $(DSOCOMMAND) ../lib/libfltk.a -Wl,--no-whole-archive \ + echo $(DSOCOMMAND) ../lib64/libfltk.a ... + $(DSOCOMMAND) ../lib64/libfltk.a -Wl,--no-whole-archive \ -Wl,--out-implib=libfltk.dll.a $(LDLIBS) mgwfltknox_forms-1.1.dll: - echo $(DSOCOMMAND) ../lib/libfltk_forms.a ... - $(DSOCOMMAND) ../lib/libfltk_forms.a -Wl,--no-whole-archive \ + echo $(DSOCOMMAND) ../lib64/libfltk_forms.a ... + $(DSOCOMMAND) ../lib64/libfltk_forms.a -Wl,--no-whole-archive \ -Wl,--out-implib=libfltk_forms.dll.a \ - -L../lib -lfltk $(LDLIBS) + -L../lib64 -lfltk $(LDLIBS) mgwfltknox_gl-1.1.dll: - echo $(DSOCOMMAND) ../lib/libfltk_gl.a ... - $(DSOCOMMAND) ../lib/libfltk_gl.a -Wl,--no-whole-archive \ + echo $(DSOCOMMAND) ../lib64/libfltk_gl.a ... + $(DSOCOMMAND) ../lib64/libfltk_gl.a -Wl,--no-whole-archive \ -Wl,--out-implib=libfltk_gl.dll.a \ - -L../lib -lfltk $(GLDLIBS) + -L../lib64 -lfltk $(GLDLIBS) mgwfltknox_images-1.1.dll: - echo $(DSOCOMMAND) ../lib/libfltk_images ... - $(DSOCOMMAND) ../lib/libfltk_images.a -Wl,--no-whole-archive \ + echo $(DSOCOMMAND) ../lib64/libfltk_images ... + $(DSOCOMMAND) ../lib64/libfltk_images.a -Wl,--no-whole-archive \ -Wl,--out-implib=libfltk_images.dll.a \ - -L../lib -lfltk -ljpeg -lpng -lz $(LDLIBS) + -L../lib64 -lfltk -ljpeg -lpng -lz $(LDLIBS) clean: -$(RM) *.o core.* *~ *.bck *.bck -$(RM) $(DSONAME) $(FLDSONAME) $(GLDSONAME) $(IMGDSONAME) \ - ../lib/$(LIBNAME) ../lib/$(FLLIBNAME) ../lib/$(GLLIBNAME) \ - ../lib/$(IMGLIBNAME) \ + ../lib64/$(LIBNAME) ../lib64/$(FLLIBNAME) ../lib64/$(GLLIBNAME) \ + ../lib64/$(IMGLIBNAME) \ libfltk.so libfltk_forms.so libfltk_gl.so libfltk_images.so \ libfltk.sl libfltk_forms.sl libfltk_gl.sl libfltk_images.sl \ libfltk.dylib libfltk_forms.dylib \ --- test/Makefile +++ test/Makefile @@ -233,7 +233,7 @@ ../fluid/fluid$(EXEEXT) -c $< # All demos depend on the FLTK library... -$(ALL): ../lib/$(LIBNAME) +$(ALL): $(LIBNAME) # General demos... unittests$(EXEEXT): unittests.o @@ -288,7 +288,7 @@ fast_slow$(EXEEXT): fast_slow.o fast_slow.cxx: fast_slow.fl -file_chooser$(EXEEXT): file_chooser.o ../lib/$(IMGLIBNAME) +file_chooser$(EXEEXT): file_chooser.o $(IMGLIBNAME) echo Linking $@... $(CXX) -I.. $(CXXFLAGS) file_chooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS) $(POSTBUILD) $@ ../FL/mac.r @@ -302,7 +302,7 @@ hello$(EXEEXT): hello.o -help$(EXEEXT): help.o ../lib/$(IMGLIBNAME) +help$(EXEEXT): help.o $(IMGLIBNAME) echo Linking $@... $(CXX) -I.. $(CXXFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS) $(POSTBUILD) $@ ../FL/mac.r @@ -349,7 +349,7 @@ navigation$(EXEEXT): navigation.o -output$(EXEEXT): output.o ../lib/$(FLLIBNAME) +output$(EXEEXT): output.o $(FLLIBNAME) echo Linking $@... $(CXX) -I.. $(CXXFLAGS) -o $@ output.o $(LINKFLTKFORMS) $(LDLIBS) $(POSTBUILD) $@ ../FL/mac.r @@ -360,7 +360,7 @@ pixmap$(EXEEXT): pixmap.o -pixmap_browser$(EXEEXT): pixmap_browser.o ../lib/$(IMGLIBNAME) +pixmap_browser$(EXEEXT): pixmap_browser.o $(IMGLIBNAME) echo Linking $@... $(CXX) -I.. $(CXXFLAGS) pixmap_browser.o -o $@ $(LINKFLTKIMG) $(LDLIBS) $(POSTBUILD) $@ ../FL/mac.r @@ -409,7 +409,7 @@ valuators.cxx: valuators.fl # All OpenGL demos depend on the FLTK and FLTK_GL libraries... -$(GLALL): ../lib/$(LIBNAME) ../lib/$(GLLIBNAME) +$(GLALL): $(LIBNAME) $(GLLIBNAME) # OpenGL demos... CubeView$(EXEEXT): CubeMain.o CubeView.o CubeViewUI.o ++++++ fltk-delete-fix.patch ++++++ --- FL/Fl_Browser_.H +++ FL/Fl_Browser_.H @@ -101,8 +101,8 @@ public: - Fl_Scrollbar scrollbar; // Vertical scrollbar - Fl_Scrollbar hscrollbar; // Horizontal scrollbar + Fl_Scrollbar &scrollbar; // Vertical scrollbar + Fl_Scrollbar &hscrollbar; // Horizontal scrollbar int handle(int); void resize(int,int,int,int); --- FL/Fl_Help_View.H +++ FL/Fl_Help_View.H @@ -128,8 +128,8 @@ leftline_, // Lefthand position size_, // Total document length hsize_; // Maximum document width - Fl_Scrollbar scrollbar_, // Vertical scrollbar for document - hscrollbar_; // Horizontal scrollbar + Fl_Scrollbar &scrollbar_, // Vertical scrollbar for document + &hscrollbar_; // Horizontal scrollbar Fl_Help_Block *add_block(const char *s, int xx, int yy, int ww, int hh, uchar border = 0); void add_link(const char *n, int xx, int yy, int ww, int hh); --- FL/Fl_Scroll.H +++ FL/Fl_Scroll.H @@ -46,8 +46,8 @@ public: - Fl_Scrollbar scrollbar; - Fl_Scrollbar hscrollbar; + Fl_Scrollbar &scrollbar; + Fl_Scrollbar &hscrollbar; void resize(int,int,int,int); int handle(int); --- src/Fl_Browser_.cxx +++ src/Fl_Browser_.cxx @@ -705,8 +705,8 @@ Fl_Browser_::Fl_Browser_(int X, int Y, int W, int H, const char* l) : Fl_Group(X, Y, W, H, l), - scrollbar(0, 0, 0, 0, 0), // they will be resized by draw() - hscrollbar(0, 0, 0, 0, 0) + scrollbar(*new Fl_Scrollbar(0, 0, 0, 0, 0)), // they will be resized by draw() + hscrollbar(*new Fl_Scrollbar(0, 0, 0, 0, 0)) { box(FL_NO_BOX); align(FL_ALIGN_BOTTOM); --- src/Fl_Help_View.cxx +++ src/Fl_Help_View.cxx @@ -2299,8 +2299,8 @@ int hh, // I - Height in pixels const char *l) : Fl_Group(xx, yy, ww, hh, l), - scrollbar_(xx + ww - 17, yy, 17, hh - 17), - hscrollbar_(xx, yy + hh - 17, ww - 17, 17) + scrollbar_(*new Fl_Scrollbar(xx + ww - 17, yy, 17, hh - 17)), + hscrollbar_(*new Fl_Scrollbar(xx, yy + hh - 17, ww - 17, 17)) { color(FL_BACKGROUND2_COLOR, FL_SELECTION_COLOR); --- src/Fl_Scroll.cxx +++ src/Fl_Scroll.cxx @@ -232,8 +232,8 @@ Fl_Scroll::Fl_Scroll(int X,int Y,int W,int H,const char* L) : Fl_Group(X,Y,W,H,L), - scrollbar(X+W-SLIDER_WIDTH,Y,SLIDER_WIDTH,H-SLIDER_WIDTH), - hscrollbar(X,Y+H-SLIDER_WIDTH,W-SLIDER_WIDTH,SLIDER_WIDTH) { + scrollbar(*new Fl_Scrollbar(X+W-SLIDER_WIDTH,Y,SLIDER_WIDTH,H-SLIDER_WIDTH)), + hscrollbar(*new Fl_Scrollbar(X,Y+H-SLIDER_WIDTH,W-SLIDER_WIDTH,SLIDER_WIDTH)) { type(BOTH); xposition_ = 0; yposition_ = 0; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org