commit 9ab091f6273c417567a22af7b79adc1099d16959 Author: Danny Rawlins <monster.romster@gmail.com> Date: Sun Aug 18 16:31:15 2019 +1000 fltk: 1.3.4-2 -> 1.3.5 diff --git a/fltk/.footprint b/fltk/.footprint index 21081860..14946820 100644 --- a/fltk/.footprint +++ b/fltk/.footprint @@ -1,175 +1,354 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/blocks +-rwxr-xr-x root/root usr/bin/checkers -rwxr-xr-x root/root usr/bin/fltk-config -rwxr-xr-x root/root usr/bin/fluid +-rwxr-xr-x root/root usr/bin/sudoku drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/FL/ -rw-r--r-- root/root usr/include/FL/Enumerations.H +lrwxrwxrwx root/root usr/include/FL/Enumerations.h -> Enumerations.H -rw-r--r-- root/root usr/include/FL/Fl.H +lrwxrwxrwx root/root usr/include/FL/Fl.h -> Fl.H -rw-r--r-- root/root usr/include/FL/Fl_Adjuster.H +lrwxrwxrwx root/root usr/include/FL/Fl_Adjuster.h -> Fl_Adjuster.H -rw-r--r-- root/root usr/include/FL/Fl_BMP_Image.H +lrwxrwxrwx root/root usr/include/FL/Fl_BMP_Image.h -> Fl_BMP_Image.H -rw-r--r-- root/root usr/include/FL/Fl_Bitmap.H +lrwxrwxrwx root/root usr/include/FL/Fl_Bitmap.h -> Fl_Bitmap.H -rw-r--r-- root/root usr/include/FL/Fl_Box.H +lrwxrwxrwx root/root usr/include/FL/Fl_Box.h -> Fl_Box.H -rw-r--r-- root/root usr/include/FL/Fl_Browser.H +lrwxrwxrwx root/root usr/include/FL/Fl_Browser.h -> Fl_Browser.H -rw-r--r-- root/root usr/include/FL/Fl_Browser_.H +lrwxrwxrwx root/root usr/include/FL/Fl_Browser_.h -> Fl_Browser_.H -rw-r--r-- root/root usr/include/FL/Fl_Button.H +lrwxrwxrwx root/root usr/include/FL/Fl_Button.h -> Fl_Button.H -rw-r--r-- root/root usr/include/FL/Fl_Cairo.H +lrwxrwxrwx root/root usr/include/FL/Fl_Cairo.h -> Fl_Cairo.H -rw-r--r-- root/root usr/include/FL/Fl_Cairo_Window.H +lrwxrwxrwx root/root usr/include/FL/Fl_Cairo_Window.h -> Fl_Cairo_Window.H -rw-r--r-- root/root usr/include/FL/Fl_Chart.H +lrwxrwxrwx root/root usr/include/FL/Fl_Chart.h -> Fl_Chart.H -rw-r--r-- root/root usr/include/FL/Fl_Check_Browser.H +lrwxrwxrwx root/root usr/include/FL/Fl_Check_Browser.h -> Fl_Check_Browser.H -rw-r--r-- root/root usr/include/FL/Fl_Check_Button.H +lrwxrwxrwx root/root usr/include/FL/Fl_Check_Button.h -> Fl_Check_Button.H -rw-r--r-- root/root usr/include/FL/Fl_Choice.H +lrwxrwxrwx root/root usr/include/FL/Fl_Choice.h -> Fl_Choice.H -rw-r--r-- root/root usr/include/FL/Fl_Clock.H +lrwxrwxrwx root/root usr/include/FL/Fl_Clock.h -> Fl_Clock.H -rw-r--r-- root/root usr/include/FL/Fl_Color_Chooser.H +lrwxrwxrwx root/root usr/include/FL/Fl_Color_Chooser.h -> Fl_Color_Chooser.H -rw-r--r-- root/root usr/include/FL/Fl_Copy_Surface.H +lrwxrwxrwx root/root usr/include/FL/Fl_Copy_Surface.h -> Fl_Copy_Surface.H -rw-r--r-- root/root usr/include/FL/Fl_Counter.H +lrwxrwxrwx root/root usr/include/FL/Fl_Counter.h -> Fl_Counter.H -rw-r--r-- root/root usr/include/FL/Fl_Device.H +lrwxrwxrwx root/root usr/include/FL/Fl_Device.h -> Fl_Device.H -rw-r--r-- root/root usr/include/FL/Fl_Dial.H +lrwxrwxrwx root/root usr/include/FL/Fl_Dial.h -> Fl_Dial.H -rw-r--r-- root/root usr/include/FL/Fl_Double_Window.H +lrwxrwxrwx root/root usr/include/FL/Fl_Double_Window.h -> Fl_Double_Window.H -rw-r--r-- root/root usr/include/FL/Fl_Export.H +lrwxrwxrwx root/root usr/include/FL/Fl_Export.h -> Fl_Export.H -rw-r--r-- root/root usr/include/FL/Fl_File_Browser.H +lrwxrwxrwx root/root usr/include/FL/Fl_File_Browser.h -> Fl_File_Browser.H -rw-r--r-- root/root usr/include/FL/Fl_File_Chooser.H +lrwxrwxrwx root/root usr/include/FL/Fl_File_Chooser.h -> Fl_File_Chooser.H -rw-r--r-- root/root usr/include/FL/Fl_File_Icon.H +lrwxrwxrwx root/root usr/include/FL/Fl_File_Icon.h -> Fl_File_Icon.H -rw-r--r-- root/root usr/include/FL/Fl_File_Input.H +lrwxrwxrwx root/root usr/include/FL/Fl_File_Input.h -> Fl_File_Input.H -rw-r--r-- root/root usr/include/FL/Fl_Fill_Dial.H +lrwxrwxrwx root/root usr/include/FL/Fl_Fill_Dial.h -> Fl_Fill_Dial.H -rw-r--r-- root/root usr/include/FL/Fl_Fill_Slider.H +lrwxrwxrwx root/root usr/include/FL/Fl_Fill_Slider.h -> Fl_Fill_Slider.H -rw-r--r-- root/root usr/include/FL/Fl_Float_Input.H +lrwxrwxrwx root/root usr/include/FL/Fl_Float_Input.h -> Fl_Float_Input.H -rw-r--r-- root/root usr/include/FL/Fl_FormsBitmap.H +lrwxrwxrwx root/root usr/include/FL/Fl_FormsBitmap.h -> Fl_FormsBitmap.H -rw-r--r-- root/root usr/include/FL/Fl_FormsPixmap.H +lrwxrwxrwx root/root usr/include/FL/Fl_FormsPixmap.h -> Fl_FormsPixmap.H -rw-r--r-- root/root usr/include/FL/Fl_Free.H +lrwxrwxrwx root/root usr/include/FL/Fl_Free.h -> Fl_Free.H -rw-r--r-- root/root usr/include/FL/Fl_GIF_Image.H +lrwxrwxrwx root/root usr/include/FL/Fl_GIF_Image.h -> Fl_GIF_Image.H -rw-r--r-- root/root usr/include/FL/Fl_Gl_Window.H +lrwxrwxrwx root/root usr/include/FL/Fl_Gl_Window.h -> Fl_Gl_Window.H -rw-r--r-- root/root usr/include/FL/Fl_Group.H +lrwxrwxrwx root/root usr/include/FL/Fl_Group.h -> Fl_Group.H -rw-r--r-- root/root usr/include/FL/Fl_Help_Dialog.H +lrwxrwxrwx root/root usr/include/FL/Fl_Help_Dialog.h -> Fl_Help_Dialog.H -rw-r--r-- root/root usr/include/FL/Fl_Help_View.H +lrwxrwxrwx root/root usr/include/FL/Fl_Help_View.h -> Fl_Help_View.H -rw-r--r-- root/root usr/include/FL/Fl_Hold_Browser.H +lrwxrwxrwx root/root usr/include/FL/Fl_Hold_Browser.h -> Fl_Hold_Browser.H -rw-r--r-- root/root usr/include/FL/Fl_Hor_Fill_Slider.H +lrwxrwxrwx root/root usr/include/FL/Fl_Hor_Fill_Slider.h -> Fl_Hor_Fill_Slider.H -rw-r--r-- root/root usr/include/FL/Fl_Hor_Nice_Slider.H +lrwxrwxrwx root/root usr/include/FL/Fl_Hor_Nice_Slider.h -> Fl_Hor_Nice_Slider.H -rw-r--r-- root/root usr/include/FL/Fl_Hor_Slider.H +lrwxrwxrwx root/root usr/include/FL/Fl_Hor_Slider.h -> Fl_Hor_Slider.H -rw-r--r-- root/root usr/include/FL/Fl_Hor_Value_Slider.H +lrwxrwxrwx root/root usr/include/FL/Fl_Hor_Value_Slider.h -> Fl_Hor_Value_Slider.H -rw-r--r-- root/root usr/include/FL/Fl_Image.H +lrwxrwxrwx root/root usr/include/FL/Fl_Image.h -> Fl_Image.H -rw-r--r-- root/root usr/include/FL/Fl_Image_Surface.H +lrwxrwxrwx root/root usr/include/FL/Fl_Image_Surface.h -> Fl_Image_Surface.H -rw-r--r-- root/root usr/include/FL/Fl_Input.H +lrwxrwxrwx root/root usr/include/FL/Fl_Input.h -> Fl_Input.H -rw-r--r-- root/root usr/include/FL/Fl_Input_.H +lrwxrwxrwx root/root usr/include/FL/Fl_Input_.h -> Fl_Input_.H -rw-r--r-- root/root usr/include/FL/Fl_Input_Choice.H +lrwxrwxrwx root/root usr/include/FL/Fl_Input_Choice.h -> Fl_Input_Choice.H -rw-r--r-- root/root usr/include/FL/Fl_Int_Input.H +lrwxrwxrwx root/root usr/include/FL/Fl_Int_Input.h -> Fl_Int_Input.H -rw-r--r-- root/root usr/include/FL/Fl_JPEG_Image.H +lrwxrwxrwx root/root usr/include/FL/Fl_JPEG_Image.h -> Fl_JPEG_Image.H -rw-r--r-- root/root usr/include/FL/Fl_Light_Button.H +lrwxrwxrwx root/root usr/include/FL/Fl_Light_Button.h -> Fl_Light_Button.H -rw-r--r-- root/root usr/include/FL/Fl_Line_Dial.H +lrwxrwxrwx root/root usr/include/FL/Fl_Line_Dial.h -> Fl_Line_Dial.H -rw-r--r-- root/root usr/include/FL/Fl_Menu.H +lrwxrwxrwx root/root usr/include/FL/Fl_Menu.h -> Fl_Menu.H -rw-r--r-- root/root usr/include/FL/Fl_Menu_.H +lrwxrwxrwx root/root usr/include/FL/Fl_Menu_.h -> Fl_Menu_.H -rw-r--r-- root/root usr/include/FL/Fl_Menu_Bar.H +lrwxrwxrwx root/root usr/include/FL/Fl_Menu_Bar.h -> Fl_Menu_Bar.H -rw-r--r-- root/root usr/include/FL/Fl_Menu_Button.H +lrwxrwxrwx root/root usr/include/FL/Fl_Menu_Button.h -> Fl_Menu_Button.H -rw-r--r-- root/root usr/include/FL/Fl_Menu_Item.H +lrwxrwxrwx root/root usr/include/FL/Fl_Menu_Item.h -> Fl_Menu_Item.H -rw-r--r-- root/root usr/include/FL/Fl_Menu_Window.H +lrwxrwxrwx root/root usr/include/FL/Fl_Menu_Window.h -> Fl_Menu_Window.H -rw-r--r-- root/root usr/include/FL/Fl_Multi_Browser.H +lrwxrwxrwx root/root usr/include/FL/Fl_Multi_Browser.h -> Fl_Multi_Browser.H -rw-r--r-- root/root usr/include/FL/Fl_Multi_Label.H +lrwxrwxrwx root/root usr/include/FL/Fl_Multi_Label.h -> Fl_Multi_Label.H -rw-r--r-- root/root usr/include/FL/Fl_Multiline_Input.H +lrwxrwxrwx root/root usr/include/FL/Fl_Multiline_Input.h -> Fl_Multiline_Input.H -rw-r--r-- root/root usr/include/FL/Fl_Multiline_Output.H +lrwxrwxrwx root/root usr/include/FL/Fl_Multiline_Output.h -> Fl_Multiline_Output.H -rw-r--r-- root/root usr/include/FL/Fl_Native_File_Chooser.H +lrwxrwxrwx root/root usr/include/FL/Fl_Native_File_Chooser.h -> Fl_Native_File_Chooser.H -rw-r--r-- root/root usr/include/FL/Fl_Nice_Slider.H +lrwxrwxrwx root/root usr/include/FL/Fl_Nice_Slider.h -> Fl_Nice_Slider.H -rw-r--r-- root/root usr/include/FL/Fl_Object.H +lrwxrwxrwx root/root usr/include/FL/Fl_Object.h -> Fl_Object.H -rw-r--r-- root/root usr/include/FL/Fl_Output.H +lrwxrwxrwx root/root usr/include/FL/Fl_Output.h -> Fl_Output.H -rw-r--r-- root/root usr/include/FL/Fl_Overlay_Window.H +lrwxrwxrwx root/root usr/include/FL/Fl_Overlay_Window.h -> Fl_Overlay_Window.H -rw-r--r-- root/root usr/include/FL/Fl_PNG_Image.H +lrwxrwxrwx root/root usr/include/FL/Fl_PNG_Image.h -> Fl_PNG_Image.H -rw-r--r-- root/root usr/include/FL/Fl_PNM_Image.H +lrwxrwxrwx root/root usr/include/FL/Fl_PNM_Image.h -> Fl_PNM_Image.H -rw-r--r-- root/root usr/include/FL/Fl_Pack.H +lrwxrwxrwx root/root usr/include/FL/Fl_Pack.h -> Fl_Pack.H -rw-r--r-- root/root usr/include/FL/Fl_Paged_Device.H +lrwxrwxrwx root/root usr/include/FL/Fl_Paged_Device.h -> Fl_Paged_Device.H -rw-r--r-- root/root usr/include/FL/Fl_Pixmap.H +lrwxrwxrwx root/root usr/include/FL/Fl_Pixmap.h -> Fl_Pixmap.H -rw-r--r-- root/root usr/include/FL/Fl_Plugin.H +lrwxrwxrwx root/root usr/include/FL/Fl_Plugin.h -> Fl_Plugin.H -rw-r--r-- root/root usr/include/FL/Fl_Positioner.H +lrwxrwxrwx root/root usr/include/FL/Fl_Positioner.h -> Fl_Positioner.H -rw-r--r-- root/root usr/include/FL/Fl_PostScript.H +lrwxrwxrwx root/root usr/include/FL/Fl_PostScript.h -> Fl_PostScript.H -rw-r--r-- root/root usr/include/FL/Fl_Preferences.H +lrwxrwxrwx root/root usr/include/FL/Fl_Preferences.h -> Fl_Preferences.H -rw-r--r-- root/root usr/include/FL/Fl_Printer.H +lrwxrwxrwx root/root usr/include/FL/Fl_Printer.h -> Fl_Printer.H -rw-r--r-- root/root usr/include/FL/Fl_Progress.H +lrwxrwxrwx root/root usr/include/FL/Fl_Progress.h -> Fl_Progress.H -rw-r--r-- root/root usr/include/FL/Fl_RGB_Image.H +lrwxrwxrwx root/root usr/include/FL/Fl_RGB_Image.h -> Fl_RGB_Image.H -rw-r--r-- root/root usr/include/FL/Fl_Radio_Button.H +lrwxrwxrwx root/root usr/include/FL/Fl_Radio_Button.h -> Fl_Radio_Button.H -rw-r--r-- root/root usr/include/FL/Fl_Radio_Light_Button.H +lrwxrwxrwx root/root usr/include/FL/Fl_Radio_Light_Button.h -> Fl_Radio_Light_Button.H -rw-r--r-- root/root usr/include/FL/Fl_Radio_Round_Button.H +lrwxrwxrwx root/root usr/include/FL/Fl_Radio_Round_Button.h -> Fl_Radio_Round_Button.H -rw-r--r-- root/root usr/include/FL/Fl_Repeat_Button.H +lrwxrwxrwx root/root usr/include/FL/Fl_Repeat_Button.h -> Fl_Repeat_Button.H -rw-r--r-- root/root usr/include/FL/Fl_Return_Button.H +lrwxrwxrwx root/root usr/include/FL/Fl_Return_Button.h -> Fl_Return_Button.H -rw-r--r-- root/root usr/include/FL/Fl_Roller.H +lrwxrwxrwx root/root usr/include/FL/Fl_Roller.h -> Fl_Roller.H -rw-r--r-- root/root usr/include/FL/Fl_Round_Button.H +lrwxrwxrwx root/root usr/include/FL/Fl_Round_Button.h -> Fl_Round_Button.H -rw-r--r-- root/root usr/include/FL/Fl_Round_Clock.H +lrwxrwxrwx root/root usr/include/FL/Fl_Round_Clock.h -> Fl_Round_Clock.H -rw-r--r-- root/root usr/include/FL/Fl_Scroll.H +lrwxrwxrwx root/root usr/include/FL/Fl_Scroll.h -> Fl_Scroll.H -rw-r--r-- root/root usr/include/FL/Fl_Scrollbar.H +lrwxrwxrwx root/root usr/include/FL/Fl_Scrollbar.h -> Fl_Scrollbar.H -rw-r--r-- root/root usr/include/FL/Fl_Secret_Input.H +lrwxrwxrwx root/root usr/include/FL/Fl_Secret_Input.h -> Fl_Secret_Input.H -rw-r--r-- root/root usr/include/FL/Fl_Select_Browser.H +lrwxrwxrwx root/root usr/include/FL/Fl_Select_Browser.h -> Fl_Select_Browser.H -rw-r--r-- root/root usr/include/FL/Fl_Shared_Image.H +lrwxrwxrwx root/root usr/include/FL/Fl_Shared_Image.h -> Fl_Shared_Image.H -rw-r--r-- root/root usr/include/FL/Fl_Simple_Counter.H +lrwxrwxrwx root/root usr/include/FL/Fl_Simple_Counter.h -> Fl_Simple_Counter.H -rw-r--r-- root/root usr/include/FL/Fl_Single_Window.H +lrwxrwxrwx root/root usr/include/FL/Fl_Single_Window.h -> Fl_Single_Window.H -rw-r--r-- root/root usr/include/FL/Fl_Slider.H +lrwxrwxrwx root/root usr/include/FL/Fl_Slider.h -> Fl_Slider.H -rw-r--r-- root/root usr/include/FL/Fl_Spinner.H +lrwxrwxrwx root/root usr/include/FL/Fl_Spinner.h -> Fl_Spinner.H -rw-r--r-- root/root usr/include/FL/Fl_Sys_Menu_Bar.H +lrwxrwxrwx root/root usr/include/FL/Fl_Sys_Menu_Bar.h -> Fl_Sys_Menu_Bar.H -rw-r--r-- root/root usr/include/FL/Fl_Table.H +lrwxrwxrwx root/root usr/include/FL/Fl_Table.h -> Fl_Table.H -rw-r--r-- root/root usr/include/FL/Fl_Table_Row.H +lrwxrwxrwx root/root usr/include/FL/Fl_Table_Row.h -> Fl_Table_Row.H -rw-r--r-- root/root usr/include/FL/Fl_Tabs.H +lrwxrwxrwx root/root usr/include/FL/Fl_Tabs.h -> Fl_Tabs.H -rw-r--r-- root/root usr/include/FL/Fl_Text_Buffer.H +lrwxrwxrwx root/root usr/include/FL/Fl_Text_Buffer.h -> Fl_Text_Buffer.H -rw-r--r-- root/root usr/include/FL/Fl_Text_Display.H +lrwxrwxrwx root/root usr/include/FL/Fl_Text_Display.h -> Fl_Text_Display.H -rw-r--r-- root/root usr/include/FL/Fl_Text_Editor.H +lrwxrwxrwx root/root usr/include/FL/Fl_Text_Editor.h -> Fl_Text_Editor.H -rw-r--r-- root/root usr/include/FL/Fl_Tile.H +lrwxrwxrwx root/root usr/include/FL/Fl_Tile.h -> Fl_Tile.H -rw-r--r-- root/root usr/include/FL/Fl_Tiled_Image.H +lrwxrwxrwx root/root usr/include/FL/Fl_Tiled_Image.h -> Fl_Tiled_Image.H -rw-r--r-- root/root usr/include/FL/Fl_Timer.H +lrwxrwxrwx root/root usr/include/FL/Fl_Timer.h -> Fl_Timer.H -rw-r--r-- root/root usr/include/FL/Fl_Toggle_Button.H +lrwxrwxrwx root/root usr/include/FL/Fl_Toggle_Button.h -> Fl_Toggle_Button.H -rw-r--r-- root/root usr/include/FL/Fl_Toggle_Light_Button.H +lrwxrwxrwx root/root usr/include/FL/Fl_Toggle_Light_Button.h -> Fl_Toggle_Light_Button.H -rw-r--r-- root/root usr/include/FL/Fl_Toggle_Round_Button.H +lrwxrwxrwx root/root usr/include/FL/Fl_Toggle_Round_Button.h -> Fl_Toggle_Round_Button.H -rw-r--r-- root/root usr/include/FL/Fl_Tooltip.H +lrwxrwxrwx root/root usr/include/FL/Fl_Tooltip.h -> Fl_Tooltip.H -rw-r--r-- root/root usr/include/FL/Fl_Tree.H +lrwxrwxrwx root/root usr/include/FL/Fl_Tree.h -> Fl_Tree.H -rw-r--r-- root/root usr/include/FL/Fl_Tree_Item.H +lrwxrwxrwx root/root usr/include/FL/Fl_Tree_Item.h -> Fl_Tree_Item.H -rw-r--r-- root/root usr/include/FL/Fl_Tree_Item_Array.H +lrwxrwxrwx root/root usr/include/FL/Fl_Tree_Item_Array.h -> Fl_Tree_Item_Array.H -rw-r--r-- root/root usr/include/FL/Fl_Tree_Prefs.H +lrwxrwxrwx root/root usr/include/FL/Fl_Tree_Prefs.h -> Fl_Tree_Prefs.H -rw-r--r-- root/root usr/include/FL/Fl_Valuator.H +lrwxrwxrwx root/root usr/include/FL/Fl_Valuator.h -> Fl_Valuator.H -rw-r--r-- root/root usr/include/FL/Fl_Value_Input.H +lrwxrwxrwx root/root usr/include/FL/Fl_Value_Input.h -> Fl_Value_Input.H -rw-r--r-- root/root usr/include/FL/Fl_Value_Output.H +lrwxrwxrwx root/root usr/include/FL/Fl_Value_Output.h -> Fl_Value_Output.H -rw-r--r-- root/root usr/include/FL/Fl_Value_Slider.H +lrwxrwxrwx root/root usr/include/FL/Fl_Value_Slider.h -> Fl_Value_Slider.H -rw-r--r-- root/root usr/include/FL/Fl_Widget.H +lrwxrwxrwx root/root usr/include/FL/Fl_Widget.h -> Fl_Widget.H -rw-r--r-- root/root usr/include/FL/Fl_Window.H +lrwxrwxrwx root/root usr/include/FL/Fl_Window.h -> Fl_Window.H -rw-r--r-- root/root usr/include/FL/Fl_Wizard.H +lrwxrwxrwx root/root usr/include/FL/Fl_Wizard.h -> Fl_Wizard.H -rw-r--r-- root/root usr/include/FL/Fl_XBM_Image.H +lrwxrwxrwx root/root usr/include/FL/Fl_XBM_Image.h -> Fl_XBM_Image.H -rw-r--r-- root/root usr/include/FL/Fl_XPM_Image.H +lrwxrwxrwx root/root usr/include/FL/Fl_XPM_Image.h -> Fl_XPM_Image.H +-rw-r--r-- root/root usr/include/FL/Makefile.in -rw-r--r-- root/root usr/include/FL/abi-version.h -rw-r--r-- root/root usr/include/FL/dirent.h -rw-r--r-- root/root usr/include/FL/filename.H +lrwxrwxrwx root/root usr/include/FL/filename.h -> filename.H -rw-r--r-- root/root usr/include/FL/fl_ask.H +lrwxrwxrwx root/root usr/include/FL/fl_ask.h -> fl_ask.H -rw-r--r-- root/root usr/include/FL/fl_draw.H +lrwxrwxrwx root/root usr/include/FL/fl_draw.h -> fl_draw.H -rw-r--r-- root/root usr/include/FL/fl_message.H +lrwxrwxrwx root/root usr/include/FL/fl_message.h -> fl_message.H -rw-r--r-- root/root usr/include/FL/fl_show_colormap.H +lrwxrwxrwx root/root usr/include/FL/fl_show_colormap.h -> fl_show_colormap.H -rw-r--r-- root/root usr/include/FL/fl_show_input.H +lrwxrwxrwx root/root usr/include/FL/fl_show_input.h -> fl_show_input.H -rw-r--r-- root/root usr/include/FL/fl_types.h -rw-r--r-- root/root usr/include/FL/fl_utf8.h -rw-r--r-- root/root usr/include/FL/forms.H +lrwxrwxrwx root/root usr/include/FL/forms.h -> forms.H -rw-r--r-- root/root usr/include/FL/gl.h -rw-r--r-- root/root usr/include/FL/gl2opengl.h -rw-r--r-- root/root usr/include/FL/gl_draw.H +lrwxrwxrwx root/root usr/include/FL/gl_draw.h -> gl_draw.H -rw-r--r-- root/root usr/include/FL/glu.h -rw-r--r-- root/root usr/include/FL/glut.H +lrwxrwxrwx root/root usr/include/FL/glut.h -> glut.H -rw-r--r-- root/root usr/include/FL/mac.H +lrwxrwxrwx root/root usr/include/FL/mac.h -> mac.H -rw-r--r-- root/root usr/include/FL/math.h -rw-r--r-- root/root usr/include/FL/names.h +-rw-r--r-- root/root usr/include/FL/platform.H +lrwxrwxrwx root/root usr/include/FL/platform.h -> platform.H -rw-r--r-- root/root usr/include/FL/win32.H +lrwxrwxrwx root/root usr/include/FL/win32.h -> win32.H -rw-r--r-- root/root usr/include/FL/x.H +lrwxrwxrwx root/root usr/include/FL/x.h -> x.H +lrwxrwxrwx root/root usr/include/Fl -> FL drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libfltk.a lrwxrwxrwx root/root usr/lib/libfltk.so -> libfltk.so.1.3 --rwxr-xr-x root/root usr/lib/libfltk.so.1.3 +lrwxrwxrwx root/root usr/lib/libfltk.so.1.3 -> libfltk.so.1.3.5 +-rwxr-xr-x root/root usr/lib/libfltk.so.1.3.5 -rw-r--r-- root/root usr/lib/libfltk_forms.a lrwxrwxrwx root/root usr/lib/libfltk_forms.so -> libfltk_forms.so.1.3 --rwxr-xr-x root/root usr/lib/libfltk_forms.so.1.3 +lrwxrwxrwx root/root usr/lib/libfltk_forms.so.1.3 -> libfltk_forms.so.1.3.5 +-rwxr-xr-x root/root usr/lib/libfltk_forms.so.1.3.5 -rw-r--r-- root/root usr/lib/libfltk_gl.a lrwxrwxrwx root/root usr/lib/libfltk_gl.so -> libfltk_gl.so.1.3 --rwxr-xr-x root/root usr/lib/libfltk_gl.so.1.3 +lrwxrwxrwx root/root usr/lib/libfltk_gl.so.1.3 -> libfltk_gl.so.1.3.5 +-rwxr-xr-x root/root usr/lib/libfltk_gl.so.1.3.5 -rw-r--r-- root/root usr/lib/libfltk_images.a lrwxrwxrwx root/root usr/lib/libfltk_images.so -> libfltk_images.so.1.3 --rwxr-xr-x root/root usr/lib/libfltk_images.so.1.3 +lrwxrwxrwx root/root usr/lib/libfltk_images.so.1.3 -> libfltk_images.so.1.3.5 +-rwxr-xr-x root/root usr/lib/libfltk_images.so.1.3.5 drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/applications/ +-rw-r--r-- root/root usr/share/applications/blocks.desktop +-rw-r--r-- root/root usr/share/applications/checkers.desktop +-rw-r--r-- root/root usr/share/applications/fluid.desktop +-rw-r--r-- root/root usr/share/applications/sudoku.desktop +drwxr-xr-x root/root usr/share/fltk/ +-rw-r--r-- root/root usr/share/fltk/FLTK-Functions.cmake +-rw-r--r-- root/root usr/share/fltk/FLTK-Targets-noconfig.cmake +-rw-r--r-- root/root usr/share/fltk/FLTK-Targets.cmake +-rw-r--r-- root/root usr/share/fltk/FLTKConfig.cmake +-rw-r--r-- root/root usr/share/fltk/UseFLTK.cmake +drwxr-xr-x root/root usr/share/icons/ +drwxr-xr-x root/root usr/share/icons/hicolor/ +drwxr-xr-x root/root usr/share/icons/hicolor/128x128/ +drwxr-xr-x root/root usr/share/icons/hicolor/128x128/apps/ +-rw-r--r-- root/root usr/share/icons/hicolor/128x128/apps/blocks.png +-rw-r--r-- root/root usr/share/icons/hicolor/128x128/apps/checkers.png +-rw-r--r-- root/root usr/share/icons/hicolor/128x128/apps/fluid.png +-rw-r--r-- root/root usr/share/icons/hicolor/128x128/apps/sudoku.png +drwxr-xr-x root/root usr/share/icons/hicolor/32x32/ +drwxr-xr-x root/root usr/share/icons/hicolor/32x32/apps/ +-rw-r--r-- root/root usr/share/icons/hicolor/32x32/apps/blocks.png +-rw-r--r-- root/root usr/share/icons/hicolor/32x32/apps/checkers.png +-rw-r--r-- root/root usr/share/icons/hicolor/32x32/apps/fluid.png +-rw-r--r-- root/root usr/share/icons/hicolor/32x32/apps/sudoku.png +drwxr-xr-x root/root usr/share/icons/hicolor/48x48/ +drwxr-xr-x root/root usr/share/icons/hicolor/48x48/apps/ +-rw-r--r-- root/root usr/share/icons/hicolor/48x48/apps/fluid.png +drwxr-xr-x root/root usr/share/icons/hicolor/64x64/ +drwxr-xr-x root/root usr/share/icons/hicolor/64x64/apps/ +-rw-r--r-- root/root usr/share/icons/hicolor/64x64/apps/fluid.png drwxr-xr-x root/root usr/share/man/ -drwxr-xr-x root/root usr/share/man/cat1/ --rw-r--r-- root/root usr/share/man/cat1/fltk-config.1 --rw-r--r-- root/root usr/share/man/cat1/fluid.1 -drwxr-xr-x root/root usr/share/man/cat3/ --rw-r--r-- root/root usr/share/man/cat3/fltk.3 drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/fltk-config.1.gz -rw-r--r-- root/root usr/share/man/man1/fluid.1.gz drwxr-xr-x root/root usr/share/man/man3/ -rw-r--r-- root/root usr/share/man/man3/fltk.3.gz +drwxr-xr-x root/root usr/share/man/man6/ +-rw-r--r-- root/root usr/share/man/man6/blocks.6.gz +-rw-r--r-- root/root usr/share/man/man6/checkers.6.gz +-rw-r--r-- root/root usr/share/man/man6/sudoku.6.gz +drwxr-xr-x root/root usr/share/mime/ +drwxr-xr-x root/root usr/share/mime/packages/ +-rw-r--r-- root/root usr/share/mime/packages/fluid.xml diff --git a/fltk/.signature b/fltk/.signature index 84be4ab4..1cd20950 100644 --- a/fltk/.signature +++ b/fltk/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF33OEe69B2zX3USB/hd1BKhR9HIRffEaYJ7MrYrRR8PsI3AmEYK842G8X1luSO5YUS/n+l32nxM2LQr3M2AsFHAc= -SHA256 (Pkgfile) = 2bf8f51b35f034cee6a51133fa4edcf61357de32dd4d350c248d6d8fc5c086d9 -SHA256 (.footprint) = 5a3f8f1b246eba609ab7cd114a060bec3c6415ad28bf91bbf86fb501513f94e9 -SHA256 (fltk-1.3.4-2-source.tar.bz2) = 8cfe7690d70f9a3db5cd88748a82aa7958a9dc7ec3d7e94eef9063e107864150 +RWSagIOpLGJF31iUT8npqUPVMTnaeNF6DUxZBkiYX4i4bML/vuUSbnuEnFugqQbZlTZxWKEwXNYCeIKGKH/WphrhRmmwWWLWxQo= +SHA256 (Pkgfile) = ae6b4739f57515acb8be8802a8465fbea8b815f98b70a1c3d00576fa0f4d8a6b +SHA256 (.footprint) = 74a630b8710cab430659705e7c433bc4ceda6b33d4f557eb14f8a746b9d34364 +SHA256 (fltk-1.3.5-source.tar.bz2) = 2933c72400f9e7c0f4c3a81a1ce98bc9582b2a3edc44b8597ccd26e240e32c3c +SHA256 (fltk-fix-lib-mess.patch) = b8061f26d989f76441d68a07ba4089b50eceb90fb3234106a88511a12d9ddb50 diff --git a/fltk/Pkgfile b/fltk/Pkgfile index 3d85f29e..7345ac17 100644 --- a/fltk/Pkgfile +++ b/fltk/Pkgfile @@ -1,26 +1,47 @@ # Description: Cross-platform C++ GUI toolkit for Unix, Windows and Mac OS X. # URL: http://www.fltk.org/ # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: alsa-lib libjpeg-turbo mesa3d xorg-libxft xorg-libxinerama +# Depends on: alsa-lib libjpeg-turbo mesa3d util-linux xorg-libxft xorg-libxinerama name=fltk -version=1.3.4-2 +version=1.3.5 release=1 -source=(http://fltk.org/pub/$name/${version%-*}/$name-$version-source.tar.bz2) +source=(https://fltk.org/pub/$name/${version%-*}/$name-$version-source.tar.bz2 + fltk-fix-lib-mess.patch) build() { cd $name-$version - ./configure \ - --prefix=/usr \ - --enable-threads \ - --enable-shared \ - --enable-xft + # https://github.com/fltk/fltk/issues/20 + patch -p1 -i $SRC/fltk-fix-lib-mess.patch + + mkdir build + cd build + + cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DFLTK_LIBDIR=/usr/lib \ + -DOPTION_CREATE_LINKS=ON \ + -DOPTION_BUILD_SHARED_LIBS=ON \ + -DOpenGL_GL_PREFERENCE=GLVND \ + -DOPTION_BUILD_HTML_DOCUMENTATION=OFF make make DESTDIR=$PKG install - chmod a-x $PKG/usr/lib/*.a + # example apps and integration files, that are not covered by make install + for app in {blocks,checkers,sudoku}; do + install -D -m 0755 -t "$PKG/usr/bin/" "bin/examples/$app" + + install -D -m 0644 "../test/desktop/$app.desktop" \ + -t "$PKG/usr/share/applications/" + + install -D -m 0644 "../test/desktop/$app-32.png" \ + "$PKG/usr/share/icons/hicolor/32x32/apps/$app.png" + + install -D -m 0644 "../test/desktop/$app-128.png" \ + "$PKG/usr/share/icons/hicolor/128x128/apps/$app.png" + done - rm -r $PKG/usr/share/doc + rm $PKG/usr/include/FL/README.Xcode } diff --git a/fltk/fltk-1.3.0-share.patch b/fltk/fltk-1.3.0-share.patch deleted file mode 100644 index 4b4267a4..00000000 --- a/fltk/fltk-1.3.0-share.patch +++ /dev/null @@ -1,44 +0,0 @@ - fluid/Makefile | 20 ++++++++++---------- - 1 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/fluid/Makefile b/fluid/Makefile -index 1cb3210..9d438a5 100644 ---- a/fluid/Makefile -+++ b/fluid/Makefile -@@ -82,16 +82,16 @@ install: all - $(INSTALL_BIN) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT) - - install-linux: -- -$(INSTALL_DIR) $(DESTDIR)/usr/share/applications -- $(INSTALL_DATA) fluid.desktop $(DESTDIR)/usr/share/applications -+ -$(INSTALL_DIR) $(DESTDIR)$(datadir)/applications -+ $(INSTALL_DATA) fluid.desktop $(DESTDIR)$(datadir)/applications - for size in 16 32 48 64 128; do \ -- if test ! -d $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; then \ -- $(INSTALL_DIR) $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; \ -+ if test ! -d $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps; then \ -+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps; \ - fi; \ -- $(INSTALL_DATA) icons/fluid-$$size.png $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps/fluid.png; \ -+ $(INSTALL_DATA) icons/fluid-$$size.png $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps/fluid.png; \ - done -- -$(INSTALL_DIR) $(DESTDIR)/usr/share/mimelnk/application -- $(INSTALL_DATA) x-fluid.desktop $(DESTDIR)/usr/share/mimelnk/application -+ -$(INSTALL_DIR) $(DESTDIR)$(datadir)/mimelnk/application -+ $(INSTALL_DATA) x-fluid.desktop $(DESTDIR)$(datadir)/mimelnk/application - - install-osx: - echo Installing Fluid in $(DESTDIR)/Applications... -@@ -109,9 +109,9 @@ uninstall: - $(RM) $(DESTDIR)$(bindir)/fluid$(EXEEXT) - - uninstall-linux: -- $(RM) $(DESTDIR)/usr/share/applications/fluid.desktop -- $(RM) $(DESTDIR)/usr/share/icons/hicolor/*/fluid.png -- $(RM) $(DESTDIR)/usr/share/mimelnk/application/x-fluid.desktop -+ $(RM) $(DESTDIR)$(datadir)/applications/fluid.desktop -+ $(RM) $(DESTDIR)$(datadir)/icons/hicolor/*/fluid.png -+ $(RM) $(DESTDIR)$(datadir)/mimelnk/application/x-fluid.desktop - - uninstall-osx: - $(RM) -r $(DESTDIR)/Applications/fluid.app diff --git a/fltk/fltk-1.3.2-conf-tests.patch b/fltk/fltk-1.3.2-conf-tests.patch deleted file mode 100644 index 74022a72..00000000 --- a/fltk/fltk-1.3.2-conf-tests.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -100,9 +103,6 @@ - touch config.h - chmod +x fltk-config - --configure: configure.in -- autoconf -- - config.guess config.sub: - -automake --add-missing 2> /dev/null - if [ ! -e config.sub ]; then echo NOTE: Using frozen copy of config.sub; cp misc/config.sub . ; fi ---- a/documentation/Makefile -+++ b/documentation/Makefile -@@ -84,11 +84,6 @@ - $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \ - fi - echo "Installing man pages in $(DESTDIR)$(mandir) ..." -- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1 -- $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 -- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 -- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3 -- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3 - -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1 - $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1 - $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1 -@@ -96,10 +91,6 @@ - $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.man $(DESTDIR)$(mandir)/man3/fltk.3 - - install-linux install-osx: -- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat6 -- $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 -- $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 -- $(INSTALL_MAN) $(SRC_DOCDIR)/sudoku.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 - -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man6 - $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.man $(DESTDIR)$(mandir)/man6/blocks.6 - $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.man $(DESTDIR)$(mandir)/man6/checkers.6 -@@ -108,17 +99,11 @@ - - uninstall: - $(RMDIR) $(DESTDIR)$(docdir) -- $(RM) $(DESTDIR)$(mandir)/cat1/fluid.$(CAT1EXT) - $(RM) $(DESTDIR)$(mandir)/man1/fluid.1 -- $(RM) $(DESTDIR)$(mandir)/cat1/fltk-config.$(CAT1EXT) - $(RM) $(DESTDIR)$(mandir)/man1/fltk-config.1 -- $(RM) $(DESTDIR)$(mandir)/cat3/fltk.$(CAT3EXT) - $(RM) $(DESTDIR)$(mandir)/man3/fltk.3 - - uninstall-linux uninstall-osx: -- $(RM) $(DESTDIR)$(mandir)/cat6/blocks.$(CAT6EXT) -- $(RM) $(DESTDIR)$(mandir)/cat6/checkers.$(CAT6EXT) -- $(RM) $(DESTDIR)$(mandir)/cat6/sudoku.$(CAT6EXT) - $(RM) $(DESTDIR)$(mandir)/man6/blocks.6 - $(RM) $(DESTDIR)$(mandir)/man6/checkers.6 - $(RM) $(DESTDIR)$(mandir)/man6/sudoku.6 diff --git a/fltk/fltk-1.3.2-desktop.patch b/fltk/fltk-1.3.2-desktop.patch deleted file mode 100644 index abec41a4..00000000 --- a/fltk/fltk-1.3.2-desktop.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- fltk-1.3.2/fluid/fluid.desktop -+++ fltk-1.3.2/fluid/fluid.desktop -@@ -6,5 +6,5 @@ - Icon=fluid - Terminal=false - Type=Application --MimeType=application/x-fluid -+MimeType=application/x-fluid; - Categories=Development;GUIDesigner; ---- fltk-1.3.2/fluid/x-fluid.desktop -+++ fltk-1.3.2/fluid/x-fluid.desktop -@@ -1,6 +1,6 @@ - [Desktop Entry] - Type=MimeType --MimeType=application/x-fluid -+MimeType=application/x-fluid; - Icon=fluid.png - Patterns=*.fl - Name=FLUID diff --git a/fltk/fltk-1.3.2-jpeg-9a.patch b/fltk/fltk-1.3.2-jpeg-9a.patch deleted file mode 100644 index 701f04ca..00000000 --- a/fltk/fltk-1.3.2-jpeg-9a.patch +++ /dev/null @@ -1,22 +0,0 @@ -http://bugs.gentoo.org/479774 - ---- src/Fl_JPEG_Image.cxx -+++ src/Fl_JPEG_Image.cxx -@@ -155,7 +155,7 @@ - - jpeg_create_decompress(&dinfo); - jpeg_stdio_src(&dinfo, fp); -- jpeg_read_header(&dinfo, 1); -+ jpeg_read_header(&dinfo, TRUE); - - dinfo.quantize_colors = (boolean)FALSE; - dinfo.out_color_space = JCS_RGB; -@@ -337,7 +337,7 @@ - - jpeg_create_decompress(&dinfo); - jpeg_mem_src(&dinfo, data); -- jpeg_read_header(&dinfo, 1); -+ jpeg_read_header(&dinfo, TRUE); - - dinfo.quantize_colors = (boolean)FALSE; - dinfo.out_color_space = JCS_RGB; diff --git a/fltk/fltk-1.3.3-fl_open_display.patch b/fltk/fltk-1.3.3-fl_open_display.patch deleted file mode 100644 index 562f1157..00000000 --- a/fltk/fltk-1.3.3-fl_open_display.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/Fl_x.cxx -+++ b/src/Fl_x.cxx -@@ -2211,6 +2211,7 @@ - static int result = -1; - - if (result == -1) { -+ fl_open_display(); - result = 0; - unsigned long nitems; - unsigned long *words = 0; diff --git a/fltk/fltk-1.3.3-fltk-config.patch b/fltk/fltk-1.3.3-fltk-config.patch deleted file mode 100644 index ca7607af..00000000 --- a/fltk/fltk-1.3.3-fltk-config.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/fltk-config.in -+++ b/fltk-config.in -@@ -42,9 +42,8 @@ - - # flags for C++ compiler: - ARCHFLAGS="@ARCHFLAGS@" --CFLAGS="@CFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@" --CXXFLAGS="@CXXFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@" --LDFLAGS="@LDFLAGS@" -+CFLAGS=" @LARGEFILE@ @PTHREAD_FLAGS@" -+CXXFLAGS=" @LARGEFILE@ @PTHREAD_FLAGS@" - LDLIBS="@LIBS@" - OPTIM="@OPTIM@" - CAIROFLAGS="@CAIROFLAGS@" diff --git a/fltk/fltk-1.3.3-visibility.patch b/fltk/fltk-1.3.3-visibility.patch deleted file mode 100644 index 491e0a18..00000000 --- a/fltk/fltk-1.3.3-visibility.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/src/Fl.cxx -+++ b/src/Fl.cxx -@@ -928,7 +928,7 @@ - - //////////////////////////////////////////////////////////////// - --Fl_Widget* fl_oldfocus; // kludge for Fl_Group... -+FL_EXPORT Fl_Widget* fl_oldfocus; // kludge for Fl_Group... - - /** - Sets the widget that will receive FL_KEYBOARD events. ---- a/FL/x.H -+++ b/FL/x.H -@@ -114,7 +114,7 @@ FL_EXPORT Fl_Region XRectangleRegion(int x, int y, int w, int h); // in fl_rect. - // With Xlib / X11 fonts, fl_xfont will return the current selected font. - // With XFT / X11 fonts, fl_xfont will attempt to return the bitmap "core" font most - // similar to (usually the same as) the current XFT font. --class Fl_XFont_On_Demand -+class FL_EXPORT Fl_XFont_On_Demand - { - public: - Fl_XFont_On_Demand(XFontStruct* p = NULL) : ptr(p) { } diff --git a/fltk/fltk-1.3.3-xutf8-visibility.patch b/fltk/fltk-1.3.3-xutf8-visibility.patch deleted file mode 100644 index f30105e1..00000000 --- a/fltk/fltk-1.3.3-xutf8-visibility.patch +++ /dev/null @@ -1,165 +0,0 @@ ---- a/src/xutf8/utf8Input.c -+++ b/src/xutf8/utf8Input.c -@@ -18,6 +18,7 @@ - - #include <config.h> - #include "../Xutf8.h" -+#include "../../FL/Fl_Export.H" - #include <X11/X.h> - #include <X11/Xlib.h> - #include <X11/Xutil.h> -@@ -53,7 +54,7 @@ typedef struct { - #include "lcUniConv/jisx0212.h" - #include "lcUniConv/ksc5601.h" - --static int -+FL_EXPORT static int - XConvertEucTwToUtf8(char* buffer_return, int len) { - /* FIXME */ - #if HAVE_LIBC_ICONV -@@ -120,7 +121,7 @@ XConvertEucTwToUtf8(char* buffer_return, - return l; - } - --static int -+FL_EXPORT static int - XConvertEucKrToUtf8(char* buffer_return, int len) { - int i = 0, l = 0; - char *buf; -@@ -160,7 +161,7 @@ XConvertEucKrToUtf8(char* buffer_return, - return l; - } - --static int -+FL_EXPORT static int - XConvertBig5ToUtf8(char* buffer_return, int len) { - int i = 0, l = 0; - char *buf; -@@ -189,7 +190,7 @@ XConvertBig5ToUtf8(char* buffer_return, - return l; - } - --static int -+FL_EXPORT static int - XConvertCp936extToUtf8(char* buffer_return, int len) - { - int i = 0, l = 0; -@@ -226,7 +227,7 @@ XConvertCp936extToUtf8(char* buffer_retu - return l; - } - --static int -+FL_EXPORT static int - XConvertGb2312ToUtf8(char* buffer_return, int len) { - int i = 0, l = 0; - char *buf; -@@ -261,7 +262,7 @@ XConvertGb2312ToUtf8(char* buffer_return - return l; - } - --static int -+FL_EXPORT static int - XConvertEucCnToUtf8(char* buffer_return, int len) { - int i = 0, l = 0; - char *buf; -@@ -300,7 +301,7 @@ XConvertEucCnToUtf8(char* buffer_return, - return l; - } - --static int -+FL_EXPORT static int - XConvertEucJpToUtf8(char* buffer_return, int len) { - int i = 0, l = 0; - char *buf; -@@ -373,7 +374,7 @@ XConvertEucJpToUtf8(char* buffer_return, - return l; - } - --static int -+FL_EXPORT static int - XConvertEucToUtf8(const char* locale, - char* buffer_return, - int len, -@@ -408,7 +409,7 @@ XConvertEucToUtf8(const char* locale, - return len; - } - --int -+FL_EXPORT int - XUtf8LookupString(XIC ic, - XKeyPressedEvent* event, - char* buffer_return, ---- a/src/xutf8/utf8Utils.c -+++ b/src/xutf8/utf8Utils.c -@@ -21,6 +21,7 @@ - #if !defined(WIN32) && !defined(__APPLE__) - - #include "../Xutf8.h" -+#include "../../FL/Fl_Export.H" - - /*** NOTE : all functions are LIMITED to 24 bits Unicode values !!! ***/ - -@@ -29,7 +30,7 @@ - * Returns the byte length of the converted UTF-8 char - * Returns -1 if the UTF-8 string is not valid - */ --int -+FL_EXPORT int - XConvertUtf8ToUcs(const unsigned char *buf, - int len, - unsigned int *ucs) { -@@ -137,7 +138,7 @@ XConvertUcsToUtf8(unsigned int ucs, - * returns the byte length of the first UTF-8 char - * (returns -1 if not valid) - */ --int -+FL_EXPORT int - XUtf8CharByteLen(const unsigned char *buf, - int len) { - unsigned int ucs; -@@ -165,7 +166,7 @@ XCountUtf8Char(const unsigned char *buf - /* - * Same as XConvertUtf8ToUcs but no sanity check is done. - */ --int -+FL_EXPORT int - XFastConvertUtf8ToUcs(const unsigned char *buf, - int len, - unsigned int *ucs) { ---- a/src/xutf8/utf8Wrap.c -+++ b/src/xutf8/utf8Wrap.c -@@ -20,6 +20,7 @@ - #if !defined(WIN32) && !defined(__APPLE__) - - #include "../Xutf8.h" -+#include "../../FL/Fl_Export.H" - #include <X11/Xlib.h> - #include <ctype.h> - #include <stdlib.h> -@@ -705,7 +706,7 @@ XUtf8_measure_extents( - /*****************************************************************************/ - /** returns the pixel width of a UTF-8 string **/ - /*****************************************************************************/ --int -+FL_EXPORT int - XUtf8TextWidth(XUtf8FontStruct *font_set, - const char *string, - int num_bytes) { -@@ -815,7 +816,7 @@ XUtf8TextWidth(XUtf8FontStruct *font_se - /*****************************************************************************/ - /** get the X font and glyph ID of a UCS char **/ - /*****************************************************************************/ --int -+FL_EXPORT int - XGetUtf8FontAndGlyph(XUtf8FontStruct *font_set, - unsigned int ucs, - XFontStruct **fnt, -@@ -886,7 +887,7 @@ XGetUtf8FontAndGlyph(XUtf8FontStruct *f - /*****************************************************************************/ - /** returns the pixel width of a UCS char **/ - /*****************************************************************************/ --int -+FL_EXPORT int - XUtf8UcsWidth(XUtf8FontStruct *font_set, - unsigned int ucs) { - diff --git a/fltk/fltk-fix-lib-mess.patch b/fltk/fltk-fix-lib-mess.patch new file mode 100644 index 00000000..62f2645b --- /dev/null +++ b/fltk/fltk-fix-lib-mess.patch @@ -0,0 +1,375 @@ +diff -ruN b/CMake/macros.cmake a/CMake/macros.cmake +--- b/CMake/macros.cmake 2019-03-03 09:40:23.000000000 +0100 ++++ a/CMake/macros.cmake 2019-03-10 21:58:32.895224605 +0100 +@@ -22,11 +22,7 @@ + ####################################################################### + macro(FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES) + +- if (${LIBTYPE} STREQUAL "SHARED") +- set (LIBRARY_NAME ${LIBNAME}_SHARED) +- else () +- set (LIBRARY_NAME ${LIBNAME}) +- endif (${LIBTYPE} STREQUAL "SHARED") ++ set (LIBRARY_NAME ${LIBNAME}_${LIBTYPE}) + + if (MSVC) + set (LIBRARY_NAME_DEBUG "${LIBRARY_NAME}d") +@@ -38,7 +34,7 @@ + + set_target_properties(${LIBRARY_NAME} + PROPERTIES +- OUTPUT_NAME ${LIBRARY_NAME} ++ OUTPUT_NAME ${LIBNAME} + DEBUG_OUTPUT_NAME ${LIBRARY_NAME_DEBUG} + CLEAN_DIRECT_OUTPUT TRUE + COMPILE_DEFINITIONS "FL_LIBRARY" +@@ -47,6 +43,7 @@ + if (${LIBTYPE} STREQUAL "SHARED") + set_target_properties(${LIBRARY_NAME} + PROPERTIES ++ OUTPUT_NAME ${LIBNAME} + VERSION ${FLTK_VERSION_FULL} + SOVERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR} + PREFIX "lib" # for MSVC static/shared coexistence +diff -ruN b/documentation/CMakeLists.txt a/documentation/CMakeLists.txt +--- b/documentation/CMakeLists.txt 2019-03-03 09:40:23.000000000 +0100 ++++ a/documentation/CMakeLists.txt 2019-03-10 22:40:51.077135317 +0100 +@@ -45,7 +45,7 @@ + ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMENT "Generating HTML documentation" VERBATIM +- DEPENDS fltk ++ DEPENDS fltk_STATIC + ) + + endif(OPTION_BUILD_HTML_DOCUMENTATION) +@@ -92,7 +92,7 @@ + COMMAND cp -f latex/refman.pdf fltk.pdf + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMENT "Generating PDF documentation" VERBATIM +- DEPENDS fltk ++ DEPENDS fltk_STATIC + ) + + # add target 'pdf' +diff -ruN b/fluid/CMakeLists.txt a/fluid/CMakeLists.txt +--- b/fluid/CMakeLists.txt 2019-03-03 09:40:23.000000000 +0100 ++++ a/fluid/CMakeLists.txt 2019-03-10 22:09:52.482801651 +0100 +@@ -48,7 +48,7 @@ + add_executable(fluid WIN32 ${CPPFILES}) + endif(APPLE AND NOT OPTION_APPLE_X11) + +-target_link_libraries(fluid fltk fltk_images fltk_forms) ++target_link_libraries(fluid fltk_STATIC fltk_images_STATIC fltk_forms_STATIC) + + # install fluid + +diff -ruN b/src/CMakeLists.txt a/src/CMakeLists.txt +--- b/src/CMakeLists.txt 2019-03-03 09:40:23.000000000 +0100 ++++ a/src/CMakeLists.txt 2019-03-10 22:57:37.458302812 +0100 +@@ -246,7 +246,7 @@ + endif (WIN32) + + if (FLTK_HAVE_CAIRO) +- list(APPEND OPTIONAL_LIBS fltk_cairo ${PKG_CAIRO_LIBRARIES}) ++ list(APPEND OPTIONAL_LIBS fltk_cairo_STATIC ${PKG_CAIRO_LIBRARIES}) + ENDif (FLTK_HAVE_CAIRO) + + if (HAVE_XINERAMA) +@@ -275,41 +275,41 @@ + ####################################################################### + + FL_ADD_LIBRARY(fltk STATIC "${STATIC_FILES}") +-target_link_libraries(fltk ${OPTIONAL_LIBS}) ++target_link_libraries(fltk_STATIC ${OPTIONAL_LIBS}) + + ####################################################################### + + FL_ADD_LIBRARY(fltk_forms STATIC "${FLCPPFILES}") +-target_link_libraries(fltk_forms fltk) ++target_link_libraries(fltk_forms_STATIC fltk_STATIC) + + ####################################################################### + + FL_ADD_LIBRARY(fltk_images STATIC "${IMGCPPFILES}") +-target_link_libraries(fltk_images fltk) ++target_link_libraries(fltk_images_STATIC fltk_STATIC) + + if (OPTION_USE_SYSTEM_LIBJPEG) +- target_link_libraries(fltk_images ${FLTK_JPEG_LIBRARIES}) ++ target_link_libraries(fltk_images_STATIC ${FLTK_JPEG_LIBRARIES}) + else() +- target_link_libraries(fltk_images fltk_jpeg) ++ target_link_libraries(fltk_images_STATIC fltk_jpeg_STATIC) + endif (OPTION_USE_SYSTEM_LIBJPEG) + + if (OPTION_USE_SYSTEM_ZLIB) +- target_link_libraries(fltk_images ${FLTK_ZLIB_LIBRARIES}) ++ target_link_libraries(fltk_images_STATIC ${FLTK_ZLIB_LIBRARIES}) + else() +- target_link_libraries(fltk_images fltk_z) ++ target_link_libraries(fltk_images_STATIC fltk_z_STATIC) + endif (OPTION_USE_SYSTEM_ZLIB) + + if (OPTION_USE_SYSTEM_LIBPNG) +- target_link_libraries(fltk_images ${FLTK_PNG_LIBRARIES}) ++ target_link_libraries(fltk_images_STATIC ${FLTK_PNG_LIBRARIES}) + else() +- target_link_libraries(fltk_images fltk_png) ++ target_link_libraries(fltk_images_STATIC fltk_png_STATIC) + endif (OPTION_USE_SYSTEM_LIBPNG) + + ####################################################################### + + if (OPENGL_FOUND) + FL_ADD_LIBRARY(fltk_gl STATIC "${GLCPPFILES}") +- target_link_libraries(fltk_gl fltk ${OPENGL_LIBRARIES}) ++ target_link_libraries(fltk_gl_STATIC fltk_STATIC ${OPENGL_LIBRARIES}) + endif (OPENGL_FOUND) + + ####################################################################### +@@ -332,7 +332,7 @@ + + FL_ADD_LIBRARY(fltk_forms SHARED "${FLCPPFILES}") + if (MSVC) +- target_link_libraries(fltk_forms_SHARED fltk) ++ target_link_libraries(fltk_forms_SHARED fltk_SHARED) + else () + target_link_libraries(fltk_forms_SHARED fltk_SHARED) + endif (MSVC) +@@ -341,27 +341,27 @@ + + FL_ADD_LIBRARY(fltk_images SHARED "${IMGCPPFILES}") + if (MSVC) +- target_link_libraries(fltk_images_SHARED fltk) ++ target_link_libraries(fltk_images_SHARED fltk_SHARED) + else () + target_link_libraries(fltk_images_SHARED fltk_SHARED) + endif (MSVC) + + if (OPTION_USE_SYSTEM_LIBJPEG) +- target_link_libraries(fltk_images_SHARED ${FLTK_JPEG_LIBRARIES}) ++ target_link_libraries(fltk_images_SHARED ${FLTK_JPEG_LIBRARIES}) + else() +- target_link_libraries(fltk_images_SHARED fltk_jpeg_SHARED) ++ target_link_libraries(fltk_images_SHARED fltk_jpeg_SHARED) + endif (OPTION_USE_SYSTEM_LIBJPEG) + + if (OPTION_USE_SYSTEM_LIBPNG) +- target_link_libraries(fltk_images_SHARED ${FLTK_PNG_LIBRARIES}) ++ target_link_libraries(fltk_images_SHARED ${FLTK_PNG_LIBRARIES}) + else() +- target_link_libraries(fltk_images_SHARED fltk_png_SHARED) ++ target_link_libraries(fltk_images_SHARED fltk_png_SHARED) + endif (OPTION_USE_SYSTEM_LIBPNG) + + if (OPTION_USE_SYSTEM_ZLIB) +- target_link_libraries(fltk_images_SHARED ${FLTK_ZLIB_LIBRARIES}) ++ target_link_libraries(fltk_images_SHARED ${FLTK_ZLIB_LIBRARIES}) + else() +- target_link_libraries(fltk_images_SHARED fltk_z_SHARED) ++ target_link_libraries(fltk_images_SHARED fltk_z_SHARED) + endif (OPTION_USE_SYSTEM_ZLIB) + + ################################################################### +@@ -369,9 +369,9 @@ + if (OPENGL_FOUND) + FL_ADD_LIBRARY(fltk_gl SHARED "${GLCPPFILES}") + if (MSVC) +- target_link_libraries(fltk_gl_SHARED fltk ${OPENGL_LIBRARIES}) ++ target_link_libraries(fltk_gl_SHARED fltk_SHARED ${OPENGL_LIBRARIES}) + else () +- target_link_libraries(fltk_gl_SHARED fltk_SHARED ${OPENGL_LIBRARIES}) ++ target_link_libraries(fltk_gl_SHARED fltk_SHARED ${OPENGL_LIBRARIES}) + endif (MSVC) + endif (OPENGL_FOUND) + +diff -ruN b/test/CMakeLists.txt a/test/CMakeLists.txt +--- b/test/CMakeLists.txt 2019-03-03 09:40:23.000000000 +0100 ++++ a/test/CMakeLists.txt 2019-03-10 23:13:36.096519270 +0100 +@@ -25,108 +25,108 @@ + endif(APPLE AND NOT OPTION_APPLE_X11) + + ####################################################################### +-CREATE_EXAMPLE(adjuster adjuster.cxx fltk) +-CREATE_EXAMPLE(arc arc.cxx fltk) +-CREATE_EXAMPLE(animated animated.cxx fltk) +-CREATE_EXAMPLE(ask ask.cxx fltk) +-CREATE_EXAMPLE(bitmap bitmap.cxx fltk) ++CREATE_EXAMPLE(adjuster adjuster.cxx fltk_STATIC) ++CREATE_EXAMPLE(arc arc.cxx fltk_STATIC) ++CREATE_EXAMPLE(animated animated.cxx fltk_STATIC) ++CREATE_EXAMPLE(ask ask.cxx fltk_STATIC) ++CREATE_EXAMPLE(bitmap bitmap.cxx fltk_STATIC) + + set(BLOCKS_ICON "${CMAKE_CURRENT_SOURCE_DIR}/blocks.app/Contents/Resources/blocks.icns") +-CREATE_EXAMPLE(blocks "blocks.cxx;${BLOCKS_ICON}" "fltk;${AUDIOLIBS}") ++CREATE_EXAMPLE(blocks "blocks.cxx;${BLOCKS_ICON}" "fltk_STATIC;${AUDIOLIBS}") + +-CREATE_EXAMPLE(boxtype boxtype.cxx fltk) +-CREATE_EXAMPLE(browser browser.cxx fltk) +-CREATE_EXAMPLE(button button.cxx fltk) +-CREATE_EXAMPLE(buttons buttons.cxx fltk) ++CREATE_EXAMPLE(boxtype boxtype.cxx fltk_STATIC) ++CREATE_EXAMPLE(browser browser.cxx fltk_STATIC) ++CREATE_EXAMPLE(button button.cxx fltk_STATIC) ++CREATE_EXAMPLE(buttons buttons.cxx fltk_STATIC) + + set(CHECKERS_ICON "${CMAKE_CURRENT_SOURCE_DIR}/checkers.app/Contents/Resources/checkers.icns") +-CREATE_EXAMPLE(checkers "checkers.cxx;${CHECKERS_ICON}" fltk) ++CREATE_EXAMPLE(checkers "checkers.cxx;${CHECKERS_ICON}" fltk_STATIC) + +-CREATE_EXAMPLE(clock clock.cxx fltk) +-CREATE_EXAMPLE(colbrowser colbrowser.cxx "fltk;fltk_forms") +-CREATE_EXAMPLE(color_chooser color_chooser.cxx fltk) +-CREATE_EXAMPLE(cursor cursor.cxx fltk) +-CREATE_EXAMPLE(curve curve.cxx fltk) ++CREATE_EXAMPLE(clock clock.cxx fltk_STATIC) ++CREATE_EXAMPLE(colbrowser colbrowser.cxx "fltk_STATIC;fltk_forms_STATIC") ++CREATE_EXAMPLE(color_chooser color_chooser.cxx fltk_STATIC) ++CREATE_EXAMPLE(cursor cursor.cxx fltk_STATIC) ++CREATE_EXAMPLE(curve curve.cxx fltk_STATIC) + +-CREATE_EXAMPLE(demo "demo.cxx;demo.menu" fltk) ++CREATE_EXAMPLE(demo "demo.cxx;demo.menu" fltk_STATIC) + set_source_files_properties(demo.menu PROPERTIES MACOSX_PACKAGE_LOCATION Resources) + +-CREATE_EXAMPLE(device device.cxx fltk) +-CREATE_EXAMPLE(doublebuffer doublebuffer.cxx fltk) ++CREATE_EXAMPLE(device device.cxx fltk_STATIC) ++CREATE_EXAMPLE(doublebuffer doublebuffer.cxx fltk_STATIC) + +-CREATE_EXAMPLE(editor editor.cxx fltk) ++CREATE_EXAMPLE(editor editor.cxx fltk_STATIC) + set_target_properties(editor PROPERTIES + MACOSX_BUNDLE_INFO_PLIST "${PROJECT_SOURCE_DIR}/ide/Xcode4/plists/editor-Info.plist" + ) + +-CREATE_EXAMPLE(fast_slow fast_slow.fl fltk) +-CREATE_EXAMPLE(file_chooser file_chooser.cxx "fltk;fltk_images") +-CREATE_EXAMPLE(fonts fonts.cxx fltk) +-CREATE_EXAMPLE(forms forms.cxx "fltk;fltk_forms") +-CREATE_EXAMPLE(hello hello.cxx fltk) +-CREATE_EXAMPLE(help help.cxx "fltk;fltk_images") +-CREATE_EXAMPLE(icon icon.cxx fltk) +-CREATE_EXAMPLE(iconize iconize.cxx fltk) +-CREATE_EXAMPLE(image image.cxx fltk) +-CREATE_EXAMPLE(inactive inactive.fl fltk) +-CREATE_EXAMPLE(input input.cxx fltk) +-CREATE_EXAMPLE(input_choice input_choice.cxx fltk) +-CREATE_EXAMPLE(keyboard "keyboard.cxx;keyboard_ui.fl" fltk) +-CREATE_EXAMPLE(label label.cxx "fltk;fltk_forms") +-CREATE_EXAMPLE(line_style line_style.cxx fltk) +-CREATE_EXAMPLE(list_visuals list_visuals.cxx fltk) +-CREATE_EXAMPLE(mandelbrot "mandelbrot_ui.fl;mandelbrot.cxx" fltk) +-CREATE_EXAMPLE(menubar menubar.cxx fltk) +-CREATE_EXAMPLE(message message.cxx fltk) +-CREATE_EXAMPLE(minimum minimum.cxx fltk) +-CREATE_EXAMPLE(native-filechooser native-filechooser.cxx "fltk;fltk_images") +-CREATE_EXAMPLE(navigation navigation.cxx fltk) +-CREATE_EXAMPLE(output output.cxx "fltk;fltk_forms") +-CREATE_EXAMPLE(overlay overlay.cxx fltk) +-CREATE_EXAMPLE(pack pack.cxx fltk) +-CREATE_EXAMPLE(pixmap pixmap.cxx fltk) +-CREATE_EXAMPLE(pixmap_browser pixmap_browser.cxx "fltk;fltk_images") +-CREATE_EXAMPLE(preferences preferences.fl fltk) +-CREATE_EXAMPLE(offscreen offscreen.cxx fltk) +-CREATE_EXAMPLE(radio radio.fl fltk) +-CREATE_EXAMPLE(resize resize.fl fltk) +-CREATE_EXAMPLE(resizebox resizebox.cxx fltk) +-CREATE_EXAMPLE(rotated_text rotated_text.cxx fltk) +-CREATE_EXAMPLE(scroll scroll.cxx fltk) +-CREATE_EXAMPLE(subwindow subwindow.cxx fltk) ++CREATE_EXAMPLE(fast_slow fast_slow.fl fltk_STATIC) ++CREATE_EXAMPLE(file_chooser file_chooser.cxx "fltk_STATIC;fltk_images_STATIC") ++CREATE_EXAMPLE(fonts fonts.cxx fltk_STATIC) ++CREATE_EXAMPLE(forms forms.cxx "fltk_STATIC;fltk_forms_STATIC") ++CREATE_EXAMPLE(hello hello.cxx fltk_STATIC) ++CREATE_EXAMPLE(help help.cxx "fltk_STATIC;fltk_images_STATIC") ++CREATE_EXAMPLE(icon icon.cxx fltk_STATIC) ++CREATE_EXAMPLE(iconize iconize.cxx fltk_STATIC) ++CREATE_EXAMPLE(image image.cxx fltk_STATIC) ++CREATE_EXAMPLE(inactive inactive.fl fltk_STATIC) ++CREATE_EXAMPLE(input input.cxx fltk_STATIC) ++CREATE_EXAMPLE(input_choice input_choice.cxx fltk_STATIC) ++CREATE_EXAMPLE(keyboard "keyboard.cxx;keyboard_ui.fl" fltk_STATIC) ++CREATE_EXAMPLE(label label.cxx "fltk_STATIC;fltk_forms_STATIC") ++CREATE_EXAMPLE(line_style line_style.cxx fltk_STATIC) ++CREATE_EXAMPLE(list_visuals list_visuals.cxx fltk_STATIC) ++CREATE_EXAMPLE(mandelbrot "mandelbrot_ui.fl;mandelbrot.cxx" fltk_STATIC) ++CREATE_EXAMPLE(menubar menubar.cxx fltk_STATIC) ++CREATE_EXAMPLE(message message.cxx fltk_STATIC) ++CREATE_EXAMPLE(minimum minimum.cxx fltk_STATIC) ++CREATE_EXAMPLE(native-filechooser native-filechooser.cxx "fltk_STATIC;fltk_images_STATIC") ++CREATE_EXAMPLE(navigation navigation.cxx fltk_STATIC) ++CREATE_EXAMPLE(output output.cxx "fltk_STATIC;fltk_forms_STATIC") ++CREATE_EXAMPLE(overlay overlay.cxx fltk_STATIC) ++CREATE_EXAMPLE(pack pack.cxx fltk_STATIC) ++CREATE_EXAMPLE(pixmap pixmap.cxx fltk_STATIC) ++CREATE_EXAMPLE(pixmap_browser pixmap_browser.cxx "fltk_STATIC;fltk_images_STATIC") ++CREATE_EXAMPLE(preferences preferences.fl fltk_STATIC) ++CREATE_EXAMPLE(offscreen offscreen.cxx fltk_STATIC) ++CREATE_EXAMPLE(radio radio.fl fltk_STATIC) ++CREATE_EXAMPLE(resize resize.fl fltk_STATIC) ++CREATE_EXAMPLE(resizebox resizebox.cxx fltk_STATIC) ++CREATE_EXAMPLE(rotated_text rotated_text.cxx fltk_STATIC) ++CREATE_EXAMPLE(scroll scroll.cxx fltk_STATIC) ++CREATE_EXAMPLE(subwindow subwindow.cxx fltk_STATIC) + + set(SUDOKU_ICON "${CMAKE_CURRENT_SOURCE_DIR}/sudoku.app/Contents/Resources/sudoku.icns") +-CREATE_EXAMPLE(sudoku "sudoku.cxx;${SUDOKU_ICON}" "fltk;fltk_images;${AUDIOLIBS}") ++CREATE_EXAMPLE(sudoku "sudoku.cxx;${SUDOKU_ICON}" "fltk_STATIC;fltk_images_STATIC;${AUDIOLIBS}") + +-CREATE_EXAMPLE(symbols symbols.cxx fltk) +-CREATE_EXAMPLE(tabs tabs.fl fltk) +-CREATE_EXAMPLE(table table.cxx fltk) +-CREATE_EXAMPLE(threads threads.cxx fltk) +-CREATE_EXAMPLE(tile tile.cxx fltk) +-CREATE_EXAMPLE(tiled_image tiled_image.cxx fltk) +-CREATE_EXAMPLE(tree tree.fl fltk) +-CREATE_EXAMPLE(twowin twowin.cxx fltk) +-CREATE_EXAMPLE(utf8 utf8.cxx fltk) +-CREATE_EXAMPLE(valuators valuators.fl fltk) +-CREATE_EXAMPLE(unittests unittests.cxx fltk) +-CREATE_EXAMPLE(windowfocus windowfocus.cxx fltk) ++CREATE_EXAMPLE(symbols symbols.cxx fltk_STATIC) ++CREATE_EXAMPLE(tabs tabs.fl fltk_STATIC) ++CREATE_EXAMPLE(table table.cxx fltk_STATIC) ++CREATE_EXAMPLE(threads threads.cxx fltk_STATIC) ++CREATE_EXAMPLE(tile tile.cxx fltk_STATIC) ++CREATE_EXAMPLE(tiled_image tiled_image.cxx fltk_STATIC) ++CREATE_EXAMPLE(tree tree.fl fltk_STATIC) ++CREATE_EXAMPLE(twowin twowin.cxx fltk_STATIC) ++CREATE_EXAMPLE(utf8 utf8.cxx fltk_STATIC) ++CREATE_EXAMPLE(valuators valuators.fl fltk_STATIC) ++CREATE_EXAMPLE(unittests unittests.cxx fltk_STATIC) ++CREATE_EXAMPLE(windowfocus windowfocus.cxx fltk_STATIC) + +-CREATE_EXAMPLE(fltk-versions ../examples/fltk-versions.cxx fltk) ++CREATE_EXAMPLE(fltk-versions ../examples/fltk-versions.cxx fltk_STATIC) + + # OpenGL demos... + if(OPENGL_FOUND) +-CREATE_EXAMPLE(CubeView "CubeMain.cxx;CubeView.cxx;CubeViewUI.fl" "fltk;fltk_gl") +-CREATE_EXAMPLE(cube cube.cxx "fltk;fltk_gl;${OPENGL_LIBRARIES}") +-CREATE_EXAMPLE(fractals "fractals.cxx;fracviewer.cxx" "fltk;fltk_gl") +-CREATE_EXAMPLE(fullscreen fullscreen.cxx "fltk;fltk_gl") +-CREATE_EXAMPLE(glpuzzle glpuzzle.cxx "fltk;fltk_gl;${OPENGL_LIBRARIES}") +-CREATE_EXAMPLE(gl_overlay gl_overlay.cxx "fltk;fltk_gl;${OPENGL_LIBRARIES}") +-CREATE_EXAMPLE(shape shape.cxx "fltk;fltk_gl;${OPENGL_LIBRARIES}") ++CREATE_EXAMPLE(CubeView "CubeMain.cxx;CubeView.cxx;CubeViewUI.fl" "fltk_STATIC;fltk_gl_STATIC") ++CREATE_EXAMPLE(cube cube.cxx "fltk_STATIC;fltk_gl_STATIC;${OPENGL_LIBRARIES}") ++CREATE_EXAMPLE(fractals "fractals.cxx;fracviewer.cxx" "fltk_STATIC;fltk_gl_STATIC") ++CREATE_EXAMPLE(fullscreen fullscreen.cxx "fltk_STATIC;fltk_gl_STATIC") ++CREATE_EXAMPLE(glpuzzle glpuzzle.cxx "fltk_STATIC;fltk_gl_STATIC;${OPENGL_LIBRARIES}") ++CREATE_EXAMPLE(gl_overlay gl_overlay.cxx "fltk_STATIC;fltk_gl_STATIC;${OPENGL_LIBRARIES}") ++CREATE_EXAMPLE(shape shape.cxx "fltk_STATIC;fltk_gl_STATIC;${OPENGL_LIBRARIES}") + endif(OPENGL_FOUND) + + # Cairo demo + if(FLTK_HAVE_CAIRO) +- CREATE_EXAMPLE(cairo_test cairo_test.cxx "fltk;fltk_cairo") ++ CREATE_EXAMPLE(cairo_test cairo_test.cxx "fltk_STATIC;fltk_cairo_STATIC") + endif(FLTK_HAVE_CAIRO) + + # We need some support files for the demo programs: