[Debian-astro-commits] [x11iraf] 02/02: Switch patches to gbp
Ole Streicher
olebole at moszumanska.debian.org
Wed Dec 6 20:21:03 UTC 2017
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch master
in repository x11iraf.
commit 7e006657829346a630962fa9cb2f7a257ddaf302
Author: Ole Streicher <olebole at debian.org>
Date: Wed Dec 6 21:20:25 2017 +0100
Switch patches to gbp
---
debian/patches/Don-t-use-mkpkg.patch | 22 ++
...function-type-of-Create-functions-in-obm.patch} | 53 +++--
...h => Fix-pixel-window-copy-in-ObmW-Gterm.patch} | 20 +-
debian/patches/Force-use-of-stdarg.patch | 21 ++
...lldir.patch => Include-install-directory.patch} | 17 +-
debian/patches/Remove-declaration-of-malloc.patch | 20 ++
...dard_tcl.patch => Use-system-Tcl-library.patch} | 246 ++++++++++++---------
...s.patch => Use-system-libs-when-possible.patch} | 70 ++++--
debian/patches/dummy_mkpkg.patch | 12 -
debian/patches/fix_decl.patch | 10 -
debian/patches/fix_stdarg.patch | 11 -
debian/patches/series | 16 +-
debian/patches/x11iraf_1.2-4.diff | 62 ------
13 files changed, 327 insertions(+), 253 deletions(-)
diff --git a/debian/patches/Don-t-use-mkpkg.patch b/debian/patches/Don-t-use-mkpkg.patch
new file mode 100644
index 0000000..90beb40
--- /dev/null
+++ b/debian/patches/Don-t-use-mkpkg.patch
@@ -0,0 +1,22 @@
+From: Ole Streicher <olebole at debian.org>
+Date: Wed, 6 Dec 2017 21:05:47 +0100
+Subject: Don't use mkpkg
+
+---
+ ximtool/clients/Imakefile | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/ximtool/clients/Imakefile b/ximtool/clients/Imakefile
+index 0c12652..11c8849 100644
+--- a/ximtool/clients/Imakefile
++++ b/ximtool/clients/Imakefile
+@@ -11,8 +11,7 @@ X11IRAFDIR = ../../
+ all:: ism_wcspix.e
+
+ ism_wcspix.e: $(WC_SRCS) $(LIB_SRCS)
+- @(SHELL=/bin/sh ; export SHELL ; mkpkg relink)
+- touch DONE
++ touch DONE ism_wcspix.e
+
+ SubdirLibraryRule($(WC_SRCS) $(LIB_SRCS))
+
diff --git a/debian/patches/obm_fix_createtype.patch b/debian/patches/Fix-function-type-of-Create-functions-in-obm.patch
similarity index 66%
rename from debian/patches/obm_fix_createtype.patch
rename to debian/patches/Fix-function-type-of-Create-functions-in-obm.patch
index f5a0a18..3968a35 100644
--- a/debian/patches/obm_fix_createtype.patch
+++ b/debian/patches/Fix-function-type-of-Create-functions-in-obm.patch
@@ -1,7 +1,31 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Fix function type of Create functions in obm
- This will avoid the conversion pointer -> int -> pointer which is not lossless
- on 64 bit.
+From: Ole Streicher <olebole at debian.org>
+Date: Wed, 6 Dec 2017 21:05:47 +0100
+Subject: Fix function type of Create functions in obm
+
+This will avoid the conversion pointer -> int -> pointer which is not lossless
+on 64 bit.
+---
+ obm/Obm.c | 2 +-
+ obm/ObmP.h | 5 ++++-
+ obm/client.c | 2 +-
+ obm/server.c | 2 +-
+ 4 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/obm/Obm.c b/obm/Obm.c
+index d9f5e7c..a3172a7 100644
+--- a/obm/Obm.c
++++ b/obm/Obm.c
+@@ -690,7 +690,7 @@ int nargs; /* optional argument list */
+
+ /* Create the object. */
+
+- newobj = (ObmObject) (*(classrec->Create)) (obm,
++ newobj = (*(classrec->Create)) (obm,
+ name, classrec, parent, args, nargs);
+ if (!newobj) {
+ fprintf (stderr, "obm: could not create object %s class %s\n",
+diff --git a/obm/ObmP.h b/obm/ObmP.h
+index 81ac52d..6d0193b 100644
--- a/obm/ObmP.h
+++ b/obm/ObmP.h
@@ -107,7 +107,10 @@
@@ -15,7 +39,7 @@ Description: Fix function type of Create functions in obm
typedef void (*ObmMethod)();
extern void ServerClassInit(), ClientClassInit(), ParameterClassInit();
-@@ -189,7 +192,7 @@
+@@ -189,7 +192,7 @@ typedef struct {
unsigned long flag1, flag2; /* widget class bit flags. */
ObmMethod ClassInit; /* initializes class record */
ObmMethod ClassDestroy; /* close class record */
@@ -24,9 +48,11 @@ Description: Fix function type of Create functions in obm
ObmMethod Destroy; /* destroy proc */
ObmFunc Evaluate; /* evaluate proc */
XtPointer class_data; /* class specific data */
+diff --git a/obm/client.c b/obm/client.c
+index 3227757..00cc2c5 100644
--- a/obm/client.c
+++ b/obm/client.c
-@@ -65,7 +65,7 @@
+@@ -65,7 +65,7 @@ ObmContext obm;
register ObjClassRec classrec;
{
classrec->ClassDestroy = obmGenericClassDestroy;
@@ -35,9 +61,11 @@ Description: Fix function type of Create functions in obm
classrec->Destroy = ClientDestroy;
classrec->Evaluate = ClientEvaluate;
}
+diff --git a/obm/server.c b/obm/server.c
+index fa46d2f..9c8be1b 100644
--- a/obm/server.c
+++ b/obm/server.c
-@@ -132,7 +132,7 @@
+@@ -132,7 +132,7 @@ ObmContext obm;
register ObjClassRec classrec;
{
classrec->ClassDestroy = obmGenericClassDestroy;
@@ -46,14 +74,3 @@ Description: Fix function type of Create functions in obm
classrec->Destroy = ServerDestroy;
classrec->Evaluate = ServerEvaluate;
}
---- a/obm/Obm.c
-+++ b/obm/Obm.c
-@@ -690,7 +690,7 @@
-
- /* Create the object. */
-
-- newobj = (ObmObject) (*(classrec->Create)) (obm,
-+ newobj = (*(classrec->Create)) (obm,
- name, classrec, parent, args, nargs);
- if (!newobj) {
- fprintf (stderr, "obm: could not create object %s class %s\n",
diff --git a/debian/patches/gterm_fix_windowcopy.patch b/debian/patches/Fix-pixel-window-copy-in-ObmW-Gterm.patch
similarity index 59%
rename from debian/patches/gterm_fix_windowcopy.patch
rename to debian/patches/Fix-pixel-window-copy-in-ObmW-Gterm.patch
index 3b84f4b..bace6e8 100644
--- a/debian/patches/gterm_fix_windowcopy.patch
+++ b/debian/patches/Fix-pixel-window-copy-in-ObmW-Gterm.patch
@@ -1,7 +1,15 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Fix pixel window copy in ObmW/Gterm.
- The original code assumed that the "long" size is 4 bytes. On 64 bit machines,
- this is wrong; so we replace the unsigned longs with uint32_t.
+From: Ole Streicher <olebole at debian.org>
+Date: Wed, 6 Dec 2017 21:05:47 +0100
+Subject: Fix pixel window copy in ObmW/Gterm.
+
+The original code assumed that the "long" size is 4 bytes. On 64 bit machines,
+this is wrong; so we replace the unsigned longs with uint32_t.
+---
+ obm/ObmW/GtermCnv.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/obm/ObmW/GtermCnv.c b/obm/ObmW/GtermCnv.c
+index 47119bb..8f7cdc4 100644
--- a/obm/ObmW/GtermCnv.c
+++ b/obm/ObmW/GtermCnv.c
@@ -1,4 +1,5 @@
@@ -10,7 +18,7 @@ Description: Fix pixel window copy in ObmW/Gterm.
/* Convenience macros.
*/
#define GPMtoRPM gtermPM_to_rasPM /* Pixmap */
-@@ -199,7 +200,7 @@
+@@ -199,7 +200,7 @@ int sx, sy, dnx, dny;
int bpl, bpp, border;
{
register int i, j, npix = (width * height);
@@ -19,7 +27,7 @@ Description: Fix pixel window copy in ObmW/Gterm.
int nbytes = ((depth == ColormapDepth) ? 1 : 4);
uchar *ip = in, pv;
uchar *img = (uchar *) NULL;
-@@ -232,12 +233,11 @@
+@@ -232,12 +233,11 @@ int bpl, bpp, border;
** off-screen pixels.
*/
ip = &in[sy * width + sx];
diff --git a/debian/patches/Force-use-of-stdarg.patch b/debian/patches/Force-use-of-stdarg.patch
new file mode 100644
index 0000000..689e07e
--- /dev/null
+++ b/debian/patches/Force-use-of-stdarg.patch
@@ -0,0 +1,21 @@
+From: "olebole at debian.org" <olebole at debian.org>
+Date: Wed, 6 Dec 2017 21:05:47 +0100
+Subject: Force use of stdarg
+
+---
+ obm/ObmW/HTML-PSformat.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/obm/ObmW/HTML-PSformat.c b/obm/ObmW/HTML-PSformat.c
+index 011651a..f31fc5f 100644
+--- a/obm/ObmW/HTML-PSformat.c
++++ b/obm/ObmW/HTML-PSformat.c
+@@ -48,7 +48,7 @@
+ #include <math.h>
+ #include "HTMLP.h"
+
+-#ifdef _GNU_SOURCE
++#if 1
+ #define USE_STDARG
+ #endif
+ #if defined(__APPLE__) || (__APPLE_CC__ > 1151) || defined(USE_STDARG)
diff --git a/debian/patches/include_installdir.patch b/debian/patches/Include-install-directory.patch
similarity index 53%
rename from debian/patches/include_installdir.patch
rename to debian/patches/Include-install-directory.patch
index 6a411ec..57142c2 100644
--- a/debian/patches/include_installdir.patch
+++ b/debian/patches/Include-install-directory.patch
@@ -1,6 +1,17 @@
+From: Ole Streicher <olebole at debian.org>
+Date: Wed, 6 Dec 2017 21:05:47 +0100
+Subject: Include install directory
+
+---
+ cdl/Imakefile | 2 +-
+ obm/Imakefile | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cdl/Imakefile b/cdl/Imakefile
+index 9185071..a7a2a30 100644
--- a/cdl/Imakefile
+++ b/cdl/Imakefile
-@@ -77,7 +77,7 @@
+@@ -77,7 +77,7 @@ install::
$(RM) X11irafIncDir/$$i; \
done)
for i in $(HEADERS); do \
@@ -9,9 +20,11 @@
done
#endif
+diff --git a/obm/Imakefile b/obm/Imakefile
+index 3ee5a70..85090b7 100644
--- a/obm/Imakefile
+++ b/obm/Imakefile
-@@ -86,6 +86,6 @@
+@@ -86,6 +86,6 @@ install::
$(RM) X11irafIncDir/$$i; \
done)
for i in $(HEADERS); do \
diff --git a/debian/patches/Remove-declaration-of-malloc.patch b/debian/patches/Remove-declaration-of-malloc.patch
new file mode 100644
index 0000000..205dde0
--- /dev/null
+++ b/debian/patches/Remove-declaration-of-malloc.patch
@@ -0,0 +1,20 @@
+From: Ole Streicher <olebole at debian.org>
+Date: Wed, 6 Dec 2017 21:05:47 +0100
+Subject: Remove declaration of malloc()
+
+---
+ xgterm/button.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/xgterm/button.c b/xgterm/button.c
+index 18a1567..26a655a 100644
+--- a/xgterm/button.c
++++ b/xgterm/button.c
+@@ -40,7 +40,6 @@ button.c Handles button events in the terminal emulator.
+ #include "error.h"
+ #include "menu.h"
+
+-extern char *malloc();
+
+ extern void DoSecureKeyboard();
+
diff --git a/debian/patches/standard_tcl.patch b/debian/patches/Use-system-Tcl-library.patch
similarity index 67%
rename from debian/patches/standard_tcl.patch
rename to debian/patches/Use-system-Tcl-library.patch
index c47c8cd..ca6c139 100644
--- a/debian/patches/standard_tcl.patch
+++ b/debian/patches/Use-system-Tcl-library.patch
@@ -1,3 +1,57 @@
+From: Ole Streicher <olebole at debian.org>
+Date: Wed, 6 Dec 2017 21:05:47 +0100
+Subject: Use system Tcl library
+
+This requires an update for several tcl lib functions
+---
+ obm/Imakefile | 7 +++----
+ obm/ObmP.h | 2 +-
+ obm/client.c | 4 ++--
+ obm/gterm.c | 6 ++++--
+ obm/server.c | 10 +++++-----
+ obm/widget.c | 2 +-
+ obmsh/Imakefile | 2 +-
+ xgterm/Imakefile | 2 +-
+ ximtool/Imakefile | 2 +-
+ ximtool/ism.c | 2 +-
+ ximtool/ism_wcspix.c | 2 +-
+ ximtool/ximclient.c | 4 ++--
+ 12 files changed, 23 insertions(+), 22 deletions(-)
+
+diff --git a/obm/Imakefile b/obm/Imakefile
+index 85090b7..c08def2 100644
+--- a/obm/Imakefile
++++ b/obm/Imakefile
+@@ -20,7 +20,7 @@ X11IRAFDIR = ../
+ ARADD = ar rul
+ #endif
+
+- LIBDIRS = Tcl ObmW
++ LIBDIRS = ObmW
+ SUBDIRS = $(LIBDIRS)
+
+ HEADERS = Obm.h ObmP.h widget.h
+@@ -28,8 +28,8 @@ X11IRAFDIR = ../
+ html.c geom.c
+ OBJS = Obm.o client.o param.o server.o widget.o gterm.o marker.o \
+ html.o geom.o
+- ALL_OBJS = Tcl/[A-Za-z]*.o ObmW/[A-Za-z]*.o $(OBJS)
+- ALL_DONE = Tcl/DONE ObmW/DONE
++ ALL_OBJS = ObmW/[A-Za-z]*.o $(OBJS)
++ ALL_DONE = ObmW/DONE
+ RESOBJ = obmres.o
+
+ all:: libobm.a
+@@ -48,7 +48,6 @@ World:
+
+ libobm.a: $(LIBDIRS) $(ALL_DONE) $(OBJS)
+ $(RM) $@
+- @(cd Tcl; $(MAKE) $(MFLAGS) all X11IRAFDIR=../../)
+ @(cd ObmW; $(MAKE) $(MFLAGS) all X11IRAFDIR=../../)
+ $(AR) $@ $(OBJS)
+ $(ARADD) $@ $(ALL_OBJS)
+diff --git a/obm/ObmP.h b/obm/ObmP.h
+index 6d0193b..2c8906a 100644
--- a/obm/ObmP.h
+++ b/obm/ObmP.h
@@ -65,7 +65,7 @@
@@ -9,9 +63,11 @@
/* Size limiting definitions. */
#define SZ_NAME 128 /* class or object name */
+diff --git a/obm/client.c b/obm/client.c
+index 00cc2c5..e1fbbff 100644
--- a/obm/client.c
+++ b/obm/client.c
-@@ -142,7 +142,7 @@
+@@ -142,7 +142,7 @@ literal: if (Tcl_SplitList (tcl, command, &argc, &argvp) == TCL_OK) {
argv[i+1] = argvp[i];
status = clientLiteral (object, tcl, argc + 1, argv);
@@ -20,7 +76,7 @@
}
}
-@@ -224,7 +224,7 @@
+@@ -224,7 +224,7 @@ char **argv;
if (argc >= 2) {
char *message = Tcl_Concat (argc-1, &argv[1]);
stat = client_output (obm, obj->core.name, 0, message);
@@ -29,9 +85,11 @@
} else
stat = -1;
+diff --git a/obm/gterm.c b/obm/gterm.c
+index 7185635..095cba5 100644
--- a/obm/gterm.c
+++ b/obm/gterm.c
-@@ -4127,8 +4127,10 @@
+@@ -4127,8 +4127,10 @@ char **argv;
obmNewObject (obm, name, "Marker", obj->core.name, args, nargs);
@@ -44,50 +102,11 @@
return (TCL_OK);
}
---- a/obm/widget.c
-+++ b/obm/widget.c
-@@ -2273,7 +2273,7 @@
- items, nitems, 0, resize, NULL);
-
- if (wp->data)
-- free (wp->data);
-+ Tcl_Free (wp->data);
-
- wp->data = (char *) items;
- wp->datalen = nitems;
---- a/obm/Imakefile
-+++ b/obm/Imakefile
-@@ -20,7 +20,7 @@
- ARADD = ar rul
- #endif
-
-- LIBDIRS = Tcl ObmW
-+ LIBDIRS = ObmW
- SUBDIRS = $(LIBDIRS)
-
- HEADERS = Obm.h ObmP.h widget.h
-@@ -28,8 +28,8 @@
- html.c geom.c
- OBJS = Obm.o client.o param.o server.o widget.o gterm.o marker.o \
- html.o geom.o
-- ALL_OBJS = Tcl/[A-Za-z]*.o ObmW/[A-Za-z]*.o $(OBJS)
-- ALL_DONE = Tcl/DONE ObmW/DONE
-+ ALL_OBJS = ObmW/[A-Za-z]*.o $(OBJS)
-+ ALL_DONE = ObmW/DONE
- RESOBJ = obmres.o
-
- all:: libobm.a
-@@ -48,7 +48,6 @@
-
- libobm.a: $(LIBDIRS) $(ALL_DONE) $(OBJS)
- $(RM) $@
-- @(cd Tcl; $(MAKE) $(MFLAGS) all X11IRAFDIR=../../)
- @(cd ObmW; $(MAKE) $(MFLAGS) all X11IRAFDIR=../../)
- $(AR) $@ $(OBJS)
- $(ARADD) $@ $(ALL_OBJS)
+diff --git a/obm/server.c b/obm/server.c
+index 9c8be1b..c24f3e1 100644
--- a/obm/server.c
+++ b/obm/server.c
-@@ -830,7 +830,7 @@
+@@ -830,7 +830,7 @@ char **argv;
else {
char *message = Tcl_Merge (argc-2, &argv[2]);
status = ObmDeliverMsg (obm, argv[1], message);
@@ -96,7 +115,7 @@
}
return (status);
-@@ -1042,9 +1042,9 @@
+@@ -1042,9 +1042,9 @@ err: sprintf (buf, "bad item '%d' in resource list", item + 1);
"Warning (getResources): cannot set value of %s\n",
values[item].variable);
}
@@ -108,7 +127,7 @@
return (TCL_OK);
}
-@@ -2261,7 +2261,7 @@
+@@ -2261,7 +2261,7 @@ char **argv;
}
/* Free list of menu item specification strings. */
@@ -117,7 +136,7 @@
/* Search the menu list and see if there is already a menu with
* the given menu name.
-@@ -2707,7 +2707,7 @@
+@@ -2707,7 +2707,7 @@ register MenuPtr mp;
if ((ip->flags & M_FreeData) && ip->data)
XtFree (ip->data);
@@ -126,62 +145,24 @@
}
XtFree ((char *)mp);
---- a/ximtool/ximclient.c
-+++ b/ximtool/ximclient.c
-@@ -4,7 +4,7 @@
- #include <sys/stat.h>
- #include <X11/Intrinsic.h>
- #include <X11/StringDefs.h>
--#include <Tcl/tcl.h>
-+#include <tcl/tcl.h>
- #include <Obm.h>
- #include <ObmW/Gterm.h>
- #include "ximtool.h"
-@@ -774,7 +774,7 @@
- goto nolist2;
- for (i=0; i < nitems; i++)
- frame_list |= (1 << (atoi(items[i]) - 1));
-- XtFree ((char *)items);
-+ Tcl_Free ((char *)items);
- } else {
- nolist2: for (i=0; i < xim->nframes; i++)
- frame_list |= (1 << i);
---- a/ximtool/ism.c
-+++ b/ximtool/ism.c
-@@ -9,7 +9,7 @@
-
- #include <X11/Intrinsic.h>
- #include <X11/StringDefs.h>
--#include <Tcl/tcl.h>
-+#include <tcl/tcl.h>
- #include <Obm.h>
- #include <ObmW/Gterm.h>
- #include "ximtool.h"
---- a/ximtool/ism_wcspix.c
-+++ b/ximtool/ism_wcspix.c
-@@ -3,7 +3,7 @@
- #include <sys/errno.h>
- #include <X11/Intrinsic.h>
- #include <X11/StringDefs.h>
--#include <Tcl/tcl.h>
-+#include <tcl/tcl.h>
- #include "ximtool.h"
-
- /*
---- a/ximtool/Imakefile
-+++ b/ximtool/Imakefile
-@@ -24,7 +24,7 @@
+diff --git a/obm/widget.c b/obm/widget.c
+index e33723f..c78af9a 100644
+--- a/obm/widget.c
++++ b/obm/widget.c
+@@ -2273,7 +2273,7 @@ char **argv;
+ items, nitems, 0, resize, NULL);
- LOCAL_LDFLAGS = $(X11IRAF_LDFLAGS)
- EXTRA_INCLUDES = $(X11IRAF_INCLUDES)
-- OBMLIBS = LibObm LibXpm
-+ OBMLIBS = LibObm LibXpm -ltcl
- MATHLIB = -lm
- DEPOBM = DepLibObm
+ if (wp->data)
+- free (wp->data);
++ Tcl_Free (wp->data);
+ wp->data = (char *) items;
+ wp->datalen = nitems;
+diff --git a/obmsh/Imakefile b/obmsh/Imakefile
+index 8a67758..000fdd0 100644
--- a/obmsh/Imakefile
+++ b/obmsh/Imakefile
-@@ -18,7 +18,7 @@
+@@ -18,7 +18,7 @@ X11IRAFDIR = ../
LOCAL_LDFLAGS = $(X11IRAF_LDFLAGS)
EXTRA_INCLUDES = $(X11IRAF_INCLUDES)
@@ -190,9 +171,11 @@
MATHLIB = -lm
XAWLIB = LibXaw3d
+diff --git a/xgterm/Imakefile b/xgterm/Imakefile
+index ec3309e..e1063e6 100644
--- a/xgterm/Imakefile
+++ b/xgterm/Imakefile
-@@ -83,7 +83,7 @@
+@@ -83,7 +83,7 @@ X11IRAFDIR = ../
TERMCAPLIB = TermcapLibrary
@@ -201,3 +184,64 @@
MATHLIB = -lm
AllTarget($(PROGRAMS))
+diff --git a/ximtool/Imakefile b/ximtool/Imakefile
+index 28d4bc8..f47f782 100644
+--- a/ximtool/Imakefile
++++ b/ximtool/Imakefile
+@@ -24,7 +24,7 @@ X11IRAFDIR = ../
+
+ LOCAL_LDFLAGS = $(X11IRAF_LDFLAGS)
+ EXTRA_INCLUDES = $(X11IRAF_INCLUDES)
+- OBMLIBS = LibObm LibXpm
++ OBMLIBS = LibObm LibXpm -ltcl
+ MATHLIB = -lm
+ DEPOBM = DepLibObm
+
+diff --git a/ximtool/ism.c b/ximtool/ism.c
+index ec9d6b6..977cfbd 100644
+--- a/ximtool/ism.c
++++ b/ximtool/ism.c
+@@ -9,7 +9,7 @@
+
+ #include <X11/Intrinsic.h>
+ #include <X11/StringDefs.h>
+-#include <Tcl/tcl.h>
++#include <tcl/tcl.h>
+ #include <Obm.h>
+ #include <ObmW/Gterm.h>
+ #include "ximtool.h"
+diff --git a/ximtool/ism_wcspix.c b/ximtool/ism_wcspix.c
+index 5c8600e..fd6306d 100644
+--- a/ximtool/ism_wcspix.c
++++ b/ximtool/ism_wcspix.c
+@@ -3,7 +3,7 @@
+ #include <sys/errno.h>
+ #include <X11/Intrinsic.h>
+ #include <X11/StringDefs.h>
+-#include <Tcl/tcl.h>
++#include <tcl/tcl.h>
+ #include "ximtool.h"
+
+ /*
+diff --git a/ximtool/ximclient.c b/ximtool/ximclient.c
+index 2d67f25..544fcbb 100644
+--- a/ximtool/ximclient.c
++++ b/ximtool/ximclient.c
+@@ -4,7 +4,7 @@
+ #include <sys/stat.h>
+ #include <X11/Intrinsic.h>
+ #include <X11/StringDefs.h>
+-#include <Tcl/tcl.h>
++#include <tcl/tcl.h>
+ #include <Obm.h>
+ #include <ObmW/Gterm.h>
+ #include "ximtool.h"
+@@ -774,7 +774,7 @@ nolist1: for (i=0; i < xim->nframes; i++)
+ goto nolist2;
+ for (i=0; i < nitems; i++)
+ frame_list |= (1 << (atoi(items[i]) - 1));
+- XtFree ((char *)items);
++ Tcl_Free ((char *)items);
+ } else {
+ nolist2: for (i=0; i < xim->nframes; i++)
+ frame_list |= (1 << i);
diff --git a/debian/patches/use_standard_libs.patch b/debian/patches/Use-system-libs-when-possible.patch
similarity index 66%
rename from debian/patches/use_standard_libs.patch
rename to debian/patches/Use-system-libs-when-possible.patch
index 8dab368..0becb85 100644
--- a/debian/patches/use_standard_libs.patch
+++ b/debian/patches/Use-system-libs-when-possible.patch
@@ -1,4 +1,18 @@
-Description: Use system libs for libXpm and libXt.
+From: Ole Streicher <olebole at debian.org>
+Date: Wed, 6 Dec 2017 21:05:47 +0100
+Subject: Use system libs when possible
+
+---
+ Imakefile | 2 +-
+ X11IRAF.tmpl | 8 --------
+ obm/ObmW/Converters.h | 2 +-
+ obm/ObmW/iconutil.c | 2 +-
+ obm/server.c | 2 +-
+ xgterm/Imakefile | 3 +--
+ 6 files changed, 5 insertions(+), 14 deletions(-)
+
+diff --git a/Imakefile b/Imakefile
+index 95538c4..cc0536c 100644
--- a/Imakefile
+++ b/Imakefile
@@ -11,7 +11,7 @@
@@ -10,6 +24,8 @@ Description: Use system libs for libXpm and libXt.
APPDIRS = xgterm ximtool xtapemon obmsh vximtool
SUBDIRS = $(LIBDIRS) $(APPDIRS)
+diff --git a/X11IRAF.tmpl b/X11IRAF.tmpl
+index 1296455..be6c70b 100644
--- a/X11IRAF.tmpl
+++ b/X11IRAF.tmpl
@@ -98,12 +98,6 @@
@@ -35,28 +51,11 @@ Description: Use system libs for libXpm and libXt.
LIBXAW3D = LibXaw3d
LIBCDL = LibCDL
---- a/xgterm/Imakefile
-+++ b/xgterm/Imakefile
-@@ -40,7 +40,6 @@
-
- CDEBUGFLAGS = -g
- XAWLIB = LibXaw3d
-- DEPXAWLIB = DepLibXaw3d
- X11IRAFDIR = ../
-
- MAIN_DEFINES = -DUTMP $(TTYGROUPDEF) $(PUCCPTYDDEF) \
-@@ -62,7 +61,7 @@
- OBJS2 = resize.o
- SRCS = $(SRCS1) $(SRCS2)
- OBJS = $(OBJS1) $(OBJS2)
-- DEPOBM = DepLibObm DepLibXpm DepLibXaw3d
-+ DEPOBM = DepLibObm
-
- PROGRAMS = resize xgterm
- DEPLIBS1 = XawClientDepLibs $(DEPOBM)
+diff --git a/obm/ObmW/Converters.h b/obm/ObmW/Converters.h
+index 45f15fa..8bdaffa 100644
--- a/obm/ObmW/Converters.h
+++ b/obm/ObmW/Converters.h
-@@ -25,7 +25,7 @@
+@@ -25,7 +25,7 @@ Boolean cvtStringToIcon(
#ifndef NO_XPM
@@ -65,9 +64,11 @@ Description: Use system libs for libXpm and libXt.
/* The |Icon| type is a convenient combination of a pixmap, a mask and
the pixmaps's attributes. Not all attributes are stored, only width
+diff --git a/obm/ObmW/iconutil.c b/obm/ObmW/iconutil.c
+index d139296..550a70b 100644
--- a/obm/ObmW/iconutil.c
+++ b/obm/ObmW/iconutil.c
-@@ -123,7 +123,7 @@
+@@ -123,7 +123,7 @@ static void file_to_xpmimage (dpy, file, image)
Cardinal one = 1;
int status;
@@ -76,9 +77,11 @@ Description: Use system libs for libXpm and libXt.
switch (status) {
case XpmOpenFailed:
+diff --git a/obm/server.c b/obm/server.c
+index c24f3e1..7bdc8fc 100644
--- a/obm/server.c
+++ b/obm/server.c
-@@ -1757,7 +1757,7 @@
+@@ -1757,7 +1757,7 @@ char *description;
/* Create the pixmap (actually icon).
*/
@@ -87,3 +90,24 @@ Description: Use system libs for libXpm and libXt.
if (status != XpmSuccess)
return (TCL_ERROR);
XpmCreateDataFromXpmImage (&data, &image, NULL);
+diff --git a/xgterm/Imakefile b/xgterm/Imakefile
+index e1063e6..c930e0f 100644
+--- a/xgterm/Imakefile
++++ b/xgterm/Imakefile
+@@ -40,7 +40,6 @@ X11IRAFDIR = ../
+
+ CDEBUGFLAGS = -g
+ XAWLIB = LibXaw3d
+- DEPXAWLIB = DepLibXaw3d
+ X11IRAFDIR = ../
+
+ MAIN_DEFINES = -DUTMP $(TTYGROUPDEF) $(PUCCPTYDDEF) \
+@@ -62,7 +61,7 @@ X11IRAFDIR = ../
+ OBJS2 = resize.o
+ SRCS = $(SRCS1) $(SRCS2)
+ OBJS = $(OBJS1) $(OBJS2)
+- DEPOBM = DepLibObm DepLibXpm DepLibXaw3d
++ DEPOBM = DepLibObm
+
+ PROGRAMS = resize xgterm
+ DEPLIBS1 = XawClientDepLibs $(DEPOBM)
diff --git a/debian/patches/dummy_mkpkg.patch b/debian/patches/dummy_mkpkg.patch
deleted file mode 100644
index cc1fa29..0000000
--- a/debian/patches/dummy_mkpkg.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/ximtool/clients/Imakefile
-+++ b/ximtool/clients/Imakefile
-@@ -11,8 +11,7 @@
- all:: ism_wcspix.e
-
- ism_wcspix.e: $(WC_SRCS) $(LIB_SRCS)
-- @(SHELL=/bin/sh ; export SHELL ; mkpkg relink)
-- touch DONE
-+ touch DONE ism_wcspix.e
-
- SubdirLibraryRule($(WC_SRCS) $(LIB_SRCS))
-
diff --git a/debian/patches/fix_decl.patch b/debian/patches/fix_decl.patch
deleted file mode 100644
index a9fdf82..0000000
--- a/debian/patches/fix_decl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/xgterm/button.c
-+++ b/xgterm/button.c
-@@ -40,7 +40,6 @@
- #include "error.h"
- #include "menu.h"
-
--extern char *malloc();
-
- extern void DoSecureKeyboard();
-
diff --git a/debian/patches/fix_stdarg.patch b/debian/patches/fix_stdarg.patch
deleted file mode 100644
index de05beb..0000000
--- a/debian/patches/fix_stdarg.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/obm/ObmW/HTML-PSformat.c
-+++ b/obm/ObmW/HTML-PSformat.c
-@@ -48,7 +48,7 @@
- #include <math.h>
- #include "HTMLP.h"
-
--#ifdef _GNU_SOURCE
-+#if 1
- #define USE_STDARG
- #endif
- #if defined(__APPLE__) || (__APPLE_CC__ > 1151) || defined(USE_STDARG)
diff --git a/debian/patches/series b/debian/patches/series
index 4d32b95..f20bd8b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,8 @@
-dummy_mkpkg.patch
-fix_decl.patch
-fix_stdarg.patch
-gterm_fix_windowcopy.patch
-include_installdir.patch
-obm_fix_createtype.patch
-standard_tcl.patch
-use_standard_libs.patch
+Don-t-use-mkpkg.patch
+Remove-declaration-of-malloc.patch
+Force-use-of-stdarg.patch
+Fix-pixel-window-copy-in-ObmW-Gterm.patch
+Include-install-directory.patch
+Fix-function-type-of-Create-functions-in-obm.patch
+Use-system-Tcl-library.patch
+Use-system-libs-when-possible.patch
diff --git a/debian/patches/x11iraf_1.2-4.diff b/debian/patches/x11iraf_1.2-4.diff
deleted file mode 100644
index 47fd537..0000000
--- a/debian/patches/x11iraf_1.2-4.diff
+++ /dev/null
@@ -1,62 +0,0 @@
---- x11iraf-1.2.orig/xaw3d/laygram.h
-+++ x11iraf-1.2/xaw3d/laygram.h
-@@ -1,5 +1,4 @@
--
--typedef union {
-+typedef union {
- int ival;
- XrmQuark qval;
- BoxPtr bval;
-@@ -9,27 +8,29 @@
- ExprPtr eval;
- Operator oval;
- } YYSTYPE;
-+#define OC 257
-+#define CC 258
-+#define OA 259
-+#define CA 260
-+#define OP 261
-+#define CP 262
-+#define NAME 263
-+#define NUMBER 264
-+#define INFINITY 265
-+#define VERTICAL 266
-+#define HORIZONTAL 267
-+#define EQUAL 268
-+#define DOLLAR 269
-+#define PLUS 270
-+#define MINUS 271
-+#define TIMES 272
-+#define DIVIDE 273
-+#define PERCENTOF 274
-+#define PERCENT 275
-+#define WIDTH 276
-+#define HEIGHT 277
-+#define UMINUS 278
-+#define UPLUS 279
-+
-+
- extern YYSTYPE LayYYlval;
--# define OC 257
--# define CC 258
--# define OA 259
--# define CA 260
--# define OP 261
--# define CP 262
--# define NAME 263
--# define NUMBER 264
--# define INFINITY 265
--# define VERTICAL 266
--# define HORIZONTAL 267
--# define EQUAL 268
--# define DOLLAR 269
--# define PLUS 270
--# define MINUS 271
--# define TIMES 272
--# define DIVIDE 273
--# define PERCENTOF 274
--# define PERCENT 275
--# define WIDTH 276
--# define HEIGHT 277
--# define UMINUS 278
--# define UPLUS 279
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/x11iraf.git
More information about the Debian-astro-commits
mailing list