[packages/denemo] - added fixes for gcc 14

qboosh qboosh at pld-linux.org
Tue Sep 24 18:13:56 CEST 2024


commit 14b71d684e5390bc9c906b9fc8bd7ad33858886f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Sep 24 18:17:00 2024 +0200

    - added fixes for gcc 14

 denemo-evince.patch   | 22 ++++++++++++++++++++++
 denemo-includes.patch | 19 +++++++++++++++++++
 denemo.spec           |  4 ++++
 3 files changed, 45 insertions(+)
---
diff --git a/denemo.spec b/denemo.spec
index a493a70..78d16ee 100644
--- a/denemo.spec
+++ b/denemo.spec
@@ -21,6 +21,8 @@ Source0:	https://ftp.gnu.org/gnu/denemo/%{name}-%{version}.tar.gz
 # Source0-md5:	3267b27350e7a103cd809012aeb15e43
 Patch0:		%{name}-fontsdir.patch
 Patch1:		guile3.0.patch
+Patch2:		%{name}-includes.patch
+Patch3:		%{name}-evince.patch
 URL:		https://www.denemo.org/
 %{?with_alsa:BuildRequires:	alsa-lib-devel >= 1.0.0}
 %{?with_aubio:BuildRequires:	aubio-devel >= 0.4.0}
@@ -79,6 +81,8 @@ ale może być zaadaptowany do innych celów związanych z muzyką.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %{__intltoolize}
diff --git a/denemo-evince.patch b/denemo-evince.patch
new file mode 100644
index 0000000..ba4a498
--- /dev/null
+++ b/denemo-evince.patch
@@ -0,0 +1,22 @@
+--- denemo-2.6.0/src/source/proof.c.orig	2022-03-11 13:15:53.614541275 +0100
++++ denemo-2.6.0/src/source/proof.c	2024-09-24 06:19:38.994756909 +0200
+@@ -279,8 +279,7 @@ press (EvView * view,  GdkEventButton  *
+     if (event->button != 1)
+         infodialog (help_text);
+     nearest_annotation_text = NULL;
+-    extern EvMappingList * ev_document_annotations_get_annotations();
+-    EvMappingList *mapping_list = ev_document_annotations_get_annotations (doc, ev_document_get_page(doc, i));
++    EvMappingList *mapping_list = ev_document_annotations_get_annotations (EV_DOCUMENT_ANNOTATIONS(doc), ev_document_get_page(doc, i));
+     if(mapping_list)
+     {
+     gdouble nearest = G_MAXDOUBLE;
+@@ -312,8 +311,7 @@ find_annotated_pages (EvDocumentModel *m
+     gint i;
+     for (i=0; i< ev_document_get_n_pages(doc);i++)
+         {
+-            extern EvMappingList * ev_document_annotations_get_annotations();
+-            EvMappingList *mapping_list = ev_document_annotations_get_annotations (doc, ev_document_get_page(doc, i));
++            EvMappingList *mapping_list = ev_document_annotations_get_annotations (EV_DOCUMENT_ANNOTATIONS(doc), ev_document_get_page(doc, i));
+             if(mapping_list)
+             {
+              annotated_pages = g_list_append (annotated_pages, GINT_TO_POINTER(i));
diff --git a/denemo-includes.patch b/denemo-includes.patch
new file mode 100644
index 0000000..493c91b
--- /dev/null
+++ b/denemo-includes.patch
@@ -0,0 +1,19 @@
+--- denemo-2.6.0/libs/libsffile/sffile.c.orig	2022-03-11 13:15:53.387874374 +0100
++++ denemo-2.6.0/libs/libsffile/sffile.c	2024-09-23 21:51:38.213427652 +0200
+@@ -20,6 +20,7 @@
+  *================================================================*/
+ //Interface to Denemo License:  FSF GPL version 3 or later
+ 
++#include <ctype.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
+@@ -51,7 +52,7 @@ static void ConvertIllegalChar(char *nam
+ int  ParseSoundfont(char *soundfont, int index, char **name, int *preset, int *bank) {
+   FILE *fp;
+   static SFInfo sf;
+-  static initialized = FALSE;
++  static int initialized = FALSE;
+   int i;
+   int number = 0;
+   if(soundfont) {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/denemo.git/commitdiff/14b71d684e5390bc9c906b9fc8bd7ad33858886f



More information about the pld-cvs-commit mailing list