On Tue, 24 Oct 2017 22:31:47 +0200, Rafael Sadowski wrote:
> On Thu Sep 14, 2017 at 09:42:14PM +0200, Rafael Sadowski wrote:
> > Hi all.
> >
> > please find below a diff to update kguitar to the last commit on github.
> > Kguitar switch to Qt5. I request the github maintainer for a new release
> > tag.
> >
> > Starts fast and everything looks very good on amd64.
> >
> > Ok? Commenst?
> >
> > Best regards,
> >
> > Rafael Sadowski,
> >
> > ... Where there's a will there's a way. ;-)
> >
>
> Please find below the final diff to update kguitar.
>
> - remove EPOCH and add commit date as version number. (request by
> maintainer)
> - fix LIB_DEPENDS
> - fix org.kde.kguitar.desktop
>
> I hope that's all. Works fine on amd64 but I can't do anything with
> that.
>
> Best Regards,
>
> Rafael Sadowski
Works fine for me. ok.
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/multimedia/kguitar/Makefile,v
> retrieving revision 1.19
> diff -u -p -u -p -r1.19 Makefile
> --- Makefile 26 Jul 2017 22:45:27 -0000 1.19
> +++ Makefile 24 Oct 2017 20:24:37 -0000
> @@ -1,47 +1,57 @@
> # $OpenBSD: Makefile,v 1.19 2017/07/26 22:45:27 sthen Exp $
>
> -COMMENT = guitar tab editor
> +COMMENT = guitar tab editor
>
> -DISTNAME = kguitar-0.5.1
> -REVISION= 11
> +GH_ACCOUNT = pavelliavonau
> +GH_PROJECT = kguitar
> +GH_COMMIT = a7c73491ef236134de55cbdcfc9f8cafa2a76ae1
>
> -CATEGORIES = multimedia kde
> +# commit date YYYYMMDD
> +DISTNAME = ${GH_PROJECT}-20170809
>
> -HOMEPAGE = http://kguitar.sourceforge.net/
> +# override kf5
> +EXTRACT_SUFX = .tar.gz
>
> -MAINTAINER = Pascal Stumpf <pas...@stumpf.co>
> +CATEGORIES = multimedia
>
> -# GPLv2+; for MusicXML copyright see licenseMusicXML.html
> -PERMIT_PACKAGE_CDROM = Yes
> -
> -WANTLIB = ICE SM X11 Xext Xfixes Xrender Xt art_lgpl_2 c expat
> -WANTLIB += fontconfig freetype idn m png pthread ${COMPILER_LIBCXX} util
> -WANTLIB += xcb z fam pthread-stubs
> -WANTLIB += X11-xcb Xdamage Xxf86vm drm glapi xcb-dri2 xcb-glx
> -WANTLIB += ${KDE}/DCOP ${KDE}/kdecore ${KDE}/kdefx ${KDE}/kdeprint
> -WANTLIB += ${KDE}/kdesu ${KDE}/kdeui ${KDE}/kio ${KDE}/kparts
> -WANTLIB += ${KDE}/kwalletclient
> -
> -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=kguitar/}
> -EXTRACT_SUFX = .tar.bz2
> -
> -MODULES = devel/gettext \
> - x11/kde
> -LIB_DEPENDS = x11/kde/libs3
> -RUN_DEPENDS = x11/gtk+3,-guic
> -
> -CONFIGURE_STYLE = gnu
> -CONFIGURE_ARGS += --disable-midisupport \
> - --with-qt-dir="${LOCALBASE}" \
> - --with-qt-libraries="${LOCALBASE}/lib/qt3" \
> - --with-qt-includes="${LOCALBASE}/include/X11/qt3" \
> - --with-extra-libs="${LOCALBASE}/lib" \
> - --with-extra-includes="${LOCALBASE}/include"
> +HOMEPAGE = http://kguitar.sourceforge.net/
>
> -CONFIGURE_ENV = ${MODKDE_CONFIGURE_ENV}
> +MAINTAINER = KDE porting team <openbsd-...@googlegroups.com>
>
> -PORTHOME= ${WRKDIR}
> +# GPLv2+; for MusicXML copyright see licenseMusicXML.html
> +PERMIT_PACKAGE_CDROM = Yes
>
> -NO_TEST = Yes
> +WANTLIB += ${COMPILER_LIBCXX} KF5Auth KF5Codecs KF5Completion
> +WANTLIB += KF5ConfigCore KF5ConfigGui KF5ConfigWidgets KF5CoreAddons
> +WANTLIB += KF5I18n KF5JobWidgets KF5KIOCore KF5KIOWidgets KF5Parts
> +WANTLIB += KF5Service KF5SonnetUi KF5TextWidgets KF5WidgetsAddons
> +WANTLIB += KF5XmlGui Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5PrintSupport
> +WANTLIB += Qt5Widgets Qt5Xml c m
> +
> +MODULES = devel/cmake \
> + devel/kf5
> +
> +RUN_DEPENDS += devel/desktop-file-utils \
> + devel/gettext \
> + x11/gtk+3,-guic
> +
> +# kdelibs4support includes kdex.dtd which is necessary to generate docs
> +BUILD_DEPENDS += devel/kf5/kdoctools \
> + devel/kf5/kdelibs4support \
> + devel/gettext-tools
> +
> +LIB_DEPENDS = devel/kf5/kauth \
> + devel/kf5/kcodecs \
> + devel/kf5/kcompletion \
> + devel/kf5/kconfig \
> + devel/kf5/kcoreaddons \
> + devel/kf5/kconfigwidgets \
> + devel/kf5/ki18n \
> + devel/kf5/kio \
> + devel/kf5/ki18n \
> + devel/kf5/kparts \
> + devel/kf5/kservice \
> + devel/kf5/kxmlgui \
> + devel/kf5/sonnet
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/multimedia/kguitar/distinfo,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 distinfo
> --- distinfo 18 Jan 2015 03:14:34 -0000 1.2
> +++ distinfo 24 Oct 2017 20:24:37 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (kguitar-0.5.1.tar.bz2) = vhEevAQ4lN1gzzOPrkAtDF5L7PFuGkFIjhYeKLNt9O0=
> -SIZE (kguitar-0.5.1.tar.bz2) = 745758
> +SHA256 (kguitar-20170809-a7c73491.tar.gz) =
> NdTxwI1h1b/lgfrDrhglX5rZB75D3aX1dT6XAnSK/gY=
> +SIZE (kguitar-20170809-a7c73491.tar.gz) = 352046
> Index: patches/patch-Makefile_in
> ===================================================================
> RCS file: patches/patch-Makefile_in
> diff -N patches/patch-Makefile_in
> --- patches/patch-Makefile_in 31 Aug 2011 18:35:02 -0000 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,22 +0,0 @@
> -$OpenBSD: patch-Makefile_in,v 1.1.1.1 2011/08/31 18:35:02 landry Exp $
> ---- Makefile.in.orig Wed Jan 16 21:24:30 2008
> -+++ Makefile.in Tue Aug 23 14:59:40 2011
> -@@ -327,7 +327,7 @@ MAINTAINERCLEANFILES = subdirs configure.in acinclude.
> - SUBDIRS = $(TOPSUBDIRS)
> - #>- all: config.h
> - #>+ 1
> --all: docs-am config.h
> -+all: docs-am
> - $(MAKE) $(AM_MAKEFLAGS) all-recursive
> -
> - .SUFFIXES:
> -@@ -436,9 +436,6 @@ $(RECURSIVE_TARGETS):
> - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
> - || eval $$failcom; \
> - done; \
> -- if test "$$dot_seen" = "no"; then \
> -- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
> -- fi; test -z "$$fail"
> -
> - $(RECURSIVE_CLEAN_TARGETS):
> - @failcom='exit 1'; \
> Index: patches/patch-configure
> ===================================================================
> RCS file: patches/patch-configure
> diff -N patches/patch-configure
> --- patches/patch-configure 27 Aug 2012 09:34:42 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,33 +0,0 @@
> -$OpenBSD: patch-configure,v 1.2 2012/08/27 09:34:42 jasper Exp $
> ---- configure.orig Wed Jan 16 21:24:31 2008
> -+++ configure Tue Aug 23 14:28:39 2011
> -@@ -30012,16 +30012,16 @@ else
> - IFS=$kde_save_IFS
> -
> - for dir in $dirs; do
> -- if test -x "$dir/uic"; then
> -+ if test -x "$dir/uic3"; then
> - if test -n ""
> - then
> -- evalstr="$dir/uic 2>&1 "
> -+ evalstr="$dir/uic3 2>&1 "
> - if eval $evalstr; then
> -- kde_cv_path="$dir/uic"
> -+ kde_cv_path="$dir/uic3"
> - break
> - fi
> - else
> -- kde_cv_path="$dir/uic"
> -+ kde_cv_path="$dir/uic3"
> - break
> - fi
> - fi
> -@@ -30361,7 +30361,7 @@ if test "$kde_qtver" = 1; then
> - kde_check_lib="libkdecore.so"
> - else
> - kde_check_header="ksharedptr.h"
> -- kde_check_lib="libkio.so"
> -+ kde_check_lib="libkio.so.7.0"
> - fi
> -
> - if test -z ""; then
> Index: patches/patch-kguitar_convertgp3_cpp
> ===================================================================
> RCS file: patches/patch-kguitar_convertgp3_cpp
> diff -N patches/patch-kguitar_convertgp3_cpp
> --- patches/patch-kguitar_convertgp3_cpp 7 May 2017 02:16:45 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,13 +0,0 @@
> -$OpenBSD: patch-kguitar_convertgp3_cpp,v 1.1 2017/05/07 02:16:45 espie Exp $
> -
> -Index: kguitar/convertgp3.cpp
> ---- kguitar/convertgp3.cpp.orig
> -+++ kguitar/convertgp3.cpp
> -@@ -1,6 +1,7 @@
> - #include "convertgp3.h"
> - #include "settings.h"
> -
> -+#include <stdlib.h>
> - #include <qfile.h>
> - #include <qdatastream.h>
> -
> Index: patches/patch-kguitar_convertgtp_cpp
> ===================================================================
> RCS file: patches/patch-kguitar_convertgtp_cpp
> diff -N patches/patch-kguitar_convertgtp_cpp
> --- patches/patch-kguitar_convertgtp_cpp 7 May 2017 02:16:45 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,13 +0,0 @@
> -$OpenBSD: patch-kguitar_convertgtp_cpp,v 1.1 2017/05/07 02:16:45 espie Exp $
> -
> -Index: kguitar/convertgtp.cpp
> ---- kguitar/convertgtp.cpp.orig
> -+++ kguitar/convertgtp.cpp
> -@@ -3,6 +3,7 @@
> - #include <klocale.h>
> - #include <qfile.h>
> - #include <qdatastream.h>
> -+#include <stdlib.h>
> -
> - ConvertGtp::ConvertGtp(TabSong *song): ConvertBase(song)
> - {
> Index: patches/patch-kguitar_global_h
> ===================================================================
> RCS file: patches/patch-kguitar_global_h
> diff -N patches/patch-kguitar_global_h
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-kguitar_global_h 24 Oct 2017 20:24:37 -0000
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: kguitar/global.h
> +--- kguitar/global.h.orig
> ++++ kguitar/global.h
> +@@ -16,7 +16,7 @@ QString midi_patch_name(int);
> +
> + extern QString drum_abbr[128];
> +
> +-#ifndef _MSC_VER
> ++#if !defined(__clang__) && !defined(_MSC_VER)
> +
> + #pragma GCC diagnostic ignored "-Wsign-compare"
> + #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
> Index: patches/patch-kguitar_shell_org_kde_kguitar_desktop
> ===================================================================
> RCS file: patches/patch-kguitar_shell_org_kde_kguitar_desktop
> diff -N patches/patch-kguitar_shell_org_kde_kguitar_desktop
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-kguitar_shell_org_kde_kguitar_desktop 24 Oct 2017
> 20:24:37 -0000
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +fix: Could not parse file "org.kde.kguitar.desktop":
> +Key file does not have group ?Desktop Entry?
> +
> +Index: kguitar_shell/org.kde.kguitar.desktop
> +--- kguitar_shell/org.kde.kguitar.desktop.orig
> ++++ kguitar_shell/org.kde.kguitar.desktop
> +@@ -1,4 +1,4 @@
> +-[KDE Desktop Entry]
> ++[Desktop Entry]
> + Encoding=UTF-8
> + Name=KGuitar
> + Exec=kguitar %u -qwindowtitle "%c" %m
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/multimedia/kguitar/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 PLIST
> --- pkg/PLIST 22 Oct 2013 11:34:22 -0000 1.4
> +++ pkg/PLIST 24 Oct 2017 20:24:37 -0000
> @@ -1,93 +1,77 @@
> @comment $OpenBSD: PLIST,v 1.4 2013/10/22 11:34:22 zhuk Exp $
> @bin bin/kguitar
> -${KDE}/libkguitarpart.a
> -${KDE}/libkguitarpart.la
> -${KDE}/libkguitarpart.so
> -share/applnk/
> -share/applnk/Multimedia/
> -share/applnk/Multimedia/kguitar.desktop
> -share/apps.kde3/kguitar/
> -share/apps.kde3/kguitar/icons/
> -share/apps.kde3/kguitar/icons/hicolor/
> -share/apps.kde3/kguitar/icons/hicolor/16x16/
> -share/apps.kde3/kguitar/icons/hicolor/16x16/actions/
> -share/apps.kde3/kguitar/icons/hicolor/16x16/actions/chord.png
> -share/apps.kde3/kguitar/icons/hicolor/16x16/actions/keysig.png
> -share/apps.kde3/kguitar/icons/hicolor/16x16/actions/timesig.png
> -share/apps.kde3/kguitar/icons/hicolor/22x22/
> -share/apps.kde3/kguitar/icons/hicolor/22x22/actions/
> -share/apps.kde3/kguitar/icons/hicolor/22x22/actions/arc.png
> -share/apps.kde3/kguitar/icons/hicolor/22x22/actions/chord.png
> -share/apps.kde3/kguitar/icons/hicolor/22x22/actions/fx_bend.png
> -share/apps.kde3/kguitar/icons/hicolor/22x22/actions/fx_harmonic.png
> -share/apps.kde3/kguitar/icons/hicolor/22x22/actions/fx_legato.png
> -share/apps.kde3/kguitar/icons/hicolor/22x22/actions/fx_let_ring.png
> -share/apps.kde3/kguitar/icons/hicolor/22x22/actions/fx_palmmute.png
> -share/apps.kde3/kguitar/icons/hicolor/22x22/actions/fx_slide.png
> -share/apps.kde3/kguitar/icons/hicolor/22x22/actions/keysig.png
> -share/apps.kde3/kguitar/icons/hicolor/22x22/actions/melodyeditor.png
> -share/apps.kde3/kguitar/icons/hicolor/22x22/actions/note1.png
> -share/apps.kde3/kguitar/icons/hicolor/22x22/actions/note16.png
> -share/apps.kde3/kguitar/icons/hicolor/22x22/actions/note2.png
> -share/apps.kde3/kguitar/icons/hicolor/22x22/actions/note32.png
> -share/apps.kde3/kguitar/icons/hicolor/22x22/actions/note4.png
> -share/apps.kde3/kguitar/icons/hicolor/22x22/actions/note8.png
> -share/apps.kde3/kguitar/icons/hicolor/22x22/actions/rhythmer.png
> -share/apps.kde3/kguitar/icons/hicolor/22x22/actions/score.png
> -share/apps.kde3/kguitar/icons/hicolor/22x22/actions/timesig.png
> -share/apps.kde3/kguitar/icons/hicolor/32x32/
> -share/apps.kde3/kguitar/icons/hicolor/32x32/actions/
> -share/apps.kde3/kguitar/icons/hicolor/32x32/actions/keysig.png
> -share/apps.kde3/kguitar/icons/hicolor/32x32/actions/melodyeditor.png
> -share/apps.kde3/kguitar/icons/hicolor/64x64/
> -share/apps.kde3/kguitar/icons/hicolor/64x64/actions/
> -share/apps.kde3/kguitar/icons/hicolor/64x64/actions/keysig.png
> -share/apps.kde3/kguitar/icons/locolor/
> -share/apps.kde3/kguitar/icons/locolor/16x16/
> -share/apps.kde3/kguitar/icons/locolor/16x16/actions/
> -share/apps.kde3/kguitar/icons/locolor/16x16/actions/timesig.png
> -share/apps.kde3/kguitar/icons/locolor/22x22/
> -share/apps.kde3/kguitar/icons/locolor/22x22/actions/
> -share/apps.kde3/kguitar/icons/locolor/22x22/actions/deadnote.png
> -share/apps.kde3/kguitar/kguitar_part.rc
> -share/apps.kde3/kguitar/kguitar_shell.rc
> -share/apps.kde3/kguitar/pics/
> -share/apps.kde3/kguitar/pics/fret.png
> -share/apps.kde3/kguitar/pics/musixtex.png
> -share/apps.kde3/kguitar/pics/rosewood.jpg
> -share/apps.kde3/kguitar/pics/zerofret.png
> -share/doc/HTML.kde3/en/kguitar/
> -share/doc/HTML.kde3/en/kguitar/common
> -share/doc/HTML.kde3/en/kguitar/index.cache.bz2
> -share/doc/HTML.kde3/en/kguitar/index.docbook
> -share/doc/HTML.kde3/en/kguitar/let-ring-dead.png
> -share/doc/HTML.kde3/en/kguitar/let-ring-null.png
> -share/doc/HTML.kde3/en/kguitar/let-ring-other.png
> -share/doc/HTML.kde3/en/kguitar/multi-duration-staff.png
> -share/doc/HTML.kde3/en/kguitar/songview.png
> +lib/qt5/plugins/libkguitarpart.so
> +share/applications/org.kde.kguitar.desktop
> +share/applications/org.kde.kguitar_part.desktop
> +share/doc/HTML/
> +share/doc/HTML/en/
> +share/doc/HTML/en/kguitar/
> +share/doc/HTML/en/kguitar/index.cache.bz2
> +share/doc/HTML/en/kguitar/index.docbook
> +share/doc/HTML/en/kguitar/let-ring-dead.png
> +share/doc/HTML/en/kguitar/let-ring-null.png
> +share/doc/HTML/en/kguitar/let-ring-other.png
> +share/doc/HTML/en/kguitar/multi-duration-staff.png
> +share/doc/HTML/en/kguitar/songview.png
> share/icons/hicolor/128x128/apps/kguitar.png
> +share/icons/hicolor/16x16/actions/chord.png
> +share/icons/hicolor/16x16/actions/keysig.png
> +share/icons/hicolor/16x16/actions/timesig.png
> share/icons/hicolor/16x16/apps/kguitar.png
> +share/icons/hicolor/16x16/mimetypes/kguitar_tab.png
> +share/icons/hicolor/22x22/actions/arc.png
> +share/icons/hicolor/22x22/actions/chord.png
> +share/icons/hicolor/22x22/actions/fx_bend.png
> +share/icons/hicolor/22x22/actions/fx_harmonic.png
> +share/icons/hicolor/22x22/actions/fx_legato.png
> +share/icons/hicolor/22x22/actions/fx_let_ring.png
> +share/icons/hicolor/22x22/actions/fx_palmmute.png
> +share/icons/hicolor/22x22/actions/fx_slide.png
> +share/icons/hicolor/22x22/actions/keysig.png
> +share/icons/hicolor/22x22/actions/melodyeditor.png
> +share/icons/hicolor/22x22/actions/note1.png
> +share/icons/hicolor/22x22/actions/note16.png
> +share/icons/hicolor/22x22/actions/note2.png
> +share/icons/hicolor/22x22/actions/note32.png
> +share/icons/hicolor/22x22/actions/note4.png
> +share/icons/hicolor/22x22/actions/note8.png
> +share/icons/hicolor/22x22/actions/rhythmer.png
> +share/icons/hicolor/22x22/actions/score.png
> +share/icons/hicolor/22x22/actions/timesig.png
> +share/icons/hicolor/32x32/actions/keysig.png
> +share/icons/hicolor/32x32/actions/melodyeditor.png
> share/icons/hicolor/32x32/apps/kguitar.png
> share/icons/hicolor/32x32/mimetypes/kguitar_tab.png
> share/icons/hicolor/48x48/apps/kguitar.png
> share/icons/hicolor/48x48/mimetypes/kguitar_tab.png
> +share/icons/hicolor/64x64/actions/keysig.png
> share/icons/hicolor/64x64/apps/kguitar.png
> share/icons/locolor/
> share/icons/locolor/16x16/
> +share/icons/locolor/16x16/actions/
> +share/icons/locolor/16x16/actions/timesig_lo.png
> share/icons/locolor/16x16/apps/
> -share/icons/locolor/16x16/apps/kguitar.png
> -share/icons/locolor/16x16/mimetypes/
> -share/icons/locolor/16x16/mimetypes/kguitar_tab.png
> +share/icons/locolor/16x16/apps/kguitar_lo.png
> +share/icons/locolor/22x22/
> +share/icons/locolor/22x22/actions/
> +share/icons/locolor/22x22/actions/deadnote_lo.png
> share/icons/locolor/32x32/
> share/icons/locolor/32x32/apps/
> -share/icons/locolor/32x32/apps/kguitar.png
> -share/locale/de/LC_MESSAGES/kguitar.mo
> -share/locale/es/LC_MESSAGES/kguitar.mo
> -share/locale/fr/LC_MESSAGES/kguitar.mo
> -share/locale/it/LC_MESSAGES/kguitar.mo
> -share/locale/ru/LC_MESSAGES/kguitar.mo
> -share/mimelnk/application/x-kguitar.desktop
> -share/services/kguitar_part.desktop
> +share/icons/locolor/32x32/apps/kguitar_lo.png
> +share/kguitar/
> +share/kguitar/pics/
> +share/kguitar/pics/fret.png
> +share/kguitar/pics/musixtex.png
> +share/kguitar/pics/rosewood.jpg
> +share/kguitar/pics/zerofret.png
> +share/kxmlgui5/
> +share/kxmlgui5/kguitar/
> +share/kxmlgui5/kguitar/kguitar_konq.rc
> +share/kxmlgui5/kguitar/kguitar_shell.rc
> +share/kxmlgui5/kguitarpart/
> +share/kxmlgui5/kguitarpart/kguitar_part.rc
> +@exec %D/bin/update-desktop-database
> +@unexec-delete %D/bin/update-desktop-database
> @exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
> @unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
> @exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/locolor
