pool/tix
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

- Split %requires_ge tcl tk into two lines: simple workaround

Browse Source 
against the macro missing to add a newline in some cases.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:tcl/tix?expand=0&rev=13
This commit is contained in:
Reinhard Max
2024-11-05 11:50:45 +00:00
committed by Git OBS Bridge
commit 7ff396e386
9 changed files with 582 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
.gitattributes vendored Normal file
View File

@@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
.osc

BIN
Tix8.4.3-src.tar.bz2 (Stored with Git LFS) Normal file
View File

Binary file not shown.

228
tix-c89.patch Normal file
View File

@@ -0,0 +1,228 @@
Fix various incompatible pointers by switching to correct
const-qualified types.
Several problematic casts can be removed, except for the one in the
masterPtr->data in ImgXpmGetData.
diff --git generic/tixDItem.c generic/tixDItem.c
index 602c506d158d8a98..d23a4eb036aa8997 100644
--- generic/tixDItem.c
+++ generic/tixDItem.c
@@ -30,7 +30,7 @@ static int DItemParseProc _ANSI_ARGS_((ClientData clientData,
Tcl_Interp *interp, Tk_Window tkwin, CONST84 char *value,
char *widRec, int offset));
-static char *DItemPrintProc _ANSI_ARGS_((
+static const char *DItemPrintProc _ANSI_ARGS_((
ClientData clientData, Tk_Window tkwin, char *widRec,
int offset, Tcl_FreeProc **freeProcPtr));
@@ -548,7 +548,7 @@ static int DItemParseProc(clientData, interp, tkwin, value, widRec,offset)
return TCL_OK;
}
-static char *DItemPrintProc(clientData, tkwin, widRec,offset, freeProcPtr)
+static const char *DItemPrintProc(clientData, tkwin, widRec,offset, freeProcPtr)
ClientData clientData;
Tk_Window tkwin;
char *widRec;
diff --git generic/tixDiStyle.c generic/tixDiStyle.c
index 3c450cf001d075ba..fba76706afcd16f0 100644
--- generic/tixDiStyle.c
+++ generic/tixDiStyle.c
@@ -31,7 +31,7 @@ typedef struct StyleInfo {
static int DItemStyleParseProc _ANSI_ARGS_((ClientData clientData,
Tcl_Interp *interp, Tk_Window tkwin,
CONST84 char *value,char *widRec, int offset));
-static char * DItemStylePrintProc _ANSI_ARGS_((
+static const char * DItemStylePrintProc _ANSI_ARGS_((
ClientData clientData, Tk_Window tkwin,
char *widRec, int offset,
Tcl_FreeProc **freeProcPtr));
@@ -998,7 +998,7 @@ not_found:
return TCL_ERROR;
}
-static char *DItemStylePrintProc(clientData, tkwin, widRec,offset, freeProcPtr)
+static const char *DItemStylePrintProc(clientData, tkwin, widRec,offset, freeProcPtr)
ClientData clientData;
Tk_Window tkwin;
char *widRec;
diff --git generic/tixImgCmp.c generic/tixImgCmp.c
index 4ba60ca06541156e..5df05c4eb32a4611 100644
--- generic/tixImgCmp.c
+++ generic/tixImgCmp.c
@@ -142,8 +142,8 @@ typedef union CmpItemPtr {
* The type record for bitmap images:
*/
static int ImgCmpCreate _ANSI_ARGS_((Tcl_Interp *interp,
- char *name, int argc, Tcl_Obj *CONST objv[],
- Tk_ImageType *typePtr, Tk_ImageMaster master,
+ const char *name, int argc, Tcl_Obj *CONST objv[],
+ const Tk_ImageType *typePtr, Tk_ImageMaster master,
ClientData *clientDataPtr));
static ClientData ImgCmpGet _ANSI_ARGS_((Tk_Window tkwin,
ClientData clientData));
@@ -378,11 +378,11 @@ static int
ImgCmpCreate(interp, name, argc, objv, typePtr, master, clientDataPtr)
Tcl_Interp *interp; /* Interpreter for application containing
* image. */
- char *name; /* Name to use for image. */
+ const char *name; /* Name to use for image. */
int argc; /* Number of arguments. */
Tcl_Obj *CONST objv[]; /* Argument strings for options (doesn't
* include image name or type). */
- Tk_ImageType *typePtr; /* Pointer to our type record (not used). */
+ const Tk_ImageType *typePtr;/* Pointer to our type record (not used). */
Tk_ImageMaster master; /* Token for image, to be used by us in
* later callbacks. */
ClientData *clientDataPtr; /* Store manager's token for image here;
diff --git generic/tixImgXpm.c generic/tixImgXpm.c
index 23c3981c6ea29fe8..16afe3b2318cf6e2 100644
--- generic/tixImgXpm.c
+++ generic/tixImgXpm.c
@@ -22,8 +22,8 @@
*/
static int ImgXpmCreate _ANSI_ARGS_((Tcl_Interp *interp,
- char *name, int argc, Tcl_Obj *CONST objv[],
- Tk_ImageType *typePtr, Tk_ImageMaster master,
+ const char *name, int argc, Tcl_Obj *CONST objv[],
+ const Tk_ImageType *typePtr, Tk_ImageMaster master,
ClientData *clientDataPtr));
static ClientData ImgXpmGet _ANSI_ARGS_((Tk_Window tkwin,
ClientData clientData));
@@ -45,11 +45,11 @@ static int ImgXpmConfigureMaster _ANSI_ARGS_((
int flags));
static int ImgXpmGetData _ANSI_ARGS_((Tcl_Interp *interp,
PixmapMaster *masterPtr));
-static char ** ImgXpmGetDataFromFile _ANSI_ARGS_((Tcl_Interp * interp,
+static const char ** ImgXpmGetDataFromFile _ANSI_ARGS_((Tcl_Interp * interp,
char * string, int * numLines_return));
-static char ** ImgXpmGetDataFromId _ANSI_ARGS_((Tcl_Interp * interp,
+static const char ** ImgXpmGetDataFromId _ANSI_ARGS_((Tcl_Interp * interp,
CONST84 char * id));
-static char ** ImgXpmGetDataFromString _ANSI_ARGS_((Tcl_Interp*interp,
+static const char ** ImgXpmGetDataFromString _ANSI_ARGS_((Tcl_Interp*interp,
char * string, int * numLines_return));
static void ImgXpmGetPixmapFromData _ANSI_ARGS_((
Tcl_Interp * interp,
@@ -115,11 +115,11 @@ static int
ImgXpmCreate(interp, name, argc, objv, typePtr, master, clientDataPtr)
Tcl_Interp *interp; /* Interpreter for application containing
* image. */
- char *name; /* Name to use for image. */
+ const char *name; /* Name to use for image. */
int argc; /* Number of arguments. */
Tcl_Obj *CONST objv[]; /* Argument strings for options (doesn't
* include image name or type). */
- Tk_ImageType *typePtr; /* Pointer to our type record (not used). */
+ const Tk_ImageType *typePtr;/* Pointer to our type record (not used). */
Tk_ImageMaster master; /* Token for image, to be used by us in
* later callbacks. */
ClientData *clientDataPtr; /* Store manager's token for image here;
@@ -286,7 +286,7 @@ ImgXpmGetData(interp, masterPtr)
Tcl_Interp *interp; /* For reporting errors. */
PixmapMaster *masterPtr;
{
- char ** data = NULL;
+ const char ** data = NULL;
int isAllocated = 0; /* do we need to free "data"? */
int listArgc;
CONST84 char ** listArgv = NULL;
@@ -342,7 +342,7 @@ ImgXpmGetData(interp, masterPtr)
ckfree((char*)masterPtr->data);
}
masterPtr->isDataAlloced = isAllocated;
- masterPtr->data = data;
+ masterPtr->data = (char **)data;
masterPtr->size[0] = size[0];
masterPtr->size[1] = size[1];
masterPtr->cpp = cpp;
@@ -363,7 +363,7 @@ ImgXpmGetData(interp, masterPtr)
return code;
}
-static char ** ImgXpmGetDataFromId(interp, id)
+static const char ** ImgXpmGetDataFromId(interp, id)
Tcl_Interp * interp;
CONST84 char * id;
{
@@ -378,13 +378,13 @@ static char ** ImgXpmGetDataFromId(interp, id)
if (hashPtr == NULL) {
Tcl_AppendResult(interp, "unknown pixmap ID \"", id,
"\"", NULL);
- return (char**)NULL;
+ return NULL;
} else {
- return (char**)Tcl_GetHashValue(hashPtr);
+ return Tcl_GetHashValue(hashPtr);
}
}
-static char ** ImgXpmGetDataFromString(interp, string, numLines_return)
+static const char ** ImgXpmGetDataFromString(interp, string, numLines_return)
Tcl_Interp * interp;
char * string;
int * numLines_return;
@@ -392,7 +392,7 @@ static char ** ImgXpmGetDataFromString(interp, string, numLines_return)
int quoted;
char * p, * list;
int numLines;
- char ** data;
+ const char ** data;
/* skip the leading blanks (leading blanks are not defined in the
* the XPM definition, but skipping them shouldn't hurt. Also, the ability
@@ -510,17 +510,17 @@ static char ** ImgXpmGetDataFromString(interp, string, numLines_return)
error:
Tcl_AppendResult(interp, "File format error", NULL);
- return (char**) NULL;
+ return NULL;
}
-static char ** ImgXpmGetDataFromFile(interp, fileName, numLines_return)
+static const char ** ImgXpmGetDataFromFile(interp, fileName, numLines_return)
Tcl_Interp * interp;
char * fileName;
int * numLines_return;
{
FILE * fd = NULL;
int size, n;
- char ** data;
+ const char ** data;
char *cmdBuffer = NULL;
Tcl_DString buffer; /* initialized by Tcl_TildeSubst */
@@ -588,7 +588,7 @@ static char ** ImgXpmGetDataFromFile(interp, fileName, numLines_return)
ckfree(cmdBuffer);
}
Tcl_DStringFree(&buffer);
- return (char**)NULL;
+ return NULL;
}
diff --git generic/tixUtils.c generic/tixUtils.c
index 998acb84e3f8c79c..e7967b51ecd3a1e4 100644
--- generic/tixUtils.c
+++ generic/tixUtils.c
@@ -24,7 +24,7 @@
static int ReliefParseProc(ClientData clientData,
Tcl_Interp *interp, Tk_Window tkwin, CONST84 char *value,
char *widRec, int offset);
-static char * ReliefPrintProc(ClientData clientData,
+static const char * ReliefPrintProc(ClientData clientData,
Tk_Window tkwin, char *widRec, int offset,
Tix_FreeProc **freeProcPtr);
@@ -637,7 +637,7 @@ ReliefParseProc(clientData, interp, tkwin, value, widRec,offset)
return TCL_ERROR;
}
-static char *
+static const char *
ReliefPrintProc(clientData, tkwin, widRec,offset, freeProcPtr)
ClientData clientData;
Tk_Window tkwin;

54
tix-implicit-int.patch Normal file
View File

@@ -0,0 +1,54 @@
Avoid implicit int declarations, a feature removed from C language with C99.
diff --git generic/tixDiImg.c generic/tixDiImg.c
index da20d53c16cca3c7..3fb9f800fcd9e52a 100644
--- generic/tixDiImg.c
+++ generic/tixDiImg.c
@@ -352,6 +352,8 @@ Tix_ImageItemDisplay(drawable, iPtr, x, y, width, height, xOffset, yOffset,
int y;
int width;
int height;
+ int xOffset;
+ int yOffset;
int flags;
{
TixImageItem *itPtr = (TixImageItem *)iPtr;
diff --git generic/tixDiWin.c generic/tixDiWin.c
index e62529ecd19a9790..a96cd287e11c34e3 100644
--- generic/tixDiWin.c
+++ generic/tixDiWin.c
@@ -458,6 +458,8 @@ Tix_WindowItemDisplay(drawable, iPtr, x, y, width, height, xOffset, yOffset,
int y;
int width;
int height;
+ int xOffset;
+ int yOffset;
int flags;
{
TixWindowItem *itPtr = (TixWindowItem *)iPtr;
diff --git generic/tixForm.c generic/tixForm.c
index 5ab21f15a99bfde9..ba56617e436f748b 100644
--- generic/tixForm.c
+++ generic/tixForm.c
@@ -150,7 +150,7 @@ static Tcl_HashTable masterInfoHashTable;
/*
* Have static variables in this module been initialized?
*/
-static initialized = 0;
+static int initialized = 0;
static int ReqSize(tkwin, axis)
Tk_Window tkwin;
diff --git unix/tixUnixMwm.c unix/tixUnixMwm.c
index 3c4ac4d83bc51c80..02b58c16311b2c54 100644
--- unix/tixUnixMwm.c
+++ unix/tixUnixMwm.c
@@ -768,7 +768,7 @@ GetMwmInfo(interp, tkwin)
Tcl_Interp * interp;
Tk_Window tkwin;
{
- static inited = 0;
+ static int inited = 0;
Tcl_HashEntry *hashPtr;
int isNew;

20
tix-includes.patch Normal file
View File

@@ -0,0 +1,20 @@
--- generic/tixGrUtl.c.orig
+++ generic/tixGrUtl.c
@@ -17,6 +17,7 @@
#include <tixInt.h>
#include <tixDef.h>
#include <tixGrid.h>
+#include <ctype.h>
#ifndef UCHAR
#define UCHAR(c) ((unsigned char) (c))
--- generic/tixImgXpm.c.orig
+++ generic/tixImgXpm.c
@@ -16,6 +16,7 @@
#include <tixPort.h>
#include <tixInt.h>
#include <tixImgXpm.h>
+#include <ctype.h>
/*
* Prototypes for procedures used only locally in this file:

163
tix.changes Normal file
View File

@@ -0,0 +1,163 @@
-------------------------------------------------------------------
Tue Nov 5 11:47:14 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Split %requires_ge tcl tk into two lines: simple workaround
against the macro missing to add a newline in some cases.
-------------------------------------------------------------------
Mon Jul 1 16:51:07 UTC 2024 - Reinhard Max <max@suse.com>
- boo#1225944: Add patches to build with gcc14:
* tix-c89.patch
* tix-implicit-int.patch
* tix-includes.patch
-------------------------------------------------------------------
Mon Feb 26 15:01:21 UTC 2024 - pgajdos@suse.com
- Use %autosetup macro. Allows to eliminate the usage of deprecated
%patchN
-------------------------------------------------------------------
Mon Feb 19 19:22:57 UTC 2018 - crrodriguez@opensuse.org
- Remove buildrequires on xorg-x11-devel
- apps linked to tcl/tk static stubs must %require_ge tcl tk
-------------------------------------------------------------------
Thu Jun 20 14:42:27 UTC 2013 - max@suse.com
- Fix build with Tcl 8.6.0.
- Cleanup spec file.
-------------------------------------------------------------------
Wed Dec 21 10:46:44 UTC 2011 - coolo@suse.com
- tcl's license is BSD-3-Clause
-------------------------------------------------------------------
Wed Dec 21 10:45:53 UTC 2011 - coolo@suse.com
- add autoconf as buildrequire to avoid implicit dependency
-------------------------------------------------------------------
Fri Apr 4 17:58:54 CEST 2008 - max@suse.de
- New version 8.4.3, works with Tcl/Tk 8.5.
-------------------------------------------------------------------
Tue Jun 5 14:50:21 CEST 2007 - max@suse.de
- New version: 8.4.0
- Lots of cleanup and bugs fixed.
- Better per-default compliance with rpmlint.
- The 'tixwish' executable is gone. Use tclsh or wish and load the
Tix package dynamically.
-------------------------------------------------------------------
Wed Jan 25 21:42:12 CET 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
-------------------------------------------------------------------
Fri Jul 29 11:55:53 CEST 2005 - max@suse.de
- Moved script library to /usr/share/tcl .
-------------------------------------------------------------------
Thu Feb 5 15:09:57 CET 2004 - max@suse.de
- Building as a shared lib again.
- Added -fno-strict-aliasing to CFLAGS.
-------------------------------------------------------------------
Thu Jan 15 17:27:17 CET 2004 - max@suse.de
- New version: 8.1.4
-------------------------------------------------------------------
Sat Jan 10 17:57:52 CET 2004 - adrian@suse.de
- build as user
-------------------------------------------------------------------
Wed Jul 23 13:58:51 CEST 2003 - max@suse.de
- Added tk-devel to neededforbuild.
-------------------------------------------------------------------
Wed May 21 01:10:38 CEST 2003 - ro@suse.de
- remove .cvsignore files
- fix filelist
-------------------------------------------------------------------
Mon Nov 11 23:49:55 CET 2002 - ro@suse.de
- changed neededforbuild <xshared> to <x-devel-packages>
- changed neededforbuild <xdevel> to <>
-------------------------------------------------------------------
Tue Jul 9 13:19:24 CEST 2002 - max@suse.de
- Ready for Tcl/Tk 8.4.
- Doesn't break on KDE3 anymore [Bug #16428].
-------------------------------------------------------------------
Wed Apr 10 13:19:23 CEST 2002 - max@suse.de
- Fixed for new version of autobuild.
-------------------------------------------------------------------
Wed Feb 20 18:22:36 CET 2002 - max@suse.de
- Fixed for lib64-s390x.
-------------------------------------------------------------------
Thu Jan 17 17:35:20 CET 2002 - max@suse.de
- New version 8.1.3
- Tix is a separate package again. The new version is able to build
without having the Tcl/Tk sources at hand.
- Don't build static libs anymore.
-------------------------------------------------------------------
Tue Nov 24 18:24:43 MET 1998 - max@suse.de
- merged spec-files into tcl_new.spec
-------------------------------------------------------------------
Mon Nov 23 17:24:49 MET 1998 - max@suse.de
- building with new Tcl/Tk version: 8.0.4
- tixwish is now dynamically linked to libtcl
-------------------------------------------------------------------
Wed Sep 23 10:04:40 MEST 1998 - ro@suse.de
- added to specfile: applx patch for tcl8.0
-------------------------------------------------------------------
Thu May 14 17:51:43 MEST 1998 - hf@suse.de
- english and german README.SuSE
-------------------------------------------------------------------
Mon Feb 23 13:24:06 MET 1998 - hf@suse.de
- changed README.SuSE
----------------------------------------------------------------------
Mon Feb 16 12:55:29 MET 1998 - hf@suse.de
- changes in spec file
----------------------------------------------------------------------
Thu Feb 5 16:25:32 MET 1998 - hf@suse.de
new package Tix for Tcl/Tk 8.0
and new directorypath to tcl/tk in /usr/lib/tcltk

13
tix.patch Normal file
View File

@@ -0,0 +1,13 @@
--- configure.in
+++ configure.in
@@ -100,8 +100,8 @@
#--------------------------------------------------------------------
# needed for tclPort.h and such ... can be corrected
-TEA_PRIVATE_TCL_HEADERS
-TEA_PRIVATE_TK_HEADERS
+TEA_PUBLIC_TCL_HEADERS
+TEA_PUBLIC_TK_HEADERS
#--------------------------------------------------------------------
# For Unix/Tk builds, make sure that the X libraries/headers are found.

77
tix.spec Normal file
View File

@@ -0,0 +1,77 @@
#
# spec file for package tix
#
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: tix
BuildRequires: autoconf
BuildRequires: fdupes
BuildRequires: tcl-devel
BuildRequires: tk-devel
BuildRequires: pkgconfig(x11)
Version: 8.4.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Tools for tk
License: BSD-3-Clause
Group: Development/Libraries/Tcl
Source: Tix%version-src.tar.bz2
Patch0: %name.patch
Patch1: %name-c89.patch
Patch2: %name-implicit-int.patch
Patch3: %name-includes.patch
%requires_ge tcl
%requires_ge tk
%description
The Tix library has, by far, the greatest collection of widgets for
programming with Tcl/Tk. Highlights include: hierarchical list box,
directory list/tree view, spreadsheet, tabular list box, combo box,
Motif style file select box, MS Windows style file select box, paned
window, note book, spin control widget and many more. With these new
widgets, your applications will look great and interact with your users
in intuitive ways.
%prep
%autosetup -p0 -n Tix%version
find docs -type f | xargs chmod a-x
%build
autoreconf
export CFLAGS="$RPM_OPT_FLAGS -DUSE_INTERP_RESULT -fno-strict-aliasing"
%configure \
--with-tcl=%_libdir \
--with-tk=%_libdir
make
%install
make install DESTDIR=%buildroot libdir=%_libdir/tcl
MANN=%buildroot/%_mandir/mann
mkdir -p $MANN
pushd man
for f in *.n; do
sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' $f > $MANN/$f
done
popd
%files
%defattr(-,root,root)
%doc ABOUT* README* ChangeLog license.terms index.html
%doc docs/Release* docs/*html docs/img docs/pdf/* demos
%doc %_mandir/*/*
%_libdir/tcl
%changelog