diff --git a/0001-build-fix-gcc-warning-for-handle_text_input-function.patch b/0001-build-fix-gcc-warning-for-handle_text_input-function.patch deleted file mode 100644 index c61844d..0000000 --- a/0001-build-fix-gcc-warning-for-handle_text_input-function.patch +++ /dev/null @@ -1,39 +0,0 @@ -From f3969bdd83f1d16a8cd1b78ed68b485b2e25d404 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Wed, 29 May 2024 21:19:15 +0200 -Subject: [PATCH] build: fix gcc warning for handle_text_input functions - -page_loadinst.c: In function "file_list_handle_text_input": -page_loadinst.c:383:1: error: control reaches end of non-void function [-Werror=return-type] ---- - schism/page_loadinst.c | 1 + - schism/page_loadsample.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/schism/page_loadinst.c b/schism/page_loadinst.c -index 6b73cc74..9c209b87 100644 ---- a/schism/page_loadinst.c -+++ b/schism/page_loadinst.c -@@ -380,6 +380,7 @@ static int file_list_handle_text_input(const uint8_t* text) { - return 1; - } - } -+ return 0; - } - - static int file_list_handle_key(struct key_event * k) -diff --git a/schism/page_loadsample.c b/schism/page_loadsample.c -index 448913ee..00bcb43c 100644 ---- a/schism/page_loadsample.c -+++ b/schism/page_loadsample.c -@@ -639,6 +639,7 @@ static int file_list_handle_text_input(const uint8_t* text) { - return 1; - } - } -+ return 0; - } - - static int file_list_handle_key(struct key_event * k) --- -2.45.1 - diff --git a/20240529.tar.gz b/20240529.tar.gz deleted file mode 100644 index b5791da..0000000 --- a/20240529.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:73c475b3344c460cbc543878f8c728af3c62fba11211604834d880c0a41a506e -size 1047955 diff --git a/20240609.tar.gz b/20240609.tar.gz new file mode 100644 index 0000000..be21ba6 --- /dev/null +++ b/20240609.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8c4b13de65c0fb25b264d89080154f3c5b66785b295c3a859ba7b4fda55794c +size 1071090 diff --git a/schism-deptrack.diff b/schism-deptrack.diff index c67db13..6343a0b 100644 --- a/schism-deptrack.diff +++ b/schism-deptrack.diff @@ -11,23 +11,23 @@ Anyway, create the directory beforehand. configure.ac | 1 + 2 files changed, 2 insertions(+) -Index: schismtracker-20220125/Makefile.am +Index: schismtracker-20240609/Makefile.am =================================================================== ---- schismtracker-20220125.orig/Makefile.am -+++ schismtracker-20220125/Makefile.am -@@ -147,6 +147,7 @@ CLEANFILES = \ +--- schismtracker-20240609.orig/Makefile.am ++++ schismtracker-20240609/Makefile.am +@@ -149,6 +149,7 @@ CLEANFILES = \ auto/helptext.c auto/default-font.c: Makefile.am scripts/bin2h.sh scripts/build-font.sh $(fonts) + ${MKDIR_P} auto sh $(srcdir)/scripts/build-font.sh $(srcdir) $(fonts) >$@ - auto/helptext.c: Makefile.am scripts/genhelp.py $(helptexts) - $(PYTHON) $(srcdir)/scripts/genhelp.py $(srcdir) $(helptexts) >$@ -Index: schismtracker-20220125/configure.ac + + auto/helptext.c: Makefile.am scripts/genhelp.pl $(helptexts) +Index: schismtracker-20240609/configure.ac =================================================================== ---- schismtracker-20220125.orig/configure.ac -+++ schismtracker-20220125/configure.ac -@@ -38,6 +38,7 @@ AM_PROG_CC_C_O +--- schismtracker-20240609.orig/configure.ac ++++ schismtracker-20240609/configure.ac +@@ -111,6 +111,7 @@ AM_PROG_CC_C_O AC_PROG_CPP AC_PROG_INSTALL AC_PROG_LN_S diff --git a/schismtracker.changes b/schismtracker.changes index 10b3240..d8410fa 100644 --- a/schismtracker.changes +++ b/schismtracker.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Sun Jun 9 11:04:48 UTC 2024 - Jan Engelhardt + +- Update to release 20240609 + * Fix saving 16-bit and/or stereo FLAC samples + * Attempt to convert song messages from Modplug/OpenMPT IT + files. + * Expand the file and directory listings in the Load/Save + Module screens to actually make use of wasted space. It + didn't even look like IT did anyway. + * File listings should now support paths with Unicode out of + the box and will fall back to interpreting the raw characters + if that fails. + * Reimplement key repeat configuration + * Allow copying and pasting palette settings to the clipboard + and actually save them when applied + * Fix saving the module's Schism version + * Fix issues with the implementation that would have caused + it to break after the Epochalypse +- Delete 0001-build-fix-gcc-warning-for-handle_text_input-function.patch + (merged) + ------------------------------------------------------------------- Wed May 29 17:55:33 UTC 2024 - Jan Engelhardt diff --git a/schismtracker.spec b/schismtracker.spec index 2cfb0eb..6caf8a5 100644 --- a/schismtracker.spec +++ b/schismtracker.spec @@ -17,7 +17,7 @@ Name: schismtracker -Version: 20240529 +Version: 20240609 Release: 0 Summary: Music editor that matches the look and feel of Impulse Tracker License: GPL-2.0-or-later @@ -29,7 +29,6 @@ Source2: %name.desktop Patch1: schism-alsa.diff Patch2: schism-nodate.diff Patch3: schism-deptrack.diff -Patch4: 0001-build-fix-gcc-warning-for-handle_text_input-function.patch BuildRequires: alsa-devel BuildRequires: autoconf BuildRequires: automake