main/qt5ct: update to 0.39

Did you try building this?

By Luca Weiss on 2019-07-17T11:40:24

added 1 commit

• 73794b7b - updated qt5ct checksum

Compare with previous version

By rahmanshaber on 2019-07-17T12:15:20

yes. just used another repo to push it

but issue is i can't sqush last two commits. those are not showing up after i did a git pull. what to do .

By rahmanshaber on 2019-07-17T13:16:14

What do you mean with "the commits are not showing up"?

Not really related, but did you do this tutorial already? https://git-rebase.io/ That should help with understanding rebasing (better).

By Luca Weiss on 2019-07-17T13:19:24

i am following this https://www.youtube.com/watch?v=2E23I9PzplM

pick e3921e5d xiaomi-santoni: add android adaptation (!420)
pick c4110b60 xiaomi-santoni: workaround for long boot times with hybris userland (!420)
pick 206b763d device-xiaomi-santoni: add contributors and maintainers (!420)
pick 0ea7b9a7 xiaomi-santoni: tweak kernel config for hybris-boot, add X11 config for xf86-video-hwcomposer (!420)
pick 3d513070 device-xiaomi-santoni: move alsa ucm files and sound dependencies to nonfree_firmware (!420)
pick 19c17622 device-xiaomi-santoni: remove asound.conf (!420)
pick 4499ff72 device-xiaomi-santoni: add pulseaudio support through hybris (!420)
pick cec2a9de linux-xiaomi-santoni: add hci smd for bluetooth support (!420)
pick 861fb8e5 device-xiaomi-santoni: fix post-install script (!420)
pick 96d27423 phosh/phoc: new aport (!495)
pick ccfa6e2d phosh/phosh: update to 0.3.0 (!495)
pick 40b98f4c temp/wlroots: remove, superseded by Phoc (!495)
pick 5ccbcf99 samsung-i927: update kernel to 5.2.1, more updates (!452)
pick 3dd4d8f2 samsung-zanin: new device (Samsung Galaxy Chat) (!496)
pick 326dc7b8 phosh/phoc: enable for all architectures and update to latest commit (!497)
pick 41a120ef qt5ct v39

# Rebase 2087c988..41a120ef onto 41a120ef (200 commands)

see the last commit. i see the commit i just made but can't see before that, 2 commits.

By rahmanshaber on 2019-07-17T13:22:51

The commit message should be coreapps/qt5ct: update to 0.39.

That list you're rebasing is way too big, you only need to do the last 2 commits in your branch. So git rebase -i HEAD~2 would do it.

By Bart Ribbers on 2019-07-17T13:43:11

but git rebase -i HEAD~2 not giving me the old commits i did. why q5ct in coreapps?

By rahmanshaber on 2019-07-17T13:49:11

i think "git pull" mess-up everything. Should i remove this MR and do a new one?

By rahmanshaber on 2019-07-17T14:19:47

Please don't and fix your branch!

By Luca Weiss on 2019-07-17T14:58:24

i did this. after cloning the repo from my fork of pmaport then

git checkout newmessport - that is the branch i made and pushed the commits.

git rebase -i HEAD~2 - got this, but there is no commit from mine.

pick 3dd4d8f2 samsung-zanin: new device (Samsung Galaxy Chat) (!496)
pick 36465222 phosh/phoc: enable for all architectures and update to latest commit (!497)

so how can i rebase. i tried HEAD~200 but no commit from me.

By rahmanshaber on 2019-07-17T15:16:50

With these commands I see your commits:

git clone https://gitlab.com/rahmanshaber/pmaports
cd pmaports
git checkout newmessport
git log -2

Can you dump your terminal log onto some paste site (e.g. pastebin.com)? Otherwise I can't tell what you're doing.

By Luca Weiss on 2019-07-17T15:24:25

My net is slow in peck hour. i am in mobile net now.

@z3ntu can you tell me how to rebase those w commits? that will be easy for me.

By rahmanshaber on 2019-07-17T16:39:08

changed title from updated qt5ct to coreapps/qt5ct: update to 0.39

By Bart Ribbers on 2019-07-17T19:32:29

added category::upgrade label

@z3ntu https://pastebin.com/TeTnGfvB

in short update were rejected because the tip of your current branch is behindits remote counterpart.

if i do Git pull then i can't see my commits. what to do?

By rahmanshaber on 2019-07-18T05:22:01

It seems like you almost have it. Just change

$ git push --set-upstream origin newmessport

to this (the --force is added):

$ git push --force --set-upstream origin newmessport

(In fact, you should not need "--set-upstream origin newmessport", this is only needed the first time. So git push --force should also do it.)

By Oliver Smith on 2019-07-18T21:13:52

i did the changes but not seeing any difference!!!! @ollieparanoid

By rahmanshaber on 2019-07-23T21:50:38

added 19 commits

• 73794b7b...2f2e1791 - 17 commits from branch postmarketOS:master
• 2bd91a0c - updated qt5ct
• 07db8cef - updated qt5ct checksum

Compare with previous version

By rahmanshaber on 2019-07-24T12:13:07

resolved all threads

By Luca Weiss on 2019-07-24T12:27:21

added 1 commit

• 70b38328 - main/qt5ct: update to 0.39

Compare with previous version

By rahmanshaber on 2019-07-24T12:32:46