Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 769341 - net-misc/unison[gtk] depends on dev-ml/lablgtk:2
Summary: net-misc/unison[gtk] depends on dev-ml/lablgtk:2
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Gentoo Team for the ML programming language family
URL: https://github.com/bcpierce00/unison/...
Whiteboard:
Keywords: PullRequest
Depends on: 887609 934634
Blocks: lablgtk2-removal
  Show dependency tree
 
Reported: 2021-02-07 15:53 UTC by Andreas Sturmlechner
Modified: 2024-06-21 12:32 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
Updated ebuild with lablgtk:3 (unison-2.51.4.ebuild,2.88 KB, text/plain)
2021-10-08 11:18 UTC, Bernd Feige
Details
Replace statistics GtkCList with GtkTreeView (28167e3b67611dfc5ebff866b0ce91bf86d74d66.patch,4.33 KB, patch)
2021-10-08 11:19 UTC, Bernd Feige
Details | Diff
uigtk2: Compile with lablgtk3 (541941cbbe477cd8ff9c6fcc6b85bc63dc689153.patch,25.05 KB, patch)
2021-10-08 11:20 UTC, Bernd Feige
Details | Diff
Remove last remnants of uigtk (78d36f8a3ef9e3c57f3a95a78741490cc0bac143.patch,3.11 KB, patch)
2021-10-08 11:20 UTC, Bernd Feige
Details | Diff
uigtk2 -> uigtk3 (bb02de806e813b4c9a5b61861fc4f44536f7a856.patch,6.46 KB, patch)
2021-10-08 11:21 UTC, Bernd Feige
Details | Diff
Additional patch needed to arrive at tleedjarv' version of uigtk3.ml (rest.patch,28.75 KB, patch)
2021-10-08 11:22 UTC, Bernd Feige
Details | Diff
Updated ebuild with lablgtk:3 (unison-2.51.5.ebuild,2.73 KB, text/plain)
2022-02-22 21:29 UTC, Bernd Feige
Details
Replace statistics GtkCList with GtkTreeView (62272e8f203f32510dfa292c99408928da974f4e.patch,4.33 KB, patch)
2022-02-22 21:31 UTC, Bernd Feige
Details | Diff
GHA: Fix building lablgtk on Windows (393c03565399de3a8e02e105eb2b8ee8cc620f19.patch,1.27 KB, patch)
2022-02-22 21:32 UTC, Bernd Feige
Details | Diff
uigtk2: Compile with lablgtk3 (9626711a6c6a4da4fb73fd6b81e1023710ee1266.patch,24.78 KB, patch)
2022-02-22 21:32 UTC, Bernd Feige
Details | Diff
Remove last remnants of uigtk (d0b45f073c0899d7e743582bdcad858bd2c69ea1.patch,3.09 KB, patch)
2022-02-22 21:33 UTC, Bernd Feige
Details | Diff
uigtk2 -> uigtk3 (e05957692b1e21517708e4252f3b0e22cb1ac206.patch,321.54 KB, patch)
2022-02-22 21:34 UTC, Bernd Feige
Details | Diff
git am-able patch for GTK3 switch (0001-Unison-GTK3-switch-cf.-https-github.com-bcpierce00-u.patch,368.26 KB, text/plain)
2022-02-23 15:28 UTC, Bernd Feige
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Andreas Sturmlechner gentoo-dev 2021-02-07 15:53:30 UTC
x11-libs/gtk+:2 is dead and needs to go away.
Comment 1 Volkmar W. Pogatzki 2021-02-07 19:17:39 UTC
(In reply to Andreas Sturmlechner from comment #0)
> x11-libs/gtk+:2 is dead and needs to go away.

Upstream: https://github.com/bcpierce00/unison/issues/358
Comment 2 Andreas Sturmlechner gentoo-dev 2021-07-29 09:05:42 UTC
Upstream PR to switch to GTK3.
Comment 3 Bernd Feige 2021-10-08 11:18:13 UTC
Created attachment 743826 [details]
Updated ebuild with lablgtk:3

Ebuild with the patches of https://github.com/tleedjarv/unison
Comment 4 Bernd Feige 2021-10-08 11:19:32 UTC
Created attachment 743829 [details, diff]
Replace statistics GtkCList with GtkTreeView
Comment 5 Bernd Feige 2021-10-08 11:20:05 UTC
Created attachment 743832 [details, diff]
uigtk2: Compile with lablgtk3
Comment 6 Bernd Feige 2021-10-08 11:20:38 UTC
Created attachment 743835 [details, diff]
Remove last remnants of uigtk
Comment 7 Bernd Feige 2021-10-08 11:21:09 UTC
Created attachment 743838 [details, diff]
uigtk2 -> uigtk3
Comment 8 Bernd Feige 2021-10-08 11:22:17 UTC
Created attachment 743841 [details, diff]
Additional patch needed to arrive at  tleedjarv' version of uigtk3.ml
Comment 9 Bernd Feige 2021-10-08 11:27:45 UTC
I just pulled the patches from the linked pull request https://github.com/bcpierce00/unison/pull/566 on top of current unison-2.51.4. The four patches are not sufficient to also replace the mainWindow widget in uigtk3.ml, so I pulled that file directly from https://github.com/tleedjarv/unison and added rest.patch to get that version.

With this, unison compiles and runs fine - seems that the diff widget is fixed height and therefore hardly usable, but all basic functionality is in place.
Comment 10 Bernd Feige 2022-02-22 21:29:19 UTC
Created attachment 765681 [details]
Updated ebuild with lablgtk:3
Comment 11 Bernd Feige 2022-02-22 21:31:27 UTC
Created attachment 765682 [details, diff]
Replace statistics GtkCList with GtkTreeView
Comment 12 Bernd Feige 2022-02-22 21:32:08 UTC
Created attachment 765683 [details, diff]
GHA: Fix building lablgtk on Windows
Comment 13 Bernd Feige 2022-02-22 21:32:46 UTC
Created attachment 765684 [details, diff]
uigtk2: Compile with lablgtk3
Comment 14 Bernd Feige 2022-02-22 21:33:30 UTC
Created attachment 765685 [details, diff]
Remove last remnants of uigtk
Comment 15 Bernd Feige 2022-02-22 21:34:08 UTC
Created attachment 765686 [details, diff]
uigtk2 -> uigtk3
Comment 16 Bernd Feige 2022-02-22 21:37:24 UTC
Attached is now the ebuild using the rebased patches from pull request https://github.com/bcpierce00/unison/pull/566 on top of 2.51.5 (of Jan 16/17).
Comment 17 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2022-02-22 21:42:18 UTC
(In reply to Bernd Feige from comment #16)
> Attached is now the ebuild using the rebased patches from pull request
> https://github.com/bcpierce00/unison/pull/566 on top of 2.51.5 (of Jan
> 16/17).

Could you please either make a github PR or attach a git am-able patch to this bug (use git format-patch) from the gentoo.git repository which I can apply? It would include the ebuilds and all patches.
Comment 18 Bernd Feige 2022-02-23 15:28:08 UTC
Created attachment 765714 [details]
git am-able patch for GTK3 switch

Please find the requested patch attached.
Comment 19 Andreas Sturmlechner gentoo-dev 2022-05-18 12:52:21 UTC
GTK3
Comment 20 Andreas Sturmlechner gentoo-dev 2022-05-18 12:52:45 UTC
...GTK3 support is now in git master.
Comment 21 Larry the Git Cow gentoo-dev 2024-01-27 09:16:53 UTC
The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=437509263eb4ac577eb618e8744a06d8ad7a3b5b

commit 437509263eb4ac577eb618e8744a06d8ad7a3b5b
Author:     Christopher Fore <csfore@posteo.net>
AuthorDate: 2023-11-25 19:19:14 +0000
Commit:     Joonas Niilola <juippis@gentoo.org>
CommitDate: 2024-01-27 09:16:49 +0000

    net-misc/unison: add 2.53.3
    
    Tested on amd64 and builds successfully, tests pass.
    
    Removed ~sparc-solaris from the original ebuild provided as
    `pkgcheck scan` said it was unknown.
    
    Bug: https://bugs.gentoo.org/769341
    Closes: https://bugs.gentoo.org/887609
    Signed-off-by: Christopher Fore <csfore@posteo.net>
    Closes: https://github.com/gentoo/gentoo/pull/33986
    Signed-off-by: Joonas Niilola <juippis@gentoo.org>

 net-misc/unison/Manifest             |  1 +
 net-misc/unison/unison-2.53.3.ebuild | 99 ++++++++++++++++++++++++++++++++++++
 2 files changed, 100 insertions(+)
Comment 22 Larry the Git Cow gentoo-dev 2024-06-21 12:32:13 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=432e263820f632c52366c900519e793afe74e2be

commit 432e263820f632c52366c900519e793afe74e2be
Author:     Maciej Barć <xgqt@gentoo.org>
AuthorDate: 2024-06-21 12:28:35 +0000
Commit:     Maciej Barć <xgqt@gentoo.org>
CommitDate: 2024-06-21 12:28:35 +0000

    net-misc/unison: drop old 2.51.5-r1
    
    Closes: https://bugs.gentoo.org/850343
    Closes: https://bugs.gentoo.org/769341
    Signed-off-by: Maciej Barć <xgqt@gentoo.org>

 net-misc/unison/Manifest                |   1 -
 net-misc/unison/unison-2.51.5-r1.ebuild | 146 --------------------------------
 2 files changed, 147 deletions(-)