cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to fleditor-0.4.4 (bugfix release)

Browse Source 
+  Update to work with FLTK 1.1 and latest 2.x CVS.
+  Added workaround for strange focus behaviour when scrolling with
   the scrollbar.  The text widget gets an unfocus when the scrollbar
   is clicked, but then when you click back on the text, instead
   of it getting a focus event, it gets another unfocus.  This makes
   the cursor remain invisible when it shouldn't.
*  Fixes to scrollbar handling.
*  Fixed status panel on Fl_FancyEditor (positioning problem).
This commit is contained in:
wilfried 2002-08-10 20:04:16 +00:00
parent cfe38f9339
commit d2f742606d
7 changed files with 81 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
x11/fleditor/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.10 2002/05/15 09:30:22 wilfried Exp $
# $OpenBSD: Makefile,v 1.11 2002/08/10 20:04:16 wilfried Exp $
COMMENT= 'Text Editor for FLTK'
DISTNAME= fl_editor-0.4.3
PKGNAME= fleditor-0.4.3
V= 0.4.4
DISTNAME= fl_editor-${V}
PKGNAME= fleditor-${V}
CATEGORIES= x11
NEED_VERSION= 1.482
HOMEPAGE= http://www.robertk.com/source/
@ -20,7 +20,7 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= http://www.robertk.com/source/fl_editor/
EXTRACT_SUFX= .tgz
LIB_DEPENDS= fltk.::x11/fltk
LIB_DEPENDS= fltk.1::x11/fltk
USE_X11= Yes
REGRESS_TARGET= test
@ -38,6 +38,13 @@ REGRESS_IS_INTERACTIVE= Yes
post-patch:
@rmdir ${WRKSRC}/obj
pre-regress:
.for t in DISPLAY XAUTHORITY
.if !defined($t)
@echo "$t needs to be set to run regress"; exit 1
.endif
.endfor
do-install:
@${install_shared_frag}
${INSTALL_DATA} ${WRKBUILD}/libfleditor.a ${PREFIX}/lib
@ -52,4 +59,3 @@ install_shared_frag= :
install_shared_frag=\
${INSTALL_DATA} ${WRKBUILD}/libfleditor.so* ${PREFIX}/lib
.endif

6
x11/fleditor/distinfo
View File

@ -1,3 +1,3 @@
MD5 (fl_editor-0.4.3.tgz) = 689813fc13cb1a39ced29be542c4a719
RMD160 (fl_editor-0.4.3.tgz) = 3b411410e0e81abe29e7324e4902a5c83fe2560a
SHA1 (fl_editor-0.4.3.tgz) = e9e9379b91cea592464d5c5346ddc3bc678b8985
MD5 (fl_editor-0.4.4.tgz) = 65a8be5f628d4dc87486e4996eded364
RMD160 (fl_editor-0.4.4.tgz) = 3778601d83110c4010916ce51468160a270e2be5
SHA1 (fl_editor-0.4.4.tgz) = ecd332afe4c3e4d70c66ed6939b240beb30d4e7d

