Hello community, here is the log from the commit of package kdeedu4 checked in at Mon Nov 5 23:54:18 CET 2007. -------- --- KDE/kdeedu4/kdeedu4.changes 2007-11-01 12:19:25.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdeedu4/kdeedu4.changes 2007-11-05 18:19:01.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 5 18:18:55 CET 2007 - dmueller@suse.de + +- fix build on ppc + +------------------------------------------------------------------- New: ---- r733147.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeedu4.spec ++++++ --- /var/tmp/diff_new_pack.s20785/_old 2007-11-05 23:52:03.000000000 +0100 +++ /var/tmp/diff_new_pack.s20785/_new 2007-11-05 23:52:03.000000000 +0100 @@ -24,13 +24,14 @@ Summary: General Data for KDE Education Applications Url: http://edu.kde.org Version: 3.95.1 -Release: 1 +Release: 4 %define rversion 3.95.1 Source0: kdeedu-%rversion.tar.bz2 Source1: _upstream BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: kdebase4-runtime libkdeedu4 Patch: desktop-files.diff +Patch1: r733147.diff Suggests: libkdeedu4 Suggests: kde4-blinken Suggests: kde4-kalzium @@ -65,6 +66,7 @@ %prep %setup -q -n kdeedu-%rversion %patch +%patch1 %build %cmake_kde4 -d build @@ -774,6 +776,8 @@ %doc COPYING COPYING-DOCS README %_kde_share_dir/apps/libkdeedu %changelog +* Mon Nov 05 2007 - dmueller@suse.de +- fix build on ppc * Thu Nov 01 2007 - dmueller@suse.de - update to 3.95.1 * Wed Oct 31 2007 - dmueller@suse.de ++++++ r733147.diff ++++++ ------------------------------------------------------------------------ r733147 | mueller | 2007-11-05 18:15:04 +0100 (Mon, 05 Nov 2007) | 3 lines fix build on Linux/PPC __unix is only old compat crap, PPC is newer than old compat crap, so it doesn't have old compat crap ;) ------------------------------------------------------------------------ --- kstars/kstars/htmesh/SpatialGeneral.h +++ kstars/kstars/htmesh/SpatialGeneral.h @@ -80,8 +80,8 @@ typedef unsigned long long uint64; // emulate the standard bool type where not supported by compiler -# if !defined(SXGENERAL_H) && !defined(__sgi) && !defined(__linux) && !defined(_WIN32) && !defined(__FreeBSD__) -# ifdef __unix +# if !defined(SXGENERAL_H) && !defined(__sgi) && !defined(__linux__) && !defined(_WIN32) && !defined(__FreeBSD__) +# ifdef __unix__ /* * The following ifndef must ALWAYS be present since C++ may use * _BOOL_EXISTS to prevent the header from trying to redefine a @@ -98,8 +98,8 @@ const bool true = 1 # endif # endif /* _BOOL_EXISTS */ -# endif /* __unix */ -# endif /* __sgi && __linux */ +# endif /* __unix__ */ +# endif /* __sgi && __linux__ */ // Global Math Constants @@ -125,7 +125,7 @@ const float64 gEpsilon = 1.0E-15; # define LINKAGE #endif -#if defined(__unix) +#if defined(__unix__) # if defined(__osf__) # define SpatialDigitalUnix 1 @@ -136,7 +136,7 @@ const float64 gEpsilon = 1.0E-15; # elif defined(__sun) # define SpatialSUN 1 # define SpatialStandardTemplate 1 -# elif defined(__linux) +# elif defined(__linux__) # define SpatialLinux 1 # define SpatialStandardTemplate 1 # endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org