Nam Nguyen writes: > Nam Nguyen writes: > > ping ping
> >> Here is an update for games/jag 0.3.8, released September 7, 2020. >> changelog: https://gitlab.com/coringao/jag/-/tags/0.3.8 >> >> This update: >> - switches to -std=gnu++17 by default >> - removes gameprofile.cpp and displaywrapper.cpp patches, as they have >> already been added upstream >> https://gitlab.com/coringao/jag/-/commit/9edca4bdfdb8a049ad6ca0628b3d427e461d17f5 >> https://gitlab.com/coringao/jag/-/commit/4f67546bc8e8b2ac60156605ad32fa0a3880d5dd >> - PERMIT_PACKAGE = Yes due to removal of all themes except for the >> default theme >> discussion: https://gitlab.com/coringao/jag/-/issues/1 >> >> All questionable assets were removed so I propose PERMIT_PACKAGE = >> Yes. I still could not find a license for the default theme made by >> PixelMixer. Given that the default theme's assets are featured on the >> website and they were not made by Fasticon, they should fall under the >> JAG menu's statement: "Thanks to the authors of graphics, icons and >> sounds, which are used under free licenses in the game." Hopefully this >> is sufficient for PERMIT_PACKAGE = Yes. >> >> Some warnings remain and seem safe to ignore: >> - deprecated os info testing for windows vista >> - overloaded exec(const Qstring &qs) vs exec() in gamemenu.h and >> qdialog.h. gamemenu.h's version is always called. >> >> In file included from ../src/menucontrol.cpp:26: >> ../src/gamemenu.h:55:9: warning: 'ConfirmDialog::exec' hides overloaded >> virtual >> int exec(const QString &qs); >> ^ >> >> /usr/local/include/X11/qt5/QtWidgets/qdialog.h:95:17: note: hidden >> overloaded virtual function 'QDialog::exec' declared here: different >> number of parameters (0 vs 1) >> virtual int exec(); >> >> I tested jag and jag-editor runtimes. Feedback and tests are welcome. Index: Makefile =================================================================== RCS file: /cvs/ports/games/jag/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- Makefile 1 Aug 2020 05:34:08 -0000 1.12 +++ Makefile 18 Sep 2020 22:20:57 -0000 @@ -1,14 +1,12 @@ # $OpenBSD: Makefile,v 1.12 2020/08/01 05:34:08 landry Exp $ COMMENT = arcade-puzzle game -V = 0.3.7 +V = 0.3.8 DISTNAME = jag-${V} CATEGORIES = games HOMEPAGE = https://gitlab.com/coringao/jag # GPLv3 -# https://gitlab.com/coringao/jag/-/issues/1 -PERMIT_PACKAGE = restrictively licensed themes -PERMIT_DISTFILES = restrictively licensed themes +PERMIT_PACKAGE = Yes WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets WANTLIB += Qt5X11Extras SDL2 SDL2_mixer X11 Xrandr c Index: distinfo =================================================================== RCS file: /cvs/ports/games/jag/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo 1 Aug 2020 05:34:08 -0000 1.2 +++ distinfo 18 Sep 2020 22:20:57 -0000 @@ -1,2 +1,2 @@ -SHA256 (jag-0.3.7.tar.gz) = jI+SYKL476N4ojzhUdWjoEDklJ+EFBClnRDUzeJH9t4= -SIZE (jag-0.3.7.tar.gz) = 6971529 +SHA256 (jag-0.3.8.tar.gz) = NG07uNFmccGCsFaLkpg7jVM6Caz7PQPpSneO6HnS1gQ= +SIZE (jag-0.3.8.tar.gz) = 3025319 Index: patches/patch-src_displaywrapper_cpp =================================================================== RCS file: patches/patch-src_displaywrapper_cpp diff -N patches/patch-src_displaywrapper_cpp --- patches/patch-src_displaywrapper_cpp 1 Aug 2020 05:34:08 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -$OpenBSD: patch-src_displaywrapper_cpp,v 1.1 2020/08/01 05:34:08 landry Exp $ - -Index: src/displaywrapper.cpp ---- src/displaywrapper.cpp.orig -+++ src/displaywrapper.cpp -@@ -305,8 +305,6 @@ void DisplayWrapper::dw_init(bool filter, int minWidth - //short original_rate = XRRConfigCurrentRate(conf); - //SizeID original_size_id = XRRConfigCurrentConfiguration(conf, &original_rotation); - -- XCloseDisplay(dpy); -- - for (int i = 0; i < num_sizes; i++) - { - int width = xrrs[i].width; -@@ -325,6 +323,8 @@ void DisplayWrapper::dw_init(bool filter, int minWidth - modes.append(mode); - } - } -+ -+ XCloseDisplay(dpy); - - if (filter) - modeNames.removeDuplicates(); Index: patches/patch-src_editor_jag-editor_pro =================================================================== RCS file: /cvs/ports/games/jag/patches/patch-src_editor_jag-editor_pro,v retrieving revision 1.1 diff -u -p -r1.1 patch-src_editor_jag-editor_pro --- patches/patch-src_editor_jag-editor_pro 1 Aug 2020 05:34:08 -0000 1.1 +++ patches/patch-src_editor_jag-editor_pro 18 Sep 2020 22:20:57 -0000 @@ -5,7 +5,7 @@ install jag-editor to correct prefix. ja Index: src/editor/jag-editor.pro --- src/editor/jag-editor.pro.orig +++ src/editor/jag-editor.pro -@@ -22,11 +22,8 @@ QMAKE_CXXFLAGS += -g -std=gnu++14 -D_FORTIFY_SOURCE=2 +@@ -22,11 +22,8 @@ QMAKE_CXXFLAGS += -g -std=gnu++17 -D_FORTIFY_SOURCE=2 QMAKE_LFLAGS += -lpthread -fPIE -pie -Wl,--as-needed -Wl,-z,now unix: { Index: patches/patch-src_gameprofile_cpp =================================================================== RCS file: patches/patch-src_gameprofile_cpp diff -N patches/patch-src_gameprofile_cpp --- patches/patch-src_gameprofile_cpp 1 Aug 2020 05:34:08 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_gameprofile_cpp,v 1.1 2020/08/01 05:34:08 landry Exp $ - -Index: src/gameprofile.cpp ---- src/gameprofile.cpp.orig -+++ src/gameprofile.cpp -@@ -88,7 +88,7 @@ GameProfile::GameProfile(QObject *parent) : QObject(pa - m_accel(false) - { - userPath = QDir::homePath(); -- userPath += "/.xlabsoft/jag/"; -+ userPath += "/.jag/"; - - - QDir userdir(userPath); Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/games/jag/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 1 Aug 2020 05:34:08 -0000 1.2 +++ pkg/PLIST 18 Sep 2020 22:20:57 -0000 @@ -34,45 +34,6 @@ share/jag/levels/abc.lpk share/jag/levels/default.lpk share/jag/levels/sunzero.lpk share/jag/schemes/ -share/jag/schemes/african/ -share/jag/schemes/african/bg1.jpg -share/jag/schemes/african/bg2.jpg -share/jag/schemes/african/bg3.jpg -share/jag/schemes/african/item1.png -share/jag/schemes/african/item2.png -share/jag/schemes/african/item3.png -share/jag/schemes/african/item4.png -share/jag/schemes/african/item5.png -share/jag/schemes/animals/ -share/jag/schemes/animals/bg1.jpg -share/jag/schemes/animals/bg2.jpg -share/jag/schemes/animals/bg3.jpg -share/jag/schemes/animals/item1.png -share/jag/schemes/animals/item2.png -share/jag/schemes/animals/item3.png -share/jag/schemes/animals/item4.png -share/jag/schemes/animals/item5.png -share/jag/schemes/animals/item6.png -share/jag/schemes/chinese/ -share/jag/schemes/chinese/bg1.jpg -share/jag/schemes/chinese/bg2.jpg -share/jag/schemes/chinese/bg3.jpg -share/jag/schemes/chinese/item1.png -share/jag/schemes/chinese/item2.png -share/jag/schemes/chinese/item3.png -share/jag/schemes/chinese/item4.png -share/jag/schemes/chinese/item5.png -share/jag/schemes/chinese/item6.png -share/jag/schemes/creatures/ -share/jag/schemes/creatures/bg1.jpg -share/jag/schemes/creatures/bg2.jpg -share/jag/schemes/creatures/bg3.jpg -share/jag/schemes/creatures/item1.png -share/jag/schemes/creatures/item2.png -share/jag/schemes/creatures/item3.png -share/jag/schemes/creatures/item4.png -share/jag/schemes/creatures/item5.png -share/jag/schemes/creatures/item6.png share/jag/schemes/default/ share/jag/schemes/default/bg1.jpg share/jag/schemes/default/bg2.jpg @@ -92,53 +53,6 @@ share/jag/schemes/default/item5.png share/jag/schemes/default/item6.png share/jag/schemes/default/target1.png share/jag/schemes/default/target2.png -share/jag/schemes/futurama/ -share/jag/schemes/futurama/bg1.jpg -share/jag/schemes/futurama/bg2.jpg -share/jag/schemes/futurama/bg3.jpg -share/jag/schemes/futurama/item1.png -share/jag/schemes/futurama/item2.png -share/jag/schemes/futurama/item3.png -share/jag/schemes/futurama/item4.png -share/jag/schemes/futurama/item5.png -share/jag/schemes/futurama/item6.png -share/jag/schemes/kde-crystal/ -share/jag/schemes/kde-crystal/bg1.jpg -share/jag/schemes/kde-crystal/bg2.jpg -share/jag/schemes/kde-crystal/bg3.jpg -share/jag/schemes/kde-crystal/bg4.jpg -share/jag/schemes/kde-crystal/block1.png -share/jag/schemes/kde-crystal/block2.png -share/jag/schemes/kde-crystal/item1.png -share/jag/schemes/kde-crystal/item2.png -share/jag/schemes/kde-crystal/item3.png -share/jag/schemes/kde-crystal/item4.png -share/jag/schemes/kde-crystal/item5.png -share/jag/schemes/kde-crystal/item6.png -share/jag/schemes/kde-crystal/target1.png -share/jag/schemes/kde-crystal/target2.png -share/jag/schemes/kde-nuvola/ -share/jag/schemes/kde-nuvola/bg1.jpg -share/jag/schemes/kde-nuvola/bg2.jpg -share/jag/schemes/kde-nuvola/bg3.jpg -share/jag/schemes/kde-nuvola/bg4.jpg -share/jag/schemes/kde-nuvola/bg5.jpg -share/jag/schemes/kde-nuvola/item1.png -share/jag/schemes/kde-nuvola/item2.png -share/jag/schemes/kde-nuvola/item3.png -share/jag/schemes/kde-nuvola/item4.png -share/jag/schemes/kde-nuvola/item5.png -share/jag/schemes/kde-nuvola/item6.png -share/jag/schemes/toys/ -share/jag/schemes/toys/bg1.jpg -share/jag/schemes/toys/bg2.jpg -share/jag/schemes/toys/bg3.jpg -share/jag/schemes/toys/item1.png -share/jag/schemes/toys/item2.png -share/jag/schemes/toys/item3.png -share/jag/schemes/toys/item4.png -share/jag/schemes/toys/item5.png -share/jag/schemes/toys/item6.png share/jag/sounds/ share/jag/sounds/beep.wav share/jag/sounds/bighammer.wav
