Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Please forward patches upstream #32

Open
rzr opened this issue Jan 8, 2020 · 8 comments
Open

Please forward patches upstream #32

rzr opened this issue Jan 8, 2020 · 8 comments

Comments

@rzr
Copy link

rzr commented Jan 8, 2020

It would be appreciated if we could avoid double maintenance effort

I started to pick some of your changes,
now can you please consider to forward valuable patches
that are not merged in this branch:

https://github.com/rzr/pinball

Smaller changes are better and easier to review:

adoptware#2

Then you can try to rebase on upstream

I also plan to release a new version which number do you suggest ?
@sergiomb2
Copy link
Owner

OK , I very busy right now , I though in squash all commits into a few , may I just can reply on end of the month .

Thanks

@rzr
Copy link
Author

rzr commented Jan 8, 2020

thx for feedback there is no emergency we can do it anytime.

Meanwhile my "priority" is to release tables on current version, double check will be welcome:

adoptware/pinball-table-gnu#2

adoptware/pinball-table-hurd#2

@rzr rzr mentioned this issue Jan 19, 2021
Open
@rzr
Copy link
Author

rzr commented Jan 19, 2021 •
edited
Loading

Is there any patches here worth up streaming, feel free to comment each of them on linked page and then tick the box

Preferably start from top to bottom

Relate-to: adoptware#15

