Re: audio/solfege: update and move to python3/gtk3

2020-11-08 Thread Brian Callahan


On Sunday, November 8, 2020 9:51 AM, Jeremie Courreges-Anglas  
wrote:

> cc'ing bcallah@, spotted in cvs log, and ajacoutot@ because py-gtk2
>
> The current solfege port seems unstable (lots of errors at runtime).
> This update seems to work more reliably in my limited testing.
> Moving to python3 and gtk3 instead of py-gtk2 is the reason why I took
> a look.
>
> Neither xsltproc, docbook or swig seem to create problems when detected
> at configure time.
>
> ok?

OK for me. Thanks.

~Brian



Re: audio/solfege: update and move to python3/gtk3

2020-11-08 Thread Antoine Jacoutot
On Sun, Nov 08, 2020 at 03:51:14PM +0100, Jeremie Courreges-Anglas wrote:
> 
> cc'ing bcallah@, spotted in cvs log, and ajacoutot@ because py-gtk2
> 
> The current solfege port seems unstable (lots of errors at runtime).
> This update seems to work more reliably in my limited testing.
> Moving to python3 and gtk3 instead of py-gtk2 is the reason why I took
> a look.
> 
> Neither xsltproc, docbook or swig seem to create problems when detected
> at configure time.
> 
> ok?

I don't use this but ports wise, OK.
Thanks :-)

> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/solfege/Makefile,v
> retrieving revision 1.10
> diff -u -p -r1.10 Makefile
> --- Makefile  12 Jul 2019 20:43:41 -  1.10
> +++ Makefile  8 Nov 2020 10:37:10 -
> @@ -1,12 +1,14 @@
>  # $OpenBSD: Makefile,v 1.10 2019/07/12 20:43:41 sthen Exp $
>  
> +BROKEN-hppa =SIGILL when running lilypond
> +
>  COMMENT =solfege and ear training program
> -DISTNAME =   solfege-3.22.2
> +
> +DISTNAME =   solfege-3.23.4
> +
>  CATEGORIES = audio x11
> -BROKEN-hppa =SIGILL when running lilypond
> -REVISION =   2
>  
> -HOMEPAGE =   http://www.solfege.org/
> +HOMEPAGE =   https://www.solfege.org/
>  
>  # GPLv3+
>  PERMIT_PACKAGE = Yes
> @@ -14,22 +16,26 @@ PERMIT_PACKAGE =  Yes
>  MASTER_SITES =   ${MASTER_SITE_SOURCEFORGE:=solfege/}
>  
>  MODULES =lang/python
> +MODPY_VERSION =  ${MODPY_DEFAULT_VERSION_3}
>  
>  BUILD_DEPENDS =  devel/gettext,-tools \
> + devel/py-gobject3 \
>   print/lilypond,-main \
>   sysutils/coreutils \
> - x11/py-gtk2
> + textproc/txt2man
>  
>  RUN_DEPENDS =audio/lame \
>   audio/mpg123 \
>   timidity-*|fluidsynth-*:audio/timidity \
>   audio/vorbis-tools \
>   devel/desktop-file-utils \
> - x11/py-gtk2
> + devel/py-gobject3 \
> + x11/gtk+3
>  
>  CONFIGURE_STYLE =gnu
>  
>  USE_GMAKE =  Yes
> +ALL_TARGET =
>  
>  FAKE_FLAGS = sysconfdir=${LOCALBASE}/share/examples/solfege
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/audio/solfege/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo  28 Oct 2013 15:36:03 -  1.3
> +++ distinfo  8 Nov 2020 10:37:10 -
> @@ -1,2 +1,2 @@
> -SHA256 (solfege-3.22.2.tar.gz) = 5GoJYMg+SZjZ3Pe7B7gmngP8gfq2xEhfgRLFo+ZIj+Q=
> -SIZE (solfege-3.22.2.tar.gz) = 6890977
> +SHA256 (solfege-3.23.4.tar.gz) = t6JJxgGk5hpN76o9snxtM07tkYnwpQ808M/8Ttw+gWk=
> +SIZE (solfege-3.23.4.tar.gz) = 5148412
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/audio/solfege/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- pkg/PLIST 27 Jun 2018 21:03:37 -  1.3
> +++ pkg/PLIST 8 Nov 2020 10:37:10 -
> @@ -5,6 +5,7 @@ share/applications/solfege.desktop
>  share/examples/solfege/
>  share/examples/solfege/solfege
>  @sample ${SYSCONFDIR}/solfege
> +share/locale/ca/LC_MESSAGES/solfege.mo
>  share/locale/cs/LC_MESSAGES/solfege.mo
>  share/locale/da/LC_MESSAGES/solfege.mo
>  share/locale/de/LC_MESSAGES/solfege.mo
> @@ -65,9 +66,9 @@ share/solfege/exercises/standard/lesson-
>  share/solfege/exercises/standard/lesson-files/compare-intervals-harmonic
>  share/solfege/exercises/standard/lesson-files/compare-intervals-harmonic-10
>  share/solfege/exercises/standard/lesson-files/compare-intervals-harmonic-2
> -share/solfege/exercises/standard/lesson-files/compare-intervals-harmonic-2-3
> +share/solfege/exercises/standard/lesson-files/compare-intervals-harmonic-2${MODPY_BIN_SUFFIX}
>  
> share/solfege/exercises/standard/lesson-files/compare-intervals-harmonic-2-to-8
> -share/solfege/exercises/standard/lesson-files/compare-intervals-harmonic-3
> +share/solfege/exercises/standard/lesson-files/compare-intervals-harmonic${MODPY_BIN_SUFFIX}
>  share/solfege/exercises/standard/lesson-files/compare-intervals-harmonic-4-5
>  
> share/solfege/exercises/standard/lesson-files/compare-intervals-harmonic-4-5-8
>  share/solfege/exercises/standard/lesson-files/compare-intervals-harmonic-6
> @@ -79,9 +80,9 @@ share/solfege/exercises/standard/lesson-
>  share/solfege/exercises/standard/lesson-files/compare-intervals-melodic
>  share/solfege/exercises/standard/lesson-files/compare-intervals-melodic-10
>  share/solfege/exercises/standard/lesson-files/compare-intervals-melodic-2
> -share/solfege/exercises/standard/lesson-files/compare-intervals-melodic-2-3
> +share/solfege/exercises/standard/lesson-files/compare-intervals-melodic-2${MODPY_BIN_SUFFIX}
>  
> share/solfege/exercises/standard/lesson-files/compare-intervals-melodic-2-to-8
> -share/solfege/exercises/standard/lesson-files/compare-intervals-melodic-3
> 

