From owner-svn-ports-all@freebsd.org Mon Nov 16 19:29:37 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 90C9946F38E; Mon, 16 Nov 2020 19:29:37 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CZfKF3dK1z4W2R; Mon, 16 Nov 2020 19:29:37 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6F8F9133A1; Mon, 16 Nov 2020 19:29:37 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AGJTbgO000142; Mon, 16 Nov 2020 19:29:37 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AGJTaWs000138; Mon, 16 Nov 2020 19:29:36 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <202011161929.0AGJTaWs000138@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 16 Nov 2020 19:29:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r555511 - in head/games/lordsawar: . files X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: in head/games/lordsawar: . files X-SVN-Commit-Revision: 555511 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Nov 2020 19:29:37 -0000 Author: amdmi3 Date: Mon Nov 16 19:29:36 2020 New Revision: 555511 URL: https://svnweb.freebsd.org/changeset/ports/555511 Log: - Update to 0.3.2 Added: head/games/lordsawar/files/patch-create-lw-file (contents, props changed) head/games/lordsawar/files/patch-src_armyproto.cpp (contents, props changed) Deleted: head/games/lordsawar/files/patch-src_MapRenderer.cpp head/games/lordsawar/files/patch-src__LocationList.h head/games/lordsawar/files/patch-src__armyproto.cpp head/games/lordsawar/files/patch-src__setlist.h head/games/lordsawar/files/patch-src_bigmap.cpp head/games/lordsawar/files/patch-src_game-parameters.h head/games/lordsawar/files/patch-src_gui_stack-army-button.cpp Modified: head/games/lordsawar/Makefile head/games/lordsawar/distinfo head/games/lordsawar/pkg-plist Modified: head/games/lordsawar/Makefile ============================================================================== --- head/games/lordsawar/Makefile Mon Nov 16 19:28:59 2020 (r555510) +++ head/games/lordsawar/Makefile Mon Nov 16 19:29:36 2020 (r555511) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= lordsawar -PORTVERSION= 0.3.1 -PORTREVISION= 5 +PORTVERSION= 0.3.2 CATEGORIES= games MASTER_SITES= SAVANNAH @@ -15,11 +14,19 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= compiler:c++11-lib gettext gmake gnome libarchive pkgconfig \ shebangfix USE_GNOME= gtkmm30 intltool libxslt -USE_GSTREAMER= mm -USE_CXXSTD= c++11 INSTALLS_ICONS= yes GNU_CONFIGURE= yes SHEBANG_FILES= create-lw-file bash_CMD= /bin/sh + +OPTIONS_DEFINE= SOUND +OPTIONS_DEFAULT=SOUND + +SOUND_USE= GSTREAMER1=mm,good,ogg,vorbis +SOUND_CONFIGURE_ENABLE= sound + +post-patch: + @${REINPLACE_CMD} -e 's|class SetList::|typename SetList::|' \ + ${WRKSRC}/src/setlist.h .include Modified: head/games/lordsawar/distinfo ============================================================================== --- head/games/lordsawar/distinfo Mon Nov 16 19:28:59 2020 (r555510) +++ head/games/lordsawar/distinfo Mon Nov 16 19:29:36 2020 (r555511) @@ -1,3 +1,3 @@ -TIMESTAMP = 1477596930 -SHA256 (lordsawar-0.3.1.tar.gz) = 9bc75c4c14953e9d70bd4c130a1b8803aac681b97c7616c657241c1e4fe864ab -SIZE (lordsawar-0.3.1.tar.gz) = 26112514 +TIMESTAMP = 1605219363 +SHA256 (lordsawar-0.3.2.tar.gz) = ee9f8f2f0e07595ae5fbdb6259bfbc1fb9c88d17eeda723c8e23428a0bcda7b1 +SIZE (lordsawar-0.3.2.tar.gz) = 27942317 Added: head/games/lordsawar/files/patch-create-lw-file ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/lordsawar/files/patch-create-lw-file Mon Nov 16 19:29:36 2020 (r555511) @@ -0,0 +1,11 @@ +--- create-lw-file.orig 2020-11-10 14:34:22 UTC ++++ create-lw-file +@@ -19,7 +19,7 @@ if [ "x$tmpdir" != "x" ]; then + done + #we want to use --clamp-mtime but it is too new. (requires GNU tar version 1.29) + #we want to use --sort=name but it is too new. +- tar -cvf $tarball $tmpfiles --mtime="@${SOURCE_DATE_EPOCH:-$(date +%s)}" --mode=go=rX,u+rw,a-s --owner=root --group=root --numeric-owner ++ tar -cvf $tarball $tmpfiles + if [ "$?" != "0" ]; then + exitstatus="1"; + fi Added: head/games/lordsawar/files/patch-src_armyproto.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/lordsawar/files/patch-src_armyproto.cpp Mon Nov 16 19:29:36 2020 (r555511) @@ -0,0 +1,17 @@ +--- src/armyproto.cpp.orig 2020-04-09 19:57:07 UTC ++++ src/armyproto.cpp +@@ -35,9 +35,13 @@ Glib::ustring ArmyProto::d_tag = "armyproto"; + + ArmyProto::ArmyProto(const ArmyProto& a) + :ArmyProtoBase(a), d_id(a.d_id), d_defends_ruins(a.d_defends_ruins), +- d_awardable(a.d_awardable), d_image_name(a.d_image_name), ++ d_awardable(a.d_awardable), + d_gender(a.d_gender) + { ++ for (size_t i = 0; i < sizeof(d_image_name)/sizeof(d_image_name[0]); i++) { ++ d_image_name[i] = a.d_image_name[i]; ++ } ++ + for (unsigned int c = Shield::WHITE; c <= Shield::NEUTRAL; c++) + { + d_image_name[c] = a.d_image_name[c]; Modified: head/games/lordsawar/pkg-plist ============================================================================== --- head/games/lordsawar/pkg-plist Mon Nov 16 19:28:59 2020 (r555510) +++ head/games/lordsawar/pkg-plist Mon Nov 16 19:29:36 2020 (r555511) @@ -1,12 +1,10 @@ bin/lordsawar -bin/lordsawar-editor bin/lordsawar-game-host-client bin/lordsawar-game-host-server bin/lordsawar-game-list-client bin/lordsawar-game-list-server bin/lordsawar-import bin/lordsawar-upgrade-file -man/man6/lordsawar-editor.6.gz man/man6/lordsawar-game-host-client.6.gz man/man6/lordsawar-game-host-server.6.gz man/man6/lordsawar-game-list-client.6.gz @@ -14,18 +12,22 @@ man/man6/lordsawar-game-list-server.6.gz man/man6/lordsawar-import.6.gz man/man6/lordsawar.6.gz share/appdata/lordsawar-appdata.xml -share/applications/lordsawar-editor.desktop share/applications/lordsawar.desktop -share/icons/hicolor/32x32/apps/lordsawar-editor.png +share/icons/hicolor/16x16/apps/lordsawar.png +share/icons/hicolor/22x22/apps/lordsawar.png +share/icons/hicolor/24x24/apps/lordsawar.png share/icons/hicolor/32x32/apps/lordsawar.png -share/icons/hicolor/64x64/apps/lordsawar-editor.png +share/icons/hicolor/48x48/apps/lordsawar.png share/icons/hicolor/64x64/apps/lordsawar.png share/locale/ca/LC_MESSAGES/lordsawar.mo share/locale/da/LC_MESSAGES/lordsawar.mo share/locale/de/LC_MESSAGES/lordsawar.mo +share/locale/fr/LC_MESSAGES/lordsawar.mo share/locale/hu/LC_MESSAGES/lordsawar.mo share/locale/nl/LC_MESSAGES/lordsawar.mo share/locale/pl/LC_MESSAGES/lordsawar.mo +share/locale/sv/LC_MESSAGES/lordsawar.mo +share/locale/tr/LC_MESSAGES/lordsawar.mo %%DATADIR%%/army/bigdefault.lwa %%DATADIR%%/army/default.lwa %%DATADIR%%/army/duel.lwa @@ -55,18 +57,23 @@ share/locale/pl/LC_MESSAGES/lordsawar.mo %%DATADIR%%/glade/editor/armyset-info-dialog.ui %%DATADIR%%/glade/editor/armyset-window.ui %%DATADIR%%/glade/editor/backpack-editor-dialog.ui +%%DATADIR%%/glade/editor/battle-calculator-dialog.ui %%DATADIR%%/glade/editor/city-editor-dialog.ui %%DATADIR%%/glade/editor/cityset-info-dialog.ui %%DATADIR%%/glade/editor/cityset-window.ui %%DATADIR%%/glade/editor/editor-quit-dialog.ui +%%DATADIR%%/glade/editor/editor-save-changes-dialog.ui %%DATADIR%%/glade/editor/editor-splash-window.ui %%DATADIR%%/glade/editor/fight-order-editor-dialog.ui %%DATADIR%%/glade/editor/hero-editor-dialog.ui +%%DATADIR%%/glade/editor/heroes-dialog.ui %%DATADIR%%/glade/editor/image-editor-dialog.ui %%DATADIR%%/glade/editor/itemlist-dialog.ui +%%DATADIR%%/glade/editor/keeper-dialog.ui %%DATADIR%%/glade/editor/main-window.ui %%DATADIR%%/glade/editor/map-info-dialog.ui %%DATADIR%%/glade/editor/masked-image-editor-dialog.ui +%%DATADIR%%/glade/editor/media-dialog.ui %%DATADIR%%/glade/editor/new-map-dialog.ui %%DATADIR%%/glade/editor/players-dialog.ui %%DATADIR%%/glade/editor/reward-editor-dialog.ui @@ -76,16 +83,15 @@ share/locale/pl/LC_MESSAGES/lordsawar.mo %%DATADIR%%/glade/editor/select-army-dialog.ui %%DATADIR%%/glade/editor/select-hidden-ruin-dialog.ui %%DATADIR%%/glade/editor/select-item-dialog.ui -%%DATADIR%%/glade/editor/select-reward-dialog.ui %%DATADIR%%/glade/editor/shieldset-info-dialog.ui %%DATADIR%%/glade/editor/shieldset-window.ui %%DATADIR%%/glade/editor/signpost-editor-dialog.ui %%DATADIR%%/glade/editor/smallmap-editor-dialog.ui %%DATADIR%%/glade/editor/stack-editor-dialog.ui +%%DATADIR%%/glade/editor/stone-editor-dialog.ui %%DATADIR%%/glade/editor/switch-sets-dialog.ui %%DATADIR%%/glade/editor/temple-editor-dialog.ui %%DATADIR%%/glade/editor/tile-preview-dialog.ui -%%DATADIR%%/glade/editor/tile-size-editor-dialog.ui %%DATADIR%%/glade/editor/tileset-explosion-picture-editor-dialog.ui %%DATADIR%%/glade/editor/tileset-flag-editor-dialog.ui %%DATADIR%%/glade/editor/tileset-info-dialog.ui @@ -93,12 +99,11 @@ share/locale/pl/LC_MESSAGES/lordsawar.mo %%DATADIR%%/glade/editor/tileset-smallmap-building-colors-dialog.ui %%DATADIR%%/glade/editor/tileset-window.ui %%DATADIR%%/glade/editor/tilestyle-organizer-dialog.ui +%%DATADIR%%/glade/editor/validation-dialog.ui %%DATADIR%%/glade/fight-order-dialog.ui %%DATADIR%%/glade/fight-window.ui %%DATADIR%%/glade/fighter.ui -%%DATADIR%%/glade/game-button-box-desktop.ui %%DATADIR%%/glade/game-button-box-large-screen.ui -%%DATADIR%%/glade/game-button-box-netbook.ui %%DATADIR%%/glade/game-loaded-dialog.ui %%DATADIR%%/glade/game-lobby-dialog.ui %%DATADIR%%/glade/game-options-dialog.ui @@ -113,6 +118,7 @@ share/locale/pl/LC_MESSAGES/lordsawar.mo %%DATADIR%%/glade/history-report-dialog.ui %%DATADIR%%/glade/item-bonus-dialog.ui %%DATADIR%%/glade/item-report-dialog.ui +%%DATADIR%%/glade/load-progress-window.ui %%DATADIR%%/glade/load-scenario-dialog.ui %%DATADIR%%/glade/main-preferences-dialog.ui %%DATADIR%%/glade/medal-awarded-dialog.ui @@ -129,6 +135,7 @@ share/locale/pl/LC_MESSAGES/lordsawar.mo %%DATADIR%%/glade/quest-assigned-dialog.ui %%DATADIR%%/glade/quest-expired-dialog.ui %%DATADIR%%/glade/quest-report-dialog.ui +%%DATADIR%%/glade/quick-help-window.ui %%DATADIR%%/glade/report-dialog.ui %%DATADIR%%/glade/ruin-report-dialog.ui %%DATADIR%%/glade/ruin-rewarded-dialog.ui @@ -138,17 +145,11 @@ share/locale/pl/LC_MESSAGES/lordsawar.mo %%DATADIR%%/glade/sage-dialog.ui %%DATADIR%%/glade/signpost-change-dialog.ui %%DATADIR%%/glade/splash-window.ui -%%DATADIR%%/glade/stack-army-button-desktop.ui %%DATADIR%%/glade/stack-army-button-large-screen.ui -%%DATADIR%%/glade/stack-army-button-netbook.ui %%DATADIR%%/glade/stack-info-dialog.ui %%DATADIR%%/glade/stack-info-window.ui -%%DATADIR%%/glade/stack-tile-box-desktop.ui %%DATADIR%%/glade/stack-tile-box-large-screen.ui -%%DATADIR%%/glade/stack-tile-box-netbook.ui -%%DATADIR%%/glade/status-box-desktop.ui %%DATADIR%%/glade/status-box-large-screen.ui -%%DATADIR%%/glade/status-box-netbook.ui %%DATADIR%%/glade/surrender-dialog.ui %%DATADIR%%/glade/surrender-refused-dialog.ui %%DATADIR%%/glade/temple-visit-dialog.ui @@ -180,15 +181,13 @@ share/locale/pl/LC_MESSAGES/lordsawar.mo %%DATADIR%%/tilesets/default.lwt %%DATADIR%%/tilesets/stark.lwt %%DATADIR%%/tilesets/wesnoth.lwt -%%DATADIR%%/various/arrows-medium.png -%%DATADIR%%/various/arrows.png %%DATADIR%%/various/bag.png %%DATADIR%%/various/bigmedals.png -%%DATADIR%%/various/buttons-medium.png %%DATADIR%%/various/buttons.png %%DATADIR%%/various/castle_icon.ico %%DATADIR%%/various/castle_icon.png %%DATADIR%%/various/city_occupied.png +%%DATADIR%%/various/commentator.png %%DATADIR%%/various/cursors.png %%DATADIR%%/various/diplomacy-large.png %%DATADIR%%/various/diplomacy-small.png @@ -202,6 +201,7 @@ share/locale/pl/LC_MESSAGES/lordsawar.mo %%DATADIR%%/various/editor/button_bridge.png %%DATADIR%%/various/editor/button_castle.png %%DATADIR%%/various/editor/button_erase.png +%%DATADIR%%/various/editor/button_fight.png %%DATADIR%%/various/editor/button_move.png %%DATADIR%%/various/editor/button_port.png %%DATADIR%%/various/editor/button_road.png @@ -209,6 +209,7 @@ share/locale/pl/LC_MESSAGES/lordsawar.mo %%DATADIR%%/various/editor/button_selector.png %%DATADIR%%/various/editor/button_signpost.png %%DATADIR%%/various/editor/button_stack.png +%%DATADIR%%/various/editor/button_stone.png %%DATADIR%%/various/editor/button_temple.png %%DATADIR%%/various/hero-inactive.png %%DATADIR%%/various/hero-newlevel-female.png @@ -220,7 +221,6 @@ share/locale/pl/LC_MESSAGES/lordsawar.mo %%DATADIR%%/various/movebonus.png %%DATADIR%%/various/parley_offered.png %%DATADIR%%/various/parley_refused.png -%%DATADIR%%/various/prodshieldset-medium.png %%DATADIR%%/various/prodshieldset.png %%DATADIR%%/various/recruit_female.png %%DATADIR%%/various/recruit_male.png @@ -237,12 +237,15 @@ share/locale/pl/LC_MESSAGES/lordsawar.mo %%DATADIR%%/various/smallunexploredruin.png %%DATADIR%%/various/smallunexploredstronghold.png %%DATADIR%%/various/smallupkeep.png -%%DATADIR%%/various/splash_screen.jpg +%%DATADIR%%/various/splash_screen.png %%DATADIR%%/various/tileset_icon.ico %%DATADIR%%/various/tileset_icon.png %%DATADIR%%/various/tilestyles.png %%DATADIR%%/various/waypoints.png %%DATADIR%%/various/win.png %%DATADIR%%/various/xslt/as-0.2.1-0.3.0.xsl +%%DATADIR%%/various/xslt/c-0.2.1-0.2.2.xsl %%DATADIR%%/various/xslt/gs-0.2.0-0.2.1.xsl -%%DATADIR%%/various/xslt/pbm-0.2.0-0.2.1.xsl +%%DATADIR%%/various/xslt/gs-0.2.1-0.3.2.xsl +%%DATADIR%%/various/xslt/ss-0.2.1-0.3.2.xsl +%%DATADIR%%/various/xslt/ts-0.2.1-0.3.2.xsl