gregorio: bump to version 6.1.0

This commit is contained in:
Joachim Mairböck
2025-03-16 14:13:50 +01:00
parent b45003ff3d
commit 1584bedd2f
2 changed files with 47 additions and 9 deletions

View File

@@ -3,11 +3,11 @@ DESCRIPTION="Gregorio is a software application for engraving Gregorian Chant sc
computer. Gregorio's main job is to convert a gabc file (simple text representation of a score) \
into a GregorioTeX file, which makes TeX able to create a PDF of your score."
HOMEPAGE="http://gregorio-project.github.io/"
COPYRIGHT="2007-2021 The Gregorio Project"
COPYRIGHT="2007-2025 The Gregorio Project"
LICENSE="GNU GPL v3"
REVISION="1"
SOURCE_URI="https://github.com/gregorio-project/gregorio/releases/download/v$portVersion/gregorio-$portVersion.tar.bz2"
CHECKSUM_SHA256="e2a3da9cb760cfd3bd152440bbd40c1776be430de8f421dc21cee70ae48a63b2"
CHECKSUM_SHA256="7781843c3f454067e18236e27cfb593143fa0eff6f6df15482b163cb4a4f2ca4"
PATCHES="gregorio-$portVersion.patchset"
ARCHITECTURES="all"

View File

@@ -1,4 +1,4 @@
From a59bef58d9ddc54ad69f0ee802666804ae2fbc7b Mon Sep 17 00:00:00 2001
From d61281df40170267a5f6cadf6b0c83afa4192515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
Date: Fri, 23 Aug 2024 18:42:43 +0200
Subject: disable PIE, remove BRANCH_VERSION
@@ -9,7 +9,7 @@ Subject: disable PIE, remove BRANCH_VERSION
We build from a tarball, so remove that code entirely.
diff --git a/configure.ac b/configure.ac
index c43ef39..65f8ce5 100644
index 795ff47..664466f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,6 @@ dnl until flex gets their act together, use pedantic instead of pedantic-errors
@@ -20,19 +20,17 @@ index c43ef39..65f8ce5 100644
AX_CHECK_COMPILE_FLAG([-Wformat=2], [CFLAGS+=" -Wformat=2"])
AX_CHECK_COMPILE_FLAG([-Werror=format-security], [CFLAGS+=" -Werror=format-security"])
AX_CHECK_COMPILE_FLAG([-Wstrict-prototypes], [CFLAGS+=" -Wstrict-prototypes"])
@@ -55,10 +54,7 @@ AX_CHECK_COMPILE_FLAG([-Wextra], [CFLAGS+=" -Wextra"])
@@ -55,8 +54,6 @@ AX_CHECK_COMPILE_FLAG([-Wextra], [CFLAGS+=" -Wextra"])
AX_CHECK_COMPILE_FLAG([-Wno-gnu-statement-expression], [CFLAGS+=" -Wno-gnu-statement-expression"])
AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS+=" -Wl,-z,relro"])
AX_CHECK_LINK_FLAG([-Wl,-z,now], [LDFLAGS+=" -Wl,-z,now"])
-AX_CHECK_LINK_FLAG([-fPIE], [LDFLAGS+=" -fPIE"])
-AX_CHECK_LINK_FLAG([-pie], [LDFLAGS+=" -pie"])
-AC_HEADER_STDC
gl_FUNC_REALPATH_WORKS
diff --git a/src/Makefile.am b/src/Makefile.am
index 5059209..520352e 100644
index b5c1c2e..d9ffe27 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,25 +27,6 @@ gregorio__GREGORIO_EXE_SUFFIX__SOURCES = \
@@ -62,5 +60,45 @@ index 5059209..520352e 100644
gregorio__GREGORIO_EXE_SUFFIX__SOURCES += \
gabc/gabc-elements-determination.c gabc/gabc-write.c \
--
2.45.2
2.48.1
From d60f684cbec3e2cc39539598d8f4cf51e78ebebe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
Date: Sun, 16 Mar 2025 14:09:47 +0100
Subject: add Haiku build support
diff --git a/configure.ac b/configure.ac
index 664466f..9bc80a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,6 +117,7 @@ AC_CANONICAL_HOST
build_linux=no
build_windows=no
build_mac=no
+build_haiku=no
# Detect the target system
case "${host_os}" in
@@ -129,6 +130,9 @@ case "${host_os}" in
darwin*)
build_mac=yes
;;
+ haiku*)
+ build_haiku=yes
+ ;;
*)
AC_MSG_ERROR(["OS $host_os is not supported"])
;;
@@ -138,6 +142,7 @@ esac
AM_CONDITIONAL([LINUX], [test "$build_linux" = "yes"])
AM_CONDITIONAL([WINDOWS], [test "$build_windows" = "yes"])
AM_CONDITIONAL([MACOSX], [test "$build_mac" = "yes"])
+AM_CONDITIONAL([HAIKU], [test "$build_haiku" = "yes"])
AC_CONFIG_HEADERS([src/config_.h])
AC_CONFIG_FILES([
--
2.48.1