rpms/tk
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

merge into: rpms:c10s
Branches Tags
rpms:c8
rpms:c10s
rpms:c8s
rpms:c9
rpms:c9-beta
rpms:c9s
rpms:c8-beta
rpms:imports/c10s/tk-8.6.13-5.el10
rpms:imports/c10s/tk-8.6.13-4.el10
rpms:imports/c9/tk-8.6.10-9.el9
rpms:imports/c9-beta/tk-8.6.10-9.el9
rpms:imports/c9/tk-8.6.10-8.el9
rpms:imports/c9-beta/tk-8.6.10-8.el9
rpms:imports/c8-beta/tk-8.6.8-1.el8
rpms:imports/c8/tk-8.6.8-1.el8
...
pull from: rpms:c8
Branches Tags
rpms:c10s
rpms:c8s
rpms:c9
rpms:c9-beta
rpms:c9s
rpms:c8-beta
rpms:c8
rpms:imports/c10s/tk-8.6.13-5.el10
rpms:imports/c10s/tk-8.6.13-4.el10
rpms:imports/c9/tk-8.6.10-9.el9
rpms:imports/c9-beta/tk-8.6.10-9.el9
rpms:imports/c9/tk-8.6.10-8.el9
rpms:imports/c9-beta/tk-8.6.10-8.el9
rpms:imports/c8-beta/tk-8.6.8-1.el8
rpms:imports/c8/tk-8.6.8-1.el8

No commits in common. "c10s" and "c8" have entirely different histories.
c10s ... c8

13 changed files with 65 additions and 174 deletions
Show Stats Expand all files Collapse all files

1
.fmf/version
View File

@ -1 +0,0 @@
1

2
.gitignore vendored
View File

@ -1 +1 @@
tk*-src.tar.gz
SOURCES/tk8.6.8-src.tar.gz

1
.tk.metadata Normal file
View File

@ -0,0 +1 @@
7d674881bcfda5acb937bea084b10fe271463632 SOURCES/tk8.6.8-src.tar.gz

15
SOURCES/tk-8.6.5-fix-xft.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/unix/configure.in b/unix/configure.in
index cb412af..abfd43b 100755
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -479,8 +479,8 @@ if test $tk_aqua = no; then
XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
if test "$found_xft" = "no" ; then
found_xft=yes
- XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no"
- XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no"
+ XFT_CFLAGS=`pkg-config --cflags xft freetype2 2>/dev/null` || found_xft="no"
+ XFT_LIBS=`pkg-config --libs xft freetype2 2>/dev/null` || found_xft="no"
fi
AC_MSG_RESULT([$found_xft])
dnl make sure that compiling against Xft header file doesn't bomb

4
tk-8.6.12-make.patch → SOURCES/tk-8.6.5-make.patch
View File

@ -1,8 +1,8 @@
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 010ba48..2372d57 100644
index 96f1408..05270c6 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -745,7 +745,7 @@ install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE}
@@ -739,7 +739,7 @@ install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE}
fi
@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
@@INSTALL_LIB@

13
tk-8.6.12-conf.patch → SOURCES/tk-8.6.7-conf.patch
View File

@ -1,21 +1,18 @@
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index f3d08ec..1a8d6b6 100644
index 8a802fb..46a08c1 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1382,7 +1382,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
@@ -1402,12 +1402,12 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
# get rid of the warnings.
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
- SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared'
+ SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared -Wl,-soname,${@}'
- SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
+ SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS} -Wl,-soname,${@}'
DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
@@ -1398,7 +1398,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
esac
AS_IF([test $doRpath = yes], [
- CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'])
- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
+ CC_SEARCH_FLAGS=''])
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"])

