On Tue, 19 Mar 2019 14:39:43 +0100
Jeremie Courreges-Anglas <j...@wxcvbn.org> wrote:
> On Tue, Mar 19 2019, Charlene Wendling <juliana...@posteo.jp> wrote:
> > (i've snipped many things)
>
> [...]
>
> >> > patches/patch-src_qsynthChannelsForm_cpp
> >> > ===================================================================
> >> > RCS file: patches/patch-src_qsynthChannelsForm_cpp diff -N
> >> > patches/patch-src_qsynthChannelsForm_cpp
> >> > --- /dev/null 1 Jan 1970 00:00:00 -0000
> >> > +++ patches/patch-src_qsynthChannelsForm_cpp 18 Mar 2019
> >> > 22:58:05 -0000 @@ -0,0 +1,33 @@
> >> > +$OpenBSD$
> >> > +
> >> > +Index: src/qsynthChannelsForm.cpp
> >> > +--- src/qsynthChannelsForm.cpp.orig
> >> > ++++ src/qsynthChannelsForm.cpp
> >> > +@@ -256,11 +256,11 @@ void qsynthChannelsForm::updateChannel
> >> > ( int iChan )
> >> > + #ifdef CONFIG_FLUID_BANK_OFFSET
> >> > + int iSFID = 0;
> >> > + QString sSFName;
> >> > +- #ifdef CONFIG_FLUID_PRESET_GET_SFONT
> >> > ++ #ifdef CONFIG_FLUID_PRESET_GET_SFONT
> >> > + fluid_sfont_t *pSoundFont
> >> > = ::fluid_preset_get_sfont(pPreset); +- #else
> >> > ++ #else
> >> > + fluid_sfont_t *pSoundFont = pPreset->sfont;
> >> > +- #endif
> >> > ++ #endif
> >> > + if (pSoundFont) {
> >> > + #ifdef CONFIG_FLUID_SFONT_GET_ID
> >> > + iSFID
> >> > = ::fluid_sfont_get_id(pSoundFont);
> >>
> >> Is that hunk really needed?
> >
> > This is the only thing my diff doesn't address.
>
> As far as I can see, this hunk only adds a TAB to three lines and
> shouldn't affect semantics. I'd suggest to leave those lines alone.
>
Sebastian agreed as well out of band. Here is a new diff with
that change done.
Any objection left?
Charlène.
> Hah, nice. Thanks, ok jca@
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE
> 1524 E7EE
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/qsynth/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile 8 Mar 2019 20:00:40 -0000 1.6
+++ Makefile 19 Mar 2019 19:00:04 -0000
@@ -2,8 +2,7 @@
COMMENT = Qt GUI Interface for FluidSynth
-DISTNAME = qsynth-0.5.4
-REVISION = 0
+DISTNAME = qsynth-0.5.5
CATEGORIES = audio
@@ -16,22 +15,26 @@ PERMIT_PACKAGE_CDROM = Yes
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=qsynth/}
-WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Widgets X11 c
-WANTLIB += m fluidsynth Qt5X11Extras
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Widgets c
+WANTLIB += m fluidsynth GL Qt5Network curses readline
-MODULES = devel/cmake \
- x11/qt5
+.if ${MACHINE_ARCH} == "powerpc"
+WANTLIB += atomic
+.endif
-LIB_DEPENDS += audio/fluidsynth \
- x11/qt5/qtx11extras
+MODULES = x11/qt5
+
+LIB_DEPENDS += audio/fluidsynth
RUN_DEPENDS += devel/desktop-file-utils \
+ x11/gtk+3,-guic
+USE_GMAKE = Yes
NO_TEST = Yes
-BUILD_DEPENDS = audio/fluidsynth
+CONFIGURE_STYLE = gnu
-post-build:
- cp ${WRKSRC}/src/qsynth.desktop ${WRKBUILD}/src/
+CONFIGURE_ENV += CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
+ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib"
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/qsynth/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo 2 Jan 2019 21:56:15 -0000 1.4
+++ distinfo 19 Mar 2019 19:00:04 -0000
@@ -1,2 +1,2 @@
-SHA256 (qsynth-0.5.4.tar.gz) = LWvvtAI/imTzXYApkdDUE+EdAwfodIVCjJablLsr+E4=
-SIZE (qsynth-0.5.4.tar.gz) = 268106
+SHA256 (qsynth-0.5.5.tar.gz) = hY9SuVZCol9XA0LVz3+v0qKt24nVZ8W2ijVFvrb9pyM=
+SIZE (qsynth-0.5.5.tar.gz) = 269061
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile_in 19 Mar 2019 19:00:04 -0000
@@ -0,0 +1,32 @@
+$OpenBSD$
+
+Don't compress manpages, also install(1) has no -v option
+
+Index: Makefile.in
+--- Makefile.in.orig
++++ Makefile.in
+@@ -104,16 +104,18 @@ translations_lrelease: translations_lupdate $(translat
+
+ install: $(target) translations_lrelease $(name).1
+ @$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak install
+- @install -d -v -m 0755 $(DESTDIR)$(translations_dir)
+- @install -d -v -m 0755 $(DESTDIR)$(mandir)/man1
+- @install -v -m 0644 $(translations_targets)
$(DESTDIR)$(translations_dir)
+- @install -v -m 0644 $(name)*.1 $(DESTDIR)$(mandir)/man1
+- @gzip -vf $(DESTDIR)$(mandir)/man1/$(name)*.1
++ @install -d -m 0755 $(DESTDIR)$(translations_dir)
++ @install -d -m 0755 $(DESTDIR)$(mandir)/man1
++ @install -d -m 0755 $(DESTDIR)$(mandir)/fr/man1
++ @install -m 0644 $(translations_targets) $(DESTDIR)$(translations_dir)
++ @install -m 0644 $(name).1 $(DESTDIR)$(mandir)/man1
++ @install -m 0644 $(name).fr.1 $(DESTDIR)$(mandir)/fr/man1/$(name).1
+
+ uninstall: $(DESTDIR)$(prefix)/bin/$(name)
+ @$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak uninstall
+ @rm -rvf $(DESTDIR)$(translations_dir)
+- @rm -vf $(DESTDIR)$(mandir)/man1/$(name)*.1.gz
++ @rm -vf $(DESTDIR)$(mandir)/man1/$(name).1
++ @rm -vf $(DESTDIR)$(mandir)/fr/man1/$(name).1
+
+
+ clean: $(name).mak
Index: patches/patch-src_qsynthChannelsForm_cpp
===================================================================
RCS file: patches/patch-src_qsynthChannelsForm_cpp
diff -N patches/patch-src_qsynthChannelsForm_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_qsynthChannelsForm_cpp 19 Mar 2019 19:00:04 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Index: src/qsynthChannelsForm.cpp
+--- src/qsynthChannelsForm.cpp.orig
++++ src/qsynthChannelsForm.cpp
+@@ -290,10 +290,12 @@ void qsynthChannelsForm::updateChannel ( int iChan )
+ pItem->setText(QSYNTH_CHANNELS_PROG,
+ QString::number(iProg));
+ pItem->setText(QSYNTH_CHANNELS_NAME, sName);
++ #ifdef CONFIG_FLUID_BANK_OFFSET
+ pItem->setText(QSYNTH_CHANNELS_SFID,
+ QString::number(iSFID));
+ pItem->setText(QSYNTH_CHANNELS_SFNAME,
+ QFileInfo(sSFName).baseName());
++ #endif
+ // Make this a dirty-operation.
+ m_iDirtyCount++;
+ }
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/qsynth/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 26 Jul 2018 12:16:34 -0000 1.3
+++ pkg/PLIST 19 Mar 2019 19:00:04 -0000
@@ -1,14 +1,19 @@
@comment $OpenBSD: PLIST,v 1.3 2018/07/26 12:16:34 sebastia Exp $
@bin bin/qsynth
+man/fr/
+man/fr/man1/
+@man man/fr/man1/qsynth.1
+@man man/man1/qsynth.1
share/applications/qsynth.desktop
-share/pixmaps/
-share/pixmaps/qsynth.png
+share/icons/hicolor/32x32/apps/qsynth.png
+share/metainfo/
+share/metainfo/qsynth.appdata.xml
share/qsynth/
share/qsynth/translations/
share/qsynth/translations/qsynth_cs.qm
share/qsynth/translations/qsynth_de.qm
-share/qsynth/translations/qsynth_es.qm
share/qsynth/translations/qsynth_fr.qm
share/qsynth/translations/qsynth_ru.qm
share/qsynth/translations/qsynth_sr.qm
@tag update-desktop-database
+@tag gtk-update-icon-cache %D/share/icons/hicolor
