pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/x11/fltk13
Module Name: pkgsrc
Committed By: dbj
Date: Fri Jul 13 04:24:39 UTC 2018
Modified Files:
pkgsrc/x11/fltk13: Makefile PLIST distinfo
pkgsrc/x11/fltk13/patches: patch-aa patch-ac patch-ad patch-ae patch-af
patch-ag patch-test_Makefile
Removed Files:
pkgsrc/x11/fltk13/patches: patch-FL_Enumerations.H patch-FL_Fl_Widget.H
patch-ab patch-src_Fl.cxx patch-src_Fl__Tree__Item.cxx
patch-src_Fl_cocoa.mm patch-src_Fl_grab.cxx patch-src_Fl_x.cxx
patch-src_xutf8_imKStoUCS.c
Log Message:
x11/fltk13: update to fltk-1.3.4
CHANGES IN FLTK 1.3.4 RELEASED: Nov 11 2016
Bug fixes and other improvements
- Fix test/native-filechooser help display artifact (STR #3349).
- MacOS: fix a crash when closing a fullscreen window.
- Accept empty Fl_Pixmap in Fl_RGB_Image c'tor (STR #3348).
- MacOS: fix drawing error when a window containing a hidden subwindow
is changed to fullscreen (error visible with the tabs test program).
- MacOS: fix possible crash when enabling fullscreen in test/scroll.
- Add a snapshot of known STR's and RFE's (KNOWN_BUGS.html).
CHANGES IN FLTK 1.3.4rc3 RELEASED: Oct 31 2016
Bug fixes and other improvements
- Fix string truncation in fluid (STR #2722 continued).
- MacOS: fix a small problem where the Command-Quit menu hotkey
may not work if Fl_Native_File_Chooser is used before any
window is shown.
CHANGES IN FLTK 1.3.4rc2 RELEASED: Oct 24 2016
Bug fixes and other improvements
- Make sure the "File Systems" menu item of Fl_File_Chooser
lists "/" as the first mounted file system (Linux/Unix platform).
- Added line numbers to fluid Edit -> Show Source Code viewer.
- Improved fluid's template handling (STR #3335).
CHANGES IN FLTK 1.3.4rc1 RELEASED: Oct 17 2016
New features and extensions
- Added support for Mac OS 10.11 "El Capitan" and 10.12 "Sierra".
- Added full support of true subwindows to the Mac OS X platform.
Window nesting to any depth is possible. An Fl_Gl_Window window or
subwindow can contain Fl_Window's as subwindows.
- Fluid now supports external editors (STR#3213)
See: Edit -> GUI Settings -> Use external editor
- Added method Fl_Widget::is_label_copied().
- Added methods Fl_Copy_Surface::w(), Fl_Copy_Surface::h(),
and Fl_Copy_Surface::draw_decorated_window().
- Added method Fl_Image_Surface::draw_decorated_window().
- Added method Fl_Shared_Image *Fl_Image_Surface::highres_image()
to draw into a high-resolution bitmap image (Mac OS X only).
- Added support for OpenGL version 3 and later.
- Added method Fl_Mac_App_Menu::custom_application_menu_items()
allowing customization of the application menu (Mac OS X only).
- Added 'fluid -u' command-line switch to upgrade fluid files in
batch mode. This option opens a fluid ('.fl') file and saves it
overwriting the old file with the current syntax and library version
number. Use with care (input file is overwritten unconditionally).
- Added FL_ZOOM_GESTURE gesture for OS X (only). Needs implementation
on other platforms.
- Added FL_ABI_VERSION, FL_API_VERSION, Fl::abi_version(), and
Fl::api_version(). Constants can be used to determine the compiled
FLTK version. Functions can be used to find the linked library version.
- Added Fl::abi_check() method to test if the runtime (linked)
ABI version is correct.
- Added Fl_Image::fail() to test if an image was loaded successfully
to allow for easier error detection when loading images (STR #2873).
- Added line numbers to fluid's source code viewer for New -> Code
New configuration options (ABI version)
- FLTK's ABI version can now be configured with 'configure', CMake, or
by editing a supplied file when using the bundled IDE projects.
See documentation in README.abi-version.txt.
1.3.4 ABI FEATURES
- Added deactivated user icon to Fl_Tree.
- Added Fl_Shared_Image::scale(width, height) which gives a shared
image its own drawing size, independently of the size of the
underlying image. This improves image drawing on high resolution
surfaces such as Laser printers, PDF files, and Apple retina displays.
Other improvements
- Configure now correctly sets HAVE_* variables only if both the
library and the header files were found. The configuration process
is aborted if Xft was requested explicitly with --enable-xft and
Xft was not found. The configuration summary now shows _found_
options as opposed to requested options.
- Improved drawing of rounded box (STR #2943).
- Full support of Apple 'retina' displays for which one drawing unit
corresponds to two pixels.
- The Mac OS X platform no longer uses the deprecated AGL
(Apple GL library) to draw OpenGL data. Instead, it uses standard
Cocoa APIs. This allows FLTK to support drawing GL scenes at high
resolution when an Fl_Gl_Window is mapped to a 'retina' display.
- Added Fl_Gl_Window::pixel_w(), Fl_Gl_Window::pixel_h(), and
Fl_Gl_Window::pixels_per_unit() useful for high resolution OpenGL windows.
- fl_read_image() now captures all pixels within the rectangle
described by its arguments, whether they belong to a GL scene
or not (STR #3142). It also captures subwindows of GL windows.
- Fl::delete_widget() now hides the widget or window immediately
(i.e. when called) - only destruction is delayed as before.
- FLTK header files don't expose X11 definitions in user code any more
unless requested by including FL/x.H explicitly or implicitly.
- The PostScript code output when printing images under Linux/Unix
is now much smaller by using lossless compression techniques.
- The Linux/Unix printer dialog now uses BSD-style printing commands
(lpr/lpq) when SystemV-style commands (lp/lpstat) are not available.
- Drawing alpha-blended images under X11 is now accelerated with
Xrender.
- The font used for the FL_COURIER font family was changed on the Mac OS X
platform from 'Courier New' to 'Courier' because it was too thin.
- Text drawing on the Mac platform supports Unicode 'variation selectors'
in the range [0xFE00-0xFE0F].
- Added a Mac OS implementation of Fl_Window::wait_for_expose() that
became necessary with Mac OS 10.10 "Yosemite".
- Added the libfltk target to the Xcode project producing a static
version of the FLTK library (Mac OS X).
- Restored the possibility to call Fl::set_font() before main() starts.
- Allow using the --enable-x11 configure option on the Mac OS platform
which produces an X11 version of the FLTK library (don't use unless
you know what you're doing).
- FLTK code and fluid-generated code can be used in static initializers.
- Added light gray separator line to fluid's widget browser (STR #2997).
- Improved tooltip behavior for huge tooltips: remove flicker, support
key/mouse dismiss (STR #2650).
- Modifier key names displayed in shortcut labels can now be localized.
See documentation of fl_shortcut_label(). You can set modifier key
names for Ctrl, Alt, Shift, and Meta by assigning global string
pointers to your translated modifier key names.
- Many documentation improvements and fixes.
- Fixed many compiler warnings (STR #2988).
- Fluid now generates code with less compiler warnings (STR #2813).
- Many CMake improvements and fixes. Note: CMake is mostly operating
now, but not yet recommended for production use. Please test and
report issues.
- Updated bundled zlib from 1.2.5 to 1.2.8.
- Updated bundled libjpeg from jpeg-8c to jpeg-9a.
Bug fixes
- Fix potential crash when using keyboard navigation on Fl_Tabs
widget without children (STR #3333).
- Fix potential crash if Fl_Window::icon(NULL) was called to clear
(reset) a window icon. This is now legal and documented behavior.
The same applies to Fl_Window::default_icon().
- Allow widget callback to be NULL, i.e. no callback (STR #2835).
- Fixed Fl_Help_View buffer overflow (STR #3275).
- Fl_Browser now correctly adjusts its scrollbars when the default
text size is changed with textsize(int) (STR #3057).
- Fixed Fl_Text_Display/Fl_Text_Editor slow scrolling, line number
display, wrap mode "hiding" text behind scrollbars, and more
scrollbar handling (alignment) (STR #3272).
- Fixed valgrind warning (uninitialized variable) in Fl_Window.
Visible only with FLTK_ABI_VERSION >= 10303, since FLTK 1.3.3.
- Fixed Windows drag'n'drop not showing insert position if the drop
target is inside the same window or process (STR #3209).
- Fixed undefined reference building shared cairo library (STR #3276).
- Fixed Fl_Browser if text argument to some methods is NULL (STR #3269).
- Fixed missing image release in fluid (STR #2840).
- Fixed out-of-bounds memory access in fluid (STR #3263).
- Fixed trailing white space in fluid .fl files (STR #3239).
- Several box types were not drawn correctly when deactivated.
The background color for deactivated widgets is now correct:
fl_inactive(color()) (STR #2907).
- Fix inconsistent interpretation of ld() in image handling
(STR #3308). This is a minor issue since ld() is usually 0 or
w()*d(). Documentation has been fixed, and ld() handling is now
consistent in Fl_(RGB_)Image and fl_draw_image() and friends. See
documentation of Fl_Image and Fl_RGB_Image for more information.
- Fixed Fl_Pixmap (background) drawing to respect the clip region
(STR #3206).
- Fixed reading .pbm image files: 1 is now interpreted as black,
and images whose width are a multiple of 8 are correctly read.
Note: if you relied on the faulty behavior you may need to fix
your image files.
- Restored window background drawing, particularly the 'plastic'
scheme's background (STR #3059). This was a regression since
FLTK 1.3.0.
- Prevent sending (FL_SHORTCUT) events to inactive widgets (STR #3216).
- Fixed button label clipping (STR #3237).
- Fixed Fl_Menu_::item_pathname() handling of descending submenu
pointers (STR #3177).
- Fl_Text_Display: style buffer colors are no longer manipulated by
fl_contrast() for normal text drawing (fltk.coredev thread started
04/08/15, Subject: "RFC: Fl_Text_Display style buffer color weirdness")
- Fl_Tree::deactivate() now affects draw color of items (must have
ABI 1.3.3 or higher enabled). For icons to draw deactivated,
enable ABI 1.3.4. (test/tree has a 'deactivate tree' button)
- Fl_Tree::find_item() did not find items if the pathname contained
identical strings (STR #3234).
- Fixed possible bad border effect when a set of radio menu items
is located first in its menu (STR #3176): Fl_Menu_Item::set_only()
is deprecated and replaced by Fl_Menu_::set_only(Fl_Menu_item*).
- Restore the correct state of mouse buttons and keyboard modifier keys
after closing a file or printer dialog (STR #3221).
- Fix for deactivate colors issue with Fl_Text_Display/Editor (STR #3219).
- Fixed issue with MSWindows platform where the program kept running
after closing all its windows (STR #3165).
- Fix potential buffer overflow (MSWindows: BEX64 error) and problem with
MSWindows environment variables "HOME"(MinGW) vs. "UserProfile"(DOS)
- Fix issue with MSWindows platform where a window would decrease
in size after each close/open (STR #3167).
- Fix undefined reference XGetUtf8FontAndGlyph (STR #3191).
- Fix potential keyboard hangup (STR #3192).
- Fix for: .xbm images were not previewed (STR #3131).
- Fixed crash on Mac platform when resizing a not yet shown() Fl_Gl_Window.
- Fixed potential Windows GDI leak (STR #3254).
- Fixed Linux/Unix potential program hang when dialog pops up while
a menu is open (STR #3179).
- Fixed a crash when a Unix/Linux program calls take_focus() before any
window has been show()n.
- Fixed an error on the Mac platform when drawing to an Fl_Image_Surface
object without using the Fl_Image_Surface::draw() method.
- Fixed STR #3268 where a fullscreen window could become relocated
behind the menu bar and dock (Mac OS only).
- Fixed STR #3207: ^C not working when numlock or capslock is on.
- Fixed code editor in Fluid (STR #3184).
- Fixed a potential hangup of the Fl::awake() queue under Windows if
a window is resized or moved while the Fl::awake() message is sent
(STR #3143).
- Fixed a regression: restore the possibility to call
fl_draw_image(buf,X,Y,W,H,D,L) with negative D and/or L arguments.
- Fixed overflow in Fl_Valuator::precision(int) to 0...9 (STR #3280).
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/x11/fltk13/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/fltk13/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/fltk13/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/fltk13/patches/patch-FL_Enumerations.H \
pkgsrc/x11/fltk13/patches/patch-src_Fl__Tree__Item.cxx \
pkgsrc/x11/fltk13/patches/patch-src_Fl_cocoa.mm \
pkgsrc/x11/fltk13/patches/patch-src_Fl_x.cxx \
pkgsrc/x11/fltk13/patches/patch-src_xutf8_imKStoUCS.c
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/fltk13/patches/patch-FL_Fl_Widget.H \
pkgsrc/x11/fltk13/patches/patch-ab \
pkgsrc/x11/fltk13/patches/patch-src_Fl.cxx \
pkgsrc/x11/fltk13/patches/patch-src_Fl_grab.cxx
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/x11/fltk13/patches/patch-aa \
pkgsrc/x11/fltk13/patches/patch-ac pkgsrc/x11/fltk13/patches/patch-ad
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/fltk13/patches/patch-ae \
pkgsrc/x11/fltk13/patches/patch-af pkgsrc/x11/fltk13/patches/patch-ag
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/fltk13/patches/patch-test_Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/x11/fltk13/Makefile
diff -u pkgsrc/x11/fltk13/Makefile:1.25 pkgsrc/x11/fltk13/Makefile:1.26
--- pkgsrc/x11/fltk13/Makefile:1.25 Mon Mar 12 11:15:49 2018
+++ pkgsrc/x11/fltk13/Makefile Fri Jul 13 04:24:39 2018
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2018/03/12 11:15:49 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2018/07/13 04:24:39 dbj Exp $
-DISTNAME= fltk-1.3.3-source
-PKGREVISION= 4
+DISTNAME= fltk-1.3.4-source
PKGNAME= ${DISTNAME:S/-source//}
VERS= ${DISTNAME:S/fltk-//:S/-source//}
CATEGORIES= x11
Index: pkgsrc/x11/fltk13/PLIST
diff -u pkgsrc/x11/fltk13/PLIST:1.4 pkgsrc/x11/fltk13/PLIST:1.5
--- pkgsrc/x11/fltk13/PLIST:1.4 Tue Dec 29 06:02:25 2015
+++ pkgsrc/x11/fltk13/PLIST Fri Jul 13 04:24:39 2018
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2015/12/29 06:02:25 dholland Exp $
+@comment $NetBSD: PLIST,v 1.5 2018/07/13 04:24:39 dbj Exp $
bin/fltk-config
bin/fluid
+include/FL/abi-version.h
include/FL/Enumerations.H
${PLIST.cs}include/FL/Enumerations.h
include/FL/Fl.H
Index: pkgsrc/x11/fltk13/distinfo
diff -u pkgsrc/x11/fltk13/distinfo:1.9 pkgsrc/x11/fltk13/distinfo:1.10
--- pkgsrc/x11/fltk13/distinfo:1.9 Fri Dec 16 00:08:03 2016
+++ pkgsrc/x11/fltk13/distinfo Fri Jul 13 04:24:39 2018
@@ -1,22 +1,13 @@
-$NetBSD: distinfo,v 1.9 2016/12/16 00:08:03 joerg Exp $
+$NetBSD: distinfo,v 1.10 2018/07/13 04:24:39 dbj Exp $
-SHA1 (fltk-1.3.3-source.tar.gz) = 873aac49b277149e054b9740378e2ca87b0bd435
-RMD160 (fltk-1.3.3-source.tar.gz) = a1736ec7da1ff751153e09bc5b5136d2fa95c18b
-SHA512 (fltk-1.3.3-source.tar.gz) = 277ba27e35c20e2d4fc5296bf418c5ab78c821870476e21d49f723765b99b3a559eed4ecd5215ac26d53a1091ada003e17f1553194cebaa97dd854809dd2885d
-Size (fltk-1.3.3-source.tar.gz) = 4986376 bytes
-SHA1 (patch-FL_Enumerations.H) = 88fd3fc95e361604b3ec735fcf23865db02152e2
-SHA1 (patch-FL_Fl_Widget.H) = c2a80956ba2245a9addb53ca974d658020c5525d
-SHA1 (patch-aa) = 777b293800af60ac508968946bcb9bc448c1ea00
-SHA1 (patch-ab) = fa941f28b2c17577a8473313f4906e8724183906
-SHA1 (patch-ac) = 9ab9a8ab5d2fd54ff0fcdeb7e2486aa3b83be5de
-SHA1 (patch-ad) = 01a25d7265784572fbd0c7d2c6f029d45333ad21
-SHA1 (patch-ae) = 88da94679399b3a8710c23b7f41a7debc8bc92b8
-SHA1 (patch-af) = a4154e31fca9ecf125922a84ac39771bc71dcb0f
-SHA1 (patch-ag) = 61e6d166d0910e02558bacea629f7fb736f7304c
-SHA1 (patch-src_Fl.cxx) = 169ed990645180694b7cce5baad72a28ac4fcb7a
-SHA1 (patch-src_Fl__Tree__Item.cxx) = 39c0c4cbb905caef8cb2ff4159fa12c42ed890d6
-SHA1 (patch-src_Fl_cocoa.mm) = 878038c611623b5337634e43d756bfb291872b18
-SHA1 (patch-src_Fl_grab.cxx) = 08e2ddabf55c7de46558681ec651acc134182e01
-SHA1 (patch-src_Fl_x.cxx) = ca7e4b98c52a84d0bc23ecf33fc30f94c0d16d35
-SHA1 (patch-src_xutf8_imKStoUCS.c) = 55ba2343b6f021bba03f67410078ae419b3354be
-SHA1 (patch-test_Makefile) = 5c3ad88366f45af1580690af938d54cd81b6beb7
+SHA1 (fltk-1.3.4-source.tar.gz) = 3c58770d2920a219d07641fa403de2c8c57bb7f0
+RMD160 (fltk-1.3.4-source.tar.gz) = a660ec3b18e89426c2edb76818bbfcec6a6f5890
+SHA512 (fltk-1.3.4-source.tar.gz) = 92c236e426ad9b2a2954a6fc401bc9bf4c4c46d47b08f8c9b879da6031ac158ef9b944f28a8bea64d18072d1af8ceaa09c00abebd745fb76dd628636424446c2
+Size (fltk-1.3.4-source.tar.gz) = 5284217 bytes
+SHA1 (patch-aa) = 335993d2e6b232b0539e583fb2463bafdffbb9b3
+SHA1 (patch-ac) = 4ee251d11b3840f525f473fe6c320e4d16ac95e1
+SHA1 (patch-ad) = 5a17f8fb46ce65b4795618d6aa22f445b55f6aa8
+SHA1 (patch-ae) = 4952426cd6ecc67921779de95f68835aa3bdaa9c
+SHA1 (patch-af) = 4c2b772cc8bd6729aeb94ee4e871c2d982356616
+SHA1 (patch-ag) = 2339189b49551d27a8246d9efd9fed4b26732dde
+SHA1 (patch-test_Makefile) = a2e47c0c21983b8906898eea3f19b19c2f09386c
Index: pkgsrc/x11/fltk13/patches/patch-aa
diff -u pkgsrc/x11/fltk13/patches/patch-aa:1.1.1.1 pkgsrc/x11/fltk13/patches/patch-aa:1.2
--- pkgsrc/x11/fltk13/patches/patch-aa:1.1.1.1 Thu Dec 1 16:35:12 2011
+++ pkgsrc/x11/fltk13/patches/patch-aa Fri Jul 13 04:24:39 2018
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2011/12/01 16:35:12 is Exp $
+$NetBSD: patch-aa,v 1.2 2018/07/13 04:24:39 dbj Exp $
---- Makefile.orig 2011-02-15 15:29:03.000000000 +0000
+--- Makefile.orig 2016-09-30 11:33:14.000000000 +0000
+++ Makefile
-@@ -27,7 +27,7 @@
+@@ -18,7 +18,7 @@
include makeinclude
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2011/12/01 1
all: makeinclude fltk-config
for dir in $(DIRS); do\
-@@ -35,6 +35,14 @@ all: makeinclude fltk-config
+@@ -26,6 +26,14 @@ all: makeinclude fltk-config
(cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\
done
Index: pkgsrc/x11/fltk13/patches/patch-ac
diff -u pkgsrc/x11/fltk13/patches/patch-ac:1.1.1.1 pkgsrc/x11/fltk13/patches/patch-ac:1.2
--- pkgsrc/x11/fltk13/patches/patch-ac:1.1.1.1 Thu Dec 1 16:35:13 2011
+++ pkgsrc/x11/fltk13/patches/patch-ac Fri Jul 13 04:24:39 2018
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2011/12/01 16:35:13 is Exp $
+$NetBSD: patch-ac,v 1.2 2018/07/13 04:24:39 dbj Exp $
---- configure.orig 2011-06-16 15:50:44.000000000 +0000
+--- configure.orig 2016-11-11 16:04:30.000000000 +0000
+++ configure
-@@ -1999,7 +1999,22 @@ if test "${enable_shared+set}" = set; th
+@@ -3816,7 +3816,22 @@ if test "${enable_shared+set}" = set; th
enableval=$enable_shared;
fi
@@ -26,7 +26,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2011/12/01 1
PICFLAG=1
SHAREDSUFFIX=""
FLUID="fluid-shared"
-@@ -2138,6 +2153,20 @@ else
+@@ -4051,6 +4066,20 @@ else
LINKSHARED="$LINKFLTKCAIRO ../lib/libfltk_images.a ../lib/libfltk_forms.a ../lib/libfltk.a"
fi
Index: pkgsrc/x11/fltk13/patches/patch-ad
diff -u pkgsrc/x11/fltk13/patches/patch-ad:1.1.1.1 pkgsrc/x11/fltk13/patches/patch-ad:1.2
--- pkgsrc/x11/fltk13/patches/patch-ad:1.1.1.1 Thu Dec 1 16:35:13 2011
+++ pkgsrc/x11/fltk13/patches/patch-ad Fri Jul 13 04:24:39 2018
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2011/12/01 16:35:13 is Exp $
+$NetBSD: patch-ad,v 1.2 2018/07/13 04:24:39 dbj Exp $
---- documentation/Makefile.orig 2011-01-05 23:00:33.000000000 +0000
+--- documentation/Makefile.orig 2015-06-16 13:18:28.000000000 +0000
+++ documentation/Makefile
-@@ -92,11 +92,6 @@ install: $(MANPAGES)
+@@ -88,11 +88,6 @@ install: $(MANPAGES)
$(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \
fi
echo "Installing man pages in $(DESTDIR)$(mandir) ..."
Index: pkgsrc/x11/fltk13/patches/patch-ae
diff -u pkgsrc/x11/fltk13/patches/patch-ae:1.2 pkgsrc/x11/fltk13/patches/patch-ae:1.3
--- pkgsrc/x11/fltk13/patches/patch-ae:1.2 Tue Jul 21 21:36:41 2015
+++ pkgsrc/x11/fltk13/patches/patch-ae Fri Jul 13 04:24:39 2018
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2015/07/21 21:36:41 markd Exp $
+$NetBSD: patch-ae,v 1.3 2018/07/13 04:24:39 dbj Exp $
---- fluid/Makefile.orig 2013-09-21 17:23:09.000000000 +0000
+--- fluid/Makefile.orig 2016-07-17 19:51:54.000000000 +0000
+++ fluid/Makefile
-@@ -48,7 +48,7 @@ all: $(FLUID) fluid$(EXEEXT)
+@@ -50,7 +50,7 @@ all: $(FLUID) fluid$(EXEEXT)
fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \
$(IMGLIBNAME)
echo Linking $@...
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.2 2015/07/21 21:36
$(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
-@@ -70,7 +70,7 @@ include makedepend
+@@ -72,7 +72,7 @@ include makedepend
install: all
echo "Installing FLUID in $(DESTDIR)$(bindir)..."
-$(INSTALL_DIR) $(DESTDIR)$(bindir)
Index: pkgsrc/x11/fltk13/patches/patch-af
diff -u pkgsrc/x11/fltk13/patches/patch-af:1.2 pkgsrc/x11/fltk13/patches/patch-af:1.3
--- pkgsrc/x11/fltk13/patches/patch-af:1.2 Sun Jun 9 16:09:35 2013
+++ pkgsrc/x11/fltk13/patches/patch-af Fri Jul 13 04:24:39 2018
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.2 2013/06/09 16:09:35 ryoon Exp $
+$NetBSD: patch-af,v 1.3 2018/07/13 04:24:39 dbj Exp $
---- makeinclude.in.orig 2012-12-05 14:53:03.000000000 +0000
+--- makeinclude.in.orig 2015-03-25 20:06:54.000000000 +0000
+++ makeinclude.in
-@@ -138,20 +138,20 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
+@@ -150,20 +150,20 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
.o$(EXEEXT):
echo Linking $@...
Index: pkgsrc/x11/fltk13/patches/patch-ag
diff -u pkgsrc/x11/fltk13/patches/patch-ag:1.2 pkgsrc/x11/fltk13/patches/patch-ag:1.3
--- pkgsrc/x11/fltk13/patches/patch-ag:1.2 Tue Jul 21 21:36:41 2015
+++ pkgsrc/x11/fltk13/patches/patch-ag Fri Jul 13 04:24:39 2018
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.2 2015/07/21 21:36:41 markd Exp $
+$NetBSD: patch-ag,v 1.3 2018/07/13 04:24:39 dbj Exp $
---- src/Makefile.orig 2014-10-30 16:05:22.000000000 +0000
+--- src/Makefile.orig 2015-03-25 20:06:54.000000000 +0000
+++ src/Makefile
-@@ -234,6 +234,10 @@ $(LIBNAME): $(OBJECTS)
+@@ -237,6 +237,10 @@ $(LIBNAME): $(OBJECTS)
$(LIBCOMMAND) $@ $(OBJECTS)
$(RANLIB) $@
@@ -10,10 +10,10 @@ $NetBSD: patch-ag,v 1.2 2015/07/21 21:36
+ echo $(CXX) $@ ...
+ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 $(LDLIBS)
+
- libfltk.so.1.3: $(OBJECTS)
+ libfltk.so.$(FL_DSO_VERSION): $(OBJECTS)
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
-@@ -270,6 +274,10 @@ $(FLLIBNAME): $(FLOBJECTS)
+@@ -273,6 +277,10 @@ $(FLLIBNAME): $(FLOBJECTS)
$(LIBCOMMAND) $@ $(FLOBJECTS)
$(RANLIB) $@
@@ -21,10 +21,10 @@ $NetBSD: patch-ag,v 1.2 2015/07/21 21:36
+ echo $(CXX) $@ ...
+ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(FLOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 $(LDLIBS)
+
- libfltk_forms.so.1.3: $(FLOBJECTS) libfltk.so.1.3
+ libfltk_forms.so.$(FL_DSO_VERSION): $(FLOBJECTS) libfltk.so.$(FL_DSO_VERSION)
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk $(LDLIBS)
-@@ -306,6 +314,10 @@ $(GLLIBNAME): $(GLOBJECTS)
+@@ -309,6 +317,10 @@ $(GLLIBNAME): $(GLOBJECTS)
$(LIBCOMMAND) $@ $(GLOBJECTS)
$(RANLIB) $@
@@ -32,10 +32,10 @@ $NetBSD: patch-ag,v 1.2 2015/07/21 21:36
+ echo $(CXX) $@ ...
+ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(GLOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 $(LDLIBS)
+
- libfltk_gl.so.1.3: $(GLOBJECTS) libfltk.so.1.3
+ libfltk_gl.so.$(FL_DSO_VERSION): $(GLOBJECTS) libfltk.so.$(FL_DSO_VERSION)
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk $(LDLIBS) $(GLDLIBS)
-@@ -342,6 +354,10 @@ $(IMGLIBNAME): $(IMGOBJECTS)
+@@ -345,6 +357,10 @@ $(IMGLIBNAME): $(IMGOBJECTS)
$(LIBCOMMAND) $@ $(IMGOBJECTS)
$(RANLIB) $@
@@ -43,46 +43,46 @@ $NetBSD: patch-ag,v 1.2 2015/07/21 21:36
+ echo $(CXX) $@ ...
+ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(IMGOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 $(LDLIBS)
+
- libfltk_images.so.1.3: $(IMGOBJECTS) libfltk.so.1.3
+ libfltk_images.so.$(FL_DSO_VERSION): $(IMGOBJECTS) libfltk.so.$(FL_DSO_VERSION)
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk $(LDLIBS)
-@@ -568,6 +584,9 @@ install: $(LIBNAME) $(DSONAME) \
+@@ -570,6 +586,9 @@ install: $(LIBNAME) $(DSONAME) \
+ $(INSTALL_LIB) $(GLLIBNAME) $(DESTDIR)$(libdir); \
$(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBBASENAME); \
fi
- $(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME)
+ if test x$(DSONAME) = xlibfltk.la; then\
+ ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk.la $(DESTDIR)$(libdir); \
+ fi
- if test x$(DSONAME) = xlibfltk.so.1.3; then\
+ $(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME)
+ if test x$(DSONAME) = xlibfltk.so.$(FL_DSO_VERSION); then\
$(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
- $(INSTALL_LIB) libfltk.so.1.3 $(DESTDIR)$(libdir); \
-@@ -587,6 +606,9 @@ install: $(LIBNAME) $(DSONAME) \
+@@ -590,6 +609,9 @@ install: $(LIBNAME) $(DSONAME) \
$(RM) $(DESTDIR)$(libdir)/libfltk_s.a;\
$(INSTALL_LIB) libfltk_s.a $(DESTDIR)$(libdir); \
fi
+ if test x$(FLDSONAME) = xlibfltk_forms.la; then\
+ ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk_forms.la $(DESTDIR)$(libdir); \
+ fi
- if test x$(DSONAME) = xcygfltknox-1.3.dll; then\
+ if test x$(DSONAME) = xcygfltknox-$(FL_DSO_VERSION).dll; then\
$(RM) $(DESTDIR)$(bindir)/$(DSONAME);\
$(INSTALL_LIB) $(DSONAME) $(DESTDIR)$(bindir); \
-@@ -604,6 +626,9 @@ install: $(LIBNAME) $(DSONAME) \
- $(INSTALL_LIB) libfltk_forms.so.1.3 $(DESTDIR)$(libdir); \
- $(LN) libfltk_forms.so.1.3 $(DESTDIR)$(libdir)/libfltk_forms.so;\
+@@ -607,6 +629,9 @@ install: $(LIBNAME) $(DSONAME) \
+ $(INSTALL_LIB) libfltk_forms.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
+ $(LN) libfltk_forms.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_forms.so;\
fi
+ if test x$(GLDSONAME) = xlibfltk_gl.la; then\
+ ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk_gl.la $(DESTDIR)$(libdir); \
+ fi
- if test x$(FLDSONAME) = xlibfltk_forms.sl.1.3; then\
+ if test x$(FLDSONAME) = xlibfltk_forms.sl.$(FL_DSO_VERSION); then\
$(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\
- $(INSTALL_LIB) libfltk_forms.sl.1.3 $(DESTDIR)$(libdir); \
-@@ -661,6 +686,9 @@ install: $(LIBNAME) $(DSONAME) \
+ $(INSTALL_LIB) libfltk_forms.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
+@@ -664,6 +689,9 @@ install: $(LIBNAME) $(DSONAME) \
$(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\
$(INSTALL_LIB) libfltk_gl.dll.a $(DESTDIR)$(libdir); \
fi
+ if test x$(IMGDSONAME) = xlibfltk_images.la; then\
+ ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk_images.la $(DESTDIR)$(libdir); \
+ fi
- if test x$(IMGDSONAME) = xlibfltk_images.so.1.3; then\
+ if test x$(IMGDSONAME) = xlibfltk_images.so.$(FL_DSO_VERSION); then\
$(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\
- $(INSTALL_LIB) libfltk_images.so.1.3 $(DESTDIR)$(libdir); \
+ $(INSTALL_LIB) libfltk_images.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
Index: pkgsrc/x11/fltk13/patches/patch-test_Makefile
diff -u pkgsrc/x11/fltk13/patches/patch-test_Makefile:1.3 pkgsrc/x11/fltk13/patches/patch-test_Makefile:1.4
--- pkgsrc/x11/fltk13/patches/patch-test_Makefile:1.3 Tue Jul 21 21:36:41 2015
+++ pkgsrc/x11/fltk13/patches/patch-test_Makefile Fri Jul 13 04:24:39 2018
@@ -1,8 +1,8 @@
-$NetBSD: patch-test_Makefile,v 1.3 2015/07/21 21:36:41 markd Exp $
+$NetBSD: patch-test_Makefile,v 1.4 2018/07/13 04:24:39 dbj Exp $
---- test/Makefile.orig 2014-09-26 23:58:05.000000000 +0000
+--- test/Makefile.orig 2016-09-03 08:14:43.000000000 +0000
+++ test/Makefile
-@@ -302,19 +302,19 @@ buttons$(EXEEXT): buttons.o
+@@ -308,19 +308,19 @@ buttons$(EXEEXT): buttons.o
blocks$(EXEEXT): blocks.o
echo Linking $@...
@@ -23,14 +23,17 @@ $NetBSD: patch-test_Makefile,v 1.3 2015/
- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ colbrowser.o $(LINKFLTKFORMS) $(LDLIBS)
+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ colbrowser.o $(LINKFLTKFORMS) $(LDLIBS)
$(OSX_ONLY) ../fltk-config --post $@
-
- color_chooser$(EXEEXT): color_chooser.o
-@@ -325,18 +325,18 @@ curve$(EXEEXT): curve.o
+ $(OSX_ONLY) mkdir -p colbrowser.app/Contents/Resources
+ $(OSX_ONLY) cp -f rgb.txt colbrowser.app/Contents/Resources/
+@@ -333,21 +333,21 @@ curve$(EXEEXT): curve.o
demo$(EXEEXT): demo.o
echo Linking $@...
- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ demo.o $(LINKFLTKFORMS) $(LDLIBS)
+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ demo.o $(LINKFLTKFORMS) $(LDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+ $(OSX_ONLY) mkdir -p demo.app/Contents/Resources
+ $(OSX_ONLY) cp -f demo.menu demo.app/Contents/Resources/
device$(EXEEXT): device.o $(IMGLIBNAME)
echo Linking $@...
@@ -45,9 +48,9 @@ $NetBSD: patch-test_Makefile,v 1.3 2015/
- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) editor.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) editor.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
$(OSX_ONLY) ../fltk-config --post $@
+ $(OSX_ONLY) cp -f ../ide/Xcode4/plists/editor-Info.plist editor.app/Contents/Info.plist
- fast_slow$(EXEEXT): fast_slow.o
-@@ -344,21 +344,21 @@ fast_slow.cxx: fast_slow.fl ../fluid/flu
+@@ -356,21 +356,21 @@ fast_slow.cxx: fast_slow.fl ../fluid/flu
file_chooser$(EXEEXT): file_chooser.o $(IMGLIBNAME)
echo Linking $@...
@@ -70,9 +73,9 @@ $NetBSD: patch-test_Makefile,v 1.3 2015/
- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
$(OSX_ONLY) ../fltk-config --post $@
-
- icon$(EXEEXT): icon.o
-@@ -376,14 +376,14 @@ input_choice$(EXEEXT): input_choice.o
+ $(OSX_ONLY) mkdir -p help.app/Contents/Resources
+ $(OSX_ONLY) cp -f help-test.html help.app/Contents/Resources/
+@@ -390,14 +390,14 @@ input_choice$(EXEEXT): input_choice.o
keyboard$(EXEEXT): keyboard_ui.o keyboard.o
echo Linking $@...
@@ -89,7 +92,7 @@ $NetBSD: patch-test_Makefile,v 1.3 2015/
$(OSX_ONLY) ../fltk-config --post $@
line_style$(EXEEXT): line_style.o
-@@ -392,7 +392,7 @@ list_visuals$(EXEEXT): list_visuals.o
+@@ -406,7 +406,7 @@ list_visuals$(EXEEXT): list_visuals.o
mandelbrot$(EXEEXT): mandelbrot_ui.o mandelbrot.o
echo Linking $@...
@@ -98,7 +101,7 @@ $NetBSD: patch-test_Makefile,v 1.3 2015/
$(OSX_ONLY) ../fltk-config --post $@
mandelbrot_ui.o: mandelbrot_ui.h
mandelbrot_ui.cxx: mandelbrot_ui.fl ../fluid/fluid$(EXEEXT)
-@@ -405,14 +405,14 @@ minimum$(EXEEXT): minimum.o
+@@ -419,7 +419,7 @@ minimum$(EXEEXT): minimum.o
native-filechooser$(EXEEXT): native-filechooser.o $(IMGLIBNAME)
echo Linking $@...
@@ -107,6 +110,7 @@ $NetBSD: patch-test_Makefile,v 1.3 2015/
$(OSX_ONLY) ../fltk-config --post $@
navigation$(EXEEXT): navigation.o
+@@ -428,7 +428,7 @@ offscreen$(EXEEXT): offscreen.o
output$(EXEEXT): output.o $(FLLIBNAME)
echo Linking $@...
@@ -115,7 +119,7 @@ $NetBSD: patch-test_Makefile,v 1.3 2015/
$(OSX_ONLY) ../fltk-config --post $@
overlay$(EXEEXT): overlay.o
-@@ -423,7 +423,7 @@ pixmap$(EXEEXT): pixmap.o
+@@ -439,7 +439,7 @@ pixmap$(EXEEXT): pixmap.o
pixmap_browser$(EXEEXT): pixmap_browser.o $(IMGLIBNAME)
echo Linking $@...
@@ -124,7 +128,7 @@ $NetBSD: patch-test_Makefile,v 1.3 2015/
$(OSX_ONLY) ../fltk-config --post $@
preferences$(EXEEXT): preferences.o
-@@ -447,13 +447,13 @@ subwindow$(EXEEXT): subwindow.o
+@@ -463,13 +463,13 @@ subwindow$(EXEEXT): subwindow.o
sudoku: sudoku.o
echo Linking $@...
@@ -140,7 +144,7 @@ $NetBSD: patch-test_Makefile,v 1.3 2015/
symbols$(EXEEXT): symbols.o
-@@ -485,7 +485,7 @@ $(GLALL): $(LIBNAME) $(GLLIBNAME)
+@@ -501,7 +501,7 @@ $(GLALL): $(LIBNAME) $(GLLIBNAME)
# OpenGL demos...
CubeView$(EXEEXT): CubeMain.o CubeView.o CubeViewUI.o
echo Linking $@...
@@ -149,7 +153,7 @@ $NetBSD: patch-test_Makefile,v 1.3 2015/
CubeMain.o CubeView.o CubeViewUI.o \
$(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
$(OSX_ONLY) ../fltk-config --post $@
-@@ -496,37 +496,37 @@ CubeViewUI.cxx: CubeViewUI.fl ../fluid/f
+@@ -512,37 +512,37 @@ CubeViewUI.cxx: CubeViewUI.fl ../fluid/f
cube$(EXEEXT): cube.o
echo Linking $@...
Home |
Main Index |
Thread Index |
Old Index