Updating the minimal required version number for kdelibs, inside kdebase

[Shlomi Fish]

Hi!

Here is the new version of the patch. See below for my commentary.

On Sun, Mar 29, 2009 at 11:11 PM, Andreas Pakulat <apaku-Mmb7MZpHnFY at public.gmane.org> wrote:
> On 29.03.09 21:13:30, Shlomi Fish wrote:
>> The attached patch adds a minimal required version number of kdelibs
>
> This is not quite the right list for patches, you should send such a patch to
> kde-core-devel next time (AFAIK). I'm cc'ing them.

Yes, but I was told to address release-team because you are the ones
who should update the version in kdebase.

>
>> to the kdebase module in trunk. At the moment, the cmake process will
>> complete successfully with any kdelibs, including that of kde-4.2.x,
>> only to result in obscure compilation errors later.
>>
>> However, the version numbers in the patch needs to be updated whenever
>> there's a new development version of KDE in the trunk. So someone has
>> to do it.
>
> That would be the job of the module coordinator for kdebase.
>

OK.

> Regarding the actual patch:
>
>
>> Index: runtime/kioslave/fish/tests/CMakeLists.txt
>> ===================================================================
>> --- runtime/kioslave/fish/tests/CMakeLists.txt        (revision 946568)
>> +++ runtime/kioslave/fish/tests/CMakeLists.txt        (working copy)
>> @@ -1,5 +1,5 @@
>>  PROJECT( copytester )
>> -FIND_PACKAGE( KDE4 REQUIRED )
>> +FIND_PACKAGE( KDE4 4.2.68 REQUIRED )
>
> This looks wrong (seems the whole dir was copied from some place where it
> was built standalone). There's no need for the find_package here as its
> already being searched in runtime.

I removed the FIND_PACKAGE call altogether.

>
>> Index: CMakeLists.txt
>> ===================================================================
>> --- CMakeLists.txt    (revision 946568)
>> +++ CMakeLists.txt    (working copy)
>> @@ -13,7 +13,7 @@
>>  #
>>
>>  # search packages used by KDE
>> -find_package(KDE4 REQUIRED)
>> +find_package(KDE4 4.2.68 REQUIRED)
>
> I guess the reason for the find_packages in runtime/workspace/apps is for
> the split-built thats supported. If that is the case I don't see why a
> find_package is needed in the top-level file at all. And the following
> calls should be moved down to the three subdirs. (I know thats unrelated to
> your actual patch).

I tried removing the find_package call altogether from the root
CMakeLists.txt file, but then the includes afterwards failed. So I
kept it there. Furthermore, upon removing the minimal version, then
the find_package calls (with the minimal version) in the
sub-directories succeeded. So I had to add it there as well.

>
>> Index: workspace/solid/solid-actions-kcm/CMakeLists.txt
>> ===================================================================
>> --- workspace/solid/solid-actions-kcm/CMakeLists.txt  (revision 946568)
>> +++ workspace/solid/solid-actions-kcm/CMakeLists.txt  (working copy)
>> @@ -1,6 +1,6 @@
>>  PROJECT (solid-actions)
>>
>> -find_package(KDE4 REQUIRED)
>> +find_package(KDE4 4.2.68 REQUIRED)
>
> Same as above for the unit-test, there's already a call in workspace so
> this one is superflous.

Removed altogether.

>
>> Index: workspace/plasma/applets/quicklaunch/CMakeLists.txt
>> ===================================================================
>> --- workspace/plasma/applets/quicklaunch/CMakeLists.txt       (revision 946568)
>> +++ workspace/plasma/applets/quicklaunch/CMakeLists.txt       (working copy)
>> @@ -2,7 +2,7 @@
>>
>>  # building separately or as part of kdebase ?
>>  if(NOT KDE4_FOUND)
>> -   find_package(KDE4 REQUIRED)
>> +   find_package(KDE4 4.2.68 REQUIRED)
>
> Superflous as well.

Removed altogether.

>
> Apart from that, the change you did will only work for KDE 4.2.0 and later,
> KDE 4.1.x will still be found as it didn't support the version argument of
> find_package. To make your change work properly for kdelibs 4.1.x or older
> also set KDE_MIN_VERSION to an apropriate string.

Done in this patch.

Regards,

     Shlomi Fish

>
> Andreas
>
> --
> You will attract cultured and artistic people to your home.
> _______________________________________________
> release-team mailing list
> release-team-RoXCvvDuEio at public.gmane.org
> https://mail.kde.org/mailman/listinfo/release-team
>





-- 
------------------------------------------
Shlomi Fish http://www.shlomifish.org/

Electrical Engineering studies. In the Technion. Been there. Done
that. Forgot a lot. Remember too much.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: kdebase-cmake-min-kdelibs-ver-r4.patch
Type: application/octet-stream
Size: 3186 bytes
Desc: not available
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20090330/89a1f1d8/attachment.obj>