Meson Build System Merge #548
Conversation
|
I'm expecting this PR to get knocked back, if you have guidance on how you want this merged I'll try to work with you on it. |
|
Do you think it would be possible to bring through the original hg commit history from the "missing files" in the pidgin source? |
Create main.yml for CI
Updated to latest Ubuntu
Added build commands
Added Archive Step
Added build folder to archive.
|
Is there anyone with write access who can merge this? |
|
I'll try to take a look tonight. |
|
I have also implemented 2FA for Facebook. |
| @@ -4,4 +4,16 @@ this plugin is back-ported for purple2. | |||
|
|
|||
| This project is not affiliated with Facebook, Inc. | |||
|
|
|||
| This has been forked from https://github.com/dequis/purple-facebook/ - Thanks Dequis for Maintaining this project for so long. | |||
There was a problem hiding this comment.
This probably shouldn't be merged with this here, it'd be very confusing.
|
You can't merge in bitlbee directly, the libpurple and bitlbee apis have
clear differences that prevent merging. I'll clean up my readme.
…On Tue, 17 Sept 2024, 10:22 am Phil Dibowitz, ***@***.***> wrote:
***@***.**** commented on this pull request.
The patches were there, I think, so that it was easy to pull in the
upstream bitlbee repos, as those were all patches on top. I think merging
them will prevent that....
—
Reply to this email directly, view it on GitHub
<#548 (review)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAFS2Y5C4AEMAV2Z6BA3E3DZW54LTAVCNFSM6AAAAABF2KB5GCVHI2DSMVQWIX3LMV43YUDVNRWFEZLROVSXG5CSMV3GSZLXHMZDGMBYGA2DKMZZGQ>
.
You are receiving this because you authored the thread.Message ID:
***@***.***>
|
I may be confusing different things here, so bear with me, but my understanding is the reason there's a patches directory is because it's checked out from mercurial and patched to work with libpurple. It's described a bit here: |
|
I've just looked at what it's doing. It's actually using Mercurial to pull code from the Pidgin repository. It's not downloading anything from Bitlbee. The URL: https://keep.imfreedom.org/pidgin/pidgin is the pidgin main repo. The "patches" are the actual Facebook plugin. So we're checking out the pidgin repository from 2017!, then applying patches to create our plugin. This is nuts. This is the patch revision: https://keep.imfreedom.org/pidgin/pidgin/rev/9ff9acf9fa14. This system needs to go in the bin, the more you look the worse it gets, there are even libpurple fixes in upstream that never get merged in with the build scripts. I will see what I can do. |
|
I've found the last revision ever uploaded to Mercurial. It's the revision we've been using. There are no more revisions past that and they actually nuked the plugin from the repository. Check that out as a hg repository and convert it to git, upload to github to preserve commit history, then we need to delete everything that we don't use (all the purple stuff except our plugin), and then we have to go through our patches and verify that they apply, and commit each patch so we have a new history of changes. This is going to take a while. |
|
I've created a new repository called https://github.com/DMJC/purple-fb-master I've attempted to extract and import the Mercurial history for pidgin into it. Once the upload finishes I will try to clean up the repository to match The Facebook Plugin. |
|
The revision of the code that the facebook plugin checks out/builds against is: https://keep.imfreedom.org/pidgin/pidgin/rev/9ff9acf9fa14 if you look in the update.sh file in the purple-facebook project, it calls a MANIFEST file and a VERSION file. The MANIFEST is the files it grabs from Mercurial, the VERSION is the revision it checks out, and there is also a MANIFEST_VOIDS which just creates empty files in includes file the project. Most of the pidgin project code/files is not needed. I need some advice on what we should clean up/keep in terms of history. |
Implemented Meson Build script. Currently only tested on linux