Source Mage code commit list

[Treeve Jelbert <treeve AT scarlet.be>]

On Saturday 28 November 2009 16:59:17 Eric Sandall wrote:
> On Sat, 28 Nov 2009 08:36:09 -0600
> 
> Treeve Jelbert <scm AT sourcemage.org> wrote:
> > GIT changes to master grimoire by Treeve Jelbert
> > <treeve AT sourcemage.org>:
> >
> >  ChangeLog                                      |    3 +
> > kde4/FUNCTIONS                                 |    7 ++-
> > kde4/HISTORY                                   |    6 ++ 18 files
> > changed, 113 insertions(+), 32 deletions(-)
> >
> > New commits:
> > commit 6e2634691b4fc210a759b1e12178d81309404613
> > Author: Treeve Jelbert <treeve AT sourcemage.org>
> > Commit: Treeve Jelbert <treeve AT sourcemage.org>
> >
> >     kde4/FUNCTIONS - fix for kdelibs4
> >     (cherry picked from commit
> > 7a827899ab8b33786da576e505730513c810ff9c)
> >
> > commit ea5363980f1c44851a0ffa68a082800184577fc9
> > Author: Treeve Jelbert <treeve AT sourcemage.org>
> > Commit: Treeve Jelbert <treeve AT sourcemage.org>
> >
> >     FUNCTIONS - add $OPTS to build
> 
> <snip>
> 
> Now I get:
> Compile log for kdelibs4 4.3.3 Built on Sat Nov 28 15:28:36 UTC 2009
> Using gcc version: 4.3.3
> Building in dir: /usr/src/kdelibs-4.3.3
> kdelibs4    4.3.3
> 
> -- The C compiler identification is GNU
> -- The CXX compiler identification is GNU
> -- Check for working C compiler: /var/lib/sorcery/build/gcc
> -- Check for working C compiler: /var/lib/sorcery/build/gcc -- works
> -- Detecting C compiler ABI info
> -- Detecting C compiler ABI info - done
> -- Check for working CXX compiler: /var/lib/sorcery/build/c++
> -- Check for working CXX compiler: /var/lib/sorcery/build/c++ -- works
> -- Detecting CXX compiler ABI info
> -- Detecting CXX compiler ABI info - done
> CMake Error at cmake/modules/FindQt4.cmake:1498 (MESSAGE):
>   Qt qmake not found!
> Call Stack (most recent call first):
>   cmake/modules/FindKDE4Internal.cmake:295 (find_package)
>   CMakeLists.txt:35 (find_package)
> 
> -- Configuring incomplete, errors occurred!
> 
> -sandalle
> 
I get

Compile log for kdelibs4 smgl Built on Sat Nov 28 16:03:33 UTC 2009
Using gcc version: 4.4.2
ESC[0mESC[36mBuilding ESC[30mESC[1mkdelibs4ESC[0m
Building in dir: /usr/src/kdelibs-smgl
kdelibs4    smgl

Revision:
-- The C compiler identification is GNU
-- The CXX compiler identification is GNU
-- Check for working C compiler: /var/lib/sorcery/build/gcc
-- Check for working C compiler: /var/lib/sorcery/build/gcc -- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working CXX compiler: /var/lib/sorcery/build/c++
-- Check for working CXX compiler: /var/lib/sorcery/build/c++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Looking for Q_WS_X11
-- Looking for Q_WS_X11 - found
-- Looking for Q_WS_WIN
-- Looking for Q_WS_WIN - not found.
-- Looking for Q_WS_QWS
-- Looking for Q_WS_QWS - not found.
-- Looking for Q_WS_MAC
-- Looking for Q_WS_MAC - not found.
-- Found Qt-Version 4.6.0 (using /usr/bin/qt4/qmake)
-- Looking for XOpenDisplay in 
/usr/lib/libX11.so;/usr/lib/libXext.so;/usr/lib/libXft.so;/usr/lib/libXau.so;/usr/lib/libXdmcp.so;/usr/lib/libXpm.so
-- Looking for XOpenDisplay in 
/usr/lib/libX11.so;/usr/lib/libXext.so;/usr/lib/libXft.so;/usr/lib/libXau.so;/usr/lib/libXdmcp.so;/usr/lib/libXpm.so
 
- found




I will check that the cherry-picking went ok

$ git diff master kde4/FUNCTIONS
 default_build() {
   persistent_add KDE4DIR                          &&
   KDE4DIR="$INSTALL_ROOT/opt/kde4"                &&
   QTDIR=$INSTALL_ROOT/usr/bin/qt4                 &&
-  cd $SOURCE_DIRECTORY                            &&
-  mkdir -p build                                  &&
-  cd build                                        &&
+  cd $SRC &&
+  message 'Revision:' `git svn find-rev HEAD`     &&
+  cd $SOURCE_DIRECTORY/build                      &&
   PATH+=:$QTDIR   &&
   if [[ $SPELL != kdelibs4 ]];then
+   PKG_CONFIG_PATH='' &&
    PATH+=:$KDE4DIR
   fi &&
   CMAKE_PREFIX_PATH=$KDE4DIR                      &&
   cmake -DCMAKE_INSTALL_PREFIX=$KDE4DIR           \
         -DCMAKE_BUILD_TYPE=$KDE_DEBUG_OPTION      \
-        $OPTS ../                                 &&
+        $OPTS $SRC                                 &&
   make
 }


That looks correct to me


I was building kde-4.4-beta1
I works for me at the moment


Konsole
Version 2.4
Using KDE 4.3.80 (KDE 4.3.80 (KDE 4.4 Beta1))

Not sure where the problem is - will keep looking
-- 
Regards, Treeve