On Fri Feb 21, 2020 at 06:17:20PM +0100, Jeremie Courreges-Anglas wrote:
> On Fri, Feb 21 2020, Rafael Sadowski <raf...@sizeofvoid.org> wrote:
> > Update tiled to 1.3.1 (Qt4 to Qt5).
> >
> > Notable changes:
> >
> > - Move to GH_*
> > - s/http/https/
> > - Tests are no longer build. I didn't get a good look at it. tiled works
> > fine for me in a simple run-time test.
> > - Set MODPY_DEFAULT_VERSION_3
> >
> > OK?
>
> I only played with tiles and tiled for a uni course (!) years ago, but
> figured I'd give this a try anyway. Runtime looks good after I install
> qtdeclarative, because of a missing dep on libQt5Qml.so.
>
> --8<--
> ritchie ~$ tiled
> ld.so: tiled: can't load library 'libQt5Qml.so.2.2'
> Killed
> -->8--
>
> --8<--
> russell /usr/ports/editors/tiled$ make port-lib-depends-check
>
> tiled-1.3.1(editors/tiled):
> Missing lib: Qt5Qml.2 (/usr/local/bin/tiled) (NOT REACHABLE)
> *** Error 1 in target 'port-lib-depends-check' (ignored)
> -->8--
>
> This needs adjusting, portcheck also says:
>
> missing RDEP on misc/shared-mime-info
>
> and...
>
Thanks for the input here is a new diff which converts all your points.
I also reorder the DPB_PROPERTIES and indented GH;
OK to nuke the creepy Qt4 stuff?
RS
Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/tiled/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- Makefile 12 Jul 2019 20:46:06 -0000 1.15
+++ Makefile 21 Feb 2020 19:13:44 -0000
@@ -1,37 +1,39 @@
# $OpenBSD: Makefile,v 1.15 2019/07/12 20:46:06 sthen Exp $
+# XXX qmake picks up Cocoa/Cocoa.h even though it's apparently unused
+DPB_PROPERTIES = nojunk
+
COMMENT = tile map editor
-V = 0.9.1
-DISTNAME = tiled-qt-${V}
-PKGNAME = tiled-${V}
-REVISION = 6
+GH_ACCOUNT = bjorn
+GH_PROJECT = tiled
+GH_TAGNAME = v1.3.1
-SHARED_LIBS += tiled 0.0 # 1.0
+SHARED_LIBS += tiled 1.0 # 1.0
CATEGORIES = editors games
-HOMEPAGE = http://www.mapeditor.org/
+HOMEPAGE = https://www.mapeditor.org/
# GPLv2+
PERMIT_PACKAGE = Yes
-WANTLIB += GL ICE QtGui QtOpenGL SM X11 Xext Xi Xinerama Xrender
-WANTLIB += c fontconfig freetype m pthread ${COMPILER_LIBCXX} z
+WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5Qml
+WANTLIB += Qt5Widgets c m ${MODPY_WANTLIB} z
-COMPILER = base-clang ports-gcc base-gcc
+MODULES = devel/qmake \
+ lang/python \
+ x11/qt5
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tiled/}
+MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
-RUN_DEPENDS = devel/desktop-file-utils \
- x11/gtk+3,-guic
-MODULES = devel/qmake x11/qt4
+LIB_DEPENDS = x11/qt5/qtdeclarative
-# XXX qmake picks up Cocoa/Cocoa.h even though it's apparently unused
-DPB_PROPERTIES = nojunk
+RUN_DEPENDS = devel/desktop-file-utils \
+ misc/shared-mime-info \
+ x11/gtk+3,-guic \
+ x11/qt5/qtquickcontrols
-do-test:
- cd ${WRKSRC}/tests/staggeredrenderer && ./staggeredrenderer && \
- cd ${WRKSRC}/tests/mapreader && ./mapreader
+NO_TEST= Yes
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/editors/tiled/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo 28 Apr 2014 09:48:54 -0000 1.2
+++ distinfo 21 Feb 2020 19:13:44 -0000
@@ -1,2 +1,2 @@
-SHA256 (tiled-qt-0.9.1.tar.gz) = aGj4MzuMZoNTAXkgUaduf8aEZ2GbbpeoW1h/U3w2tSc=
-SIZE (tiled-qt-0.9.1.tar.gz) = 1436286
+SHA256 (tiled-1.3.1.tar.gz) = s3Mh41vdt7yW+QaO3AYmiz8OuGMv5iBq7ilsjWw7pyI=
+SIZE (tiled-1.3.1.tar.gz) = 15728903
Index: patches/patch-src_automappingconverter_automappingconverter_pro
===================================================================
RCS file: patches/patch-src_automappingconverter_automappingconverter_pro
diff -N patches/patch-src_automappingconverter_automappingconverter_pro
--- patches/patch-src_automappingconverter_automappingconverter_pro 28 Apr
2014 09:48:54 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_automappingconverter_automappingconverter_pro,v 1.1
2014/04/28 09:48:54 bentley Exp $
---- src/automappingconverter/automappingconverter.pro.orig Mon Apr 28
02:32:11 2014
-+++ src/automappingconverter/automappingconverter.pro Mon Apr 28 02:32:17 2014
-@@ -48,7 +48,7 @@ HEADERS += \
- FORMS += \
- converterwindow.ui
-
--manpage.path = $${PREFIX}/share/man/man1/
-+manpage.path = $${PREFIX}/man/man1/
- manpage.files += ../../docs/automappingconverter.1
- INSTALLS += manpage
-
Index: patches/patch-src_tiled_tiled_pro
===================================================================
RCS file: /cvs/ports/editors/tiled/patches/patch-src_tiled_tiled_pro,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_tiled_tiled_pro
--- patches/patch-src_tiled_tiled_pro 28 Apr 2014 09:48:54 -0000 1.2
+++ patches/patch-src_tiled_tiled_pro 21 Feb 2020 19:13:44 -0000
@@ -1,12 +1,13 @@
$OpenBSD: patch-src_tiled_tiled_pro,v 1.2 2014/04/28 09:48:54 bentley Exp $
---- src/tiled/tiled.pro.orig Sat Jul 27 14:34:23 2013
-+++ src/tiled/tiled.pro Mon Apr 28 01:48:23 2014
-@@ -286,7 +286,7 @@ desktopfile.path = $${PREFIX}/share/applications/
- desktopfile.files += ../../docs/tiled.desktop
- INSTALLS += desktopfile
+Index: src/tiled/tiled.pro
+--- src/tiled/tiled.pro.orig
++++ src/tiled/tiled.pro
+@@ -552,7 +552,7 @@ appdatafile.path = $${PREFIX}/share/metainfo/
+ appdatafile.files += ../../org.mapeditor.Tiled.appdata.xml
+ INSTALLS += appdatafile
-manpage.path = $${PREFIX}/share/man/man1/
+manpage.path = $${PREFIX}/man/man1/
- manpage.files += ../../docs/tiled.1
+ manpage.files += ../../man/tiled.1
INSTALLS += manpage
Index: patches/patch-src_tmxrasterizer_tmxrasterizer_pro
===================================================================
RCS file:
/cvs/ports/editors/tiled/patches/patch-src_tmxrasterizer_tmxrasterizer_pro,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_tmxrasterizer_tmxrasterizer_pro
--- patches/patch-src_tmxrasterizer_tmxrasterizer_pro 8 Jul 2013 22:10:57
-0000 1.1.1.1
+++ patches/patch-src_tmxrasterizer_tmxrasterizer_pro 21 Feb 2020 19:13:44
-0000
@@ -1,11 +1,12 @@
$OpenBSD: patch-src_tmxrasterizer_tmxrasterizer_pro,v 1.1.1.1 2013/07/08
22:10:57 bentley Exp $
---- src/tmxrasterizer/tmxrasterizer.pro.orig Sat Jul 6 21:00:01 2013
-+++ src/tmxrasterizer/tmxrasterizer.pro Sat Jul 6 21:00:03 2013
-@@ -39,6 +39,6 @@ SOURCES += main.cpp \
+Index: src/tmxrasterizer/tmxrasterizer.pro
+--- src/tmxrasterizer/tmxrasterizer.pro.orig
++++ src/tmxrasterizer/tmxrasterizer.pro
+@@ -36,6 +36,6 @@ SOURCES += main.cpp \
HEADERS += tmxrasterizer.h
-manpage.path = $${PREFIX}/share/man/man1/
+manpage.path = $${PREFIX}/man/man1/
- manpage.files += ../../docs/tmxrasterizer.1
+ manpage.files += ../../man/tmxrasterizer.1
INSTALLS += manpage
Index: patches/patch-src_tmxviewer_tmxviewer_pro
===================================================================
RCS file: /cvs/ports/editors/tiled/patches/patch-src_tmxviewer_tmxviewer_pro,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_tmxviewer_tmxviewer_pro
--- patches/patch-src_tmxviewer_tmxviewer_pro 8 Jul 2013 22:10:57 -0000
1.1.1.1
+++ patches/patch-src_tmxviewer_tmxviewer_pro 21 Feb 2020 19:13:44 -0000
@@ -1,11 +1,12 @@
$OpenBSD: patch-src_tmxviewer_tmxviewer_pro,v 1.1.1.1 2013/07/08 22:10:57
bentley Exp $
---- src/tmxviewer/tmxviewer.pro.orig Sat Jul 6 21:00:07 2013
-+++ src/tmxviewer/tmxviewer.pro Sat Jul 6 21:00:17 2013
-@@ -39,6 +39,6 @@ SOURCES += main.cpp \
+Index: src/tmxviewer/tmxviewer.pro
+--- src/tmxviewer/tmxviewer.pro.orig
++++ src/tmxviewer/tmxviewer.pro
+@@ -36,6 +36,6 @@ SOURCES += main.cpp \
HEADERS += tmxviewer.h
-manpage.path = $${PREFIX}/share/man/man1/
+manpage.path = $${PREFIX}/man/man1/
- manpage.files += ../../docs/tmxviewer.1
+ manpage.files += ../../man/tmxviewer.1
INSTALLS += manpage
Index: patches/patch-tiled_pro
===================================================================
RCS file: patches/patch-tiled_pro
diff -N patches/patch-tiled_pro
--- patches/patch-tiled_pro 8 Jul 2013 22:10:57 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-$OpenBSD: patch-tiled_pro,v 1.1.1.1 2013/07/08 22:10:57 bentley Exp $
---- tiled.pro.orig Sun Jul 7 19:18:43 2013
-+++ tiled.pro Sun Jul 7 19:18:46 2013
-@@ -10,4 +10,4 @@ contains(QT_VERSION, ^4\\.[0-5]\\..*) {
- TEMPLATE = subdirs
- CONFIG += ordered
-
--SUBDIRS = src translations
-+SUBDIRS = src translations tests
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/tiled/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- pkg/PLIST 29 Jun 2018 22:16:12 -0000 1.5
+++ pkg/PLIST 21 Feb 2020 19:13:44 -0000
@@ -1,41 +1,60 @@
@comment $OpenBSD: PLIST,v 1.5 2018/06/29 22:16:12 espie Exp $
-@bin bin/automappingconverter
+@bin bin/terraingenerator
@bin bin/tiled
@bin bin/tmxrasterizer
@bin bin/tmxviewer
@lib lib/libtiled.so.${LIBtiled_VERSION}
lib/tiled/
lib/tiled/plugins/
-lib/tiled/plugins/libdroidcraft.so
-lib/tiled/plugins/libflare.so
-lib/tiled/plugins/libjson.so
-lib/tiled/plugins/liblua.so
-lib/tiled/plugins/libreplicaisland.so
-lib/tiled/plugins/libtengine.so
-lib/tiled/plugins/libtmw.so
-@man man/man1/automappingconverter.1
+@so lib/tiled/plugins/libcsv.so
+@so lib/tiled/plugins/libdefold.so
+@so lib/tiled/plugins/libdefoldcollection.so
+@so lib/tiled/plugins/libdroidcraft.so
+@so lib/tiled/plugins/libflare.so
+@so lib/tiled/plugins/libgmx.so
+@so lib/tiled/plugins/libjson.so
+@so lib/tiled/plugins/libjson1.so
+@so lib/tiled/plugins/liblua.so
+@so lib/tiled/plugins/libpython.so
+@so lib/tiled/plugins/libreplicaisland.so
+@so lib/tiled/plugins/libtbin.so
+@so lib/tiled/plugins/libtengine.so
@man man/man1/tiled.1
@man man/man1/tmxrasterizer.1
@man man/man1/tmxviewer.1
-share/applications/tiled.desktop
-share/icons/hicolor/16x16/apps/tiled.png
-share/icons/hicolor/32x32/apps/tiled.png
+share/applications/org.mapeditor.Tiled.desktop
share/icons/hicolor/scalable/apps/tiled.svg
+share/icons/hicolor/scalable/mimetypes/application-x-tiled.svg
+share/metainfo/
+share/metainfo/org.mapeditor.Tiled.appdata.xml
+share/mime/packages/org.mapeditor.Tiled.xml
+share/thumbnailers/tiled.thumbnailer
share/tiled/
share/tiled/translations/
+share/tiled/translations/tiled_ar_DZ.qm
+share/tiled/translations/tiled_bg.qm
share/tiled/translations/tiled_cs.qm
share/tiled/translations/tiled_de.qm
share/tiled/translations/tiled_en.qm
share/tiled/translations/tiled_es.qm
+share/tiled/translations/tiled_fi.qm
share/tiled/translations/tiled_fr.qm
share/tiled/translations/tiled_he.qm
+share/tiled/translations/tiled_hu.qm
share/tiled/translations/tiled_it.qm
share/tiled/translations/tiled_ja.qm
-share/tiled/translations/tiled_lv.qm
+share/tiled/translations/tiled_ko.qm
+share/tiled/translations/tiled_nb.qm
share/tiled/translations/tiled_nl.qm
+share/tiled/translations/tiled_pl.qm
share/tiled/translations/tiled_pt.qm
-share/tiled/translations/tiled_pt_BR.qm
+share/tiled/translations/tiled_pt_PT.qm
share/tiled/translations/tiled_ru.qm
-share/tiled/translations/tiled_zh.qm
+share/tiled/translations/tiled_sv.qm
+share/tiled/translations/tiled_tr.qm
+share/tiled/translations/tiled_uk.qm
+share/tiled/translations/tiled_zh_CN.qm
+share/tiled/translations/tiled_zh_TW.qm
+@tag update-mime-database
@tag update-desktop-database
@tag gtk-update-icon-cache %D/share/icons/hicolor