20
x11/fleditor/patches/patch-Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.5 2001/10/26 23:36:17 wilfried Exp $
--- Makefile.in.orig Wed Aug 29 21:15:08 2001
+++ Makefile.in Sat Oct 27 00:51:31 2001
$OpenBSD: patch-Makefile_in,v 1.6 2002/08/10 20:04:16 wilfried Exp $
--- Makefile.in.orig Fri Jun 14 23:12:25 2002
+++ Makefile.in Sat Aug 10 19:49:59 2002
@@ -29,7 +29,7 @@ FLTKLIBDIR = @ac_fltk_libraries@
# Program options...
#
@ -9,7 +9,7 @@ $OpenBSD: patch-Makefile_in,v 1.5 2001/10/26 23:36:17 wilfried Exp $
+ARFLAGS = r
CFLAGS = -I. -I.. -I$(FLTKROOT)/include @CFLAGS@ @ac_fltk2@
CXXFLAGS = -I. -I.. -I$(FLTKROOT)/include @CXXFLAGS@ @ac_fltk2@
LIBS = @ac_fltk_static@ -L$(FLTKROOT)/lib @LIBS@ -lXext -lX11 -lm @ac_fltk_dso@ $(GLLIB)
LIBS = @ac_fltk_static@ -L$(FLTKROOT)/lib @LIBS@ -lXext -lX11 -lm -ljpeg -lpng @ac_fltk_dso@ $(GLLIB)
@@ -39,15 +39,15 @@ LDFLAGS = @LDFLAGS@
# Rules...
#
@ -57,27 +57,27 @@ $OpenBSD: patch-Makefile_in,v 1.5 2001/10/26 23:36:17 wilfried Exp $
- echo $(CXX) $(LDFLAGS) $^ libfleditor.a $(LIBS) -o $@
- $(CXX) $(LDFLAGS) $^ libfleditor.a $(LIBS) -o $@
+ echo $(CXX) $(LDFLAGS) test/progress.o libfleditor.a $(LIBS) -o $@
+ $(CXX) $(LDFLAGS) test/progress.o libfleditor.a $(LIBS) -o $@
+ $(CXX) $(LDFLAGS) test/progress.o -R. -L. -lfleditor $(LIBS) -o $@
test/simple: test/simple.o
echo Building $@ test program
- $(CXX) $(LDFLAGS) $^ libfleditor.a $(LIBS) -o $@
+ $(CXX) $(LDFLAGS) test/simple.o libfleditor.a $(LIBS) -o $@
+ $(CXX) $(LDFLAGS) test/simple.o -R. -L. -lfleditor $(LIBS) -o $@
test/status: test/status.o
echo Building $@ test program
- $(CXX) $(LDFLAGS) $^ libfleditor.a $(LIBS) -o $@
+ $(CXX) $(LDFLAGS) test/status.o libfleditor.a $(LIBS) -o $@
+ $(CXX) $(LDFLAGS) test/status.o -R. -L. -lfleditor $(LIBS) -o $@
test/single: test/single.o
echo Building $@ test program
- $(CXX) $(LDFLAGS) $^ libfleditor.a $(LIBS) -o $@
+ $(CXX) $(LDFLAGS) test/single.o libfleditor.a $(LIBS) -o $@
+ $(CXX) $(LDFLAGS) test/single.o -R. -L. -lfleditor $(LIBS) -o $@
test/multiple: test/multiple.o test/multfunc.o
echo Building $@ test program
- $(CXX) $(LDFLAGS) $^ libfleditor.a $(LIBS) -o $@
+ $(CXX) $(LDFLAGS) test/multiple.o test/multfunc.o libfleditor.a $(LIBS) -o $@
+ $(CXX) $(LDFLAGS) test/multiple.o test/multfunc.o -R. -L. -lfleditor $(LIBS) -o $@
#
# Make the editor widget library.
@ -91,7 +91,7 @@ $OpenBSD: patch-Makefile_in,v 1.5 2001/10/26 23:36:17 wilfried Exp $
$(RANLIB) libfleditor.a
-libfleditor.so: $(EDITOR_OBJS)
+libfleditor.so.1.1: $(EDITOR_OBJS)
+libfleditor.so.2.0: $(EDITOR_OBJS)
echo Building library $@...
$(RM) libfleditor.so
@DSOCOMMAND@ @DSOLIBNAME@@DSOEXT@ $(EDITOR_OBJS)

58
x11/fleditor/patches/patch-configure
View File

