* [gentoo-commits] repo/gentoo:master commit in: media-sound/gmorgan/, media-sound/gmorgan/files/
@ 2020-09-04 11:57 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2020-09-04 11:57 UTC (permalink / raw
To: gentoo-commits
commit: 7b07d28a1cae63148a337171b08182d87090f281
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 4 11:57:34 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Sep 4 11:57:47 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b07d28a
media-sound/gmorgan: fixed compilation with clang
Closes: https://bugs.gentoo.org/740344
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/gmorgan/files/gmorgan-0.79-clang.patch | 13 +++++++++++++
media-sound/gmorgan/gmorgan-0.79-r1.ebuild | 3 ++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/media-sound/gmorgan/files/gmorgan-0.79-clang.patch b/media-sound/gmorgan/files/gmorgan-0.79-clang.patch
new file mode 100644
index 00000000000..fe687dad3c1
--- /dev/null
+++ b/media-sound/gmorgan/files/gmorgan-0.79-clang.patch
@@ -0,0 +1,13 @@
+diff --git a/src/NotGenerated.cxx b/src/NotGenerated.cxx
+index c2d6425..d7c6910 100644
+--- a/src/NotGenerated.cxx
++++ b/src/NotGenerated.cxx
+@@ -16139,7 +16139,7 @@ GMORGAN::cb_BPSave (Fl_Menu_ * o, void *v)
+ void GMORGAN::cb_BPPrint_i(Fl_Menu_*, void*) {
+ char *filename;
+ #define EXT ".ly"
+-filename=fl_file_chooser(gettext("Print Song:"),"(*"EXT")",NULL,0);
++filename=fl_file_chooser(gettext("Print Song:"),"(*" EXT ")",NULL,0);
+ if (filename==NULL) return;
+ filename=fl_filename_setext(filename,EXT);
+ #undef EXT
diff --git a/media-sound/gmorgan/gmorgan-0.79-r1.ebuild b/media-sound/gmorgan/gmorgan-0.79-r1.ebuild
index 1aaebf4e310..54db2b24697 100644
--- a/media-sound/gmorgan/gmorgan-0.79-r1.ebuild
+++ b/media-sound/gmorgan/gmorgan-0.79-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -25,6 +25,7 @@ PATCHES=(
"${FILESDIR}"/${P}-remove-dirs.patch
"${FILESDIR}"/${P}-remove-old-docs.patch
"${FILESDIR}"/${P}-gcc6.patch
+ "${FILESDIR}"/${P}-clang.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/gmorgan/, media-sound/gmorgan/files/
@ 2022-08-04 21:56 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2022-08-04 21:56 UTC (permalink / raw
To: gentoo-commits
commit: aa5c2cbdcb88e16b7de70f62427fc073b8c1b27e
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 4 21:55:48 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Aug 4 21:55:48 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa5c2cbd
media-sound/gmorgan: update EAPI 6 -> 8
Closes: https://bugs.gentoo.org/635680
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../gmorgan-0.79-remove-gettext-version-check.patch | 18 +++++++-----------
.../{gmorgan-0.79-r1.ebuild => gmorgan-0.79-r2.ebuild} | 16 ++++++++--------
2 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/media-sound/gmorgan/files/gmorgan-0.79-remove-gettext-version-check.patch b/media-sound/gmorgan/files/gmorgan-0.79-remove-gettext-version-check.patch
index 5a076a7ba2a8..430159271b65 100644
--- a/media-sound/gmorgan/files/gmorgan-0.79-remove-gettext-version-check.patch
+++ b/media-sound/gmorgan/files/gmorgan-0.79-remove-gettext-version-check.patch
@@ -5,22 +5,18 @@ Subject: [PATCH 1/3] Remove useless gettext version check
Fixes following error:
autopoint: *** Missing version: please specify in configure.ac through a line 'AM_GNU_GETTEXT_VERSION(x.yy.zz)' the gettext version the package is using
----
- configure.ac | 1 -
- 1 file changed, 1 deletion(-)
-diff --git a/configure.ac b/configure.ac
-index ed48b6f..f6ba2af 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -16,7 +16,6 @@ AC_HEADER_STDC
+@@ -16,9 +16,8 @@
AC_FUNC_SELECT_ARGTYPES
AC_CHECK_FUNCS([bzero memset select strdup])
AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION
- LIBS="`fltk-config --use-images --ldflags` -lasound"
- CXXFLAGS="-g `fltk-config --use-images --cxxflags`"
+-LIBS="`fltk-config --use-images --ldflags` -lasound"
+-CXXFLAGS="-g `fltk-config --use-images --cxxflags`"
++LIBS="$(fltk-config --use-images --ldflags) -lasound ${LIBS}"
++CXXFLAGS="$(fltk-config --use-images --cxxflags) ${CXXFLAGS}"
AC_CHECK_HEADERS([unistd.h])
---
-2.12.0
-
+ AC_CHECK_HEADER(alsa/asoundlib.h, true, AC_MSG_ERROR([Alsa is required]))
+ AC_PATH_PROG(FLTK_CONFIG, fltk-config, no)
diff --git a/media-sound/gmorgan/gmorgan-0.79-r1.ebuild b/media-sound/gmorgan/gmorgan-0.79-r2.ebuild
similarity index 80%
rename from media-sound/gmorgan/gmorgan-0.79-r1.ebuild
rename to media-sound/gmorgan/gmorgan-0.79-r2.ebuild
index 54db2b24697d..074f938d622c 100644
--- a/media-sound/gmorgan/gmorgan-0.79-r1.ebuild
+++ b/media-sound/gmorgan/gmorgan-0.79-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit autotools
@@ -14,10 +14,11 @@ SLOT="0"
KEYWORDS="amd64 x86"
IUSE="nls"
-RDEPEND="media-libs/alsa-lib
+RDEPEND="
+ media-libs/alsa-lib
x11-libs/fltk:1"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
PATCHES=(
"${FILESDIR}"/${P}-remove-gettext-version-check.patch
@@ -35,11 +36,10 @@ src_prepare() {
}
src_configure() {
- econf \
- $(use_enable nls)
+ econf $(use_enable nls)
}
src_install() {
default
- doman man/${PN}.1
+ doman man/gmorgan.1
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/gmorgan/, media-sound/gmorgan/files/
@ 2023-08-01 7:16 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2023-08-01 7:16 UTC (permalink / raw
To: gentoo-commits
commit: 688b950392c18c7a78f2e207f7220cdcd274e2d0
Author: Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Mon Jul 31 10:17:18 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Aug 1 07:15:26 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=688b9503
media-sound/gmorgan: Fix C++17 does not allow register storage class
Closes: https://bugs.gentoo.org/896430
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32119
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../gmorgan/files/gmorgan-0.79-clang16.patch | 182 +++++++++++++++++++++
media-sound/gmorgan/gmorgan-0.79-r3.ebuild | 46 ++++++
2 files changed, 228 insertions(+)
diff --git a/media-sound/gmorgan/files/gmorgan-0.79-clang16.patch b/media-sound/gmorgan/files/gmorgan-0.79-clang16.patch
new file mode 100644
index 000000000000..2571757244fb
--- /dev/null
+++ b/media-sound/gmorgan/files/gmorgan-0.79-clang16.patch
@@ -0,0 +1,182 @@
+Bug: https://bugs.gentoo.org/896430
+--- a/src/GMorgan.h
++++ b/src/GMorgan.h
+@@ -41,7 +41,7 @@ using namespace std;
+ #define MAGIC_TRACK 0x4d54726b
+
+ extern int Pexitprogram, espera, programa, vum, vumvum, tum, cambialo;
+-extern int vavi, pr, pr1, count, ulcount, canaledit, notplaying;
++extern int vavi, pr, pr1, count_t, ulcount, canaledit, notplaying;
+ extern int veloplus[65];
+ extern const char *FilePreset;
+ extern const char *FileDrums;
+--- a/src/NotGenerated.cxx
++++ b/src/NotGenerated.cxx
+@@ -9105,7 +9105,7 @@ GMORGAN::cb_PtBro_i (Fl_Browser *, void *)
+ else
+ {
+ gmo->sposi = 0;
+- count = 1;
++ count_t = 1;
+ gmo->negra = 0;
+ gmo->semi = 0;
+ gmo->ncompas = 0;
+@@ -24432,7 +24432,7 @@ GMORGAN::preparast ()
+ gmo->nfundi = 0;
+ gmo->ya = 0;
+ gmo->anticipa = 0;
+- count = 1;
++ count_t = 1;
+ gmo->negra = 0;
+ ulcount = 0;
+ N1->value (0);
+@@ -24792,7 +24792,7 @@ GMORGAN::PutStyle (int i)
+ else
+ {
+ gmo->sposi = 0;
+- count = 1;
++ count_t = 1;
+ gmo->negra = 0;
+ gmo->semi = 1;
+ gmo->ncompas = 0;
+@@ -26772,7 +26772,7 @@ GMORGAN::ActualizaEntrada ()
+ else
+ {
+ gmo->sposi = 0;
+- count = 1;
++ count_t = 1;
+ gmo->negra = 0;
+ gmo->semi = 1;
+ gmo->ncompas = 0;
+--- a/src/Stk.cpp
++++ b/src/Stk.cpp
+@@ -123,7 +123,7 @@ void Stk :: setRawwavePath( std::string path )
+
+ void Stk :: swap16(unsigned char *ptr)
+ {
+- register unsigned char val;
++ unsigned char val;
+
+ // Swap 1st and 2nd bytes
+ val = *(ptr);
+@@ -133,7 +133,7 @@ void Stk :: swap16(unsigned char *ptr)
+
+ void Stk :: swap32(unsigned char *ptr)
+ {
+- register unsigned char val;
++ unsigned char val;
+
+ // Swap 1st and 4th bytes
+ val = *(ptr);
+@@ -149,7 +149,7 @@ void Stk :: swap32(unsigned char *ptr)
+
+ void Stk :: swap64(unsigned char *ptr)
+ {
+- register unsigned char val;
++ unsigned char val;
+
+ // Swap 1st and 8th bytes
+ val = *(ptr);
+--- a/src/gmorgan.C
++++ b/src/gmorgan.C
+@@ -88,7 +88,7 @@ int
+ splashcounter,
+ clicksplash;
+ int
+- count,
++ count_t,
+ ulcount,
+ ponfin;
+ int
+@@ -184,7 +184,7 @@ GMO::GMO ()
+ tick = 0;
+ negra = 0;
+ ncompas = 0;
+- count = 0;
++ count_t = 0;
+ queue_id = 0;
+ elbar = 1;
+ HMode = 0;
+@@ -608,7 +608,7 @@ GMO::GMO ()
+ if (strlen (temp) > 2)
+ for (i = 0; i <= (int) strlen (temp) - 2; i++)
+ HelpFilename[i] = temp[i];
+- cout << "helpfile: " << HelpFilename << endl;
++ std::cout << "helpfile: " << HelpFilename << endl;
+ bzero (temp, sizeof (temp));
+ fgets (temp, sizeof temp, fs);
+ if (strlen (temp) > 2)
+@@ -712,14 +712,14 @@ GMO::organo ()
+ {
+ semi = 1;
+ negra++;
+- count++;
+- if (count >= Rt[sp].blackn + 1)
++ count_t++;
++ if (count_t >= Rt[sp].blackn + 1)
+ {
+ elbar++;
+ if (elbar > Rt[sp].bars)
+ elbar = 1;
+ negra = 0;
+- count = 1;
++ count_t = 1;
+ ncompas++;
+ sprintf (elbart, "%d", ncompas + 1);
+ //
+@@ -1246,7 +1246,7 @@ GMO::GeneraChord ()
+
+ if (bplay)
+ {
+- switch (count)
++ switch (count_t)
+ {
+ case 1:
+ strcpy (elacorde, S[nb].ch1);
+--- a/src/gmorgan.MIDIExport.C
++++ b/src/gmorgan.MIDIExport.C
+@@ -306,18 +306,18 @@ GMO::generatracks ()
+ }
+ for (neg = 1; neg <= SNomi; neg++)
+ {
+- count = neg;
++ count_t = neg;
+ if (MTempo)
+ MiraCambioTempoM (tcompas, neg);
+ GeneraChord ();
+ for (sem = 1; sem <= 4; sem++)
+ {
+- if ((S[nb].ar8 == 1) && (count == SNomi) && (sem == 3))
++ if ((S[nb].ar8 == 1) && (count_t == SNomi) && (sem == 3))
+ {
+ anticipa = 1;
+ GeneraChord ();
+ }
+- if ((S[nb].ar16 == 1) && (count == SNomi) && (sem == 4))
++ if ((S[nb].ar16 == 1) && (count_t == SNomi) && (sem == 4))
+ {
+ anticipa = 1;
+ GeneraChord ();
+--- a/src/main.C
++++ b/src/main.C
+@@ -195,9 +195,9 @@ LastBar = 1;
+ }
+
+ if (vumvum != vum) gmoUI->VUI1->value(vum);
+- if ((gmo.stst) && (ulcount != count))
++ if ((gmo.stst) && (ulcount != count_t))
+ {
+- ulcount = count;
++ ulcount = count_t;
+ int rvtempo = gmoUI->CTEMPO->value();
+ if (gmo.bplay != 1)
+ {
+@@ -219,7 +219,7 @@ LastBar = 1;
+ gmoUI->LightIt(nbar);
+ }
+ if (nbar > 127) nbar = 127;
+- switch(count)
++ switch(count_t)
+ {
+ case 1:
+ gmoUI->N1->setonly();
diff --git a/media-sound/gmorgan/gmorgan-0.79-r3.ebuild b/media-sound/gmorgan/gmorgan-0.79-r3.ebuild
new file mode 100644
index 000000000000..a9adb56a1c6f
--- /dev/null
+++ b/media-sound/gmorgan/gmorgan-0.79-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Opensource software rhythm station"
+HOMEPAGE="https://gmorgan.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gmorgan/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+ media-libs/alsa-lib
+ x11-libs/fltk:1"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-remove-gettext-version-check.patch
+ "${FILESDIR}"/${P}-manpages.patch
+ "${FILESDIR}"/${P}-remove-dirs.patch
+ "${FILESDIR}"/${P}-remove-old-docs.patch
+ "${FILESDIR}"/${P}-gcc6.patch
+ "${FILESDIR}"/${P}-clang.patch
+ "${FILESDIR}"/${P}-clang16.patch
+)
+
+src_prepare() {
+ default
+ sed -i -e "s#/usr/local/share/#/usr/share/#" src/gmorgan.chord.cpp || die
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable nls)
+}
+
+src_install() {
+ default
+ doman man/gmorgan.1
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-08-01 7:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-04 21:56 [gentoo-commits] repo/gentoo:master commit in: media-sound/gmorgan/, media-sound/gmorgan/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2023-08-01 7:16 Miroslav Šulc
2020-09-04 11:57 Miroslav Šulc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox