Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 302935 - kde-misc/kdiff3 supports building without KDE
Summary: kde-misc/kdiff3 supports building without KDE
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: New packages (show other bugs)
Hardware: All Linux
: High enhancement with 1 vote (vote)
Assignee: Bernard Cafarelli
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-01-31 02:32 UTC by Matthew Turnbull
Modified: 2011-01-12 22:50 UTC (History)
4 users (show)

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


Attachments
Ebuild changes (kdiff3-0.9.95-ebuild.patch,1.28 KB, text/plain)
2010-01-31 02:33 UTC, Matthew Turnbull
Details
kdiff3 patch (kdiff3-0.9.95-optional-kde.patch,18.44 KB, text/plain)
2010-01-31 02:33 UTC, Matthew Turnbull
Details
Patch against ebuild for Qt-only installation (kdiff3_qt-only_ebuild.patch,1.56 KB, patch)
2010-02-23 14:58 UTC, Peter Weilbacher
Details | Diff
Patch against ebuild for Qt-only installation (v2) (kdiff3_qt-only_ebuild_v2.patch,1.71 KB, patch)
2010-02-25 21:46 UTC, Peter Weilbacher
Details | Diff
full ebuild (kdiff3-0.9.95-r9999.ebuild,1.51 KB, patch)
2010-08-31 11:45 UTC, Peter Weilbacher
Details | Diff
ebuild (kdiff3-0.9.95-r1.ebuild,1.37 KB, text/plain)
2010-12-30 16:05 UTC, Theo Chatzimichos (RETIRED)
Details
build.log (build.log,182.14 KB, text/plain)
2010-12-30 16:06 UTC, Theo Chatzimichos (RETIRED)
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Matthew Turnbull 2010-01-31 02:32:19 UTC
kdiff3 includes some stubs that allows it to be built completely against Qt rather than KDE.

I've written a patch that rewrites a couple of the cmake files to optionally build without KDE. Ideally, I'd like to see this submitted upstream, but I figured this would be a good place to get some additional testing.

Basic items needing testing:
- Building (and running) with KDE (and libkonq)
- Building (and running) without KDE
- Translations (with and without KDE)

I've gotten it built and running without KDE, though I haven't tested if the translations work (not sure how). The only noticeable regression is that the non-KDE builds don't have the kdiff3 icon as a window titlebar decoration. I don't know how that works [in Qt], so I didn't tackle that cosmetic problem.

A month ago, when I last worked on it, it was also building and running with KDE and libkonk. Though, again, I didn't test the translations, and I don't know if the konquorer support actually worked. I have made some changes since then, but not anything I think would cause problems (but I make no guarantees).

kdiff3 does provide a qmake file, but it dosn't handle the translations. Also it would require more significant changes to the ebuild, or a separate ebuild all together. Plus, this was a good excuse to teach myself from cmake.

Anyways, I appreciate any comments/testing on the patch (especially in regard to upstreaming it).

Reproducible: Always

Steps to Reproduce:
Comment 1 Matthew Turnbull 2010-01-31 02:33:08 UTC
Created attachment 217969 [details]
Ebuild changes
Comment 2 Matthew Turnbull 2010-01-31 02:33:24 UTC
Created attachment 217971 [details]
kdiff3 patch
Comment 3 Tomáš Chvátal (RETIRED) gentoo-dev 2010-02-09 16:12:57 UTC
If upstream releases version that has optional kde4 we will gladly accept it.

We won't alter the buildsystem of the current package tho.

