10 changed files with 1461 additions and 3651 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1 @@
 /non-ntk-20130730-gitd006352.tar.bz2
-/non-ntk-20190925-gitdae1771.tar.xz
-/non-ntk-20190925-gitdae1771.1.tar.xz
--- a/non-ntk-1.3.0-fluid.desktop
+++ b/non-ntk-1.3.0-fluid.desktop
--- a/non-ntk-1.3.0-fsf.patch
+++ b/non-ntk-1.3.0-fsf.patch
--- a/non-ntk-flags.patch
+++ b/non-ntk-flags.patch
@ -1,17 +0,0 @@
-diff --git a/wscript b/wscript
-index 2b10dd8..cd76019 100644
--- a/wscript
-+++ b/wscript
-@@ -209,11 +209,7 @@ def configure(conf):
-     conf.define( 'WORDS_BIGENDIAN', 0 )
- 
-     optimization_flags = [
-        "-O3",
-        "-fomit-frame-pointer",
-        "-ffast-math",
-        #            "-fstrength-reduce",
-        "-pipe"
-+        "-ffast-math"
-         ]
- 
-     debug_flags = [
--- a/non-ntk-snapshot.sh
+++ b/non-ntk-snapshot.sh
@ -1,10 +1,8 @@
 #!/bin/bash

-# This script creates source tarball from git
-# $1 - revision number to checkout. Use HEAD to checkout the latest revision
-
-: ${1?"You must either provide desired revision number \"X\" to checkout: `basename ${0}` X
-                                or fetch the latest revision by: `basename ${0}` HEAD"}
+# $1 - revision number to checkout.
+: ${1?"You must either provide desired revision number \"X\" to checkout: `basename $0` X
+                                or fetch the latest revision by: `basename $0` HEAD"}

 set -e

@ -13,19 +11,22 @@ tmp=$(mktemp -d)
 trap cleanup EXIT
 cleanup() {
    set +e
-    [ -z "${tmp}" -o ! -d "${tmp}" ] || rm -rf "${tmp}"
+    [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
 }

 unset CDPATH
-pwd="$(pwd)"
+pwd=$(pwd)
 name=non-ntk
-version=20190925
+version=20130730

-pushd "${tmp}" > /dev/null
-echo "Archiving git revision: ${1}"
-git clone git://git.tuxfamily.org/gitroot/non/fltk.git "${name}"
-cd "${name}"
-commit=$(git rev-list --abbrev-commit --max-count=1 ${1})
-git archive --format=tar --prefix="${name}-${version}/" ${1} | xz > "${pwd}/${name}-${version}-git${commit}.tar.xz"
-echo "Written: ${name}-${version}-git${commit}.tar.xz"
+pushd "$tmp" >/dev/null
+echo "Fetching git revision: $1"
+git clone git://git.tuxfamily.org/gitroot/non/fltk.git $name-$version |tee $name.stdout
+cd $name-$version
+git reset $1
+rm -rf .git* .waf*
+cd ..
+rm -rf $name.stdout
+tar jcf "$pwd"/$name-$version-git$1.tar.bz2 $name-$version
+echo "Written: $name-$version-git$1.tar.bz2"
 popd >/dev/null
--- a/non-ntk-unused-shlib.patch
+++ b/non-ntk-unused-shlib.patch
@ -0,0 +1,39 @@
+diff -Nurp non-ntk-20130713.orig/wscript non-ntk-20130713.mod/wscript
+--- non-ntk-20130713.orig/wscript	2013-07-20 15:40:28.000000000 +0200
+++ non-ntk-20130713.mod/wscript	2013-08-15 08:02:24.439092572 +0200
+@@ -28,7 +28,7 @@ out = 'build'
+ children = [ 'fluid', 'test' ]
+ #children = []
+ 
+-CFLAGS = [ '-pthread',
+CFLAGS = [ 
+            '-D_LARGEFILE64_SOURCE',
+            '-D_FILE_OFFSET_BITS=64' ]
+
+@@ -218,7 +218,7 @@ def configure(conf):
+     print('')
+ 
+ def build(bld):
+-
+    bld.env.append_value('LINKFLAGS','-Wl,--as-needed')
+     bld.makelib(   source = '''
+ src/Fl_Cairo_Graphics_Driver.cxx
+ src/Fl.cxx
+@@ -408,7 +408,7 @@ src/Fl_Gl_Overlay.cxx
+ src/Fl_Gl_Window.cxx
+ ''',
+             target       = 'ntk_gl',
+-            uselib = [ 'X11', 'DL', 'M', 'PTHREAD', 'GL'] )
+            uselib = [ 'X11', 'DL', 'M', 'GL'] )
+ 
+     bld( features = 'subst',
+          source = 'ntk.pc.in',
+@@ -513,7 +513,7 @@ src/Fl_Gl_Window.cxx
+     bld.install_files( bld.env.INCLUDEDIR + '/ntk/FL', start_dir.ant_glob('*.H *.h'),
+                        cwd=start_dir, relative_trick=True)
+ 
+-    bld.add_post_fun( run_ldconfig )
+    # bld.add_post_fun( run_ldconfig )
+ 
+     #  bld.install_files( string.join( [ '${DATADIR}/doc', APPNAME ], '/' ), bld.path.ant_glob( 'doc/*.html doc/*.png' ) )
+     
--- a/non-ntk.spec
+++ b/non-ntk.spec
@ -1,41 +1,27 @@
-%global commit dae177189b12f74ea01ac2389b76326c06d9be78
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20190925
-%global patch 1
-
 Name:           non-ntk
-Version:        1.3.1000
-Release:        0.18.%{commitdate}git%{shortcommit}%{?dist}
+Version:        1.3.0
+Release:        0.16.20130730gitd006352%{?dist}
 Summary:        A fork of FLTK for the non audio suite

-# themes are GPLv2+, FLTK derived code is LGPLv2+
-License:        LGPL-2.0-or-later WITH FLTK-exception AND GPL-2.0-or-later
+# themse are GPLv2+, FLTK derived code is LGPLv2+
+License:        LGPLv2+ with exceptions and GPLv2+
 URL:            http://non.tuxfamily.org/
-Source0:        %{name}-%{commitdate}-git%{shortcommit}.%{patch}.tar.xz
+Source0:        non-ntk-20130730-gitd006352.tar.bz2
 # script to create source tarball from git
 # sh non-snapshot.sh $(rev)
-Source1:        %{name}-snapshot.sh
-# No desktop file in tarball
-Source2:        ntk-fluid.desktop
-# Appdata for ntk-fluid
-Source3:        ntk-fluid.appdata.xml
-# Desktop file for ntk-chtheme
-Source4:        ntk-chtheme.desktop
-# Fix wrong FSF address
-Patch0:         %{name}-fsf.patch
-# Use system provided scandir
-Patch1:         %{name}-scandir.patch
-# Delete wrong compiler flags
-Patch2:         %{name}-flags.patch
+Source1:        non-ntk-snapshot.sh
+# no desktop file in tarball
+Source2:        non-ntk-1.3.0-fluid.desktop
+# sent upstream via email
+Patch1:         non-ntk-1.3.0-fsf.patch
+Patch2:         non-ntk-unused-shlib.patch
+Patch3:         non-ntk-scandir.patch

-BuildRequires:  gcc
-BuildRequires:  gcc-c++
-BuildRequires:  cairo-devel >= 1.10.0
+BuildRequires:  cairo-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  libappstream-glib
 BuildRequires:  libjpeg-devel
 BuildRequires:  pkgconfig(libpng)
-BuildRequires:  python3
+BuildRequires:  python2
 BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(glu)
 BuildRequires:  pkgconfig(xft)
@ -55,48 +41,38 @@ Development files for the Non-ntk GUI library
 %package fluid
 Summary: Fast Light User Interface Designer
 Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: %{name}-devel%{?_isa} = %{version}-%{release}
+Requires: %{name}-devel
 %description fluid
 %{summary}, an interactive GUI designer for %{name}.

 %prep
-%autosetup -p 1 -n non-ntk-%{commitdate}
+%setup -q -n non-ntk-20130730
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
+sed -i -e "s|append_value('C\(.*\)FLAGS', CFLAGS|append_value('C\1FLAGS','%{optflags}'.split(' ')|" \
+ wscript

 %build
-%set_build_flags
-python3 ./waf -v configure --prefix=%{_prefix} \
+LDFLAGS="%{?__global_ldflags}" ./waf -v configure --prefix=%{_prefix} \
  --libdir=%{_libdir} --enable-gl
-python3 ./waf -v %{?_smp_mflags}
+./waf -v %{?_smp_mflags} 

-%install
-# Do not run ldconfig
-export DESTDIR="%{buildroot}"
-
-python3 ./waf -v install --destdir=%{buildroot}
-
-# Install desktop file
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
- %{SOURCE2} %{SOURCE4}
-
-# Install appdata file
-install -d -m755 %{buildroot}%{_metainfodir}
-install -p -m644 %{SOURCE3} %{buildroot}%{_metainfodir}
-
-# Delete static libraries
+%install 
+./waf -v install --destdir=%{buildroot}
+install -d -m 0755 %{buildroot}%{_datadir}/applications
+install -D -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/applications/ntk-fluid.desktop
 rm %{buildroot}%{_libdir}/libntk*.a*

+%ldconfig_scriptlets
+ 
 %check
-# Validate desktop files
 desktop-file-validate %{buildroot}%{_datadir}/applications/ntk-fluid.desktop
-desktop-file-validate %{buildroot}%{_datadir}/applications/ntk-chtheme.desktop
-
-# Validate appdata
-appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/ntk-fluid.appdata.xml

 %files
-%doc README
-%license COPYING
-%{_libdir}/libntk*.so.1*
+%doc COPYING
+%{_libdir}/libntk*.so.*

 %files devel
 %{_libdir}/libntk.so
@ -107,71 +83,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/ntk-fluid.appd

 %files fluid
 %{_datadir}/applications/ntk-fluid.desktop
-%{_datadir}/applications/ntk-chtheme.desktop
-%{_metainfodir}/ntk-fluid.appdata.xml
 %{_bindir}/ntk-*

 %changelog
-* Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1000-0.18.20190925gitdae1771
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1000-0.17.20190925gitdae1771
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1000-0.16.20190925gitdae1771
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1000-0.15.20190925gitdae1771
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1000-0.14.20190925gitdae1771
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Wed Jul 10 2024 Guido Aulisi <guido.aulisi@inps.it> - 1.3.1000-0.13.20190925gitdae1771
- Fix FTBFS with python 3.14
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1000-0.12.20190925gitdae1771
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1000-0.11.20190925gitdae1771
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1000-0.10.20190925gitdae1771
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1000-0.9.20190925gitdae1771
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1000-0.8.20190925gitdae1771
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1000-0.7.20190925gitdae1771
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1000-0.6.20190925gitdae1771
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1000-0.5.20190925gitdae1771
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1000-0.4.20190925gitdae1771
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1000-0.3.20190925gitdae1771
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jan 08 2020 Guido Aulisi <guido.aulisi@gmail.com> - 1.3.1000-0.2.20190925gitdae1771
- Add appdata for ntk-fluid
- Add desktop file for ntk-chtheme
- Correctly glob shared libraries
- Document patches
-
-* Sun Jan 05 2020 Guido Aulisi <guido.aulisi@gmail.com> - 1.3.1000-0.1.20190925gitdae1771
- Unretire non-ntk
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-0.17.20130730gitd006352
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-0.16.20130730gitd006352
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

--- a/ntk-chtheme.desktop
+++ b/ntk-chtheme.desktop
@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=NTK CHTHEME
-Comment=NTK GUI Theme Chooser
-Exec=ntk-chtheme
-Terminal=false
-Type=Application
-Categories=Development;GUIDesigner;
--- a/ntk-fluid.appdata.xml
+++ b/ntk-fluid.appdata.xml
@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
-  <id>ntk-fluid.desktop</id>
-  <name>ntk-fluid</name>
-  <summary>Fast Light User Interface Designer</summary>
-  <developer_name></developer_name>
-  <description>
-  <p>Fast Light User Interface Designer, an interactive GUI designer for non-ntk</p>
-  </description>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-2.0+ and LGPLv2+</project_license>
-  <url type="bugtracker">https://github.com/original-male/non/issues</url>
-  <url type="help">http://non.tuxfamily.org/wiki/HomePage</url>
-  <url type="homepage">http://non.tuxfamily.org/</url>
-  <screenshots>
-    <screenshot type="default">
-      <caption/>
-      <image height="685" width="1027">https://www.fltk.org/images/fluid-flphoto.png</image>
-    </screenshot>
-  </screenshots>
-</component>
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (non-ntk-20190925-gitdae1771.1.tar.xz) = c7eea504be3cd965feaf867bea25586f6cba07e267ae0acd1de66e77cccfafbc01bb3a018f79cbe546abe836cc839259c9a9201204a2b9ab2a8fbd1083648a8e
+02be15c5c99f97c2ca68b4fc962bf2a8  non-ntk-20130730-gitd006352.tar.bz2