diff options
Diffstat (limited to 'x11-libs/fltk/files')
| -rw-r--r-- | x11-libs/fltk/files/fltk-1.1.7-amd64.patch | 73 | ||||
| -rw-r--r-- | x11-libs/fltk/files/fltk-1.1.7-as-needed.patch | 139 | ||||
| -rw-r--r-- | x11-libs/fltk/files/fltk-1.1.7-dieonerrors.patch | 46 | ||||
| -rw-r--r-- | x11-libs/fltk/files/fltk-1.1.7-maxmin-typo.patch | 14 | ||||
| -rw-r--r-- | x11-libs/fltk/files/fltk-1.1.7-xft-and-misc.patch | 558 | ||||
| -rw-r--r-- | x11-libs/fltk/files/fltk-1.1.9-share.patch | 39 | ||||
| -rw-r--r-- | x11-libs/fltk/files/fltk-1.3.0-as-needed.patch (renamed from x11-libs/fltk/files/fltk-1.3.0_rc5-as-needed.patch) | 0 | ||||
| -rw-r--r-- | x11-libs/fltk/files/fltk-1.3.0-conf-tests.patch (renamed from x11-libs/fltk/files/fltk-1.3.0_rc3-conf-tests.patch) | 0 | ||||
| -rw-r--r-- | x11-libs/fltk/files/fltk-1.3.0-share.patch (renamed from x11-libs/fltk/files/fltk-1.3.0_rc5-share.patch) | 0 | ||||
| -rw-r--r-- | x11-libs/fltk/files/fltk-1.3.0_rc3-as-needed.patch | 158 | ||||
| -rw-r--r-- | x11-libs/fltk/files/fltk-1.3.0_rc3-share.patch | 41 | ||||
| -rw-r--r-- | x11-libs/fltk/files/libs-1.7.diff | 22 |
12 files changed, 0 insertions, 1090 deletions
diff --git a/x11-libs/fltk/files/fltk-1.1.7-amd64.patch b/x11-libs/fltk/files/fltk-1.1.7-amd64.patch deleted file mode 100644 index f1c334dad993..000000000000 --- a/x11-libs/fltk/files/fltk-1.1.7-amd64.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- fltk-1.1.7/test/cursor.cxx.old 2006-11-12 14:00:36.000000000 +0100 -+++ fltk-1.1.7/test/cursor.cxx 2006-11-12 14:00:46.000000000 +0100 -@@ -39,7 +39,7 @@ - Fl_Hor_Value_Slider *cursor_slider; - - void choice_cb(Fl_Widget *, void *v) { -- cursor = (Fl_Cursor)(int)v; -+ cursor = (Fl_Cursor)(long)v; - cursor_slider->value(cursor); - fl_cursor(cursor,fg,bg); - } ---- fltk-1.1.7/test/input.cxx.old 2006-11-12 14:01:27.000000000 +0100 -+++ fltk-1.1.7/test/input.cxx 2006-11-12 14:01:37.000000000 +0100 -@@ -61,7 +61,7 @@ - - void color_cb(Fl_Widget* button, void* v) { - Fl_Color c; -- switch ((int)v) { -+ switch ((long)v) { - case 0: c = FL_BACKGROUND2_COLOR; break; - case 1: c = FL_SELECTION_COLOR; break; - default: c = FL_FOREGROUND_COLOR; break; ---- fltk-1.1.7/test/keyboard.cxx.old 2006-11-12 14:02:10.000000000 +0100 -+++ fltk-1.1.7/test/keyboard.cxx 2006-11-12 14:02:30.000000000 +0100 -@@ -105,11 +105,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()); -+ long i = long(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()); -+ long i = long(b->user_data()); - ((Fl_Button*)b)->value(Fl::event_state(i)); - } - } ---- fltk-1.1.7/test/line_style.cxx.old 2006-11-12 14:03:00.000000000 +0100 -+++ fltk-1.1.7/test/line_style.cxx 2006-11-12 14:03:18.000000000 +0100 -@@ -54,9 +54,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()), -+ (long)(choice[0]->mvalue()->user_data()) + -+ (long)(choice[1]->mvalue()->user_data()) + -+ (long)(choice[2]->mvalue()->user_data()), - (int)(sliders[3]->value()), - buf); - fl_rect(10,10,w()-20,h()-20); ---- fltk-1.1.7/test/scroll.cxx.old 2006-11-12 14:03:55.000000000 +0100 -+++ fltk-1.1.7/test/scroll.cxx 2006-11-12 14:04:19.000000000 +0100 -@@ -71,7 +71,7 @@ - } - - void type_cb(Fl_Widget*, void* v) { -- thescroll->type(int(v)); -+ thescroll->type(long(v)); - thescroll->redraw(); - } - -@@ -87,7 +87,7 @@ - }; - - void align_cb(Fl_Widget*, void* v) { -- thescroll->scrollbar.align(int(v)); -+ thescroll->scrollbar.align(long(v)); - thescroll->redraw(); - } - diff --git a/x11-libs/fltk/files/fltk-1.1.7-as-needed.patch b/x11-libs/fltk/files/fltk-1.1.7-as-needed.patch deleted file mode 100644 index 9e5305a0aa28..000000000000 --- a/x11-libs/fltk/files/fltk-1.1.7-as-needed.patch +++ /dev/null @@ -1,139 +0,0 @@ ---- fltk-1.1.7/configure.in.old 2006-11-12 14:30:49.000000000 +0100 -+++ fltk-1.1.7/configure.in 2006-11-12 14:31:58.000000000 +0100 -@@ -171,7 +171,7 @@ - FLDSONAME="libfltk_forms.so.$FL_API_VERSION" - GLDSONAME="libfltk_gl.so.$FL_API_VERSION" - IMGDSONAME="libfltk_images.so.$FL_API_VERSION" -- DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o" -+ DSOCOMMAND="\$(CXX) \$(LDFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o" - if test "x$libdir" != "x/usr/lib"; then - DSOLINK="-Wl,-rpath,$libdir" - fi -@@ -647,10 +647,9 @@ - AC_MSG_WARN(Ignoring libraries \"$X_PRE_LIBS\" requested by configure.) - fi - -- LIBS="$LIBS -lXext -lX11 $X_EXTRA_LIBS" -+ LIBS="$LIBS -lXext -lX11 $X_EXTRA_LIBS $X_LIBS" - CFLAGS="$CFLAGS $X_CFLAGS" - CXXFLAGS="$CXXFLAGS $X_CFLAGS" -- LDFLAGS="$X_LIBS $LDFLAGS" - - if test "x$x_includes" != x; then - ac_cpp="$ac_cpp -I$x_includes" ---- fltk-1.1.7/makeinclude.in.old 2006-11-12 14:31:05.000000000 +0100 -+++ fltk-1.1.7/makeinclude.in 2006-11-12 14:31:20.000000000 +0100 -@@ -74,8 +74,9 @@ - - # libraries to link with: - AUDIOLIBS = @AUDIOLIBS@ --LDLIBS = @LDFLAGS@ @LIBS@ --GLDLIBS = @LDFLAGS@ @GLLIB@ @LIBS@ -+LDFLAGS = @LDFLAGS@ -+LDLIBS = @LIBS@ -+GLDLIBS = @GLLIB@ @LIBS@ - LINKFLTK = @LINKFLTK@ - LINKFLTKGL = @LINKFLTKGL@ - LINKFLTKFORMS = @LINKFLTKFORMS@ @LINKFLTK@ ---- fltk-1.1.7/src/Makefile.old 2006-11-12 15:30:11.000000000 +0100 -+++ fltk-1.1.7/src/Makefile 2006-11-12 15:33:56.000000000 +0100 -@@ -202,13 +202,13 @@ - - libfltk.so.1.1: $(OBJECTS) - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(OBJECTS) -+ $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS) - $(RM) libfltk.so - $(LN) libfltk.so.1.1 libfltk.so - - libfltk.sl.1.1: $(OBJECTS) - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(OBJECTS) -+ $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS) - $(RM) libfltk.sl - $(LN) libfltk.sl.1.1 libfltk.sl - -@@ -224,7 +224,7 @@ - - libfltk_s.a: $(OBJECTS) - echo $(DSOCOMMAND) libfltk_s.o ... -- $(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) -+ $(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) $(LDLIBS) - echo $(LIBCOMMAND) libfltk_s.a libfltk_s.o - $(RM) $@ - $(LIBCOMMAND) libfltk_s.a libfltk_s.o -@@ -238,13 +238,13 @@ - - libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1 - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk -+ $(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk - $(RM) libfltk_forms.so - $(LN) libfltk_forms.so.1.1 libfltk_forms.so - - libfltk_forms.sl.1.1: $(FLOBJECTS) libfltk.sl.1.1 - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk -+ $(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk - $(RM) libfltk_forms.sl - $(LN) libfltk_forms.sl.1.1 libfltk_forms.sl - -@@ -260,7 +260,7 @@ - - libfltk_forms_s.a: $(FLOBJECTS) - echo $(DSOCOMMAND) libfltk_forms_s.o ... -- $(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) -+ $(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) $(LDLIBS) - echo $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o - $(RM) $@ - $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o -@@ -274,13 +274,13 @@ - - libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1 - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk -+ $(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk - $(RM) libfltk_gl.so - $(LN) libfltk_gl.so.1.1 libfltk_gl.so - - libfltk_gl.sl.1.1: $(GLOBJECTS) libfltk.sl.1.1 - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk -+ $(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk - $(RM) libfltk_gl.sl - $(LN) libfltk_gl.sl.1.1 libfltk_gl.sl - -@@ -296,7 +296,7 @@ - - libfltk_gl_s.a: $(GLOBJECTS) - echo $(DSOCOMMAND) libfltk_gl_s.o ... -- $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) -+ $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) $(LDLIBS) - echo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o - $(RM) $@ - $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o -@@ -310,13 +310,13 @@ - - libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1 - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk -+ $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk - $(RM) libfltk_images.so - $(LN) libfltk_images.so.1.1 libfltk_images.so - - libfltk_images.sl.1.1: $(IMGOBJECTS) libfltk.sl.1.1 - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk -+ $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk - $(RM) libfltk_images.sl - $(LN) libfltk_images.sl.1.1 libfltk_images.sl - -@@ -332,7 +332,7 @@ - - libfltk_images_s.a: $(IMGOBJECTS) - echo $(DSOCOMMAND) libfltk_images_s.o ... -- $(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) -+ $(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) $(LDLIBS) - echo $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o - $(RM) $@ - $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o diff --git a/x11-libs/fltk/files/fltk-1.1.7-dieonerrors.patch b/x11-libs/fltk/files/fltk-1.1.7-dieonerrors.patch deleted file mode 100644 index cde44099cc3d..000000000000 --- a/x11-libs/fltk/files/fltk-1.1.7-dieonerrors.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- Makefile.old 2007-01-07 14:03:38.000000000 +0100 -+++ Makefile 2007-01-07 14:04:04.000000000 +0100 -@@ -32,7 +32,7 @@ - all: makeinclude - for dir in $(DIRS); do\ - echo "=== making $$dir ===";\ -- (cd $$dir; $(MAKE) $(MFLAGS)) || break;\ -+ (cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\ - done - - install: makeinclude -@@ -42,7 +42,7 @@ - -chmod 755 $(DESTDIR)$(bindir)/fltk-config - for dir in FL $(DIRS); do\ - echo "=== installing $$dir ===";\ -- (cd $$dir; $(MAKE) $(MFLAGS) install) || break;\ -+ (cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\ - done - - install-desktop: makeinclude -@@ -54,7 +54,7 @@ - $(RM) $(DESTDIR)$(bindir)/fltk-config - for dir in FL $(DIRS); do\ - echo "=== uninstalling $$dir ===";\ -- (cd $$dir; $(MAKE) $(MFLAGS) uninstall) || break;\ -+ (cd $$dir; $(MAKE) $(MFLAGS) uninstall) || exit 1;\ - done - - uninstall-desktop: makeinclude -@@ -65,14 +65,14 @@ - depend: makeinclude - for dir in $(DIRS); do\ - echo "=== making dependencies in $$dir ===";\ -- (cd $$dir; $(MAKE) $(MFLAGS) depend) || break;\ -+ (cd $$dir; $(MAKE) $(MFLAGS) depend) || exit 1;\ - done - - clean: - -$(RM) core *.o - for dir in $(DIRS); do\ - echo "=== cleaning $$dir ===";\ -- (cd $$dir; $(MAKE) $(MFLAGS) clean) || break;\ -+ (cd $$dir; $(MAKE) $(MFLAGS) clean) || exit 1;\ - done - - distclean: clean diff --git a/x11-libs/fltk/files/fltk-1.1.7-maxmin-typo.patch b/x11-libs/fltk/files/fltk-1.1.7-maxmin-typo.patch deleted file mode 100644 index 0edf839f1220..000000000000 --- a/x11-libs/fltk/files/fltk-1.1.7-maxmin-typo.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur fltk-1.1.7.orig/FL/Fl_Spinner.H fltk-1.1.7/FL/Fl_Spinner.H ---- fltk-1.1.7.orig/FL/Fl_Spinner.H 2007-08-22 18:29:38.000000000 +0200 -+++ fltk-1.1.7/FL/Fl_Spinner.H 2007-08-22 18:33:02.000000000 +0200 -@@ -128,8 +128,10 @@ - const char *format() { return (format_); } - void format(const char *f) { format_ = f; update(); } - double maxinum() const { return (maximum_); } -+ double maximum() const { return (maximum_); } - void maximum(double m) { maximum_ = m; } - double mininum() const { return (minimum_); } -+ double minimum() const { return (minimum_); } - void minimum(double m) { minimum_ = m; } - void range(double a, double b) { minimum_ = a; maximum_ = b; } - void resize(int X, int Y, int W, int H) { diff --git a/x11-libs/fltk/files/fltk-1.1.7-xft-and-misc.patch b/x11-libs/fltk/files/fltk-1.1.7-xft-and-misc.patch deleted file mode 100644 index e4e393a2cfb6..000000000000 --- a/x11-libs/fltk/files/fltk-1.1.7-xft-and-misc.patch +++ /dev/null @@ -1,558 +0,0 @@ -diff -ur fltk-1.1.7/FL/Fl_Browser_.H fltk-1.1.7.new/FL/Fl_Browser_.H ---- fltk-1.1.7/FL/Fl_Browser_.H 2005-04-16 02:13:17.000000000 +0200 -+++ fltk-1.1.7.new/FL/Fl_Browser_.H 2007-12-18 14:13:41.000000000 +0100 -@@ -88,6 +88,7 @@ - void new_list(); // completely clobber all data, as though list replaced - void deleting(void *a); // get rid of any pointers to a - void replacing(void *a,void *b); // change a pointers to b -+ void swapping(void *a,void *b); // exchange pointers a and b - void inserting(void *a,void *b); // insert b near a - int displayed(void *) const ; // true if this line is visible - void redraw_line(void *); // minimal update, no change in size -diff -ur fltk-1.1.7/FL/Fl_File_Chooser.H fltk-1.1.7.new/FL/Fl_File_Chooser.H ---- fltk-1.1.7/FL/Fl_File_Chooser.H 2005-08-08 02:50:02.000000000 +0200 -+++ fltk-1.1.7.new/FL/Fl_File_Chooser.H 2007-12-18 14:13:41.000000000 +0100 -@@ -145,6 +145,7 @@ - void preview(int e); - int preview() const { return previewButton->value(); }; - void rescan(); -+ void rescan_keep_filename(); - void show(); - int shown(); - void textcolor(Fl_Color c); -diff -ur fltk-1.1.7/FL/x.H fltk-1.1.7.new/FL/x.H ---- fltk-1.1.7/FL/x.H 2005-04-16 02:13:17.000000000 +0200 -+++ fltk-1.1.7.new/FL/x.H 2007-12-18 14:25:47.000000000 +0100 -@@ -65,10 +65,34 @@ - extern FL_EXPORT XVisualInfo *fl_visual; - extern FL_EXPORT Colormap fl_colormap; - -+#if USE_XFT -+// access to core fonts -+FL_EXPORT XFontStruct* fl_xxfont(); -+class Fl_XFont_On_Demand -+{ -+public: -+ Fl_XFont_On_Demand(XFontStruct* p = NULL) : ptr(p) { } -+ Fl_XFont_On_Demand& operator=(const Fl_XFont_On_Demand& x) -+ { ptr = x.ptr; return *this; } -+ Fl_XFont_On_Demand& operator=(XFontStruct* p) -+ { ptr = p; return *this; } -+ XFontStruct* value() { if (!ptr) { ptr = fl_xxfont(); } return ptr; } -+ operator XFontStruct*() { return value(); } -+ XFontStruct& operator*() { return *value(); } -+ XFontStruct* operator->() { return value(); } -+ bool operator==(const Fl_XFont_On_Demand& x) { return ptr == x.ptr; } -+ bool operator!=(const Fl_XFont_On_Demand& x) { return ptr != x.ptr; } -+private: -+ XFontStruct* ptr; -+}; -+extern FL_EXPORT Fl_XFont_On_Demand fl_xfont; -+#else -+extern FL_EXPORT XFontStruct* fl_xfont; -+#endif -+ - // drawing functions: - extern FL_EXPORT GC fl_gc; - extern FL_EXPORT Window fl_window; --extern FL_EXPORT XFontStruct* fl_xfont; - FL_EXPORT ulong fl_xpixel(Fl_Color i); - FL_EXPORT ulong fl_xpixel(uchar r, uchar g, uchar b); - FL_EXPORT void fl_clip_region(Fl_Region); -diff -ur fltk-1.1.7/src/Fl_Browser_.cxx fltk-1.1.7.new/src/Fl_Browser_.cxx ---- fltk-1.1.7/src/Fl_Browser_.cxx 2005-12-31 19:26:01.000000000 +0100 -+++ fltk-1.1.7.new/src/Fl_Browser_.cxx 2007-12-18 14:13:41.000000000 +0100 -@@ -470,6 +470,15 @@ - if (a == max_width_item) {max_width_item = 0; max_width = 0;} - } - -+void Fl_Browser_::swapping(void* a, void* b) { -+ redraw_line(a); -+ redraw_line(b); -+ if (a == selection_) selection_ = b; -+ else if (b == selection_) selection_ = a; -+ if (a == top_) top_ = b; -+ else if (b == top_) top_ = a; -+} -+ - void Fl_Browser_::inserting(void* a, void* b) { - if (displayed(a)) redraw_lines(); - if (a == top_) top_ = b; -diff -ur fltk-1.1.7/src/Fl_Browser.cxx fltk-1.1.7.new/src/Fl_Browser.cxx ---- fltk-1.1.7/src/Fl_Browser.cxx 2005-04-16 02:13:17.000000000 +0200 -+++ fltk-1.1.7.new/src/Fl_Browser.cxx 2007-12-18 14:13:41.000000000 +0100 -@@ -503,6 +503,7 @@ - void Fl_Browser::swap(FL_BLINE *a, FL_BLINE *b) { - - if ( a == b || !a || !b) return; // nothing to do -+ swapping(a, b); - FL_BLINE *aprev = a->prev; - FL_BLINE *anext = a->next; - FL_BLINE *bprev = b->prev; -@@ -535,8 +536,6 @@ - } - // Disable cache -- we played around with positions - cacheline = 0; -- // Redraw modified lines -- redraw_lines(); - } - - void Fl_Browser::swap(int ai, int bi) { -diff -ur fltk-1.1.7/src/Fl_File_Browser.cxx fltk-1.1.7.new/src/Fl_File_Browser.cxx ---- fltk-1.1.7/src/Fl_File_Browser.cxx 2005-08-18 16:08:17.000000000 +0200 -+++ fltk-1.1.7.new/src/Fl_File_Browser.cxx 2007-12-18 14:13:41.000000000 +0100 -@@ -467,7 +467,7 @@ - { - sprintf(filename, "%c:/", i); - -- if (i < 'C') -+ if (i < 'C') // see also: GetDriveType and GetVolumeInformation in WIN32 - add(filename, icon); - else - add(filename, icon); -diff -ur fltk-1.1.7/src/Fl_File_Chooser2.cxx fltk-1.1.7.new/src/Fl_File_Chooser2.cxx ---- fltk-1.1.7/src/Fl_File_Chooser2.cxx 2005-11-27 15:45:48.000000000 +0100 -+++ fltk-1.1.7.new/src/Fl_File_Chooser2.cxx 2007-12-18 14:13:41.000000000 +0100 -@@ -854,6 +854,57 @@ - update_preview(); - } - -+// -+// 'Fl_File_Chooser::rescan_keep_filename()' - Rescan the current directory -+// without clearing the filename, then select the file if it is in the list -+// -+ -+void -+Fl_File_Chooser::rescan_keep_filename() -+{ -+ // if no filename was set, this is likely a diretory browser -+ const char *fn = fileName->value(); -+ if (!fn || !*fn || fn[strlen(fn) - 1]=='/') { -+ rescan(); -+ return; -+ } -+ -+ int i; -+ char pathname[1024]; // New pathname for filename field -+ strlcpy(pathname, fn, sizeof(pathname)); -+ -+ // Build the file list... -+ fileList->load(directory_, sort); -+ -+ // Update the preview box... -+ update_preview(); -+ -+ // and select the chosen file -+ char found = 0; -+ char *slash = strrchr(pathname, '/'); -+ if (slash) -+ slash++; -+ else -+ slash = pathname; -+ for (i = 1; i <= fileList->size(); i ++) -+#if defined(WIN32) || defined(__EMX__) -+ if (strcasecmp(fileList->text(i), slash) == 0) { -+#else -+ if (strcmp(fileList->text(i), slash) == 0) { -+#endif // WIN32 || __EMX__ -+ fileList->topline(i); -+ fileList->select(i); -+ found = 1; -+ break; -+ } -+ -+ // update OK button activity -+ if (found || type_ & CREATE) -+ okButton->activate(); -+ else -+ okButton->deactivate(); -+} -+ - - // - // 'Fl_File_Chooser::showChoiceCB()' - Handle show selections. -@@ -889,7 +940,7 @@ - - if (shown()) { - // Rescan the directory... -- rescan(); -+ rescan_keep_filename(); - } - } - -diff -ur fltk-1.1.7/src/Fl_File_Chooser.cxx fltk-1.1.7.new/src/Fl_File_Chooser.cxx ---- fltk-1.1.7/src/Fl_File_Chooser.cxx 2005-12-30 11:13:17.000000000 +0100 -+++ fltk-1.1.7.new/src/Fl_File_Chooser.cxx 2007-12-18 14:13:41.000000000 +0100 -@@ -375,7 +375,7 @@ - window->show(); - Fl::flush(); - fl_cursor(FL_CURSOR_WAIT); --rescan(); -+rescan_keep_filename(); - fl_cursor(FL_CURSOR_DEFAULT); - fileName->take_focus(); - } -diff -ur fltk-1.1.7/src/Fl_File_Chooser.fl fltk-1.1.7.new/src/Fl_File_Chooser.fl ---- fltk-1.1.7/src/Fl_File_Chooser.fl 2005-12-30 11:13:17.000000000 +0100 -+++ fltk-1.1.7.new/src/Fl_File_Chooser.fl 2007-12-18 14:13:41.000000000 +0100 -@@ -61,7 +61,7 @@ - fileList->deselect(); - Fl::remove_timeout((Fl_Timeout_Handler)previewCB, this); - window->hide();} -- private xywh {387 242 490 380} type Double resizable -+ private xywh {368 285 490 380} type Double resizable - code0 {if (title) window->label(title);} - code1 {\#include <stdio.h>} - code2 {\#include <stdlib.h>} -@@ -138,7 +138,7 @@ - if (callback_) - (*callback_)(this, data_); - --window->hide();} selected -+window->hide();} - private xywh {313 345 85 25} - code0 {\#include <FL/fl_ask.H>} - code1 {okButton->label(fl_ok);} -@@ -160,7 +160,7 @@ - } - Fl_Window favWindow { - label {Manage Favorites} -- private xywh {437 187 355 150} type Double resizable -+ private xywh {421 56 355 150} type Double resizable - code0 {favWindow->label(manage_favorites_label);} modal size_range {181 150 0 0} visible - } { - Fl_File_Browser favList { -@@ -299,15 +299,18 @@ - } - decl {void rescan();} {public - } -- Function {show()} {return_type void -+ decl {void rescan_keep_filename();} {public -+ } -+ Function {show()} {open return_type void - } { - code {window->hotspot(fileList); - window->show(); - Fl::flush(); - fl_cursor(FL_CURSOR_WAIT); --rescan(); -+rescan_keep_filename(); - fl_cursor(FL_CURSOR_DEFAULT); --fileName->take_focus();} {} -+fileName->take_focus();} {selected -+ } - } - Function {shown()} {return_type int - } { -diff -ur fltk-1.1.7/src/Fl_Font.H fltk-1.1.7.new/src/Fl_Font.H ---- fltk-1.1.7/src/Fl_Font.H 2005-04-16 02:13:17.000000000 +0200 -+++ fltk-1.1.7.new/src/Fl_Font.H 2007-12-18 14:13:41.000000000 +0100 -@@ -40,9 +40,9 @@ - - #include <config.h> - --# if USE_XFT -+# if USE_XFT && !SUPPRESS_XFT - typedef struct _XftFont XftFont; --# endif // USE_XFT -+# endif // USE_XFT && !SUPPRESS_XFT - - class Fl_FontSize { - public: -@@ -63,7 +63,7 @@ - char *q_name; - int size; - short ascent, descent, q_width; --# elif USE_XFT -+# elif USE_XFT && !SUPPRESS_XFT - XftFont* font; - const char* encoding; - int size; -diff -ur fltk-1.1.7/src/fl_font_xft.cxx fltk-1.1.7.new/src/fl_font_xft.cxx ---- fltk-1.1.7/src/fl_font_xft.cxx 2005-04-16 02:13:17.000000000 +0200 -+++ fltk-1.1.7.new/src/fl_font_xft.cxx 2007-12-18 14:29:56.000000000 +0100 -@@ -62,6 +62,52 @@ - // are several web pages of information on how to do this. - // - -+// kludge to pull in the Xlib code as a fallback -+#define Fl_FontSize Fl_Fontsize_xlib -+#define fl_fontsize fl_fontsize_xlib -+#define Fl_Fontdesc Fl_Fontdesc_xlib -+#define fl_fonts fl_fonts_xlib -+#define built_in_table built_in_table_xlib -+#define fl_font_word fl_font_word_xlib -+#define fl_find_fontsize fl_find_fontsize_xlib -+#define fl_encoding fl_encoding_xlib -+#define fl_correct_encoding fl_correct_encoding_xlib -+#define find find_xlib -+#define fl_font_ fl_font__xlib -+#define fl_size_ fl_size__xlib -+#define fl_xfont fl_xfont_xlib -+#define font_gc font_gc_xlib -+#define fl_font fl_font_xlib -+#define fl_height fl_height_xlib -+#define fl_descent fl_descent_xlib -+#define fl_width fl_width_xlib -+#define fl_draw fl_draw_xlib -+#define SUPPRESS_XFT 1 -+#undef FL_FONT_ -+#include "Fl_Font.H" -+#include "fl_font_x.cxx" -+#undef SUPPRESS_XFT -+#undef Fl_FontSize -+#undef fl_fontsize -+#undef Fl_Fontdesc -+#undef fl_fonts -+#undef built_in_table -+#undef fl_font_word -+#undef fl_find_fontsize -+#undef fl_encoding -+#undef fl_correct_encoding -+#undef find -+#undef fl_font_ -+#undef fl_size_ -+#undef fl_xfont -+#undef font_gc -+#undef fl_font -+#undef fl_height -+#undef fl_descent -+#undef fl_width -+#undef fl_draw -+ -+ - #include <X11/Xft/Xft.h> - - // The predefined fonts that FLTK has: -@@ -90,7 +136,12 @@ - - int fl_font_ = 0; - int fl_size_ = 0; -+#if USE_XFT -+Fl_XFont_On_Demand fl_xfont; -+XFontStruct* fl_xxfont(); -+#else - XFontStruct* fl_xfont = 0; -+#endif - const char* fl_encoding_ = "iso8859-1"; - Fl_FontSize* fl_fontsize = 0; - -@@ -112,7 +163,9 @@ - font->first = f; - } - fl_fontsize = f; --#if XFT_MAJOR < 2 -+#if defined(XFT_MAJOR) && XFT_MAJOR >= 2 -+ fl_xfont = fl_xxfont(); -+#else - fl_xfont = f->font->u.core.font; - #endif // XFT_MAJOR < 2 - } -@@ -176,7 +229,6 @@ - return fl_width((const char *)(&c), 1); - } - --#if HAVE_GL - // This call is used by opengl to get a bitmapped font. - XFontStruct* fl_xxfont() { - # if XFT_MAJOR > 1 -@@ -192,7 +244,6 @@ - return xftfont->u.core.font; - # endif // XFT_MAJOR > 1 - } --#endif // HAVE_GL - - #if USE_OVERLAY - // Currently Xft does not work with colormapped visuals, so this probably -@@ -223,6 +274,15 @@ - } - - void fl_draw(const char *str, int n, int x, int y) { -+ if ( !current_font ) { -+ int saved_font = fl_font_, saved_size = fl_size_; -+ fl_font(FL_HELVETICA, 14); -+ if ( !current_font ) { -+ fl_font_xlib(saved_font, saved_size ? saved_size : fl_size_); -+ fl_draw_xlib(str, n, x, y); -+ return; -+ } -+ } - #if USE_OVERLAY - XftDraw*& draw = fl_overlay ? draw_overlay : ::draw; - if (fl_overlay) { -diff -ur fltk-1.1.7/src/Fl_mac.cxx fltk-1.1.7.new/src/Fl_mac.cxx ---- fltk-1.1.7/src/Fl_mac.cxx 2006-01-15 03:26:54.000000000 +0100 -+++ fltk-1.1.7.new/src/Fl_mac.cxx 2007-12-18 14:13:41.000000000 +0100 -@@ -121,7 +121,7 @@ - static unsigned short macKeyLookUp[128] = - { - 'a', 's', 'd', 'f', 'h', 'g', 'z', 'x', -- 'c', 'v', 0/*ISO extra ('#' on German keyboard)*/, 'b', 'q', 'w', 'e', 'r', -+ 'c', 'v', '^', 'b', 'q', 'w', 'e', 'r', - - 'y', 't', '1', '2', '3', '4', '6', '5', - '=', '9', '7', '-', '8', '0', ']', 'o', -@@ -2159,14 +2159,15 @@ - Size len = 0; - if (GetCurrentScrap(&scrap) == noErr && scrap != myScrap && - GetScrapFlavorSize(scrap, kScrapFlavorTypeText, &len) == noErr) { -- if ( len > fl_selection_buffer_length[1] ) { -+ if ( len >= fl_selection_buffer_length[1] ) { - fl_selection_buffer_length[1] = len + 32; - delete[] fl_selection_buffer[1]; -- fl_selection_buffer[1] = new char[len]; -+ fl_selection_buffer[1] = new char[len + 32]; - } -+ fl_selection_length[1] = len; len++; - GetScrapFlavorData( scrap, kScrapFlavorTypeText, &len, - fl_selection_buffer[1] ); -- fl_selection_length[1] = len; -+ fl_selection_buffer[1][fl_selection_length[1]] = 0; - // turn all \r characters into \n: - for (int x = 0; x < len; x++) { - if (fl_selection_buffer[1][x] == '\r') -diff -ur fltk-1.1.7/src/Fl_Menu.cxx fltk-1.1.7.new/src/Fl_Menu.cxx ---- fltk-1.1.7/src/Fl_Menu.cxx 2006-01-17 22:04:55.000000000 +0100 -+++ fltk-1.1.7.new/src/Fl_Menu.cxx 2007-12-18 14:13:41.000000000 +0100 -@@ -107,6 +107,7 @@ - int titlex(int); - void autoscroll(int); - void position(int x, int y); -+ int is_inside(int x, int y); - }; - - #define LEADING 4 // extra vertical leading -@@ -458,6 +459,15 @@ - return xx; - } - -+// return 1, if the given root coordinates are inside the window -+int menuwindow::is_inside(int mx, int my) { -+ if ( mx < x_root() || mx >= x_root() + w() || -+ my < y_root() || my >= y_root() + h()) { -+ return 0; -+ } -+ return 1; -+} -+ - //////////////////////////////////////////////////////////////// - // Fl_Menu_Item::popup(...) - -@@ -488,9 +498,20 @@ - int nummenus; - int menubar; // if true p[0] is a menubar - int state; -+ int is_inside(int mx, int my); - }; - static menustate* p; - -+// return 1 if the coordinates are inside any of the menuwindows -+int menustate::is_inside(int mx, int my) { -+ int i; -+ for (i=nummenus-1; i>=0; i--) { -+ if (p[i]->is_inside(mx, my)) -+ return 1; -+ } -+ return 0; -+} -+ - static inline void setitem(const Fl_Menu_Item* i, int m, int n) { - p->current_item = i; - p->menu_number = m; -@@ -595,14 +616,11 @@ - int mx = Fl::event_x_root(); - int my = Fl::event_y_root(); - int item=0; int mymenu = pp.nummenus-1; -- if (e == FL_PUSH && (!pp.menubar || mymenu) && -- (mx < pp.p[mymenu]->x_root() || -- mx >= (pp.p[mymenu]->x_root() + pp.p[mymenu]->w()) || -- my < pp.p[mymenu]->y_root() || -- my >= (pp.p[mymenu]->y_root() + pp.p[mymenu]->h()))) { -- // Clicking outside menu cancels it... -+ // Clicking or dragging outside menu cancels it... -+ if ((!pp.menubar || mymenu) && !pp.is_inside(mx, my)) { - setitem(0, -1, 0); -- pp.state = DONE_STATE; -+ if (e==FL_PUSH) -+ pp.state = DONE_STATE; - return 1; - } - for (mymenu = pp.nummenus-1; ; mymenu--) { -diff -ur fltk-1.1.7/src/fl_scroll_area.cxx fltk-1.1.7.new/src/fl_scroll_area.cxx ---- fltk-1.1.7/src/fl_scroll_area.cxx 2005-04-16 02:13:17.000000000 +0200 -+++ fltk-1.1.7.new/src/fl_scroll_area.cxx 2007-12-18 14:13:41.000000000 +0100 -@@ -32,6 +32,7 @@ - #include <config.h> - #include <FL/Fl.H> - #include <FL/x.H> -+#include <FL/fl_draw.H> - - // scroll a rectangle and redraw the newly exposed portions: - void fl_scroll(int X, int Y, int W, int H, int dx, int dy, -diff -ur fltk-1.1.7/src/Fl_Shared_Image.cxx fltk-1.1.7.new/src/Fl_Shared_Image.cxx ---- fltk-1.1.7/src/Fl_Shared_Image.cxx 2005-04-16 02:13:17.000000000 +0200 -+++ fltk-1.1.7.new/src/Fl_Shared_Image.cxx 2007-12-18 14:13:41.000000000 +0100 -@@ -227,7 +227,7 @@ - fread(header, 1, sizeof(header), fp); - fclose(fp); - } else { -- memset(header, 0, sizeof(header)); -+ return; - } - - // Load the image as appropriate... -diff -ur fltk-1.1.7/src/Fl_Window.cxx fltk-1.1.7.new/src/Fl_Window.cxx ---- fltk-1.1.7/src/Fl_Window.cxx 2005-12-14 14:51:51.000000000 +0100 -+++ fltk-1.1.7.new/src/Fl_Window.cxx 2007-12-18 14:13:41.000000000 +0100 -@@ -36,7 +36,7 @@ - #include "flstring.h" - - #ifdef __APPLE_QUARTZ__ --#include <FL/fl_draw.h> -+#include <FL/fl_draw.H> - #endif - - void Fl_Window::_Fl_Window() { -diff -ur fltk-1.1.7/test/preferences.fl fltk-1.1.7.new/test/preferences.fl ---- fltk-1.1.7/test/preferences.fl 2005-04-08 20:18:26.000000000 +0200 -+++ fltk-1.1.7.new/test/preferences.fl 2007-12-18 14:13:41.000000000 +0100 -@@ -69,7 +69,7 @@ - } - } - Fl_Choice wWear { -- label {Wear:} open -+ label {Wear:} open selected - xywh {25 100 105 20} down_box BORDER_BOX align 5 - } { - MenuItem {} { -@@ -93,15 +93,15 @@ - xywh {35 120 98 60} - } { - Fl_Round_Button wLeft { -- label {left side} selected -+ label {left side} - xywh {35 120 95 25} type Radio down_box ROUND_DOWN_BOX - } - Fl_Round_Button wRight { -- label {right side} selected -+ label {right side} - xywh {35 140 95 25} type Radio down_box ROUND_DOWN_BOX - } - Fl_Box {} { -- label {of the bed} selected -+ label {of the bed} - xywh {38 160 95 20} - } - } -diff -ur fltk-1.1.7/test/sudoku.cxx fltk-1.1.7.new/test/sudoku.cxx ---- fltk-1.1.7/test/sudoku.cxx 2006-01-13 23:46:30.000000000 +0100 -+++ fltk-1.1.7.new/test/sudoku.cxx 2007-12-18 14:13:41.000000000 +0100 -@@ -547,7 +547,7 @@ - break; - - case FL_PUSH : -- if (Fl::event_inside(this)) { -+ if (!readonly() && Fl::event_inside(this)) { - if (Fl::event_clicks()) { - // 2+ clicks increments/sets value - if (value()) { diff --git a/x11-libs/fltk/files/fltk-1.1.9-share.patch b/x11-libs/fltk/files/fltk-1.1.9-share.patch deleted file mode 100644 index 60980bb9e50c..000000000000 --- a/x11-libs/fltk/files/fltk-1.1.9-share.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- fluid/Makefile.orig 2010-03-29 22:41:01.828043805 -0500 -+++ fluid/Makefile 2010-03-29 22:43:57.973828814 -0500 -@@ -84,16 +84,16 @@ - $(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... -@@ -111,9 +111,9 @@ - $(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/x11-libs/fltk/files/fltk-1.3.0_rc5-as-needed.patch b/x11-libs/fltk/files/fltk-1.3.0-as-needed.patch index 0c516af616db..0c516af616db 100644 --- a/x11-libs/fltk/files/fltk-1.3.0_rc5-as-needed.patch +++ b/x11-libs/fltk/files/fltk-1.3.0-as-needed.patch diff --git a/x11-libs/fltk/files/fltk-1.3.0_rc3-conf-tests.patch b/x11-libs/fltk/files/fltk-1.3.0-conf-tests.patch index f5e2a1fdbfe2..f5e2a1fdbfe2 100644 --- a/x11-libs/fltk/files/fltk-1.3.0_rc3-conf-tests.patch +++ b/x11-libs/fltk/files/fltk-1.3.0-conf-tests.patch diff --git a/x11-libs/fltk/files/fltk-1.3.0_rc5-share.patch b/x11-libs/fltk/files/fltk-1.3.0-share.patch index 4b4267a4986c..4b4267a4986c 100644 --- a/x11-libs/fltk/files/fltk-1.3.0_rc5-share.patch +++ b/x11-libs/fltk/files/fltk-1.3.0-share.patch diff --git a/x11-libs/fltk/files/fltk-1.3.0_rc3-as-needed.patch b/x11-libs/fltk/files/fltk-1.3.0_rc3-as-needed.patch deleted file mode 100644 index 3502d8bba0cb..000000000000 --- a/x11-libs/fltk/files/fltk-1.3.0_rc3-as-needed.patch +++ /dev/null @@ -1,158 +0,0 @@ -diff --git a/configure.in b/configure.in -index c965e56..3ca79ef 100644 ---- a/configure.in -+++ b/configure.in -@@ -150,7 +150,7 @@ if test x$enable_cairoext = xyes; then - dnl we do not rely on pkg-config . - CAIRODIR="cairo" - CAIROFLAGS="`pkg-config --cflags cairo`" -- CAIROLIBS="-lcairo -lpixman-1" -+ CAIROLIBS="`pkg-config --libs cairo pixman-1`" - CXXFLAGS="$CAIROFLAGS $CXXFLAGS" - LINKFLTKCAIRO="../lib/libfltk_cairo.a" - FLTKCAIROOPTION="-L ../cairo -lfltk_cairo$SHAREDSUFFIX" -@@ -164,7 +164,7 @@ else - dnl we do not rely on pkg-config . - CAIRODIR="cairo" - CAIROFLAGS="`pkg-config --cflags cairo`" -- CAIROLIBS="-lcairo -lpixman-1" -+ CAIROLIBS="`pkg-config --libs cairo pixman-1`" - CXXFLAGS="$CAIROFLAGS $CXXFLAGS" - LINKFLTKCAIRO="../lib/libfltk_cairo.a" - FLTKCAIROOPTION="-L ../cairo -lfltk_cairo$SHAREDSUFFIX" -@@ -278,10 +278,7 @@ if test x$enable_shared = xyes; then - GLDSONAME="libfltk_gl.so.$FL_API_VERSION" - IMGDSONAME="libfltk_images.so.$FL_API_VERSION" - CAIRODSONAME="libfltk_cairo.so.$FL_API_VERSION" -- DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o" -- if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/usr/lib64"; then -- DSOLINK="-Wl,-rpath,$libdir" -- fi -+ DSOCOMMAND="\$(CXX) \$(DSOFLAGS) \$(LDFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o" - ;; - AIX*) - DSONAME="libfltk_s.a" -diff --git a/src/Makefile b/src/Makefile -index 7050173..de2b4a4 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -240,13 +240,13 @@ $(LIBNAME): $(OBJECTS) - - libfltk.so.1.3: $(OBJECTS) - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(OBJECTS) -+ $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS) - $(RM) libfltk.so - $(LN) libfltk.so.1.3 libfltk.so - - libfltk.sl.1.3: $(OBJECTS) - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(OBJECTS) -+ $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS) - $(RM) libfltk.sl - $(LN) libfltk.sl.1.3 libfltk.sl - -@@ -262,7 +262,7 @@ libfltk.1.3.dylib: $(OBJECTS) - - libfltk_s.a: $(OBJECTS) - echo $(DSOCOMMAND) libfltk_s.o ... -- $(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) -+ $(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) $(LDLIBS) - echo $(LIBCOMMAND) libfltk_s.a libfltk_s.o - $(RM) $@ - $(LIBCOMMAND) libfltk_s.a libfltk_s.o -@@ -276,13 +276,13 @@ $(FLLIBNAME): $(FLOBJECTS) - - libfltk_forms.so.1.3: $(FLOBJECTS) libfltk.so.1.3 - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk -+ $(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk - $(RM) libfltk_forms.so - $(LN) libfltk_forms.so.1.3 libfltk_forms.so - - libfltk_forms.sl.1.3: $(FLOBJECTS) libfltk.sl.1.3 - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk -+ $(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk - $(RM) libfltk_forms.sl - $(LN) libfltk_forms.sl.1.3 libfltk_forms.sl - -@@ -298,7 +298,7 @@ libfltk_forms.1.3.dylib: $(FLOBJECTS) libfltk.1.3.dylib - - libfltk_forms_s.a: $(FLOBJECTS) - echo $(DSOCOMMAND) libfltk_forms_s.o ... -- $(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) -+ $(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) $(LDLIBS) - echo $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o - $(RM) $@ - $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o -@@ -312,13 +312,13 @@ $(GLLIBNAME): $(GLOBJECTS) - - libfltk_gl.so.1.3: $(GLOBJECTS) libfltk.so.1.3 - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk -+ $(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk $(GLDLIBS) $(GLLIB) - $(RM) libfltk_gl.so - $(LN) libfltk_gl.so.1.3 libfltk_gl.so - - libfltk_gl.sl.1.3: $(GLOBJECTS) libfltk.sl.1.3 - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk -+ $(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk - $(RM) libfltk_gl.sl - $(LN) libfltk_gl.sl.1.3 libfltk_gl.sl - -@@ -334,7 +334,7 @@ libfltk_gl.1.3.dylib: $(GLOBJECTS) libfltk.1.3.dylib - - libfltk_gl_s.a: $(GLOBJECTS) - echo $(DSOCOMMAND) libfltk_gl_s.o ... -- $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) -+ $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) $(LDLIBS) $(GLLIB) - echo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o - $(RM) $@ - $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o -@@ -348,13 +348,13 @@ $(IMGLIBNAME): $(IMGOBJECTS) - - libfltk_images.so.1.3: $(IMGOBJECTS) libfltk.so.1.3 - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk -+ $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk - $(RM) libfltk_images.so - $(LN) libfltk_images.so.1.3 libfltk_images.so - - libfltk_images.sl.1.3: $(IMGOBJECTS) libfltk.sl.1.3 - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk -+ $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk - $(RM) libfltk_images.sl - $(LN) libfltk_images.sl.1.3 libfltk_images.sl - -@@ -370,7 +370,7 @@ libfltk_images.1.3.dylib: $(IMGOBJECTS) libfltk.1.3.dylib - - libfltk_images_s.a: $(IMGOBJECTS) - echo $(DSOCOMMAND) libfltk_images_s.o ... -- $(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) -+ $(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) $(LDLIBS) - echo $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o - $(RM) $@ - $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o -diff --git a/cairo/Makefile b/cairo/Makefile -index 24a8f32..894624a 100644 ---- a/cairo/Makefile -+++ b/cairo/Makefile -@@ -48,13 +48,13 @@ $(CAIROLIBNAME): $(CAIROOBJECTS) - - libfltk_cairo.so.1.3: $(CAIROOBJECTS) ../src/libfltk.so.1.3 - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk -+ $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk $(CAIROLIBS) - $(RM) libfltk_cairo.so - $(LN) $(CAIRODSONAME) libfltk_cairo.so - - libfltk_cairo.sl.1.3: $(CAIROOBJECTS) ../src/libfltk.sl.1.3 - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk -+ $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk $(CAIROLIBS) - $(RM) libfltk_cairo.sl - $(LN) libfltk_cairo.sl.1.3 libfltk_cairo.sl - diff --git a/x11-libs/fltk/files/fltk-1.3.0_rc3-share.patch b/x11-libs/fltk/files/fltk-1.3.0_rc3-share.patch deleted file mode 100644 index 3cefc0b7ff8c..000000000000 --- a/x11-libs/fltk/files/fltk-1.3.0_rc3-share.patch +++ /dev/null @@ -1,41 +0,0 @@ -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/x11-libs/fltk/files/libs-1.7.diff b/x11-libs/fltk/files/libs-1.7.diff deleted file mode 100644 index 7c0b41cb8a78..000000000000 --- a/x11-libs/fltk/files/libs-1.7.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff -urN fltk-1.1.0rc6/src/Makefile fltk-1.1.0rc6-modified/src/Makefile ---- fltk-1.1.0rc6/src/Makefile Thu Aug 8 20:09:49 2002 -+++ fltk-1.1.0rc6-modified/src/Makefile Thu Aug 22 15:16:20 2002 -@@ -405,12 +405,12 @@ - -$(MKDIR) $(DESTDIR)$(libdir) - $(RM) $(DESTDIR)$(libdir)/$(LIBNAME) - -$(CP) $(LIBNAME) $(FLLIBNAME) $(GLLIBNAME) $(IMGLIBNAME) $(DESTDIR)$(libdir) -- $(RANLIB) $(DESTDIR)$(libdir)/$(LIBNAME) -- $(RANLIB) $(DESTDIR)$(libdir)/$(FLLIBNAME) -- if test x$(GLLIBNAME) != x; then \ -- $(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBNAME); \ -- fi -- $(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBNAME) -+ #$(RANLIB) $(DESTDIR)$(libdir)/$(LIBNAME) -+ #$(RANLIB) $(DESTDIR)$(libdir)/$(FLLIBNAME) -+ #if test x$(GLLIBNAME) != x; then \ -+ # $(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBNAME); \ -+ #fi -+ #$(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBNAME) - if test x$(DSONAME) = xlibfltk.so.1.1; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk.so*;\ - $(CP) libfltk.so.1.1 $(DESTDIR)$(libdir); \ |