audio/solfege: update and move to python3/gtk3

2020-11-08 Thread Jeremie Courreges-Anglas


cc'ing bcallah@, spotted in cvs log, and ajacoutot@ because py-gtk2

The current solfege port seems unstable (lots of errors at runtime).
This update seems to work more reliably in my limited testing.
Moving to python3 and gtk3 instead of py-gtk2 is the reason why I took
a look.

Neither xsltproc, docbook or swig seem to create problems when detected
at configure time.

ok?


Index: Makefile
===
RCS file: /cvs/ports/audio/solfege/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile12 Jul 2019 20:43:41 -  1.10
+++ Makefile8 Nov 2020 10:37:10 -
@@ -1,12 +1,14 @@
 # $OpenBSD: Makefile,v 1.10 2019/07/12 20:43:41 sthen Exp $
 
+BROKEN-hppa =  SIGILL when running lilypond
+
 COMMENT =  solfege and ear training program
-DISTNAME = solfege-3.22.2
+
+DISTNAME = solfege-3.23.4
+
 CATEGORIES =   audio x11
-BROKEN-hppa =  SIGILL when running lilypond
-REVISION = 2
 
-HOMEPAGE = http://www.solfege.org/
+HOMEPAGE = https://www.solfege.org/
 
 # GPLv3+
 PERMIT_PACKAGE =   Yes
@@ -14,22 +16,26 @@ PERMIT_PACKAGE =Yes
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=solfege/}
 
 MODULES =  lang/python
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
 
 BUILD_DEPENDS =devel/gettext,-tools \
+   devel/py-gobject3 \
print/lilypond,-main \
sysutils/coreutils \
-   x11/py-gtk2
+   textproc/txt2man
 
 RUN_DEPENDS =  audio/lame \
