Skip to content

Fix pyjnius setup.py patches#1417

Merged
AndreMiras merged 1 commit intomasterfrom
fix_pyjnius_setup
Oct 20, 2018
Merged

Fix pyjnius setup.py patches#1417
AndreMiras merged 1 commit intomasterfrom
fix_pyjnius_setup

Conversation

@KeyWeeUsr
Copy link
Copy Markdown
Contributor

@KeyWeeUsr KeyWeeUsr commented Oct 20, 2018

Broken due to edits in kivy/pyjnius#356

@KeyWeeUsr KeyWeeUsr mentioned this pull request Oct 20, 2018
Closed
AndreMiras
AndreMiras approved these changes Oct 20, 2018
View reviewed changes
Copy link
Copy Markdown
Member

@AndreMiras AndreMiras left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Please make sure build is green before merging

@AndreMiras AndreMiras merged commit 7aaeeae into master Oct 20, 2018
@AndreMiras AndreMiras deleted the fix_pyjnius_setup branch October 20, 2018 10:07
@KeyWeeUsr KeyWeeUsr mentioned this pull request Oct 20, 2018
Closed
@KeyWeeUsr
Copy link
Copy Markdown
Contributor Author

KeyWeeUsr commented Oct 20, 2018

sdl2_jnienv_getter.patch patch though seems like it should already been applied to pyjnius directly.

https://github.com/search?q=org%3Akivy+SDL_ANDROID_GetJNIEnv&type=Code
https://github.com/search?q=org%3Akivy+SDL_AndroidGetJNIEnv&type=Code SDL_ANDROID_GetJNIEnv

is just replaced with SDL_AndroidGetJNIEnv when building SDL2... but why?

even android recipe calls the SDL2 original one _android_billing_jni.c#L19

SDL_AndroidGetJNIEnv is the original extern one from sdl2 and that calls sdl's Android_JNI_GetEnv, but for pygame there is SDL_ANDROID_GetJNIEnv

https://github.com/kivy/p4a-pygame-bootstrap-components/blob/7d39c8d2a3f194c08041a7702419e44c042eb3b1/pygame_bootstrap_jni/sdl/src/video/android/SDL_androidvideo.c#L61 for some reason and that's not even externed 🤔

I don't think it should be patched, rather renamed to the correct thing hmmm.

@AndreMiras AndreMiras mentioned this pull request Oct 20, 2018
Closed
@KeyWeeUsr KeyWeeUsr mentioned this pull request Oct 21, 2018
Closed
AndreMiras added a commit to AndreMiras/python-for-android that referenced this pull request Oct 22, 2018
@AndreMiras
Pins pyjnius==1.1.2
00c87b1 
Fixes patch failing with:
```
patching file setup.py
Hunk #1 FAILED at 53.
1 out of 1 hunk FAILED -- saving rejects to file setup.py.rej
```
refs kivy#1414, kivy#1416, kivy#1417
@AndreMiras AndreMiras mentioned this pull request Oct 22, 2018
Merged
AndreMiras added a commit to AndreMiras/python-for-android that referenced this pull request Oct 22, 2018
@AndreMiras
WIP Pins pyjnius==1.1.2
8633449 
Fixes patch failing with:
```
patching file setup.py
Hunk #1 FAILED at 53.
1 out of 1 hunk FAILED -- saving rejects to file setup.py.rej
```
refs kivy#1414, kivy#1416, kivy#1417
AndreMiras added a commit to AndreMiras/python-for-android that referenced this pull request Oct 22, 2018
@AndreMiras
Pins pyjnius==1.1.2
2c231ce 
Fixes patch failing with:
```
patching file setup.py
Hunk #1 FAILED at 53.
1 out of 1 hunk FAILED -- saving rejects to file setup.py.rej
```
refs kivy#1414, kivy#1416, kivy#1417
@r00tb3
Copy link
Copy Markdown

r00tb3 commented Dec 30, 2019

How do i fix this?

I'm unable to apply this patch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AndreMiras AndreMiras AndreMiras approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@KeyWeeUsr @r00tb3 @AndreMiras @gbm001 @OptimusGREEN