mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
sci-astronomy/skycat: Remove last-rited pkg
Closes: https://bugs.gentoo.org/688950 Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Michał Górny
@@ -867,11 +867,6 @@ dev-python/lunr
|
||||
dev-python/nltk
|
||||
dev-python/nltk-data
|
||||
|
||||
# Michał Górny <mgorny@gentoo.org> (2022-12-15)
|
||||
# Fails to build since 2019. Last bumped in 2017.
|
||||
# Removal on 2023-01-14. Bug #688950.
|
||||
sci-astronomy/skycat
|
||||
|
||||
# Jaco Kroon <jaco@uls.co.za> (2022-12-14)
|
||||
# Multiple open bugs (bug #870910, bug #877731, bug #884815), only one of which
|
||||
# is trivial to solve.
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DIST skycat-3.1.3.tar.gz 3057187 BLAKE2B 3adb385452969f4cc9dac4236c1ff3dae94f2f4cf3efef1b21acfb470ffe2c387c38aa4cc0b73c1836a2172271d6113e5d0f6ab49eaab7ad8a68c7ca6566133c SHA512 55ec0c2b367e028c23e5e8f8d74106aa51aec5173c2ab1772f5fa8a5a5b65f3d85e7b991597a89f11f6ca14d57aaa6b774f474b41e78747ee486df66ab22e9ff
|
||||
@@ -1,107 +0,0 @@
|
||||
diff -Naur skycat-3.0.2/astrotcl/configure.in skycat-3.0.2.new/astrotcl/configure.in
|
||||
--- skycat-3.0.2/astrotcl/configure.in 2006-01-25 17:21:38.000000000 -0500
|
||||
+++ skycat-3.0.2.new/astrotcl/configure.in 2009-09-24 20:48:27.000000000 -0400
|
||||
@@ -83,10 +83,10 @@
|
||||
#-----------------------------------------------------------------------
|
||||
|
||||
changequote(<<, >>)
|
||||
-csources=`cd $srcdir; echo {generic,press,libwcs,cfitsio}/*.[Cc]`
|
||||
+csources=`cd $srcdir; echo {generic,press}/*.[Cc]`
|
||||
changequote([, ])
|
||||
-cheaders=`cd $srcdir; echo {generic,press,libwcs,cfitsio}/*.h`
|
||||
-cincludes="-I$srcdir/../tclutil/generic -I$srcdir/generic -I$srcdir/press -I$srcdir/libwcs -I$srcdir/cfitsio"
|
||||
+cheaders=`cd $srcdir; echo {generic,press}/*.h`
|
||||
+cincludes="-I$srcdir/../tclutil/generic -I$srcdir/generic -I$srcdir/press -I/usr/include/wcs -I/usr/include/"
|
||||
tclsources=`cd $srcdir; echo library/*.tcl`
|
||||
|
||||
TEA_ADD_SOURCES([${csources}])
|
||||
diff -Naur skycat-3.0.2/cat/aclocal.m4 skycat-3.0.2.new/cat/aclocal.m4
|
||||
--- skycat-3.0.2/cat/aclocal.m4 2006-01-23 12:24:46.000000000 -0500
|
||||
+++ skycat-3.0.2.new/cat/aclocal.m4 2009-09-24 20:31:00.000000000 -0400
|
||||
@@ -47,11 +47,11 @@
|
||||
changequote([, ])
|
||||
|
||||
cat_headers=`cd $srcdir; echo generic/*.h`
|
||||
-astrotcl_headers=`cd $srcdir; echo ../astrotcl/{generic,press,libwcs,cfitsio}/*.h`
|
||||
+astrotcl_headers=`cd $srcdir; echo ../astrotcl/{generic,press}/*.h`
|
||||
tclutil_headers=`cd $srcdir; echo ../tclutil/generic/*.h`
|
||||
|
||||
cat_includes="-I$srcdir/generic -I$srcdir/bitmaps"
|
||||
-astrotcl_includes="-I$srcdir/../astrotcl/generic -I$srcdir/../astrotcl/cfitsio -I$srcdir/../astrotcl/libwcs"
|
||||
+astrotcl_includes="-I$srcdir/../astrotcl/generic -I/usr/include -I/usr/include/wcs"
|
||||
tclutil_includes="-I$srcdir/../tclutil/generic"
|
||||
cincludes="${cat_includes} ${astrotcl_includes} ${tclutil_includes}"
|
||||
|
||||
diff -Naur skycat-3.0.2/cat/configure.in skycat-3.0.2.new/cat/configure.in
|
||||
--- skycat-3.0.2/cat/configure.in 2006-02-03 05:29:48.000000000 -0500
|
||||
+++ skycat-3.0.2.new/cat/configure.in 2009-09-24 20:51:56.000000000 -0400
|
||||
@@ -181,6 +181,9 @@
|
||||
# and TEA_LOAD_TCLCONFIG macros above.
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
+# we need wcstools and cfitsio
|
||||
+PKG_LIBS="${PKG_LIBS} -lwcstools -lcfitsio"
|
||||
+
|
||||
TEA_MAKE_LIB
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
diff -Naur skycat-3.0.2/rtd/aclocal.m4 skycat-3.0.2.new/rtd/aclocal.m4
|
||||
--- skycat-3.0.2/rtd/aclocal.m4 2006-02-01 17:10:36.000000000 -0500
|
||||
+++ skycat-3.0.2.new/rtd/aclocal.m4 2009-09-24 20:27:46.000000000 -0400
|
||||
@@ -50,11 +50,11 @@
|
||||
changequote([, ])
|
||||
|
||||
rtd_headers=`cd $srcdir; echo generic/*.h rtdevt/rtdImageEvent.h rtdevt/rtdSem.h`
|
||||
-astrotcl_headers=`cd $srcdir; echo ../astrotcl/{generic,press,libwcs,cfitsio}/*.h`
|
||||
+astrotcl_headers=`cd $srcdir; echo ../astrotcl/{generic,press}/*.h`
|
||||
tclutil_headers=`cd $srcdir; echo ../tclutil/generic/*.h`
|
||||
|
||||
rtd_includes="-I$srcdir/generic -I$srcdir/rtdevt -I$srcdir/bitmaps"
|
||||
-astrotcl_includes="-I$srcdir/../astrotcl/generic -I$srcdir/../astrotcl/cfitsio -I$srcdir/../astrotcl/libwcs"
|
||||
+astrotcl_includes="-I$srcdir/../astrotcl/generic -I/usr/include -I/usr/include/wcs"
|
||||
tclutil_includes="-I$srcdir/../tclutil/generic"
|
||||
cincludes="${rtd_includes} ${astrotcl_includes} ${tclutil_includes}"
|
||||
|
||||
diff -Naur skycat-3.0.2/rtd/configure.in skycat-3.0.2.new/rtd/configure.in
|
||||
--- skycat-3.0.2/rtd/configure.in 2006-02-01 17:10:36.000000000 -0500
|
||||
+++ skycat-3.0.2.new/rtd/configure.in 2009-09-24 20:49:11.000000000 -0400
|
||||
@@ -192,7 +192,7 @@
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
# rtd needs -lXext
|
||||
-PKG_LIBS="${PKG_LIBS} -lXext"
|
||||
+PKG_LIBS="${PKG_LIBS} -lXext -lwcstools -lcfitsio"
|
||||
|
||||
TEA_MAKE_LIB
|
||||
|
||||
diff -Naur skycat-3.0.2/skycat/aclocal.m4 skycat-3.0.2.new/skycat/aclocal.m4
|
||||
--- skycat-3.0.2/skycat/aclocal.m4 2006-01-26 17:47:20.000000000 -0500
|
||||
+++ skycat-3.0.2.new/skycat/aclocal.m4 2009-09-24 20:33:31.000000000 -0400
|
||||
@@ -79,13 +79,13 @@
|
||||
skycat_headers=`cd $srcdir; echo generic/*.h`
|
||||
cat_headers=`cd $srcdir; echo ../cat/generic/*.h`
|
||||
rtd_headers=`cd $srcdir; echo ../rtd/generic/*.h ../rtd/rtdevt/rtdImageEvent.h ../rtd/rtdevt/rtdSem.h`
|
||||
-astrotcl_headers=`cd $srcdir; echo ../astrotcl/{generic,press,libwcs,cfitsio}/*.h`
|
||||
+astrotcl_headers=`cd $srcdir; echo ../astrotcl/{generic,press}/*.h`
|
||||
tclutil_headers=`cd $srcdir; echo ../tclutil/generic/*.h`
|
||||
|
||||
skycat_includes="-I$srcdir/generic -I$srcdir/bitmaps"
|
||||
cat_includes="-I$srcdir/../cat/generic"
|
||||
rtd_includes="-I$srcdir/../rtd/generic -I$srcdir/../rtd/rtdevt"
|
||||
-astrotcl_includes="-I$srcdir/../astrotcl/generic -I$srcdir/../astrotcl/cfitsio -I$srcdir/../astrotcl/libwcs"
|
||||
+astrotcl_includes="-I$srcdir/../astrotcl/generic -I/usr/include -I/usr/include/wcs"
|
||||
tclutil_includes="-I$srcdir/../tclutil/generic"
|
||||
cincludes="${skycat_includes} ${cat_includes} ${rtd_includes} ${astrotcl_includes} ${tclutil_includes}"
|
||||
|
||||
diff -Naur skycat-3.0.2/skycat/configure.in skycat-3.0.2.new/skycat/configure.in
|
||||
--- skycat-3.0.2/skycat/configure.in 2008-06-11 11:04:25.000000000 -0400
|
||||
+++ skycat-3.0.2.new/skycat/configure.in 2009-09-24 20:52:26.000000000 -0400
|
||||
@@ -182,7 +182,7 @@
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
# skycat needs -lXext
|
||||
-PKG_LIBS="${PKG_LIBS} -lXext"
|
||||
+PKG_LIBS="${PKG_LIBS} -lXext -lwcstools -lcfitsio"
|
||||
|
||||
TEA_MAKE_LIB
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
--- skycat-3.0.2.orig/rtd/generic/RtdImage.C 2006-02-02 18:36:47.000000000 +0100
|
||||
+++ skycat-3.0.2/rtd/generic/RtdImage.C 2009-09-15 09:23:44.505239756 +0200
|
||||
@@ -913,6 +913,9 @@
|
||||
updateIdleTasks();
|
||||
}
|
||||
|
||||
+#ifndef MODULE_SCOPE
|
||||
+#define MODULE_SCOPE extern
|
||||
+#endif
|
||||
|
||||
// Fix for Tk clipping coordinates to short range: See CanvasWindowCoordsNoClip() below.
|
||||
#ifdef HAVE_TKCANVAS_H
|
||||
--- skycat-3.0.2.orig/skycat/skycat.in 2006-02-04 14:27:30.000000000 +0100
|
||||
+++ skycat-3.0.2/skycat/skycat.in 2009-09-15 09:20:45.910857133 +0200
|
||||
@@ -54,5 +54,5 @@
|
||||
|
||||
test -d $HOME/.skycat || mkdir $HOME/.skycat
|
||||
echo "`date`: Starting skycat with: $0 ${1+"$@"}" > $HOME/.skycat/log
|
||||
-exec wish8.4 $SKYCAT_BASE/lib/skycat@PACKAGE_VERSION@/main.tcl ${1+"$@"} | tee -a $HOME/.skycat/log 2>&1
|
||||
+exec wish8.5 $SKYCAT_BASE/lib/skycat@PACKAGE_VERSION@/main.tcl ${1+"$@"} | tee -a $HOME/.skycat/log 2>&1
|
||||
|
||||
@@ -1,150 +0,0 @@
|
||||
--- a/tclconfig/tcl.m4
|
||||
+++ b/tclconfig/tcl.m4
|
||||
@@ -731,6 +731,50 @@
|
||||
])
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
+# TEA_CONFIG_SYSTEM
|
||||
+#
|
||||
+# Determine what the system is (some things cannot be easily checked
|
||||
+# on a feature-driven basis, alas). This can usually be done via the
|
||||
+# "uname" command, but there are a few systems, like Next, where
|
||||
+# this doesn't work.
|
||||
+#
|
||||
+# Arguments:
|
||||
+# none
|
||||
+#
|
||||
+# Results:
|
||||
+# Defines the following var:
|
||||
+#
|
||||
+# system - System/platform/version identification code.
|
||||
+#
|
||||
+#--------------------------------------------------------------------
|
||||
+
|
||||
+AC_DEFUN(TEA_CONFIG_SYSTEM, [
|
||||
+ AC_MSG_CHECKING([system version])
|
||||
+ AC_CACHE_VAL(tcl_cv_sys_version,[
|
||||
+ if test -f /usr/lib/NextStep/software_version; then
|
||||
+ tcl_cv_sys_version=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version`
|
||||
+ else
|
||||
+ tcl_cv_sys_version=`uname -s`-`uname -r`
|
||||
+ if test "$?" -ne 0 ; then
|
||||
+ AC_MSG_WARN([can't find uname command])
|
||||
+ tcl_cv_sys_version=unknown
|
||||
+ else
|
||||
+ # Special check for weird MP-RAS system (uname returns weird
|
||||
+ # results, and the version is kept in special file).
|
||||
+
|
||||
+ if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
|
||||
+ tcl_cv_sys_version=MP-RAS-`awk '{print $3}' /etc/.relid`
|
||||
+ fi
|
||||
+ if test "`uname -s`" = "AIX" ; then
|
||||
+ tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
|
||||
+ fi
|
||||
+ fi
|
||||
+ fi])
|
||||
+ AC_MSG_RESULT($tcl_cv_sys_version)
|
||||
+ system=$tcl_cv_sys_version
|
||||
+])
|
||||
+
|
||||
+#--------------------------------------------------------------------
|
||||
# TEA_CONFIG_CFLAGS
|
||||
#
|
||||
# Try to determine the proper flags to pass to the compiler
|
||||
@@ -849,30 +893,7 @@
|
||||
# for the system. This can usually be done via the "uname" command, but
|
||||
# there are a few systems, like Next, where this doesn't work.
|
||||
|
||||
- AC_MSG_CHECKING([system version (for dynamic loading)])
|
||||
- if test -f /usr/lib/NextStep/software_version; then
|
||||
- system=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version`
|
||||
- else
|
||||
- system=`uname -s`-`uname -r`
|
||||
- if test "$?" -ne 0 ; then
|
||||
- AC_MSG_RESULT([unknown (can't find uname command)])
|
||||
- system=unknown
|
||||
- else
|
||||
- # Special check for weird MP-RAS system (uname returns weird
|
||||
- # results, and the version is kept in special file).
|
||||
-
|
||||
- if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
|
||||
- system=MP-RAS-`awk '{print $3}' /etc/.relid'`
|
||||
- fi
|
||||
- if test "`uname -s`" = "AIX" ; then
|
||||
- system=AIX-`uname -v`.`uname -r`
|
||||
- fi
|
||||
- if test "${TEA_PLATFORM}" = "windows" ; then
|
||||
- system=windows
|
||||
- fi
|
||||
- AC_MSG_RESULT([$system])
|
||||
- fi
|
||||
- fi
|
||||
+ TEA_CONFIG_SYSTEM
|
||||
|
||||
# Step 2: check for existence of -ldl library. This is needed because
|
||||
# Linux can use either -ldl or -ldld for dynamic loading.
|
||||
@@ -2318,25 +2339,8 @@
|
||||
AC_DEFUN(TEA_BLOCKING_STYLE, [
|
||||
AC_CHECK_HEADERS(sys/ioctl.h)
|
||||
AC_CHECK_HEADERS(sys/filio.h)
|
||||
+ TEA_CONFIG_SYSTEM
|
||||
AC_MSG_CHECKING([FIONBIO vs. O_NONBLOCK for nonblocking I/O])
|
||||
- if test -f /usr/lib/NextStep/software_version; then
|
||||
- system=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version`
|
||||
- else
|
||||
- system=`uname -s`-`uname -r`
|
||||
- if test "$?" -ne 0 ; then
|
||||
- system=unknown
|
||||
- else
|
||||
- # Special check for weird MP-RAS system (uname returns weird
|
||||
- # results, and the version is kept in special file).
|
||||
-
|
||||
- if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
|
||||
- system=MP-RAS-`awk '{print $3}' /etc/.relid'`
|
||||
- fi
|
||||
- if test "`uname -s`" = "AIX" ; then
|
||||
- system=AIX-`uname -v`.`uname -r`
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
case $system in
|
||||
# There used to be code here to use FIONBIO under AIX. However, it
|
||||
# was reported that FIONBIO doesn't work under AIX 3.2.5. Since
|
||||
@@ -3031,13 +3035,13 @@
|
||||
fi
|
||||
if test "${exec_prefix}" = "NONE" -a x"${prefix_default}" = x"yes" \
|
||||
-o x"${exec_prefix_default}" = x"yes" ; then
|
||||
- #if test x"${TCL_EXEC_PREFIX}" != x; then
|
||||
- #AC_MSG_NOTICE([--exec-prefix defaulting to TCL_EXEC_PREFIX ${TCL_EXEC_PREFIX}])
|
||||
- #exec_prefix=${TCL_EXEC_PREFIX}
|
||||
- #else
|
||||
+ if test x"${TCL_EXEC_PREFIX}" != x; then
|
||||
+ AC_MSG_NOTICE([--exec-prefix defaulting to TCL_EXEC_PREFIX ${TCL_EXEC_PREFIX}])
|
||||
+ exec_prefix=${TCL_EXEC_PREFIX}
|
||||
+ else
|
||||
AC_MSG_NOTICE([--exec-prefix defaulting to ${prefix}])
|
||||
exec_prefix=$prefix
|
||||
- #fi
|
||||
+ fi
|
||||
fi
|
||||
])
|
||||
|
||||
@@ -3169,7 +3173,7 @@
|
||||
MAKE_STUB_LIB="\${STLIB_LD} -out:\[$]@ \$(PKG_STUB_OBJECTS)"
|
||||
else
|
||||
MAKE_STATIC_LIB="\${STLIB_LD} \[$]@ \$(PKG_OBJECTS)"
|
||||
- MAKE_SHARED_LIB="\${SHLIB_LD} -o \[$]@ \$(PKG_OBJECTS) \${SHLIB_LD_LIBS}"
|
||||
+ MAKE_SHARED_LIB="\${SHLIB_LD} -Wl,-soname=\[$]@ -o \[$]@ \$(PKG_OBJECTS) \${SHLIB_LD_LIBS}"
|
||||
MAKE_STUB_LIB="\${STLIB_LD} \[$]@ \$(PKG_STUB_OBJECTS)"
|
||||
fi
|
||||
|
||||
@@ -3817,7 +3821,8 @@
|
||||
|
||||
# check in a few common install locations
|
||||
if test x"${ac_cv_c_$1config}" = x ; then
|
||||
- for i in `ls -d ${exec_prefix}/lib 2>/dev/null` \
|
||||
+ for i in `ls -d ${libdir} 2>/dev/null` \
|
||||
+ `ls -d ${exec_prefix}/lib 2>/dev/null` \
|
||||
`ls -d ${prefix}/lib 2>/dev/null` \
|
||||
`ls -d /usr/local/lib 2>/dev/null` \
|
||||
`ls -d /usr/contrib/lib 2>/dev/null` \
|
||||
@@ -1,132 +0,0 @@
|
||||
--- a/astrotcl/Makefile.in
|
||||
+++ b/astrotcl/Makefile.in
|
||||
@@ -114,7 +114,7 @@
|
||||
RANLIB = @RANLIB@
|
||||
RANLIB_STUB = @RANLIB_STUB@
|
||||
SHLIB_CFLAGS = @SHLIB_CFLAGS@
|
||||
-SHLIB_LD = @SHLIB_LD@
|
||||
+SHLIB_LD = @SHLIB_LD@ $(LDFLAGS_DEFAULT)
|
||||
SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
|
||||
STLIB_LD = @STLIB_LD@
|
||||
#TCL_DEFS = @TCL_DEFS@
|
||||
--- a/rtd/Makefile.in
|
||||
+++ b/rtd/Makefile.in
|
||||
@@ -123,7 +123,7 @@
|
||||
CLEANFILES = @CLEANFILES@ $(TEST_APPS) *.o tests/*.o
|
||||
EXEEXT = @EXEEXT@
|
||||
LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@
|
||||
-MAKE_LIB = @MAKE_LIB@ $(MERGE_OBJECTS)
|
||||
+MAKE_LIB = @MAKE_LIB@ $(MERGE_OBJECTS) $(SHLIB_LD_LIBS)
|
||||
MAKE_SHARED_LIB = @MAKE_SHARED_LIB@
|
||||
MAKE_STATIC_LIB = @MAKE_STATIC_LIB@
|
||||
MAKE_STUB_LIB = @MAKE_STUB_LIB@
|
||||
@@ -131,7 +131,7 @@
|
||||
RANLIB = @RANLIB@
|
||||
RANLIB_STUB = @RANLIB_STUB@
|
||||
SHLIB_CFLAGS = @SHLIB_CFLAGS@
|
||||
-SHLIB_LD = @SHLIB_LD@
|
||||
+SHLIB_LD = @SHLIB_LD@ $(LDFLAGS_DEFAULT)
|
||||
SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
|
||||
STLIB_LD = @STLIB_LD@
|
||||
#TCL_DEFS = @TCL_DEFS@
|
||||
@@ -442,14 +442,14 @@
|
||||
$(AR) r $@ $(RTDEVT_OBJ)
|
||||
$(RANLIB) $@
|
||||
|
||||
-$(RTD_SERVER): $(RTD_SERVER_OBJS)
|
||||
- $(CXXCOMPILE) -o $@ $(RTD_SERVER_OBJS) $(RTDEVT_LIB) @LIBS@
|
||||
+$(RTD_SERVER): $(RTD_SERVER_OBJS) $(RTDEVT_LIB)
|
||||
+ $(CXXCOMPILE) $(LDFLAGS_DEFAULT) -o $@ $(RTD_SERVER_OBJS) $(RTDEVT_LIB) @LIBS@
|
||||
|
||||
-rtdClient: rtdClient.o
|
||||
- $(CXXCOMPILE) -o $@ $? $(RTDEVT_LIB) @LIBS@
|
||||
+rtdClient: rtdClient.o $(RTDEVT_LIB)
|
||||
+ $(CXXCOMPILE) $(LDFLAGS_DEFAULT) -o $@ $? $(RTDEVT_LIB) @LIBS@
|
||||
|
||||
-rtdCubeDisplay: rtdCubeDisplay.o
|
||||
- $(CXXCOMPILE) -o $@ $? $(RTDEVT_LIB) @LIBS@
|
||||
+rtdCubeDisplay: rtdCubeDisplay.o $(RTDEVT_LIB)
|
||||
+ $(CXXCOMPILE) $(LDFLAGS_DEFAULT) -o $@ $? $(RTDEVT_LIB) @LIBS@
|
||||
|
||||
#========================================================================
|
||||
# RTD Remote access C library
|
||||
@@ -464,14 +464,14 @@
|
||||
#========================================================================
|
||||
test: binaries libraries $(TEST_APPS)
|
||||
|
||||
-tImageEvent: tImageEvent.o
|
||||
- $(CXXCOMPILE) -o $@ $@.o $(RTDEVT_LIB) @LIBS@
|
||||
+tImageEvent: tImageEvent.o $(RTDEVT_LIB)
|
||||
+ $(CXXCOMPILE) $(LDFLAGS_DEFAULT) -o $@ $@.o $(RTDEVT_LIB) @LIBS@
|
||||
|
||||
trtdRemote: trtdRemote.o
|
||||
- $(COMPILE) -o $@ $@.o $(RTD_REMOTE_LIB) @LIBS@
|
||||
+ $(COMPILE) $(LDFLAGS_DEFAULT) -o $@ $@.o $(RTD_REMOTE_LIB) @LIBS@
|
||||
|
||||
-tRtd: tRtd.o tRtdEvt.o tRtdEvtData.o
|
||||
- $(CXXCOMPILE) -o $@ $@.o tRtdEvt.o tRtdEvtData.o \
|
||||
+tRtd: tRtd.o tRtdEvt.o tRtdEvtData.o $(PKG_LIB_FILE)
|
||||
+ $(CXXCOMPILE) $(LDFLAGS_DEFAULT) -o $@ $@.o tRtdEvt.o tRtdEvtData.o \
|
||||
@rtd_BUILD_LIB_SPEC@ @TK_LIB_SPEC@ @TCL_LIB_SPEC@ ${LIBS}
|
||||
|
||||
#========================================================================
|
||||
--- a/tclutil/Makefile.in
|
||||
+++ b/tclutil/Makefile.in
|
||||
@@ -116,7 +116,7 @@
|
||||
RANLIB = @RANLIB@
|
||||
RANLIB_STUB = @RANLIB_STUB@
|
||||
SHLIB_CFLAGS = @SHLIB_CFLAGS@
|
||||
-SHLIB_LD = @SHLIB_LD@
|
||||
+SHLIB_LD = @SHLIB_LD@ $(LDFLAGS_DEFAULT)
|
||||
SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
|
||||
STLIB_LD = @STLIB_LD@
|
||||
#TCL_DEFS = @TCL_DEFS@
|
||||
--- a/skycat/Makefile.in
|
||||
+++ b/skycat/Makefile.in
|
||||
@@ -112,7 +112,7 @@
|
||||
CLEANFILES = @CLEANFILES@ $(TEST_APPS) *.o tests/*.o
|
||||
EXEEXT = @EXEEXT@
|
||||
LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@
|
||||
-MAKE_LIB = @MAKE_LIB@ $(MERGE_OBJECTS)
|
||||
+MAKE_LIB = @MAKE_LIB@ $(MERGE_OBJECTS) $(SHLIB_LD_LIBS)
|
||||
MAKE_SHARED_LIB = @MAKE_SHARED_LIB@
|
||||
MAKE_STATIC_LIB = @MAKE_STATIC_LIB@
|
||||
MAKE_STUB_LIB = @MAKE_STUB_LIB@
|
||||
@@ -120,7 +120,7 @@
|
||||
RANLIB = @RANLIB@
|
||||
RANLIB_STUB = @RANLIB_STUB@
|
||||
SHLIB_CFLAGS = @SHLIB_CFLAGS@
|
||||
-SHLIB_LD = @SHLIB_LD@
|
||||
+SHLIB_LD = @SHLIB_LD@ $(LDFLAGS_DEFAULT)
|
||||
SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
|
||||
STLIB_LD = @STLIB_LD@
|
||||
#TCL_DEFS = @TCL_DEFS@
|
||||
--- a/cat/Makefile.in
|
||||
+++ b/cat/Makefile.in
|
||||
@@ -116,7 +116,7 @@
|
||||
CLEANFILES = @CLEANFILES@ $(TEST_APPS) *.result *.tmp *.o tests/*.o
|
||||
EXEEXT = @EXEEXT@
|
||||
LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@
|
||||
-MAKE_LIB = @MAKE_LIB@ $(MERGE_OBJECTS)
|
||||
+MAKE_LIB = @MAKE_LIB@ $(MERGE_OBJECTS) $(SHLIB_LD_LIBS)
|
||||
MAKE_SHARED_LIB = @MAKE_SHARED_LIB@
|
||||
MAKE_STATIC_LIB = @MAKE_STATIC_LIB@
|
||||
MAKE_STUB_LIB = @MAKE_STUB_LIB@
|
||||
@@ -124,7 +124,7 @@
|
||||
RANLIB = @RANLIB@
|
||||
RANLIB_STUB = @RANLIB_STUB@
|
||||
SHLIB_CFLAGS = @SHLIB_CFLAGS@
|
||||
-SHLIB_LD = @SHLIB_LD@
|
||||
+SHLIB_LD = @SHLIB_LD@ $(LDFLAGS_DEFAULT)
|
||||
SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
|
||||
STLIB_LD = @STLIB_LD@
|
||||
#TCL_DEFS = @TCL_DEFS@
|
||||
@@ -436,7 +436,7 @@
|
||||
cxxtests: $(CXX_TEST_APPS)
|
||||
|
||||
$(CXX_TEST_APPS): FORCE
|
||||
- $(CXXCOMPILE) -o $@ $(srcdir)/tests/$@.C $(TEST_LIBS) $(LIBS)
|
||||
+ $(CXXCOMPILE) $(LDFLAGS_DEFAULT) -o $@ $(srcdir)/tests/$@.C $(TEST_LIBS) $(LIBS)
|
||||
cp $(srcdir)/tests/test.table .
|
||||
-@@LD_LIBRARY_PATH_VAR@=@exec_prefix@/lib; export @LD_LIBRARY_PATH_VAR@ ;\
|
||||
$@ > $@.result 2>&1 ;\
|
||||
@@ -1,315 +0,0 @@
|
||||
diff -Nur skycat-3.1.3.orig/astrotcl/library/AstrotclInit.tcl skycat-3.1.3/astrotcl/library/AstrotclInit.tcl
|
||||
--- skycat-3.1.3.orig/astrotcl/library/AstrotclInit.tcl 2017-08-10 16:18:22.100000000 +0000
|
||||
+++ skycat-3.1.3/astrotcl/library/AstrotclInit.tcl 2017-08-10 17:38:25.850000000 +0000
|
||||
@@ -11,7 +11,7 @@
|
||||
# pbiereic 24/08/99 created
|
||||
# abrighto 21/12/05 updated for new version
|
||||
|
||||
-if {![lcontain $auto_path $astrotcl_library]} {
|
||||
+if { $auto_path ni $astrotcl_library } {
|
||||
lappend auto_path $astrotcl_library
|
||||
}
|
||||
|
||||
diff -Nur skycat-3.1.3.orig/cat/library/AstroCat.tcl skycat-3.1.3/cat/library/AstroCat.tcl
|
||||
--- skycat-3.1.3.orig/cat/library/AstroCat.tcl 2017-08-10 16:18:22.110000000 +0000
|
||||
+++ skycat-3.1.3/cat/library/AstroCat.tcl 2017-08-10 17:38:25.850000000 +0000
|
||||
@@ -145,7 +145,7 @@
|
||||
return
|
||||
}
|
||||
if {"$onoff" == "on"} {
|
||||
- lassign [pipe] rfd_ wfd_
|
||||
+ lassign [chan pipe] rfd_ wfd_
|
||||
fileevent $rfd_ readable [code $this feedback]
|
||||
$w_.cat feedback $wfd_
|
||||
} elseif {[info exists rfd_]} {
|
||||
diff -Nur skycat-3.1.3.orig/cat/library/AstroImage.tcl skycat-3.1.3/cat/library/AstroImage.tcl
|
||||
--- skycat-3.1.3.orig/cat/library/AstroImage.tcl 2017-08-10 16:18:22.110000000 +0000
|
||||
+++ skycat-3.1.3/cat/library/AstroImage.tcl 2017-08-10 17:38:25.850000000 +0000
|
||||
@@ -401,7 +401,7 @@
|
||||
return
|
||||
}
|
||||
if {"$onoff" == "on"} {
|
||||
- lassign [pipe] rfd_ wfd_
|
||||
+ lassign [chan pipe] rfd_ wfd_
|
||||
fileevent $rfd_ readable [code $this feedback]
|
||||
$w_.im feedback $wfd_
|
||||
} elseif {[info exists rfd_]} {
|
||||
diff -Nur skycat-3.1.3.orig/cat/library/CatInit.tcl skycat-3.1.3/cat/library/CatInit.tcl
|
||||
--- skycat-3.1.3.orig/cat/library/CatInit.tcl 2017-08-10 16:18:22.110000000 +0000
|
||||
+++ skycat-3.1.3/cat/library/CatInit.tcl 2017-08-10 17:38:25.850000000 +0000
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
package require img::xpm
|
||||
|
||||
-if {![lcontain $auto_path $cat_library]} {
|
||||
+if { $auto_path ni $cat_library } {
|
||||
lappend auto_path $cat_library
|
||||
}
|
||||
|
||||
diff -Nur skycat-3.1.3.orig/rtd/library/RtdImageBias.tcl skycat-3.1.3/rtd/library/RtdImageBias.tcl
|
||||
--- skycat-3.1.3.orig/rtd/library/RtdImageBias.tcl 2017-08-10 16:18:22.120000000 +0000
|
||||
+++ skycat-3.1.3/rtd/library/RtdImageBias.tcl 2017-08-10 17:38:25.850000000 +0000
|
||||
@@ -10,6 +10,12 @@
|
||||
|
||||
itk::usual RtdImageBias {}
|
||||
|
||||
+# see http://wiki.tcl.tk/2028
|
||||
+proc lvarpush {var val {ndx end}} {
|
||||
+ upvar $var args
|
||||
+ set args [linsert $args $ndx $val]
|
||||
+}
|
||||
+
|
||||
# RtdImageBias is a class for controlling the subtraction of
|
||||
# a bias frame.
|
||||
|
||||
diff -Nur skycat-3.1.3.orig/rtd/library/RtdImageFitsHeader.tcl skycat-3.1.3/rtd/library/RtdImageFitsHeader.tcl
|
||||
--- skycat-3.1.3.orig/rtd/library/RtdImageFitsHeader.tcl 2017-08-10 16:18:22.120000000 +0000
|
||||
+++ skycat-3.1.3/rtd/library/RtdImageFitsHeader.tcl 2017-08-10 17:41:35.500000000 +0000
|
||||
@@ -11,6 +11,8 @@
|
||||
# pbiereic 17/02/03 fixed problems with tabnotebook, packing order
|
||||
# and labels of tabsets
|
||||
|
||||
+package require Tclutil
|
||||
+
|
||||
itk::usual RtdImageFitsHeader {}
|
||||
|
||||
# RtdImageFitsHeader is an itcl widget for displaying the FITS header of all
|
||||
@@ -156,7 +158,7 @@
|
||||
set tconfig_(sort_cols) $sort_cols
|
||||
set tconfig_(sort_order) $sort_order
|
||||
|
||||
- loop i 0 $num_hdus_ {
|
||||
+ for {set i 0} {$i < $num_hdus_} {incr i} {
|
||||
$tabnotebook_(table$i) config -sort_cols $sort_cols \
|
||||
-sort_order $sort_order
|
||||
$tabnotebook_(table$i) new_info
|
||||
@@ -169,7 +171,7 @@
|
||||
global $var
|
||||
set val [set $var]
|
||||
set tconfig_($label) $val
|
||||
- loop i 0 $num_hdus_ {
|
||||
+ for {set i 0} {$i < $num_hdus_} {incr i} {
|
||||
$tabnotebook_(table$i) set_option $label Show $val
|
||||
$tabnotebook_(table$i) new_info
|
||||
}
|
||||
@@ -216,7 +218,7 @@
|
||||
|
||||
set length [string length [$listbox get 0]]
|
||||
|
||||
- loop n $start_idx $end_idx {
|
||||
+ for {set n $start_idx} {$n < $end_idx} {incr n} {
|
||||
set row [string tolower [$listbox get $n]]
|
||||
if {[catch {regexp -indices $string $row indices} idx] } { continue }
|
||||
if { $idx > 0 } {
|
||||
@@ -274,7 +276,7 @@
|
||||
set hlist [$image_ hdu list]
|
||||
|
||||
set ExtName "HDU 1"
|
||||
- loop i 0 $hdu_count {
|
||||
+ for {set i 0} {$i < $hdu_count} {incr i} {
|
||||
set hdu [expr {$i + 1}]
|
||||
set list [lindex $hlist $i]
|
||||
|
||||
diff -Nur skycat-3.1.3.orig/rtd/library/RtdImageHduChooser.tcl skycat-3.1.3/rtd/library/RtdImageHduChooser.tcl
|
||||
--- skycat-3.1.3.orig/rtd/library/RtdImageHduChooser.tcl 2017-08-10 16:18:22.120000000 +0000
|
||||
+++ skycat-3.1.3/rtd/library/RtdImageHduChooser.tcl 2017-08-10 17:38:25.850000000 +0000
|
||||
@@ -16,6 +16,7 @@
|
||||
# pbiereic 11/10/08 Break image display loop after failure.
|
||||
# pbiereic 26/11/08 Using 'view update' for HDU images display.
|
||||
# Using a toplevel window for the HDU images display.
|
||||
+package require Tclutil
|
||||
|
||||
itk::usual RtdImageHduChooser {}
|
||||
|
||||
@@ -426,7 +427,7 @@
|
||||
|
||||
private method svinfo {} {
|
||||
set list [array get ext_ *NAXIS*]
|
||||
- loop i 0 [llength $list] 2 {
|
||||
+ for {set i 0} {$i < [llength $list]} {incr i 2} {
|
||||
lappend newlist "[lindex $list $i] [lindex $list [expr {$i+1}]]"
|
||||
}
|
||||
set newlist [lsort -increasing -index 0 $newlist]
|
||||
diff -Nur skycat-3.1.3.orig/rtd/library/RtdImagePerf.tcl skycat-3.1.3/rtd/library/RtdImagePerf.tcl
|
||||
--- skycat-3.1.3.orig/rtd/library/RtdImagePerf.tcl 2017-08-10 16:18:22.120000000 +0000
|
||||
+++ skycat-3.1.3/rtd/library/RtdImagePerf.tcl 2017-08-10 17:38:25.850000000 +0000
|
||||
@@ -9,6 +9,7 @@
|
||||
# D. Hopkinson 31 Jan 97 Created
|
||||
# P.Biereichel 21/07/97 % display is the default + some bug fixes
|
||||
# P.Biereichel 01/03/01 Only % display suported + code revised
|
||||
+package require Tclutil
|
||||
|
||||
itk::usual RtdImagePerf {}
|
||||
|
||||
diff -Nur skycat-3.1.3.orig/rtd/library/RtdImagePick2.tcl skycat-3.1.3/rtd/library/RtdImagePick2.tcl
|
||||
--- skycat-3.1.3.orig/rtd/library/RtdImagePick2.tcl 2017-08-10 16:18:22.120000000 +0000
|
||||
+++ skycat-3.1.3/rtd/library/RtdImagePick2.tcl 2017-08-10 17:38:25.850000000 +0000
|
||||
@@ -62,6 +62,7 @@
|
||||
# NOTES
|
||||
# - In contrast to RtdImagePick, RtdImagePick2 does not use tkwait which may
|
||||
# cause problem for an inheriting class due to nested calls to tkwait.
|
||||
+package require Tclutil
|
||||
|
||||
itk::usual RtdImagePick2 { }
|
||||
|
||||
@@ -127,7 +128,7 @@
|
||||
{Set the magnification factor of the zoom} \
|
||||
-menu [menu $magMenu_]
|
||||
|
||||
- loop i 2 31 {
|
||||
+ for {set i 2} {$i < 31} {incr i} {
|
||||
$m.mag add radiobutton -label " ${i}x" \
|
||||
-command [code $this scaleZoom $i] \
|
||||
-variable $magMenu_
|
||||
diff -Nur skycat-3.1.3.orig/rtd/library/RtdInit.tcl skycat-3.1.3/rtd/library/RtdInit.tcl
|
||||
--- skycat-3.1.3.orig/rtd/library/RtdInit.tcl 2017-08-10 16:18:22.120000000 +0000
|
||||
+++ skycat-3.1.3/rtd/library/RtdInit.tcl 2017-08-10 17:38:25.850000000 +0000
|
||||
@@ -10,7 +10,7 @@
|
||||
# -------- --------- ----------------------------------------------
|
||||
# pbiereic 24/08/99 created
|
||||
|
||||
-if {![lcontain $auto_path $rtd_library]} {
|
||||
+if { $auto_path ni $rtd_library} {
|
||||
lappend auto_path $rtd_library
|
||||
}
|
||||
|
||||
diff -Nur skycat-3.1.3.orig/rtd/library/Rtd.tcl skycat-3.1.3/rtd/library/Rtd.tcl
|
||||
--- skycat-3.1.3.orig/rtd/library/Rtd.tcl 2017-08-10 16:18:22.120000000 +0000
|
||||
+++ skycat-3.1.3/rtd/library/Rtd.tcl 2017-08-10 17:38:25.850000000 +0000
|
||||
@@ -650,7 +650,7 @@
|
||||
set t6 "Tcl version:\t[info patchlevel]"
|
||||
set t7 "Tcl package path:\t$tcl_pkgPath"
|
||||
set t8 "Package versions:\t"
|
||||
- foreach el "Tclx Itcl Itk Tkx BLT" {
|
||||
+ foreach el "Itcl Itk BLT" {
|
||||
set t8 "$t8$el[package versions $el] "
|
||||
}
|
||||
DialogWidget $w_.rtd_about \
|
||||
diff -Nur skycat-3.1.3.orig/rtd/library/tRtd.tcl skycat-3.1.3/rtd/library/tRtd.tcl
|
||||
--- skycat-3.1.3.orig/rtd/library/tRtd.tcl 2017-08-10 16:18:22.120000000 +0000
|
||||
+++ skycat-3.1.3/rtd/library/tRtd.tcl 2017-08-10 17:38:25.850000000 +0000
|
||||
@@ -10,6 +10,7 @@
|
||||
# who when what
|
||||
# -------------- --------- ----------------------------------------
|
||||
# pbiereic 01/03/01 Created
|
||||
+package require Tclutil
|
||||
|
||||
itk::usual tRtd {}
|
||||
|
||||
diff -Nur skycat-3.1.3.orig/rtd/util/rmipc.tcl skycat-3.1.3/rtd/util/rmipc.tcl
|
||||
--- skycat-3.1.3.orig/rtd/util/rmipc.tcl 2017-08-10 16:18:22.130000000 +0000
|
||||
+++ skycat-3.1.3/rtd/util/rmipc.tcl 2017-08-10 17:38:25.850000000 +0000
|
||||
@@ -20,7 +20,7 @@
|
||||
}
|
||||
set f [open "|ipcs $opt"]
|
||||
while {[gets $f line] != -1} {
|
||||
- if { ![lcontain $line $env(USER)]} { continue }
|
||||
+ if { $line ni $env(USER) } { continue }
|
||||
set num [lindex $line 1]
|
||||
if {![catch {expr $num}]} {
|
||||
if {[catch {exec ipcrm $opt $num} msg]} {
|
||||
diff -Nur skycat-3.1.3.orig/skycat/library/SkycatInit.tcl skycat-3.1.3/skycat/library/SkycatInit.tcl
|
||||
--- skycat-3.1.3.orig/skycat/library/SkycatInit.tcl 2017-08-10 16:18:22.130000000 +0000
|
||||
+++ skycat-3.1.3/skycat/library/SkycatInit.tcl 2017-08-10 17:38:25.850000000 +0000
|
||||
@@ -12,9 +12,11 @@
|
||||
|
||||
package require img::xpm
|
||||
|
||||
-if {![lcontain $auto_path $skycat_library]} {
|
||||
+if { $auto_path ni $skycat_library } {
|
||||
lappend auto_path $skycat_library
|
||||
}
|
||||
|
||||
namespace eval skycat {namespace export *}
|
||||
namespace import -force skycat::*
|
||||
+namespace import ::tcl::mathfunc::max
|
||||
+namespace import ::tcl::mathfunc::min
|
||||
diff -Nur skycat-3.1.3.orig/tclutil/library/Batch.tcl skycat-3.1.3/tclutil/library/Batch.tcl
|
||||
--- skycat-3.1.3.orig/tclutil/library/Batch.tcl 2017-08-10 16:18:22.130000000 +0000
|
||||
+++ skycat-3.1.3/tclutil/library/Batch.tcl 2017-08-10 17:40:54.160000000 +0000
|
||||
@@ -15,6 +15,8 @@
|
||||
# -------- --------- ----------------------------------------------
|
||||
# A.Brighton 20 Dec 95 created
|
||||
|
||||
+package require Expect
|
||||
+
|
||||
itk::usual Batch {}
|
||||
|
||||
# This class is used to evaluate a set of Tcl commands in a separate
|
||||
@@ -55,7 +57,7 @@
|
||||
}
|
||||
flush stdout
|
||||
flush stderr
|
||||
- pipe rfd wfd
|
||||
+ lassign [chan pipe] rfd wfd
|
||||
set pid [fork]
|
||||
if {$pid == 0} {
|
||||
# child
|
||||
@@ -65,7 +67,7 @@
|
||||
close $fd
|
||||
puts $wfd $status
|
||||
close $wfd
|
||||
- kill [pid]
|
||||
+ kill [pid] 9
|
||||
} else {
|
||||
set bg_pid_ $pid
|
||||
fileevent $rfd readable [code $this read_pipe $rfd $wfd]
|
||||
diff -Nur skycat-3.1.3.orig/tclutil/library/canvastext.tcl skycat-3.1.3/tclutil/library/canvastext.tcl
|
||||
--- skycat-3.1.3.orig/tclutil/library/canvastext.tcl 2017-08-10 16:18:22.130000000 +0000
|
||||
+++ skycat-3.1.3/tclutil/library/canvastext.tcl 2017-08-10 17:38:25.850000000 +0000
|
||||
@@ -21,7 +21,7 @@
|
||||
proc ct_search_forward_char {canvas item char} {
|
||||
if {![lempty $item]} {
|
||||
set text [lindex [$canvas itemconfigure $item -text] 4]
|
||||
- loop i [$canvas index $item insert] [$canvas index $item end] {
|
||||
+ for {set i [$canvas index $item insert]} {$i < [$canvas index $item end]} {incr i} {
|
||||
if {$char == [string index $text $i]} {
|
||||
return $i
|
||||
}
|
||||
@@ -37,7 +37,7 @@
|
||||
proc ct_search_backward_char {canvas item char} {
|
||||
if {![lempty $item]} {
|
||||
set text [lindex [$canvas itemconfigure $item -text] 4]
|
||||
- loop i [expr {[$canvas index $item insert] - 1}] 0 -1 {
|
||||
+ for {set i [expr {[$canvas index $item insert] - 1}]} {$i > 0} {decr i} {
|
||||
if {$char == [string index $text $i]} {
|
||||
return $i
|
||||
}
|
||||
diff -Nur skycat-3.1.3.orig/tclutil/library/itcldoc.tcl skycat-3.1.3/tclutil/library/itcldoc.tcl
|
||||
--- skycat-3.1.3.orig/tclutil/library/itcldoc.tcl 2017-08-10 16:18:22.130000000 +0000
|
||||
+++ skycat-3.1.3/tclutil/library/itcldoc.tcl 2017-08-10 17:38:25.850000000 +0000
|
||||
@@ -36,7 +36,6 @@
|
||||
# A.Brighton 07 Jan 98 created
|
||||
|
||||
package require Itcl
|
||||
-package require Tclx
|
||||
|
||||
itcl::class ItclDoc {
|
||||
|
||||
diff -Nur skycat-3.1.3.orig/tclutil/library/list.tcl skycat-3.1.3/tclutil/library/list.tcl
|
||||
--- skycat-3.1.3.orig/tclutil/library/list.tcl 2017-08-10 16:18:22.130000000 +0000
|
||||
+++ skycat-3.1.3/tclutil/library/list.tcl 2017-08-10 17:38:25.850000000 +0000
|
||||
@@ -50,3 +50,9 @@
|
||||
}
|
||||
return $l
|
||||
}
|
||||
+
|
||||
+proc lempty {list} {
|
||||
+ if {[catch {llength $list} len]} { return 0 }
|
||||
+ return [expr {$len == 0}]
|
||||
+}
|
||||
+
|
||||
diff -Nur skycat-3.1.3.orig/tclutil/library/TclutilInit.tcl skycat-3.1.3/tclutil/library/TclutilInit.tcl
|
||||
--- skycat-3.1.3.orig/tclutil/library/TclutilInit.tcl 2017-08-10 16:18:22.130000000 +0000
|
||||
+++ skycat-3.1.3/tclutil/library/TclutilInit.tcl 2017-08-10 17:38:25.850000000 +0000
|
||||
@@ -16,9 +16,8 @@
|
||||
|
||||
package require Itcl
|
||||
package require Itk
|
||||
-package require Tclx
|
||||
|
||||
-if {![lcontain $auto_path $tclutil_library]} {
|
||||
+if {$auto_path ni $tclutil_library} {
|
||||
lappend auto_path $tclutil_library
|
||||
}
|
||||
|
||||
@@ -1,57 +0,0 @@
|
||||
diff -Nur skycat-3.1.3.orig/cat/generic/TclAstroCat.C skycat-3.1.3/cat/generic/TclAstroCat.C
|
||||
--- skycat-3.1.3.orig/cat/generic/TclAstroCat.C 2017-08-10 16:18:22.110000000 +0000
|
||||
+++ skycat-3.1.3/cat/generic/TclAstroCat.C 2017-08-10 18:06:22.660000000 +0000
|
||||
@@ -75,7 +75,7 @@
|
||||
*/
|
||||
static class TclAstroCatSubCmds {
|
||||
public:
|
||||
- char* name; // method name
|
||||
+ const char* name; // method name
|
||||
int (TclAstroCat::*fptr)(int argc, char* argv[]);
|
||||
int min_args; // minimum number of args
|
||||
int max_args; // maximum number of args
|
||||
diff -Nur skycat-3.1.3.orig/rtd/generic/BiasData.C skycat-3.1.3/rtd/generic/BiasData.C
|
||||
--- skycat-3.1.3.orig/rtd/generic/BiasData.C 2017-08-10 16:18:22.120000000 +0000
|
||||
+++ skycat-3.1.3/rtd/generic/BiasData.C 2017-08-10 18:05:35.520000000 +0000
|
||||
@@ -76,7 +76,7 @@
|
||||
char* BiasData::file(int nr)
|
||||
{
|
||||
if (nr < 0 || nr >=MAXBIAS)
|
||||
- return '\0';
|
||||
+ return "";
|
||||
return &files_[nr][0];
|
||||
}
|
||||
|
||||
diff -Nur skycat-3.1.3.orig/rtd/generic/RtdPerf.C skycat-3.1.3/rtd/generic/RtdPerf.C
|
||||
--- skycat-3.1.3.orig/rtd/generic/RtdPerf.C 2017-08-10 16:18:22.120000000 +0000
|
||||
+++ skycat-3.1.3/rtd/generic/RtdPerf.C 2017-08-10 18:05:35.520000000 +0000
|
||||
@@ -226,18 +226,18 @@
|
||||
accGENtime_ = accTCLtime_ = accXtime_ = accFREQtime_ = 0.0;
|
||||
|
||||
// Clear the Tcl variables.
|
||||
- Tcl_SetVar2(interp_, var, "PERF_COUNT", '\0', TCL_GLOBAL_ONLY);
|
||||
+ Tcl_SetVar2(interp_, var, "PERF_COUNT", "", TCL_GLOBAL_ONLY);
|
||||
|
||||
- Tcl_SetVar2(interp_, var, "PERF_FREQ", '\0', TCL_GLOBAL_ONLY);
|
||||
- Tcl_SetVar2(interp_, var, "PERF_GEN", '\0', TCL_GLOBAL_ONLY);
|
||||
- Tcl_SetVar2(interp_, var, "PERF_XFUNC", '\0', TCL_GLOBAL_ONLY);
|
||||
- Tcl_SetVar2(interp_, var, "PERF_TCL", '\0', TCL_GLOBAL_ONLY);
|
||||
- Tcl_SetVar2(interp_, var, "PERF_TOTAL", '\0', TCL_GLOBAL_ONLY);
|
||||
+ Tcl_SetVar2(interp_, var, "PERF_FREQ", "", TCL_GLOBAL_ONLY);
|
||||
+ Tcl_SetVar2(interp_, var, "PERF_GEN", "", TCL_GLOBAL_ONLY);
|
||||
+ Tcl_SetVar2(interp_, var, "PERF_XFUNC", "", TCL_GLOBAL_ONLY);
|
||||
+ Tcl_SetVar2(interp_, var, "PERF_TCL", "", TCL_GLOBAL_ONLY);
|
||||
+ Tcl_SetVar2(interp_, var, "PERF_TOTAL", "", TCL_GLOBAL_ONLY);
|
||||
|
||||
- Tcl_SetVar2(interp_, var, "PERF_FREQ_AVE", '\0', TCL_GLOBAL_ONLY);
|
||||
- Tcl_SetVar2(interp_, var, "PERF_GEN_AVE", '\0', TCL_GLOBAL_ONLY);
|
||||
- Tcl_SetVar2(interp_, var, "PERF_XFUNC_AVE", '\0', TCL_GLOBAL_ONLY);
|
||||
- Tcl_SetVar2(interp_, var, "PERF_TCL_AVE", '\0', TCL_GLOBAL_ONLY);
|
||||
- Tcl_SetVar2(interp_, var, "PERF_TOTAL_AVE", '\0', TCL_GLOBAL_ONLY);
|
||||
+ Tcl_SetVar2(interp_, var, "PERF_FREQ_AVE", "", TCL_GLOBAL_ONLY);
|
||||
+ Tcl_SetVar2(interp_, var, "PERF_GEN_AVE", "", TCL_GLOBAL_ONLY);
|
||||
+ Tcl_SetVar2(interp_, var, "PERF_XFUNC_AVE", "", TCL_GLOBAL_ONLY);
|
||||
+ Tcl_SetVar2(interp_, var, "PERF_TCL_AVE", "", TCL_GLOBAL_ONLY);
|
||||
+ Tcl_SetVar2(interp_, var, "PERF_TOTAL_AVE", "", TCL_GLOBAL_ONLY);
|
||||
}
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>sci-astronomy@gentoo.org</email>
|
||||
<name>Gentoo Astronomy Project</name>
|
||||
</maintainer>
|
||||
<longdescription lang="en">
|
||||
SkyCat is a tool that combines visualization of images and access
|
||||
to catalogs and archive data for astronomy. It was developed at
|
||||
the European Southern Observatory.
|
||||
</longdescription>
|
||||
</pkgmetadata>
|
||||
@@ -1,68 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit autotools flag-o-matic
|
||||
|
||||
DESCRIPTION="ESO astronomical image visualizer with catalog access"
|
||||
HOMEPAGE="https://www.eso.org/sci/observing/tools/skycat.html"
|
||||
SRC_URI="https://archive.eso.org/cms/tools-documentation/skycat-download/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2+"
|
||||
SLOT="0"
|
||||
|
||||
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="threads"
|
||||
|
||||
DEPEND="
|
||||
dev-tcltk/blt:=
|
||||
dev-tcltk/expect:=
|
||||
dev-tcltk/itcl:=
|
||||
dev-tcltk/iwidgets:=
|
||||
dev-tcltk/tkimg:=
|
||||
sci-astronomy/wcstools:=
|
||||
sci-libs/cfitsio:=
|
||||
x11-libs/libXext:=
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-3.1.3-string-issues.patch
|
||||
"${FILESDIR}"/${PN}-3.1.3-remove-tclx-dep.patch
|
||||
"${FILESDIR}"/${PN}-3.1.2-m4.patch
|
||||
"${FILESDIR}"/${PN}-3.1.2-makefile-qa.patch
|
||||
"${FILESDIR}"/${PN}-3.0.2-systemlibs.patch
|
||||
"${FILESDIR}"/${PN}-3.0.2-tk8.5.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
rm -r astrotcl/{cfitsio,libwcs} || die
|
||||
# prefix it
|
||||
sed -e "s:/usr:${EPREFIX}/usr:g" \
|
||||
-i */configure.in */aclocal.m4 || die
|
||||
local f
|
||||
for f in configure.in */configure.in ; do
|
||||
mv "$f" "${f/.in/.ac}" || die
|
||||
done
|
||||
# bug #626162 . lazy sed to avoid a big patch
|
||||
sed -i -e 's/static char/static unsigned char/g' $(find . -name \*.xbm) || die
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# bug #514604
|
||||
append-cppflags -DUSE_INTERP_RESULT
|
||||
econf $(use_enable threads) --enable-merge
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
local d f
|
||||
for d in tclutil astrotcl rtd cat skycat; do
|
||||
for f in README CHANGES VERSION; do
|
||||
newdoc ${f} ${f}.${d}
|
||||
done
|
||||
done
|
||||
}
|
||||
Reference in New Issue
Block a user