www.michael-jansen.biz

As recently announced in kde-core-devel mailing list kdelibs master is now frozen. Development will happen in the branches

frameworks

The modularization effort for kdelibs

KDE/4.7

Bugfixes for the 4.7 branch

Since this is not about announcing this change but the implications for build-tool users i won't go into details here. I made the following changes to the build-tool recipe for your convenience:

KDE/kdelibs

This module from now on tracks the KDE/4.7 branch. Which means after you updated your recipe from now on build-tool will do git rebase origin/KDE/4.7 instead of git rebase origin/master. Please make sure this works for you (consider unpushed changes leading to merge problems).

If you like it clean and tidy and switch to a local branch named 4.7 to please issue the following commands in the kdelibs git repository.

$ git branch -lt 4.7 origin/KDE/4.7
$ git checkout 4.7

frameworks/kdelibs

I added a new frameworks feature that makes it possible to build both versions in parallel. This will only work as long as you stayed with my decision to install qt and kdesupport into a different prefix than kdelibs. Or in other word if KDE_PREFIX is different from both QT_PREFIX and KDESUPPORT_PREFIX you are good to go.

To compile the frameworks version of kdelibs you have to do the following

1. Enable the feature in your recipe override file (~/.build-tool/kde/recipe for example).
   enable feature "kde-core-frameworks"
2. Add the following lines to your settings files and set a value:
   

   # Install prefix for kde frameworks branch
   KDE_FRAMEWORK_PREFIX:         "/kde4/trunk/frameworks"

Some comments. The frameworks branch is currently only present in kdelibs. That means that when the work picks up it will be most likely impossible to ensure that kdepimlibs, kdebase and the rest compiles against the reworked kdelibs. I wouldn't even try until the work on kdelibs is finished and the porting begins. Thats why the frameworks feature only contains the kdelibs module.

And to keep discussions short. Remember that any effort will be made to keep as much source compatibility as possible. But there will be no effort to do the porting at the same time.

How to update my recipe

And since i am in quite a blogging mood these days i would like to remind everyone how to update the recipe The command to do that is the recipe command.

[ bash : 1010 ] $ kde-build recipe incoming -h
Usage: kde-build recipes incoming
Options:
    -f, --[no-]fetch                 Fetch from origin.
    -r, --[no-]rebase                Rebase against master.
Common options
    -v, --verbose                    Enable verbose output
        --dry-run                    Enable dry run.
    -h, --help                       Show this help text

You should update in two steps. First fetch the changes from the recipe and carefully review my comments for any action that is necessary on your side.

[ bash : 1017 ] $ kde-build recipe incoming -f
Fetching
commit a6cbf9146a22a9ab1b85f4430a848ce736f0a3d9
Author: Michael Jansen 
Date:   Sun Aug 7 12:16:30 2011 +0200

    Master is frozen. Track the KDE/4.7  branch.
    
    NEEDS ACTION:
    
    If you like it tidy and clean, create and checkout a local branch named 4.7.
    
    > git branch -lt 4.7 origin/KDE/4.7
    > git checkout 4.7

commit e048ea0a7625b2bbd3d981f95a84f6637cb9534d
Author: Michael Jansen 
Date:   Sat Aug 6 19:11:00 2011 +0200

    Add feature kde-core-framework.
    
    It contains just one module. The new kdelibs branch frameworks.
    
    NEEDS ACTION:
      - enable the feature in your override file
      - add the following lines to your settings file and set a value
    
    +    # Install prefix for kde
    +    KDE_FRAMEWORK_PREFIX:         "/kde4/trunk/kde"

If you decide to update immediately rebase your recipe now

[ bash : 1018 ] $ kde-build recipe incoming -r
commit a6cbf9146a22a9ab1b85f4430a848ce736f0a3d9
Author: Michael Jansen 
Date:   Sun Aug 7 12:16:30 2011 +0200

    Master is frozen. Track the KDE/4.7  branch.
    
    NEEDS ACTION:
    
    If you like it tidy and clean, create and checkout a local branch named 4.7.
    
    > git branch -lt 4.7 origin/KDE/4.7
    > git checkout 4.7

commit e048ea0a7625b2bbd3d981f95a84f6637cb9534d
Author: Michael Jansen 
Date:   Sat Aug 6 19:11:00 2011 +0200

    Add feature kde-core-framework.
    
    It contains just one module. The new kdelibs branch frameworks.
    
    NEEDS ACTION:
      - enable the feature in your override file
      - add the following lines to your settings file and set a value
    
    +    # Install prefix for kde
    +    KDE_FRAMEWORK_PREFIX:         "/kde4/trunk/kde"

And immediatly do the required actions. You have to first rebase the recipe because it is impossible for example to enable a not existing module or feature.

Mike