Date: Wednesday, December 27, 2017 @ 17:07:08 Author: eschwartz Revision: 276255
Fix FS#56568 fail to build from source due to missing source Reverts back to upstream branch, reimplement the single line fix from the fork as a patch Added: bzr-fastimport/repos/community-any/str-mark.diff bzr-fastimport/trunk/str-mark.diff Modified: bzr-fastimport/repos/community-any/PKGBUILD bzr-fastimport/trunk/PKGBUILD -----------------------------------+ repos/community-any/PKGBUILD | 12 ++++++++++-- repos/community-any/str-mark.diff | 13 +++++++++++++ trunk/PKGBUILD | 12 ++++++++++-- trunk/str-mark.diff | 13 +++++++++++++ 4 files changed, 46 insertions(+), 4 deletions(-) Modified: repos/community-any/PKGBUILD =================================================================== --- repos/community-any/PKGBUILD 2017-12-27 15:31:21 UTC (rev 276254) +++ repos/community-any/PKGBUILD 2017-12-27 17:07:08 UTC (rev 276255) @@ -9,9 +9,17 @@ url='https://launchpad.net/bzr-fastimport' license=('GPL2') depends=('bzr' 'python2-fastimport') -source=("${pkgname}::bzr+lp:~jelmer/bzr-fastimport/trunk#revision=361") -sha256sums=('SKIP') +source=("${pkgname}::bzr+lp:bzr-fastimport#revision=360" + "str-mark.diff") +sha256sums=('SKIP' + 'd7e2f7c088570d9f9482bf4bba97885cf262260737b87c0ebb1122234331aeb6') +prepare() { + cd ${pkgname} + + patch -p1 < ../str-mark.diff +} + package() { cd ${pkgname} Added: repos/community-any/str-mark.diff =================================================================== --- repos/community-any/str-mark.diff (rev 0) +++ repos/community-any/str-mark.diff 2017-12-27 17:07:08 UTC (rev 276255) @@ -0,0 +1,13 @@ +=== modified file 'exporter.py' +--- old/exporter.py 2014-05-15 09:26:03 +0000 ++++ new/exporter.py 2017-12-27 17:01:10 +0000 +@@ -436,7 +436,7 @@ + pass + + # Build and return the result +- return commands.CommitCommand(git_ref, mark, author_info, ++ return commands.CommitCommand(git_ref, str(mark), author_info, + committer_info, revobj.message.encode("utf-8"), from_, merges, iter(file_cmds), + more_authors=more_author_info, properties=properties) + + Modified: trunk/PKGBUILD =================================================================== --- trunk/PKGBUILD 2017-12-27 15:31:21 UTC (rev 276254) +++ trunk/PKGBUILD 2017-12-27 17:07:08 UTC (rev 276255) @@ -9,9 +9,17 @@ url='https://launchpad.net/bzr-fastimport' license=('GPL2') depends=('bzr' 'python2-fastimport') -source=("${pkgname}::bzr+lp:~jelmer/bzr-fastimport/trunk#revision=361") -sha256sums=('SKIP') +source=("${pkgname}::bzr+lp:bzr-fastimport#revision=360" + "str-mark.diff") +sha256sums=('SKIP' + 'd7e2f7c088570d9f9482bf4bba97885cf262260737b87c0ebb1122234331aeb6') +prepare() { + cd ${pkgname} + + patch -p1 < ../str-mark.diff +} + package() { cd ${pkgname} Added: trunk/str-mark.diff =================================================================== --- trunk/str-mark.diff (rev 0) +++ trunk/str-mark.diff 2017-12-27 17:07:08 UTC (rev 276255) @@ -0,0 +1,13 @@ +=== modified file 'exporter.py' +--- old/exporter.py 2014-05-15 09:26:03 +0000 ++++ new/exporter.py 2017-12-27 17:01:10 +0000 +@@ -436,7 +436,7 @@ + pass + + # Build and return the result +- return commands.CommitCommand(git_ref, mark, author_info, ++ return commands.CommitCommand(git_ref, str(mark), author_info, + committer_info, revobj.message.encode("utf-8"), from_, merges, iter(file_cmds), + more_authors=more_author_info, properties=properties) + +
