On Fri Jan 04, 2019 at 10:08:39PM +0100, Adam Wolk wrote:
> Hi ports@,
>
> attaching a trivial bump for devel/zeal
>
> Feedback? OK's?
>
> Regards,
> Adam
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/zeal/Makefile,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile
> --- Makefile 29 Jun 2018 22:16:11 -0000 1.12
> +++ Makefile 4 Jan 2019 21:06:25 -0000
> @@ -5,9 +5,8 @@ USE_WXNEEDED = Yes
>
> COMMENT = simple offline API documentation browser
>
> -V = 0.6.0
> +V = 0.6.1
> DISTNAME = zeal-${V}
> -REVISION = 2
>
> CATEGORIES = devel
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/zeal/distinfo,v
> retrieving revision 1.6
> diff -u -p -r1.6 distinfo
> --- distinfo 4 Mar 2018 14:00:36 -0000 1.6
> +++ distinfo 4 Jan 2019 21:06:25 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (zeal-0.6.0.tar.xz) = 2eBFhGAbxQRh2Z41RRbkaJO/Leu+N3yxc9FUHU/glYo=
> -SIZE (zeal-0.6.0.tar.xz) = 670416
> +SHA256 (zeal-0.6.1.tar.xz) = +7knkjPSuCRbSd4CKK4NBEWEqK50z9UjnBbVCIsfx4s=
> +SIZE (zeal-0.6.1.tar.xz) = 671432
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/zeal/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- pkg/PLIST 29 Jun 2018 22:16:11 -0000 1.3
> +++ pkg/PLIST 4 Jan 2019 21:06:25 -0000
> @@ -1,10 +1,12 @@
> @comment $OpenBSD: PLIST,v 1.3 2018/06/29 22:16:11 espie Exp $
> @bin bin/zeal
> -share/applications/zeal.desktop
> +share/applications/org.zealdocs.Zeal.desktop
> share/icons/hicolor/128x128/apps/zeal.png
> share/icons/hicolor/16x16/apps/zeal.png
> share/icons/hicolor/24x24/apps/zeal.png
> share/icons/hicolor/32x32/apps/zeal.png
> share/icons/hicolor/64x64/apps/zeal.png
> +share/metainfo/
> +share/metainfo/org.zealdocs.Zeal.appdata.xml
> @tag update-desktop-database
> @tag gtk-update-icon-cache %D/share/icons/hicolor
Works fine here on amd64. Please find a diff with the following tweaks:
- User kf5 module, it includes qt5 and cmake.
- remove qtbase as dependency. qtbase comes with x11/qt5
- add sqlite3 as dependency
RS
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/zeal/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- Makefile 29 Jun 2018 22:16:11 -0000 1.12
+++ Makefile 5 Jan 2019 09:08:13 -0000
@@ -5,9 +5,8 @@ USE_WXNEEDED = Yes
COMMENT = simple offline API documentation browser
-V = 0.6.0
+V = 0.6.1
DISTNAME = zeal-${V}
-REVISION = 2
CATEGORIES = devel
@@ -18,20 +17,21 @@ MAINTAINER = Adam Wolk <[email protected]
# GPLv3
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += ICE Qt5Concurrent Qt5Core Qt5Gui Qt5Network Qt5WebKit
-WANTLIB += Qt5WebKitWidgets Qt5Widgets Qt5X11Extras SM X11 Xext
-WANTLIB += archive c m sqlite3 xcb xcb-keysyms
-WANTLIB += ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} ICE Qt5Concurrent Qt5Core Qt5Gui
+WANTLIB += Qt5Network Qt5WebKit Qt5WebKitWidgets Qt5Widgets Qt5X11Extras
+WANTLIB += SM X11 Xext archive c m sqlite3 xcb xcb-keysyms
MASTER_SITES = https://github.com/zealdocs/zeal/releases/download/v${V}/
EXTRACT_SUFX = .tar.xz
-MODULES = devel/cmake x11/qt5
-BUILD_DEPENDS = devel/kf5/extra-cmake-modules
-RUN_DEPENDS = devel/desktop-file-utils x11/gtk+3,-guic
-LIB_DEPENDS = archivers/libarchive \
- x11/qt5/qtbase \
+MODULES = devel/kf5
+
+RUN_DEPENDS += devel/desktop-file-utils \
+ x11/gtk+3,-guic
+
+LIB_DEPENDS += archivers/libarchive \
+ databases/sqlite3 \
x11/qt5/qtwebkit \
x11/qt5/qtx11extras
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/zeal/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo 4 Mar 2018 14:00:36 -0000 1.6
+++ distinfo 5 Jan 2019 09:08:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (zeal-0.6.0.tar.xz) = 2eBFhGAbxQRh2Z41RRbkaJO/Leu+N3yxc9FUHU/glYo=
-SIZE (zeal-0.6.0.tar.xz) = 670416
+SHA256 (zeal-0.6.1.tar.xz) = +7knkjPSuCRbSd4CKK4NBEWEqK50z9UjnBbVCIsfx4s=
+SIZE (zeal-0.6.1.tar.xz) = 671432
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/zeal/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 29 Jun 2018 22:16:11 -0000 1.3
+++ pkg/PLIST 5 Jan 2019 09:08:13 -0000
@@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.3 2018/06/29 22:16:11 espie Exp $
@bin bin/zeal
-share/applications/zeal.desktop
+share/applications/org.zealdocs.Zeal.desktop
share/icons/hicolor/128x128/apps/zeal.png
share/icons/hicolor/16x16/apps/zeal.png
share/icons/hicolor/24x24/apps/zeal.png
@@ -8,3 +8,5 @@ share/icons/hicolor/32x32/apps/zeal.png
share/icons/hicolor/64x64/apps/zeal.png
@tag update-desktop-database
@tag gtk-update-icon-cache %D/share/icons/hicolor
+share/metainfo/
+share/metainfo/org.zealdocs.Zeal.appdata.xml
