Re: UPDATE: multimedia/kguitar
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 - 1.19
> +++ Makefile 24 Oct 2017 20:24:37 -
> @@ -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 MMDD
> +DISTNAME = ${GH_PROJECT}-20170809
>
> -HOMEPAGE = http://kguitar.sourceforge.net/
> +# override kf5
> +EXTRACT_SUFX = .tar.gz
>
> -MAINTAINER = Pascal Stumpf
> +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
>
> -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
> 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 - 1.2
> +++
Re: UPDATE: multimedia/kguitar
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
Index: Makefile
===
RCS file: /cvs/ports/multimedia/kguitar/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- Makefile26 Jul 2017 22:45:27 - 1.19
+++ Makefile24 Oct 2017 20:24:37 -
@@ -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 MMDD
+DISTNAME = ${GH_PROJECT}-20170809
-HOMEPAGE = http://kguitar.sourceforge.net/
+# override kf5
+EXTRACT_SUFX = .tar.gz
-MAINTAINER = Pascal Stumpf
+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
-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
Index: distinfo
===
RCS file: /cvs/ports/multimedia/kguitar/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo18 Jan 2015 03:14:34 - 1.2
+++ distinfo24 Oct 2017 20:24:37 -
@@ -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:
UPDATE: multimedia/kguitar
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. ;-)
Index: Makefile
===
RCS file: /cvs/ports/multimedia/kguitar/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- Makefile26 Jul 2017 22:45:27 - 1.19
+++ Makefile14 Sep 2017 19:18:05 -
@@ -1,47 +1,41 @@
# $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
+DISTNAME = ${GH_PROJECT}-0.5.1v0
-HOMEPAGE = http://kguitar.sourceforge.net/
+# override kf5
+EXTRACT_SUFX = .tar.gz
-MAINTAINER = Pascal Stumpf
+CATEGORIES = multimedia
+
+HOMEPAGE = http://kguitar.sourceforge.net/
+
+MAINTAINER = Pascal Stumpf
# 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"
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5DBus Qt5Gui Qt5Network
+WANTLIB += Qt5PrintSupport Qt5Widgets Qt5Xml c m
-CONFIGURE_ENV =${MODKDE_CONFIGURE_ENV}
+MODULES = devel/cmake \
+ devel/kf5
-PORTHOME= ${WRKDIR}
+RUN_DEPENDS += devel/desktop-file-utils \
+ devel/gettext \
+ x11/gtk+3,-guic
+
+BUILD_DEPENDS += devel/kf5/kdoctools \
+ devel/kf5/kconfig \
+ devel/kf5/ki18n \
+ devel/kf5/kparts \
+ devel/gettext-tools
-NO_TEST = Yes
+PORTHOME = ${WRKDIR}
.include
Index: distinfo
===
RCS file: /cvs/ports/multimedia/kguitar/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo18 Jan 2015 03:14:34 - 1.2
+++ distinfo14 Sep 2017 19:18:05 -
@@ -1,2 +1,2 @@
-SHA256 (kguitar-0.5.1.tar.bz2) = vhEevAQ4lN1gzzOPrkAtDF5L7PFuGkFIjhYeKLNt9O0=
-SIZE (kguitar-0.5.1.tar.bz2) = 745758
+SHA256 (kguitar-0.5.1v0-a7c73491.tar.gz) =
NdTxwI1h1b/lgfrDrhglX5rZB75D3aX1dT6XAnSK/gY=
+SIZE (kguitar-0.5.1v0-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 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -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.inTue 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 - 1.2
+++ /dev/null 1 Jan 1970
