rpms/fltk
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix ABI breakage caused by fltk-1_v4.3.x-cursor.patch (#883026)

Browse Source 
Signed-off-by: Adam Tkac <atkac@redhat.com>
This commit is contained in:
Adam Tkac 2012-12-04 12:51:16 +01:00
parent afdd3c3a5c
commit 22bb3e2f7a
2 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
fltk-1_v4.3.x-cursor-abi.patch Normal file
View File

@ -0,0 +1,44 @@
diff -up fltk-1.3.x-r9671/FL/Fl_Window.H.cursor-abi fltk-1.3.x-r9671/FL/Fl_Window.H
--- fltk-1.3.x-r9671/FL/Fl_Window.H.cursor-abi 2012-12-04 12:39:42.419066193 +0100
+++ fltk-1.3.x-r9671/FL/Fl_Window.H 2012-12-04 12:40:45.791122889 +0100
@@ -467,15 +467,13 @@ public:
The type Fl_Cursor is an enumeration defined in <FL/Enumerations.H>.
+ The Fl_Color parameters are here only for backward compatibility.
+
\see cursor(const Fl_RGB_Image*, int, int), default_cursor()
*/
- void cursor(Fl_Cursor);
+ void cursor(Fl_Cursor c, Fl_Color=FL_BLACK, Fl_Color=FL_WHITE);
void cursor(const Fl_RGB_Image*, int, int);
- void default_cursor(Fl_Cursor);
-
- /* for legacy compatibility */
- void cursor(Fl_Cursor c, Fl_Color, Fl_Color=FL_WHITE) { cursor(c); };
- void default_cursor(Fl_Cursor c, Fl_Color, Fl_Color=FL_WHITE) { default_cursor(c); };
+ void default_cursor(Fl_Cursor c, Fl_Color=FL_BLACK, Fl_Color=FL_WHITE);
static void default_callback(Fl_Window*, void* v);
diff -up fltk-1.3.x-r9671/src/fl_cursor.cxx.cursor-abi fltk-1.3.x-r9671/src/fl_cursor.cxx
--- fltk-1.3.x-r9671/src/fl_cursor.cxx.cursor-abi 2012-12-04 12:40:55.714131967 +0100
+++ fltk-1.3.x-r9671/src/fl_cursor.cxx 2012-12-04 12:41:25.804159597 +0100
@@ -55,7 +55,7 @@ void fl_cursor(Fl_Cursor c, Fl_Color fg,
\see cursor(const Fl_RGB_Image*, int, int), default_cursor()
*/
-void Fl_Window::default_cursor(Fl_Cursor c) {
+void Fl_Window::default_cursor(Fl_Cursor c, Fl_Color, Fl_Color) {
cursor_default = c;
cursor(c);
}
@@ -108,7 +108,7 @@ void fallback_cursor(Fl_Window *w, Fl_Cu
}
-void Fl_Window::cursor(Fl_Cursor c) {
+void Fl_Window::cursor(Fl_Cursor c, Fl_Color, Fl_Color) {
int ret;
// the cursor must be set for the top level window, not for subwindows

7
fltk.spec
View File

@ -6,7 +6,7 @@
Summary: C++ user interface toolkit Summary: C++ user interface toolkit
Name: fltk Name: fltk
Version: 1.3.0 Version: 1.3.0
Release: 7%{?dist} Release: 8%{?dist}
# see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details # see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details
License: LGPLv2+ with exceptions License: LGPLv2+ with exceptions
@ -38,6 +38,7 @@ Patch12: fltk-1_v3.3.x-clipboard-xfixes.patch
# http://www.fltk.org/str.php?L2660 # http://www.fltk.org/str.php?L2660
Patch13: fltk-1_v4.3.x-cursor.patch Patch13: fltk-1_v4.3.x-cursor.patch
Patch20: fltk-1_v4.3.x-cursor-abi.patch
# http://www.fltk.org/str.php?L2859 # http://www.fltk.org/str.php?L2859
Patch14: fltk-1.3.x-resize-expose.patch Patch14: fltk-1.3.x-resize-expose.patch
@ -113,6 +114,7 @@ Requires: %{name}-devel
%patch11 -p1 -b .clipboard2 %patch11 -p1 -b .clipboard2
%patch12 -p1 -b .clipboard3 %patch12 -p1 -b .clipboard3
%patch13 -p1 -b .cursor %patch13 -p1 -b .cursor
%patch20 -p1 -b .cursor-abi
%patch14 -p1 -b .resize-expose %patch14 -p1 -b .resize-expose
%patch15 -p0 -b .pixmap %patch15 -p0 -b .pixmap
%patch16 -p1 -b .modal %patch16 -p1 -b .modal
@ -229,6 +231,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%changelog %changelog
* Tue Dec 04 2012 Adam Tkac <atkac redhat com> - 1.3.0-8
- fix ABI breakage caused by fltk-1_v4.3.x-cursor.patch (#883026)
* Thu Nov 29 2012 Adam Tkac <atkac redhat com> - 1.3.0-7 * Thu Nov 29 2012 Adam Tkac <atkac redhat com> - 1.3.0-7
- add xcursor BR - add xcursor BR