audio/mpg123 \
timidity-*|fluidsynth-*:audio/timidity \
audio/vorbis-tools \
devel/desktop-file-utils \
-   x11/py-gtk2
+   devel/py-gobject3 \
+   x11/gtk+3
 
 CONFIGURE_STYLE =  gnu
 
 USE_GMAKE =Yes
+ALL_TARGET =
 
 FAKE_FLAGS =   sysconfdir=${LOCALBASE}/share/examples/solfege
 
Index: distinfo
===
RCS file: /cvs/ports/audio/solfege/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo28 Oct 2013 15:36:03 -  1.3
+++ distinfo8 Nov 2020 10:37:10 -
@@ -1,2 +1,2 @@
-SHA256 (solfege-3.22.2.tar.gz) = 5GoJYMg+SZjZ3Pe7B7gmngP8gfq2xEhfgRLFo+ZIj+Q=
-SIZE (solfege-3.22.2.tar.gz) = 6890977
+SHA256 (solfege-3.23.4.tar.gz) = t6JJxgGk5hpN76o9snxtM07tkYnwpQ808M/8Ttw+gWk=
+SIZE (solfege-3.23.4.tar.gz) = 5148412
Index: pkg/PLIST
===
RCS file: /cvs/ports/audio/solfege/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   27 Jun 2018 21:03:37 -  1.3
+++ pkg/PLIST   8 Nov 2020 10:37:10 -
@@ -5,6 +5,7 @@ share/applications/solfege.desktop
 share/examples/solfege/
 share/examples/solfege/solfege
 @sample ${SYSCONFDIR}/solfege
+share/locale/ca/LC_MESSAGES/solfege.mo
 share/locale/cs/LC_MESSAGES/solfege.mo
 share/locale/da/LC_MESSAGES/solfege.mo
 share/locale/de/LC_MESSAGES/solfege.mo
@@ -65,9 +66,9 @@ share/solfege/exercises/standard/lesson-
 share/solfege/exercises/standard/lesson-files/compare-intervals-harmonic
 share/solfege/exercises/standard/lesson-files/compare-intervals-harmonic-10
 share/solfege/exercises/standard/lesson-files/compare-intervals-harmonic-2
-share/solfege/exercises/standard/lesson-files/compare-intervals-harmonic-2-3
+share/solfege/exercises/standard/lesson-files/compare-intervals-harmonic-2${MODPY_BIN_SUFFIX}
 share/solfege/exercises/standard/lesson-files/compare-intervals-harmonic-2-to-8
-share/solfege/exercises/standard/lesson-files/compare-intervals-harmonic-3
+share/solfege/exercises/standard/lesson-files/compare-intervals-harmonic${MODPY_BIN_SUFFIX}
 share/solfege/exercises/standard/lesson-files/compare-intervals-harmonic-4-5
 share/solfege/exercises/standard/lesson-files/compare-intervals-harmonic-4-5-8
 share/solfege/exercises/standard/lesson-files/compare-intervals-harmonic-6
@@ -79,9 +80,9 @@ share/solfege/exercises/standard/lesson-
 share/solfege/exercises/standard/lesson-files/compare-intervals-melodic
 share/solfege/exercises/standard/lesson-files/compare-intervals-melodic-10
 share/solfege/exercises/standard/lesson-files/compare-intervals-melodic-2
-share/solfege/exercises/standard/lesson-files/compare-intervals-melodic-2-3
+share/solfege/exercises/standard/lesson-files/compare-intervals-melodic-2${MODPY_BIN_SUFFIX}
 share/solfege/exercises/standard/lesson-files/compare-intervals-melodic-2-to-8
-share/solfege/exercises/standard/lesson-files/compare-intervals-melodic-3
+share/solfege/exercises/standard/lesson-files/compare-intervals-melodic${MODPY_BIN_SUFFIX}
 share/solfege/exercises/standard/lesson-files/compare-intervals-melodic-4-5
 share/solfege/exercises/standard/lesson-files/compare-intervals-melodic-4-5-8
 share/solfege/exercises/standard/lesson-files/compare-intervals-melodic-6
@@ -339,14 +340,15 @@ share/solfege/exercises/standard/lesson-