Page MenuHomeFreeBSD
Differential D16995

[update] games/barony to 3.2.1
ClosedPublic
Actions

Authored by devnexen_gmail.com on Sep 2 2018, 9:05 PM.
Tags
None
Referenced Files
Unknown Object (File)
Oct 29 2024, 5:58 AM
Unknown Object (File)
Oct 23 2024, 4:11 PM
Unknown Object (File)
Oct 23 2024, 4:11 PM
Unknown Object (File)
Oct 23 2024, 4:10 PM
Unknown Object (File)
Oct 20 2024, 4:29 PM
Unknown Object (File)
Oct 19 2024, 1:52 PM
Unknown Object (File)
Oct 14 2024, 3:01 AM
Unknown Object (File)
Oct 2 2024, 2:06 PM
View All 91 Files
Subscribers
mat

Details

Reviewers
tobik
Commits
rP479601: games/barony: Update to 3.2.1
Summary
  • Update to current gog.com version
  • shell script not necessary anymore, the game saving in user's home itself.

Diff Detail

Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

devnexen_gmail.com created this revision.Sep 2 2018, 9:05 PM
devnexen_gmail.com created this object with visibility "All Users".
Herald added a subscriber: mat. · View Herald TranscriptSep 2 2018, 9:05 PM
devnexen_gmail.com added a comment.Sep 2 2018, 9:10 PM

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=231109

mat added a comment.Sep 3 2018, 6:49 AM

Could you use devel/arcanist, or at least generate a diff with full context like it does, with svn diff -x -U9999 or git diff -U9999.

devnexen_gmail.com updated this revision to Diff 47624.Sep 3 2018, 6:39 PM
mat added inline comments.Sep 3 2018, 8:29 PM
games/barony/files/pkg-message.in
6

Should this be changed too?

devnexen_gmail.com updated this revision to Diff 47811.EditedSep 8 2018, 9:37 AM

Adding "hotfix" patch which unmounted one of the base folders before the application had a chance to load its contents.

I was able to push upstream this patch so it is correct.

tobik requested changes to this revision.Sep 11 2018, 12:05 PM
tobik added inline comments.
games/barony/Makefile
14–18

Having these sorted would be nicer.

games/barony/files/patch-src_menu.cpp
1–11 ↗(On Diff #47811)
  • This patch has inconsistent line endings which SVN doesn't like. The source files some to have DOS-style line endings. You might have to apply USES=dos2unix to src/menu.cpp before patching it.
  • Please use make makepatch to (re-)generate new patches in the future (also do it once for simple patches like this one if you copy them from somewhere else)
This revision now requires changes to proceed.Sep 11 2018, 12:05 PM
tobik changed the visibility from "All Users" to "Public (No Login Required)".Sep 11 2018, 12:06 PM
devnexen_gmail.com added inline comments.Sep 11 2018, 6:31 PM
games/barony/Makefile
14–18

Agreed.

games/barony/files/patch-src_menu.cpp
1–11 ↗(On Diff #47811)

Thanks good to know.

devnexen_gmail.com updated this revision to Diff 47925.Sep 11 2018, 7:23 PM
tobik accepted this revision.Sep 12 2018, 1:51 PM
tobik added inline comments.
games/barony/Makefile
20

The argument to dos2unix does nothing and dos2unix will be applied to all source files. I'm actually surprised that dos2unix even accepts an argument...

You need to set DOS2UNIX_FILES=src/menu.cpp instead if it should only be applied to src/menu.cpp. See https://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/slow-patch.html#slow-patch-automatic-replacements

This revision is now accepted and ready to land.Sep 12 2018, 1:51 PM
Closed by commit rP479601: games/barony: Update to 3.2.1 (authored by tobik). · Explain WhySep 12 2018, 1:54 PM
This revision was automatically updated to reflect the committed changes.
tobik mentioned this in D17133: Mk/Uses/dos2unix.mk: Do not accept any arguments.Sep 12 2018, 1:57 PM

Revision Contents
Changeset List

PathSize
games/
barony/
12 lines
6 lines
files/
2 lines

Diff 47624

View Options

games/barony/Makefile

Loading...
View Options

games/barony/distinfo

Loading...
View Options

games/barony/files/pkg-message.in

Loading...