Page MenuHomeLubuntu Development

Fix DND with MTP devices
Closed, ResolvedPublic

Description

There's finally a fix for a long standing bug with DND working with MTP devices (read: smartphones) in pcmanfm-qt. I think since copy/paste still works, it's not SRU'able, but we should make sure this is in 19.10.

Details

Differential Revisions
D32: Fix DND MTP Bug

Event Timeline

wxl triaged this task as High priority.Sun, Jul 28, 8:54 PM
wxl created this task.

@wxl (or another willing package such as @kc2bez or @apt-ghetto or @hmollercl); please cherry-pick this into 19.10. We can't rely on a release to happen beforehand.

As for an SRU, I'd like a second opinion here. Would someone like to ping the SRU team or should I?

The_LoudSpeaker added a subscriber: The_LoudSpeaker.

The patch doesn't apply. There are waaay too many changes since last release. around 60 something commits.

Should I ask for a new release upstream? Else will have to create a patch for each commit and apply and that will be too many patches.

There are 7 commits in all, affecting the concerned file. Some of them are highlighted in the image below

kc2bez added a comment.Fri, Aug 9, 4:33 PM

The patch doesn't apply. There are waaay too many changes since last release. around 60 something commits.
Should I ask for a new release upstream? Else will have to create a patch for each commit and apply and that will be too many patches.

It should be small enough change that is should go but you may need to quilt it in manually. Pull up the source in phab and look at the commit. See if you can find where it needs to be applied. Take a look at the following from the packaging tutorial :

## make a new patch
mkdir debian/patches # just in case it doesn't exist
quilt push -a  # just in case there are patches, we apply them all
quilt new NAME.patch
# this is where you actually make the changes you want
quilt edit PATH/TO/FILE 
quilt refresh
quilt header --dep3 -e
kc2bez added a comment.Fri, Aug 9, 4:36 PM

I forgot to mention, paste your buildlog so we can look at the errors.

Bump. @The_LoudSpeaker how is this coming along?

As I said that day, there are several commits after latest release. total 7 affecting the concerned file. But among those commits, other files are also changed. So I will have to try to create a patch of each concerning commit and then merge all patches into one. *Then* try to apply that patch. A bit busy today. Have a marathon tommorow. Will give it a shot on friday.

Also, build log got lost last time. This time I will create a paste.

D32 is the diff you should be looking at.
And here's the longest paste ever: P30
Includes build log. Had to build more than once. Don't remember exactly how many times.

Also can someone tell what does line 1984 from the paste means? I selected continue.

wxl added a comment.Thu, Aug 15, 7:06 PM

Almost there!

kc2bez added a comment.EditedThu, Aug 15, 8:11 PM
In T99#2025, @wxl wrote:

Almost there!

Really this >< close.

First. a rm -rf debian/libfm-qt6/ and a rm -rf debian/libfm-qt-l10n/ get rid of the extra naughty bits that made their way in D32 If you do a git status or git diff before you commit it will show the changes like this:

ds@ds-dev-lubuntu:~/libfm_wkdir/libfm-qt$ git status
On branch ubuntu/eoan
Your branch is up to date with 'origin/ubuntu/eoan'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   debian/changelog
        modified:   debian/patches/series

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        debian/libfm-qt-l10n/
        debian/libfm-qt6/
        debian/patches/fix-dnd-for-mtp.patch

no changes added to commit (use "git add" and/or "git commit -a")
ds@ds-dev-lubuntu:~/libfm_wkdir/libfm-qt$ rm -rf debian/libfm-qt6/
ds@ds-dev-lubuntu:~/libfm_wkdir/libfm-qt$ rm -rf debian/libfm-qt-l10n/
ds@ds-dev-lubuntu:~/libfm_wkdir/libfm-qt$ git status 
On branch ubuntu/eoan
Your branch is up to date with 'origin/ubuntu/eoan'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   debian/changelog
        modified:   debian/patches/series

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        debian/patches/fix-dnd-for-mtp.patch

no changes added to commit (use "git add" and/or "git commit -a")

Second. Take another look at your patch, it really is super close. I created P31 by hand though and it did apply cleanly. Compare P31 and the commit You can see the lines affected are different but for my patch I didn't change the code applied.
Last minor little issue. Take a look at your quilt header author.

Nice work Raman!

So this goes as a SRU?

wxl added a comment.Fri, Aug 16, 11:50 PM

I don't know @The_LoudSpeaker. My opinion was no but @tsimonq2 wanted a "second opinion" that he never reported back on.

wxl closed this task as Resolved.Sat, Aug 17, 12:25 AM

Not sure why this didn't autoclose.