@ -1,7 +1,24 @@
$OpenBSD: patch-configure,v 1.4 2001/10/26 23:36:17 wilfried Exp $
--- configure.orig Wed Aug 29 21:13:56 2001
+++ configure Sat Oct 27 01:24:21 2001
@@ -998,7 +998,7 @@ else
$OpenBSD: patch-configure,v 1.5 2002/08/10 20:04:16 wilfried Exp $
--- configure.orig Mon Apr 22 18:23:58 2002
+++ configure Fri Aug 9 15:52:32 2002
@@ -20,7 +20,7 @@ ac_help="$ac_help
ac_help="$ac_help
--with-fltk=DIR fltk root (for lib and include) [default=/usr/local]"
ac_help="$ac_help
- --with-fltk2 build for FLTK version 2 [default=no]"
+ --with-fltk2 build for \"FLTK 2 Pure\" [default=no]"
# Initialize some variables set by options.
# The variables have the same names as the options, with
@@ -531,6 +531,7 @@ else
fi
+
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -997,7 +998,7 @@ else
fi
@ -10,7 +27,7 @@ $OpenBSD: patch-configure,v 1.4 2001/10/26 23:36:17 wilfried Exp $
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
@@ -1348,33 +1348,12 @@ if test "${enable_shared+set}" = set; th
@@ -1347,33 +1348,12 @@ if test "${enable_shared+set}" = set; th
enableval="$enable_shared"
if eval "test x$enable_shared = xyes"; then
@ -43,12 +60,12 @@ $OpenBSD: patch-configure,v 1.4 2001/10/26 23:36:17 wilfried Exp $
- DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ -shared $DEBUGFLAG -o"
- ;;
- esac
+ DSOEXT=".so.1.1"
+ DSOEXT=".so.2.0"
+ DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -fPIC -shared $DEBUGFLAG -o"
fi
else
@@ -1399,15 +1378,16 @@ else
@@ -1398,36 +1378,35 @@ else
fi
@ -56,18 +73,22 @@ $OpenBSD: patch-configure,v 1.4 2001/10/26 23:36:17 wilfried Exp $
# Check whether --with-fltk2 or --without-fltk2 was given.
if test "${with_fltk2+set}" = set; then
withval="$with_fltk2"
- if test " x$withval = xyes"; then ac_fltk2="-DFLTK2"; fi
- if eval "test x$withval = xyes"; then
- ac_fltk2="-DFLTK2=1 ";
- fi
+ if test x$withval = xyes; then ac_fltk2="-DFL_MAJOR_VERSION=2"; fi
fi
echo $ac_n "checking for numericsort in -lfltk""... $ac_c" 1>&6
-echo $ac_n "checking for numericsort in -lfltk""... $ac_c" 1>&6
-echo "configure:1411: checking for numericsort in -lfltk" >&5
+echo "configure:1391: checking for numericsort in -lfltk" >&5
ac_lib_var=`echo fltk'_'numericsort | sed 'y%./+-%__p_%'`
-ac_lib_var=`echo fltk'_'numericsort | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for fl_numericsort in -lfltk""... $ac_c" 1>&6
+echo "configure:1391: checking for fl_numericsort in -lfltk" >&5
+ac_lib_var=`echo fltk'_'fl_numericsort | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1415,7 +1395,7 @@ else
else
ac_save_LIBS="$LIBS"
LIBS="-lfltk $LIBS"
cat > conftest.$ac_ext <<EOF
@ -76,8 +97,13 @@ $OpenBSD: patch-configure,v 1.4 2001/10/26 23:36:17 wilfried Exp $
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1426,7 +1406,7 @@ int main() {
numericsort()
builtin and then its argument prototype would still apply. */
-char numericsort();
+char fl_numericsort();
int main() {
-numericsort()
+fl_numericsort()
; return 0; }
EOF
-if { (eval echo configure:1430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@ -85,7 +111,7 @@ $OpenBSD: patch-configure,v 1.4 2001/10/26 23:36:17 wilfried Exp $
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1451,97 +1431,6 @@ EOF
@@ -1452,97 +1431,6 @@ EOF
else
echo "$ac_t""no" 1>&6
@ -132,7 +158,7 @@ $OpenBSD: patch-configure,v 1.4 2001/10/26 23:36:17 wilfried Exp $
- cat >> confdefs.h <<\EOF
-#define HAVE_GL 1
-EOF
- GLLIB=" -lGLU -lGL"
- GLLIB=" -lGL"
-else
- echo "$ac_t""no" 1>&6
-\

9
x11/fleditor/patches/patch-configure_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_in,v 1.4 2001/10/26 23:36:17 wilfried Exp $
$OpenBSD: patch-configure_in,v 1.5 2002/08/10 20:04:16 wilfried Exp $
--- configure.in.orig Wed Jan 10 00:11:25 2001
+++ configure.in Sat Oct 27 01:24:19 2001
+++ configure.in Fri Aug 9 15:52:32 2002
@@ -18,7 +18,7 @@ AC_PATH_PROG(AR,ar)
AC_PATH_PROG(RM,rm)
@ -43,7 +43,7 @@ $OpenBSD: patch-configure_in,v 1.4 2001/10/26 23:36:17 wilfried Exp $
- DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ -shared $DEBUGFLAG -o"
- ;;
- esac
+ DSOEXT=".so.1.1"
+ DSOEXT=".so.2.0"
+ DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -fPIC -shared $DEBUGFLAG -o"
fi],
[
@ -58,7 +58,7 @@ $OpenBSD: patch-configure_in,v 1.4 2001/10/26 23:36:17 wilfried Exp $
- [ if test " x$withval = xyes"; then ac_fltk2="-DFLTK2"; fi ])
+ [ if test x$withval = xyes; then ac_fltk2="-DFL_MAJOR_VERSION=2"; fi ])
AC_CHECK_LIB(fltk,numericsort)
-AC_CHECK_LIB(fltk,numericsort)
-
-dnl# test to see if OpenGL is on this machine:
-GLLIB=
@ -66,6 +66,7 @@ $OpenBSD: patch-configure_in,v 1.4 2001/10/26 23:36:17 wilfried Exp $
- AC_CHECK_LIB(MesaGL,glXMakeCurrent, AC_DEFINE(HAVE_GL) GLLIB=" -lMesaGLU -lMesaGL",,\
- -lX11 -lXext $X_EXTRA_LIBS -lm), \
- -lX11 -lXext $X_EXTRA_LIBS -lm)
+AC_CHECK_LIB(fltk,fl_numericsort)
AC_SUBST(GLLIB)
AC_SUBST(DSOCOMMAND)

4
x11/fleditor/pkg/PFRAG.shared
View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2001/08/29 07:44:47 wilfried Exp $
lib/libfleditor.so.1.1
@comment $OpenBSD: PFRAG.shared,v 1.3 2002/08/10 20:04:16 wilfried Exp $
lib/libfleditor.so.2.0
DYNLIBDIR(%B)

8
x11/fleditor/pkg/PLIST
View File

@ -1,10 +1,16 @@
@comment $OpenBSD: PLIST,v 1.2 2001/04/15 10:32:12 wilfried Exp $
@comment $OpenBSD: PLIST,v 1.3 2002/08/10 20:04:16 wilfried Exp $
include/FL/Fl_Editor.H
include/FL/Fl_Editor.h
include/FL/Fl_FancyEditor.H
include/FL/Fl_FancyEditor.h
include/FL/Fl_FancyMultiEditor.H
include/FL/Fl_FancyMultiEditor.h
include/FL/Fl_MultiEditor.H
include/FL/Fl_MultiEditor.h
include/FL/Fl_ProgressBox.H
include/FL/Fl_ProgressBox.h
include/FL/Fl_StatusPanel.H
include/FL/Fl_StatusPanel.h
include/FL/editengine.h
include/FL/editvars.h
include/FL/lists.h