13
SOURCES/tk-8.6.7-no-fonts-fix.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c
index cce59a8..78df47a 100644
--- a/unix/tkUnixRFont.c
+++ b/unix/tkUnixRFont.c
@@ -271,7 +271,7 @@ InitFont(
*/
set = FcFontSort(0, pattern, FcTrue, NULL, &result);
- if (!set) {
+ if (!set || set->nfont == 0) {
ckfree(fontPtr);
return NULL;
}

105
tk.spec → SPECS/tk.spec
View File

@ -1,28 +1,30 @@
%define majorver 8.6
%define vers %{majorver}.13
%define vers %{majorver}.8
Summary: The graphical toolkit for the Tcl scripting language
Name: tk
Version: %{vers}
Release: 5%{?dist}
Release: 1%{?dist}
Epoch: 1
License: TCL AND HPND-Pbmplus AND CC-BY-SA-3.0 AND MIT-open-group AND MIT
License: TCL
Group: Development/Languages
URL: http://tcl.sourceforge.net
Source0: http://download.sourceforge.net/sourceforge/tcl/%{name}%{version}-src.tar.gz
Requires: tcl = %{epoch}:%{vers}
BuildRequires: make
BuildRequires: gcc
BuildRequires: tcl-devel = %{epoch}:%{vers}, autoconf
Requires: tcl = %{epoch}:%{version}
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
BuildRequires: tcl-devel = %{epoch}:%{version}, autoconf
BuildRequires: libX11-devel
BuildRequires: libXft-devel
# panedwindow.n from itcl conflicts
Conflicts: itcl <= 3.2
Obsoletes: tile <= 0.8.2
Provides: tile = 0.8.2
Patch1: tk-8.6.12-make.patch
Patch2: tk-8.6.12-conf.patch
# https://core.tcl-lang.org/tk/tktview/dccd82bdc70dc25bb6709a6c14880a92104dda43
Patch3: tk-8.6.10-font-sizes-fix.patch
Patch1: tk-8.6.5-make.patch
Patch2: tk-8.6.7-conf.patch
# fix implicit linkage of freetype that breaks xft detection (#677692)
Patch3: tk-8.6.5-fix-xft.patch
Patch4: tk-8.6.7-no-fonts-fix.patch
%description
When paired with the Tcl scripting language, Tk provides a fast and powerful
@ -30,8 +32,9 @@ way to create cross-platform GUI applications.
%package devel
Summary: Tk graphical toolkit development files
Group: Development/Languages
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: tcl-devel = %{epoch}:%{vers}
Requires: tcl-devel = %{epoch}:%{version}
Requires: libX11-devel libXft-devel
%description devel
@ -41,13 +44,18 @@ way to create cross-platform GUI applications.
The package contains the development files and man pages for tk.
%prep
%autosetup -p1 -n %{name}%{vers}
%setup -n %{name}%{version} -q
%patch1 -p1 -b .make
%patch2 -p1 -b .conf
%patch3 -p1 -b .fix-xft
%patch4 -p1 -b .no-fonts-fix
%build
cd unix
autoconf
%configure --enable-threads
%make_build CFLAGS="%{optflags}" TK_LIBRARY=%{_datadir}/%{name}%{majorver}
make %{?_smp_mflags} CFLAGS="%{optflags}" TK_LIBRARY=%{_datadir}/%{name}%{majorver}
%check
# do not run "make test" by default since it requires an X display
@ -80,9 +88,12 @@ sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %{bu
%pre
[ ! -h %{_prefix}/%{_lib}/%{name}%{majorver} ] || rm %{_prefix}/%{_lib}/%{name}%{majorver}
%ldconfig_scriptlets
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%{_bindir}/wish*
%{_datadir}/%{name}%{majorver}
%exclude %{_datadir}/%{name}%{majorver}/tkAppInit.c
@ -90,9 +101,10 @@ sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %{bu
%{_libdir}/%{name}%{majorver}
%{_mandir}/man1/*
%{_mandir}/mann/*
%doc README.md changes license.terms
%doc README changes license.terms
%files devel
%defattr(-,root,root)
%{_includedir}/*
%{_libdir}/lib%{name}.so
%{_libdir}/lib%{name}stub%{majorver}.a
@ -102,67 +114,6 @@ sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %{bu
%{_datadir}/%{name}%{majorver}/tkAppInit.c
%changelog
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:8.6.13-5
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:8.6.13-4
- Bump release for June 2024 mass rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:8.6.13-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Tue Dec 12 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.6.13-2
- Converted license to SPDX
* Tue Aug 29 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.6.13-1
- New version
Related: rhbz#2231272
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:8.6.12-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:8.6.12-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:8.6.12-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:8.6.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Nov 23 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.6.12-1
- New version
Related: rhbz#1488695
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:8.6.10-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:8.6.10-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:8.6.10-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jul 22 2020 Tom Stellard <tstellar@redhat.com> - 1:8.6.10-4
- Use make macros
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:8.6.10-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Jan 13 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.6.10-2
- Fixed font sizes
Resolves: rhbz#1244729
* Tue Nov 26 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.6.10-1
- New version
- Upated patches
- Dropped fix-xft patch (upstreamed)
* Wed Nov 6 2019 Tom Callaway <spot@fedoraproject.org> - 1:8.6.9.1-1
- update to 8.6.9.1
* Mon Mar 19 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.6.8-1
- New version

1
ci.fmf
View File

@ -1 +0,0 @@
resultsdb-testcase: separate

25
gating.yaml
View File

@ -1,25 +0,0 @@
--- !Policy
product_versions:
- fedora-*
decision_context: bodhi_update_push_testing
subject_type: koji_build
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
#Rawhide
--- !Policy
product_versions:
- fedora-*
decision_context: bodhi_update_push_stable
subject_type: koji_build
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
#gating rhel
--- !Policy
product_versions:
- rhel-*
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}

36
plans.fmf
View File

@ -1,36 +0,0 @@
/tier1-internal:
plan:
import:
url: https://src.fedoraproject.org/tests/tk.git
name: /plans/tier1/internal
/tier1-public:
plan:
import:
url: https://src.fedoraproject.org/tests/tk.git
name: /plans/tier1/public
/tier2-tier3-internal:
plan:
import:
url: https://src.fedoraproject.org/tests/tk.git
name: /plans/tier2-tier3/internal
/tier2-tier3-public:
plan:
import:
url: https://src.fedoraproject.org/tests/tk.git
name: /plans/tier2-tier3/public
/others-internal:
plan:
import:
url: https://src.fedoraproject.org/tests/tk.git
name: /plans/others/internal
/others-public:
plan:
import:
url: https://src.fedoraproject.org/tests/tk.git
name: /plans/others/public

1
sources
View File

@ -1 +0,0 @@
SHA512 (tk8.6.13-src.tar.gz) = 719aa6776bfdc814f817919a265d3f9d847782c9f0a5fc5c2ab139beeba921e6fde8c66e7e836d78f86f53c98a7df0e587f0b2f4b08cc5ce12eecbb7f1ab71a5

22
tk-8.6.10-font-sizes-fix.patch
View File

@ -1,22 +0,0 @@
Author: Sergei Golovan
Description: Patch sets the default font sizes for X11 in points instead of
pixels. This helps to get reasonable font sizes for high DPI displays.
Last-Modified: Sat, 24 Mar 2018 16:14:33 +0300
--- a/library/ttk/fonts.tcl
+++ b/library/ttk/fonts.tcl
@@ -131,10 +131,10 @@
set F(family) "Helvetica"
set F(fixed) "courier"
}
- set F(size) -12
- set F(ttsize) -10
- set F(capsize) -14
- set F(fixedsize) -12
+ set F(size) 10
+ set F(ttsize) 9
+ set F(capsize) 12
+ set F(fixedsize) 10
font configure TkDefaultFont -family $F(family) -size $F(size)
font configure TkTextFont -family $F(family) -size $F(size)