diff --git a/README.en.md b/README.en.md deleted file mode 100644 index a229ee7..0000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# tix - -#### Description -{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**} - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md deleted file mode 100644 index 6745c38..0000000 --- a/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# tix - -#### 介绍 -{**以下是码云平台说明，您可以替换此简介** -码云是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台 -无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)} - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 码云特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目 -5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/Tix8.4.3-src.tar.gz b/Tix8.4.3-src.tar.gz new file mode 100644 index 0000000..6b63b6e Binary files /dev/null and b/Tix8.4.3-src.tar.gz differ diff --git a/tix-8.4.2-link.patch b/tix-8.4.2-link.patch new file mode 100644 index 0000000..d2d402d --- /dev/null +++ b/tix-8.4.2-link.patch @@ -0,0 +1,11 @@ +--- Tix8.4.2/Makefile.in.link 2006-11-18 04:41:06.000000000 +0100 ++++ Tix8.4.2/Makefile.in 2006-11-18 04:43:13.000000000 +0100 +@@ -124,7 +124,7 @@ + RANLIB = @RANLIB@ + RANLIB_STUB = @RANLIB_STUB@ + SHLIB_CFLAGS = @SHLIB_CFLAGS@ +-SHLIB_LD = @SHLIB_LD@ ++SHLIB_LD = @SHLIB_LD@ $(CFLAGS) -Wl,-soname=$(PKG_LIB_FILE) + SHLIB_LD_FLAGS = @SHLIB_LD_FLAGS@ + SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ + STLIB_LD = @STLIB_LD@ diff --git a/tix-8.4.3-covscan-fixes.patch b/tix-8.4.3-covscan-fixes.patch new file mode 100644 index 0000000..244de12 --- /dev/null +++ b/tix-8.4.3-covscan-fixes.patch @@ -0,0 +1,47 @@ +diff -up Tix8.4.3/generic/tixGrUtl.c.orig Tix8.4.3/generic/tixGrUtl.c +--- Tix8.4.3/generic/tixGrUtl.c.orig 2004-03-28 04:44:56.000000000 +0200 ++++ Tix8.4.3/generic/tixGrUtl.c 2018-08-01 14:49:18.839262337 +0200 +@@ -191,7 +191,7 @@ int Tix_GrConfigSize(interp, wPtr, argc, + if (sizePtr->charValue != newSize.charValue) { + changed = 1; + } +- if (sizePtr->pad1 != newSize.pad0) { ++ if (sizePtr->pad0 != newSize.pad0) { + changed = 1; + } + if (sizePtr->pad1 != newSize.pad1) { +diff -up Tix8.4.3/generic/tix.h.orig Tix8.4.3/generic/tix.h +--- Tix8.4.3/generic/tix.h.orig 2008-02-28 05:35:16.000000000 +0100 ++++ Tix8.4.3/generic/tix.h 2018-08-01 14:45:03.306004016 +0200 +@@ -39,6 +39,7 @@ extern "C" { + #endif + #ifdef HAVE_STDLIB_H + #include ++#include + #endif + + #ifndef CONST84 +diff -up Tix8.4.3/Python/Demo/tix/samples/CmpImg.py.orig Tix8.4.3/Python/Demo/tix/samples/CmpImg.py +--- Tix8.4.3/Python/Demo/tix/samples/CmpImg.py.orig 2001-12-10 00:29:43.000000000 +0100 ++++ Tix8.4.3/Python/Demo/tix/samples/CmpImg.py 2018-08-01 14:49:57.959301881 +0200 +@@ -148,7 +148,7 @@ def RunSample(w): + if not w.img0: + w.img0 = Tix.Image('bitmap', data=network_bitmap) + w.img1 = Tix.Image('pixmap', data=hard_disk_pixmap) +- if not w.img0: ++ if not w.img1: + w.img1 = Tix.Image('bitmap', data=hard_disk_bitmap) + + hdd = Tix.Button(w, padx=4, pady=1, width=120) +diff -up Tix8.4.3/PyTix-2.0/demos/samples/CmpImg.py.orig Tix8.4.3/PyTix-2.0/demos/samples/CmpImg.py +--- Tix8.4.3/PyTix-2.0/demos/samples/CmpImg.py.orig 2000-11-05 20:57:44.000000000 +0100 ++++ Tix8.4.3/PyTix-2.0/demos/samples/CmpImg.py 2018-08-01 14:50:14.934319043 +0200 +@@ -148,7 +148,7 @@ def RunSample(w): + if not w.img0: + w.img0 = Tix.Image('bitmap', data=network_bitmap) + w.img1 = Tix.Image('pixmap', data=hard_disk_pixmap) +- if not w.img0: ++ if not w.img1: + w.img1 = Tix.Image('bitmap', data=hard_disk_bitmap) + + hdd = Tix.Button(w, padx=4, pady=1, width=120) diff --git a/tix-8.4.3-tcl86.patch b/tix-8.4.3-tcl86.patch new file mode 100644 index 0000000..dd5923a --- /dev/null +++ b/tix-8.4.3-tcl86.patch @@ -0,0 +1,24 @@ +diff --git a/generic/tixGrSort.c b/generic/tixGrSort.c +index 7dee30f..d45f51d 100644 +--- a/generic/tixGrSort.c ++++ b/generic/tixGrSort.c +@@ -425,7 +425,7 @@ SortCompareProc(first, second) + } + } else { + int oldLength; +- char *end; ++ char *end, *result; + + /* + * Generate and evaluate a command to determine which string comes +@@ -447,8 +447,8 @@ SortCompareProc(first, second) + * Parse the result of the command. + */ + +- order = strtol(sortInterp->result, &end, 0); +- if ((end == sortInterp->result) || (*end != 0)) { ++ order = strtol(result = Tcl_GetStringResult(sortInterp), &end, 0); ++ if ((end == result) || (*end != 0)) { + Tcl_ResetResult(sortInterp); + Tcl_AppendResult(sortInterp, + "comparison command returned non-numeric result", diff --git a/tix.spec b/tix.spec new file mode 100644 index 0000000..09ff0fd --- /dev/null +++ b/tix.spec @@ -0,0 +1,94 @@ +%{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh)} +Name: tix +Summary: the Tk Interface eXtension +Epoch: 1 +Version: 8.4.3 +Release: 26 +License: TCL +URL: http://tix.sourceforge.net/ +Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/Tix%{version}-src.tar.gz + +Patch0: tix-8.4.2-link.patch +Patch1: tix-8.4.3-tcl86.patch +Patch2: tix-8.4.3-covscan-fixes.patch + +Buildrequires: tcl-devel >= 8.4.13 tk-devel >= 8.4.13 libX11-devel gcc + +Requires: tcl(abi) = 8.6 tcl >= 8.4.13 tk >= 8.4.13 /etc/ld.so.conf.d + +%description +Tix, the Tk Interface eXtension, is a powerful set of user interface +components that expands the capabilities of your Tcl/Tk and Python +applications. Using Tix together with Tk will greatly enhance the +appearance and functionality of your application. + +%package devel +Summary: development files for tix +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description devel +Lib and head files which are needed for tix + +%package help +Summary: Documents for tix +Buildarch: noarch +Requires: man info +Requires: %{name} = %{epoch}:%{version}-%{release} + +Obsoletes: %{name}-doc < %{epoch}:%{version}-%{release} +Provides: %{name}-doc = %{epoch}:%{version}-%{release} + +%description help +Man pages and other related documents for tix. + +%prep +%autosetup -p1 -n Tix%{version} +chmod ugo-x docs/html/gif/%{name}/*.png docs/html/gif/%{name}/*.gif docs/html/gif/%{name}/*/*.gif +sed -i 's/\r//' docs/Release-8.4.0.txt + +%build +%configure --with-tcl=%{_libdir} --with-tk=%{_libdir} --libdir=%{_libdir}/tcl%{tcl_version} +%make_build all PKG_LIB_FILE=libTix.so + +%install +%make_install PKG_LIB_FILE=libTix.so + +mv %{buildroot}%{_libdir}/tcl%{tcl_version}/Tix%{version}/libTix.so %{buildroot}%{_libdir}/tcl%{tcl_version} +pwd + +ln -sf ../libTix.so %{buildroot}%{_libdir}/tcl%{tcl_version}/Tix%{version}/libTix.so +ln -sf tcl%{tcl_version}/Tix%{version}/libTix.so %{buildroot}%{_libdir}/libTix.so +ln -sf tcl%{tcl_version}/Tix%{version}/libTix.so %{buildroot}%{_libdir}/libtix.so +install -d %{buildroot}%{_datadir}/tcl%{tcl_version}/Tix8.4 +cp -a demos %{buildroot}%{_datadir}/tcl%{tcl_version}/Tix8.4 +install -d %{buildroot}%{_includedir} +install -m 0644 generic/%{name}.h %{buildroot}%{_includedir}/%{name}.h +install -d %{buildroot}%{_mandir}/mann +cp man/*.n %{buildroot}%{_mandir}/mann +install -d %{buildroot}%{_sysconfdir}/ld.so.conf.d +echo "%{_libdir}/tcl%{tcl_version}" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf + +find docs -name .cvsignore -exec rm '{}' ';' + +%ldconfig_scriptlets + +%files +%{_libdir}/tcl%{tcl_version}/libTix.so +%{_libdir}/tcl%{tcl_version}/Tix%{version} +%{_sysconfdir}/ld.so.conf.d/* +%doc license.terms + +%files devel +%{_includedir}/%{name}.h +%{_libdir}/libtix.so +%{_libdir}/libTix.so + +%files help +%doc docs/* +%doc %{_datadir}/tcl%{tcl_version}/Tix8.4 +%{_mandir}/mann/*.n* +%doc *.txt *.html + +%changelog +* Fri Dec 6 2019 caomeng - 1:8.4.3-26 +- Package init \ No newline at end of file