Feel free to sent the build patch to the upstream maintainer if you want it included.
Comment 4 Matthew Turnbull 2010-02-09 18:30:14 UTC
I was hoping that, at least, this would at least get the patch some testing/review (regardless of whether it made it into an ebuild) before pushing upstream.. But ok, I'll just push upstream and see what happens.
Comment 5 Peter Weilbacher 2010-02-23 12:59:48 UTC
I don't quite understand why this was WONTFIXed, but I'm interested to see this in Gentoo myself. With new Gentoo installations I otherwise have to build it outside of portage from the original sources in /usr/local. (It doesn't need any patches then.)

Was something finally submitted to upstream kdiff3? Just asking because I don't find it in the SF tracker of kdiff3.
Comment 6 Samuli Suominen (RETIRED) gentoo-dev 2010-02-23 13:05:43 UTC
The place to discuss this is at upstream bug tracking system, we won't maintain this in Portage if they don't accept it first.
Comment 7 Peter Weilbacher 2010-02-23 14:41:32 UTC
I don't actually think any change upstream is necessary because the package from upstream already installs flawlessly without KDE.

I'm not good at writing ebuilds (yet) but I'm going to attach a first try in a minute which can do without any changes to the kdiff3 package.
Comment 8 Peter Weilbacher 2010-02-23 14:58:30 UTC
Created attachment 220841 [details, diff]
Patch against ebuild for Qt-only installation

I'm sure one can improve things with regard to the documentation, but this works with Qt-only. I don't have a box with KDE installed, so I cannot check if that still works (but according to the docs I found, it should).
Comment 9 Matthew Turnbull 2010-02-23 18:33:30 UTC
I finally got around to pushing this up-stream
https://sourceforge.net/tracker/?func=detail&aid=2957347&group_id=58666&atid=488548

(In reply to comment #8)
> Created an attachment (id=220841) [details]
> Patch against ebuild for Qt-only installation

At the very least, the konquorer depend should be inside the KDE depend.Take a look at my ebuild patch for how I handle DEPEND and RDEPEND.

I'm sorry I don't have more time to take a closer look. I've been really busy with my course work recently.
Comment 10 Peter Weilbacher 2010-02-25 21:46:30 UTC
Created attachment 221215 [details, diff]
Patch against ebuild for Qt-only installation (v2)

Good point. How about this then?

Is this at least good enough to reopen this bug? Or should I open a new one?
Comment 11 Tomáš Chvátal (RETIRED) gentoo-dev 2010-02-25 23:52:10 UTC
Worth reopening indeed.
Comment 12 Chetan Reddy 2010-08-31 03:23:51 UTC
Just FYI, debian has a qt only version of kdiff3 that i've been using for a while without facing any bugs. So upstream definitely supports building without kde.
Comment 13 Peter Weilbacher 2010-08-31 11:45:52 UTC
Created attachment 245469 [details, diff]
full ebuild

Here's the full ebuild file that still works for me. Compared to the patch that I submitted half a year ago, this only removes the blank between >= and kde-base (which made some portage tools give weird results) and adds amd64-linux keyword (that is also part of the official ebuild).

What is the way to proceed with this? Do I need to submit the patch for review somehow? http://www.gentoo.org/doc/en/ebuild-submit.xml does not give any hints.
Comment 14 Theo Chatzimichos (RETIRED) archtester gentoo-dev Security 2010-12-30 14:25:53 UTC
The ebuild diff does not work for -kde, but anyway, kdiff3 itself doesn't behave correct without KDE (eg missing icons). I'm following the upstream patch for the cmake patch though, we may add non-kde support in the future. For now I'm closing the bug, thank you all for your efforts though
Comment 15 Peter Weilbacher 2010-12-30 14:41:06 UTC
(In reply to comment #14)
> The ebuild diff does not work for -kde

Eh, Theo, can you please specify _what_ does not work? I have been using this ebuild since I submitted it, on several machines with -kde. It works and I have all the icons that I need.
Comment 16 Theo Chatzimichos (RETIRED) archtester gentoo-dev Security 2010-12-30 16:03:34 UTC
if it behaves ok then i'm fine in adding it in overlay.
I'm attaching the ebuild i tried (a slightly modified version of yours, nothing special) and my build.log. When compiling with -kde it calls qmake (as expected) and then it calls cmake for some reason
Comment 17 Theo Chatzimichos (RETIRED) archtester gentoo-dev Security 2010-12-30 16:05:45 UTC
Created attachment 258438 [details]
ebuild
Comment 18 Theo Chatzimichos (RETIRED) archtester gentoo-dev Security 2010-12-30 16:06:20 UTC
Created attachment 258440 [details]
build.log
Comment 19 Peter Weilbacher 2010-12-31 10:46:39 UTC
OK, for you it fails because of FEATURES=test. I never had that enabled anywhere. But with that (and your ebuild) it fails for my, too, even earlier than for you:

   [... snip ...]
   -- Detecting CXX compiler ABI info
   -- Detecting CXX compiler ABI info - done
   CMake Error at /usr/share/cmake/Modules/FindKDE4.cmake:58 (MESSAGE):
     ERROR: Could not find KDE4 kde4-config
   Call Stack (most recent call first):
     CMakeLists.txt:4 (find_package)
I have no idea what magic src_test or kde4-base_src_test do by default, so I cannot really help solve this failure (yours or mine).
Comment 20 Theo Chatzimichos (RETIRED) archtester gentoo-dev Security 2011-01-12 22:50:24 UTC
fixed in 0.9.95-r1 and -9999, enjoy