From 200fdf3ec7f5ca22ca441fa7ba63d8dfa29ff288351fa2e77dab93e2ee275550 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 29 May 2024 19:31:17 +0000 Subject: [PATCH] - Add 0001-build-fix-gcc-warning-for-file_list_handle_text_inpu.patch OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/schismtracker?expand=0&rev=79 --- ...rning-for-handle_text_input-function.patch | 39 +++++++++++++ schism-nodate.diff | 56 +++++-------------- schismtracker.changes | 1 + schismtracker.spec | 2 + 4 files changed, 55 insertions(+), 43 deletions(-) create mode 100644 0001-build-fix-gcc-warning-for-handle_text_input-function.patch 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 new file mode 100644 index 0000000..c61844d --- /dev/null +++ b/0001-build-fix-gcc-warning-for-handle_text_input-function.patch @@ -0,0 +1,39 @@ +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/schism-nodate.diff b/schism-nodate.diff index bdab6b4..c6d349a 100644 --- a/schism-nodate.diff +++ b/schism-nodate.diff @@ -8,49 +8,19 @@ encoded happens to be the current day. That is ok, since rpmlint uses just a heuristic - excessive rebuilds should not actually be happening. --- - schism/version.c | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) + schism/version.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -Index: schismtracker-20200412/schism/version.c +Index: schismtracker-20240529/schism/version.c =================================================================== ---- schismtracker-20200412.orig/schism/version.c -+++ schismtracker-20200412/schism/version.c -@@ -92,6 +92,10 @@ Information at our disposal: +--- schismtracker-20240529.orig/schism/version.c ++++ schismtracker-20240529/schism/version.c +@@ -52,7 +52,7 @@ static const char* top_banner_normal = + #if !defined(EMPTY_VERSION) + "Schism Tracker " VERSION + #else +- "Schism Tracker built " __DATE__ " " __TIME__ ++ "Schism Tracker built <>" + #endif + ; - */ - -+/* update whenever you checkout */ -+#define __HG_DATE__ "Apr 9 2011" -+#define __HG_TIME__ "00:00:00" /* screw this */ -+ - static int get_version_tm(struct tm *version) - { - char *ret; -@@ -101,10 +105,6 @@ static int get_version_tm(struct tm *ver - if (ret && !*ret) - return 1; - /* Argh. */ -- memset(version, 0, sizeof(*version)); -- ret = strptime(__DATE__, "%b %e %Y", version); -- if (ret && !*ret) -- return 1; - /* Give up; we don't know anything. */ - return 0; - } -@@ -118,7 +118,6 @@ void ver_init(void) - if (get_version_tm(&version)) { - version_sec = mktime(&version); - } else { -- printf("help, I am very confused about myself\n"); - version_sec = epoch_sec; - } - -@@ -134,7 +133,7 @@ void ver_init(void) - "Schism Tracker %s", ver); - } else { - snprintf(top_banner_normal, sizeof(top_banner_normal) - 1, -- "Schism Tracker built %s %s", __DATE__, __TIME__); -+ "Schism Tracker"); - } - - top_banner_normal[sizeof(top_banner_normal) - 1] = '\0'; /* to be sure */ diff --git a/schismtracker.changes b/schismtracker.changes index 41d652e..e3fdf19 100644 --- a/schismtracker.changes +++ b/schismtracker.changes @@ -10,6 +10,7 @@ Wed May 29 17:55:33 UTC 2024 - Jan Engelhardt * Fix Shift-Tab not being the same as in ImpulseTracker * Fix appearance of parent directories in file browsers when those directories do, in fact, not exist +- Add 0001-build-fix-gcc-warning-for-file_list_handle_text_inpu.patch ------------------------------------------------------------------- Sat May 25 09:10:32 UTC 2024 - Jan Engelhardt diff --git a/schismtracker.spec b/schismtracker.spec index cb12e53..2cfb0eb 100644 --- a/schismtracker.spec +++ b/schismtracker.spec @@ -29,6 +29,7 @@ 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 @@ -38,6 +39,7 @@ BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: python3-base BuildRequires: update-desktop-files +BuildRequires: pkgconfig(flac) BuildRequires: pkgconfig(sdl2) %description