base=v030 ; base=c5401219
git log  --pretty=" %h : '%s' <%an>"  $base..remotes/sergiomb2/master  | while read line ; do echo "- [ ] $line" ; done  | tac
  • f1e5309 : 'just noted mem leak MLK osx port'
  • 0de8804 : 'Macosx trick by Eye (rzr friend)'
  • 3b65970 : 'sound and image files'
  • 13604d6 : 'add'
  • a6feab0 : 'some macosx fixes'
  • f4762c2 : '*** empty log message ***'
  • 039ae99 : 'debian metadata (from prev version)'
  • 30238cd : 'started debian patch'
  • 055c9eb : 'debian merge'
  • 8c97a88 : '*** empty log message ***'
  • 1b887f0 : 'lintian'
  • 3b0e267 : ' * Merged debian patches from : pinball_0.3.1-7.diff.gz (debian/ ommited)'
  • f44d507 : ' * Replaced debian dir with 'pinball_0.3.1-7.diff.gz''
  • 8fbe786 : 'Rebuilt on debian, fix warnings'
  • 5a11117 : 'Remove generated file'
  • 2141d21 : 'Fix build issue'
  • 55c0eb9 : 'install mid once'
  • c2d3e8e : 'debuild'
  • e80c47a : 'Depends on aclocal'
  • 3f45fe3 : 'fix and build on lucid now'
  • 890e8a7 : 'Merge: pinball_0.3.1-12.dsc Tested to rebuild gnu table'
  • b347fa1 : 'Merge pinball_0.3.1-12.dsc/debian'
  • 2325954 : 'Imported Debian patch 0.3.1-7'
  • f2b98c6 : 'Imported Debian patch 0.3.1-13'
  • 4803095 : 'rebuild: on debian x86'
  • 39f8046 : 'clean: distclean'
  • b405a33 : 'build: amd64 ubuntu'
  • 458245b : 'clean: manually'
  • 29e2d3d : 'build: meego netbook'
  • 92df4b8 : 'add: helper links'
  • 9d6b195 : 'build: meego rpm'
  • 03f56ce : 'fix: debian'
  • 32342e2 : 'build: deb on debian'
  • f872091 : 'build: ignore generated files (debian)'
  • 56c7910 : 'build: meego-handset-sdk'
  • 6c773f9 : 'fix: ac on meego'
  • 5634461 : 'build: meego-handset-sdk'
  • ec3badd : 'build: meego-handset-sdk'
  • 07e5e11 : 'build: meego-handset-sdk'
  • f3b75e5 : 'build: meego-handset-sdk'
  • c9a3bf9 : 'add: ratio Close #555251 ( http://bugs.debian.org/555251 )'
  • b2bf4d3 : 'fix: minor bug'
  • 34ef2c5 : 'merge: from tracker'
  • 0136a78 : 'build: debian x86'
  • 0b86c85 : 'fix: ratio bug'
  • 1ab5948 : 'fail: build: meego: obs:'
  • 6bb9836 : 'fix: width issue ; run: meego-neetbook'
  • b5528f9 : 'branch: pinball-data-extra provide a hurd table'
  • b3469fe : 'merge: professor form Paolo Caroni'
  • faf300a : 'build: maemo: freemantle (x86)'
  • 9d2a9a2 : 'add: comment fr'
  • ef549c9 : 'revert: deb'
  • ab7568c : 'merge: http://pdb.finkproject.org/pdb/package.php/pinball'
  • 7d6355e : 'fix: const'
  • 8bd71af : 'verbose version'
  • e03687d : 'imported gnu table from Paolo Caroni archive see 'data/hurd/README.txt''
  • b6ba545 : 'import: http://pastefile.com/uploads/gnu.tar.gz [Ben Asselstine]'
  • 46dcb9c : 'delete mkinstalldirs'
  • 0ca7f5c : 'Merge branch 'pinball-data-extra'' <Sérgio M. Basto>
  • 9e1d9fe : 'I18n and translation into German added.'
  • 08e78d3 : 'Merge pull request My table #1 from skreutzer/master' <Phil "RzR" Coval>
  • a77ef7e : 'Merge github.com:rzr/pinball' <Sérgio M. Basto>
  • 19b666f : 'Deleted: data/gnu/.README.swp' <Sérgio M. Basto>
  • 4ce3ad7 : 'Increase drawing quality of the ball'
  • 579493f : 'Try update hurd table.' <Sérgio M. Basto>
  • 7ebc35f : 'The incomplete and mysterious table named house.' <Sérgio M. Basto>
  • 48f0aa5 : 'Update gnu table to gnu-3.1-20130301.tar.gz' <Sérgio M. Basto>
  • f13ad5c : 'Removed patches that are already applied' <Sérgio M. Basto>
  • 313afd7 : 'cp data/hurd.old/up.wav data/hurd' <Sérgio M. Basto>
  • 508b7f9 : 'Removed Debian patches, also already committed.' <Sérgio M. Basto>
  • a44b37f : 'Updated pinball.desktop' <Sérgio M. Basto>
  • fbe5938 : 'Fixed the permissions of all files.' <Sérgio M. Basto>
  • a0f1872 : 'deleted: depcomp' <Sérgio M. Basto>
  • 7a563cf : 'Add missing file for RZR_PATCHES' <Sérgio M. Basto>
  • ca7738f : 'Fix and update autotools' <Sérgio M. Basto>
  • bcab49a : 'Added pinball.appdata.xml' <Sérgio M. Basto>
  • 74d271b : 'data/hurd.old/ equal to pinball.rzr/data/hurd' <Sérgio M. Basto>
  • cbc0d6a : 'Add more screen ratios and add a test of setScale' <Sérgio M. Basto>
  • 784c7d1 : 'Update urls of homepage to advertise new releases.' <Sérgio M. Basto>
  • b574382 : 'Don't create highscores files.' <Sérgio M. Basto>
  • 438fcdc : 'Bring back old professor table' <Sérgio M. Basto>
  • bcbc262 : 'Move configuration to ~/.config' <Sérgio M. Basto>
  • f78a46a : 'upgrade Professor2 to the last version'
  • 7c664af : 'Upgrade README file on my table'
  • bf53b00 : 'Fedora pinball.spec' <Sérgio M. Basto>
  • 2b3d82b : 'Add License.txt' <Sérgio M. Basto>
  • 883cfe4 : 'Update License.txt' <Sérgio M. Basto>
  • a76d9cf : 'Keyboard is now cleared on reset.'
  • 32db9b5 : 'Do not install midi version of the intro'
  • 925793a : 'Save .hiscore in ~/.config/emilia' <Sérgio M. Basto>
  • 631b4d0 : 'Simulate behavior of flippers when the game has ended (i.e. they cannot be used)'
  • 173a904 : 'Fix gettext strings in Score.cpp and update localization files.'
  • 04164ec : 'Started french translation' <José Jorge>
  • 9b7a7d5 : 'Finish french translation, removed bogus references to de_DE translator.' <José Jorge>
  • 0555b16 : 'ascii only french text as pinball font only understands that' <José Jorge>
  • ccf34dd : 'fix french texts to fit on screen' <José Jorge>
  • 733f153 : 'portuguese translation' <José Jorge>
  • 7191611 : 'corrected french translation' <José Jorge>
  • 7c6e070 : 'Correct one sentence' <Sérgio M. Basto>
  • b987852 : 'Add AM_GNU_GETTEXT and bump release.' <Sérgio M. Basto>
  • 07cdbff : 'Fix commit 1f16f06 not use array with limited size' <Sérgio M. Basto>
  • 616a1ca : 'Use charset=UTF-8 in translations' <Sérgio M. Basto>
  • 74cb902 : 'We may require just gettext-0.17 to build in RHEL6' <Sérgio M. Basto>
  • 499b1ea : 'fix long strings'
  • 3205b02 : 'Move debian folder to downstream folder' <Sérgio M. Basto>
  • b96a7f2 : 'delete data/locale/update_utf8.sh and update po files' <Sérgio M. Basto>
  • bf29548 : 'Add generated files by gettext to .gitignore' <Sérgio M. Basto>
  • 1d9c2e7 : 'Add gettext to debian package depends' <Sérgio M. Basto>
  • 5713bed : 'Deleted clean file, clean is done with git' <Sérgio M. Basto>
  • 38bd603 : 'Translations for Catalan and Spanish' <Sérgio M. Basto>
  • 21c3e14 : '01-random-table-load.patch' <Sérgio M. Basto>
  • d1177ba : 'pinball.desktop set keywords' <Sérgio M. Basto>
  • eeef653 : 'Update ChangeLog with git changelog -a' <Sérgio M. Basto>
  • 634f92e : 'Delete file pinball.pot' <Sérgio M. Basto>
  • f525c00 : 'close this error report:' <Sérgio M. Basto>
  • 295235c : 'Rename README to README.md'
  • c8abf5d : 'Update README.md'
  • f66b02e : 'Update README.md'
  • 2d8be76 : 'Bugfix : config width can't be saved if it is bigger than 1600 pixels'
  • 074f15e : 'Add some screens sizes'
  • dd7f567 : 'Revert changes on README' <Sérgio M. Basto>
  • 0ccffed : 'Merge remote-tracking branch 'upstream/master'' <Sérgio M. Basto>
  • afd9b55 : 'Readd changes on README' <Sérgio M. Basto>

rzr referenced this issue Jan 19, 2021
@arashjafari @rzr
Rename README to README.md
295235c
@rzr
Copy link
Author

rzr commented Feb 11, 2021

I am considering to release a version soon or later
it will be appreciated if you open PR with related l10n patches

adoptware#15

@sergiomb2
Copy link
Owner

sorry ENOTIME

@rzr
Copy link
Author

rzr commented May 11, 2021

Hi,

I might release a new version (on SDL2) maybe I should ping authors to port their patch to upstream:
adoptware#15

@sergiomb2 If this version is no more maintained,
would you like to transfer it to @abandonware org ?

Same question applies pinedit , I might revive it soon or later.

BTW I'll explain about pincab profile at #LGM2021 see latest news at:
https://purl.org/rzr/pinball

@sergiomb2
Copy link
Owner

https://github.com/sergiomb2/pinball/commits/devel have all commits of SDL2 , but when pinball start it the screen wasn't refresh , we need to move or rezise windows to refresh buffer .

yes this version is no more maintained, neither pinedit

@rzr
Copy link
Author

rzr commented May 11, 2021 •
edited
Loading

I didn't observe this behaviour on my version, anyway about tranfering pinedit let's discuss how to do it at:
adoptware#13

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@rzr @sergiomb2