patchPSPP - Patches: patch #8667, gtk3 - merged master to gtk3...

 
 

You are not allowed to post comments on this tracker with your current authentication level.

patch #8667: gtk3 - merged master to gtk3 branch and fixed some problems

Submitted by:  Friedrich Beckmann <beckmanf>
Submitted on:  Mon 04 May 2015 07:08:04 AM UTC  
 
Category:  None Item Group:  None
Status:  Done Assigned to:  None
Open/Closed:  Closed

Sun 10 May 2015 04:45:03 PM UTC, comment #3: 

The merge seemed reasonable to me.  I had not worked with Git bundles before but it worked like a charm once I figured out how.

I applied this to the gtk3 branch.

Thanks a lot!

Ben Pfaff <blp>
Project Administrator
Sat 09 May 2015 08:55:32 PM UTC, comment #2: 

Hi John,

the first patch was my poor attempt to include the merge in a patch. However this seems not to work properly. I tried a bit how to make a patch which can be applied after a merge to show the manual changes as visualized by git show but I could not make it work. So I now include the git bundle which contains the three commits including the merge. To see the changes I did

mkdir tmp
cd tmp
git clone git://git.savannah.gnu.org/pspp.git
cd pspp
git remote add tryit ~/merge-master-to-gtk3.bundle
git fetch tryit
git checkout gtk3
git merge remotes/tryit/gtk3

Friedrich

(file #33969)

Friedrich Beckmann <beckmanf>
Project Member
Sat 09 May 2015 02:13:10 PM UTC, comment #1: 

For some reason I can't get the first patch to apply.

However the changes look reasonable.  I'm not really sure about the modifications to the src/output directory.  Ben: Can you have a look at these?

John Darrington <jmd>
Project Administrator
Mon 04 May 2015 07:08:04 AM UTC, original submission:  

Hi,

i merged the master to the gtk3 branch and fixed some problems. There are however still bugs in gtk3.

0001: The changes required to resolve merge conflicts from master to gtk3
0002: fixes the header window scrolling problem (Variable names in data window)
0003: fixes the problem that variable names are initially not shown in the header window.

Now psppire starts and the data is shown. Some problems that I still noticed

- gtk critical messages when the variable window shows the empty variable row
- opening some dialogs (don't remember which) crash the guy
- editing a cell in the data window and the scrolling leaves the edit rectangle in the window
- When grid.sps data is shown, the window update is slow (maybe 0.5s). This is visible when switching between menus or scrolling.

These patches are for the gtk3 branch. Patch 0001 is generated with git show <merge-commit>. The others are generated with git format-patch.

Friedrich

Friedrich Beckmann <beckmanf>
Project Member

 

Attached Files
file #33969:  merge-master-to-gtk3.bundle added by beckmanf (5KiB - application/octet-stream - git bundle to include the merge)
file #33890:  0001-merge-master-to-gtk3-changes-to-compile.patch added by beckmanf (40KiB - application/octet-stream - gtk3 patches)
file #33891:  0002-Fixed-horizontal-scrolling-for-header-window.patch added by beckmanf (3KiB - application/octet-stream - gtk3 patches)
file #33892:  0003-fixed-initial-show-of-names-in-header-window.patch added by beckmanf (7KiB - application/octet-stream - gtk3 patches)

 

Depends on the following items: None found

Items that depend on this one: None found

 

Carbon-Copy List
  • -email is unavailable- added by blp (Posted a comment)
  • -email is unavailable- added by jmd (Posted a comment)
  • -email is unavailable- added by beckmanf (Submitted the item)
  •  

    Do you think this task is very important?
    If so, you can add your encouragement to it.
    This task has 0 encouragements so far.

    Only logged-in users can vote.

     

     

     

    Follow 6 latest changes.

    Date Changed by Updated Field Previous Value => Replaced by
    2015-05-10 blp StatusNone => Done
        Open/ClosedOpen => Closed
    2015-05-09 beckmanf Attached File- => Added merge-master-to-gtk3.bundle, #33969
    2015-05-04 beckmanf Attached File- => Added 0001-merge-master-to-gtk3-changes-to-compile.patch, #33890
        Attached File- => Added 0002-Fixed-horizontal-scrolling-for-header-window.patch, #33891
        Attached File- => Added 0003-fixed-initial-show-of-names-in-header-window.patch, #33892

    Back to the top


    Powered by Savane 3.5