Hello community, here is the log from the commit of package kstars for openSUSE:Factory checked in at 2012-08-07 08:10:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kstars (Old) and /work/SRC/openSUSE:Factory/.kstars.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kstars", Maintainer is "kstars" Changes: -------- --- /work/SRC/openSUSE:Factory/kstars/kstars.changes 2012-06-12 21:44:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kstars.new/kstars.changes 2012-08-07 08:11:07.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 30 08:02:48 UTC 2012 - [email protected] + +- Fix build with glibc 2.16 (TIME_UTC is a macro). + +------------------------------------------------------------------- New: ---- kstars-utc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kstars.spec ++++++ --- /var/tmp/diff_new_pack.8E33uR/_old 2012-08-07 08:11:08.000000000 +0200 +++ /var/tmp/diff_new_pack.8E33uR/_new 2012-08-07 08:11:08.000000000 +0200 @@ -24,6 +24,7 @@ Group: Productivity/Scientific/Astronomy Url: http://edu.kde.org/kstars/ Source0: %{name}-%{version}.tar.xz +Patch1: kstars-utc.patch BuildRequires: Mesa-devel BuildRequires: fdupes BuildRequires: libcfitsio-devel @@ -51,6 +52,7 @@ %prep %setup -q +%patch1 -p1 %build %ifarch ppc ppc64 ++++++ kstars-utc.patch ++++++ >From upstream git: ID: a3dfa72dada14952d3477712c758ad6d884173e5 Added by Kevin Kofler about 1 month ago #undef TIME_UTC to fix conflict with glibc TIME_UTC is now defined as a macro, so it needs to be undefined before being used in an enum. This is a safer fix for the build failure. Index: kstars-4.8.4/kstars/indi/indielement.h =================================================================== --- kstars-4.8.4/kstars/indi/indielement.h +++ kstars-4.8.4/kstars/indi/indielement.h @@ -51,6 +51,9 @@ typedef enum {PG_NONE = 0, PG_TEXT, PG_N PG_RADIO, PG_MENU, PG_LIGHTS, PG_BLOB} PGui; /* INDI std properties */ +/* new versions of glibc define TIME_UTC as a macro */ +#undef TIME_UTC + /* N.B. Need to modify corresponding entry in indidevice.cpp when changed */ enum stdProperties { CONNECTION, DEVICE_PORT, TIME_UTC, TIME_LST, TIME_UTC_OFFSET, GEOGRAPHIC_COORD, /* General */ EQUATORIAL_COORD, EQUATORIAL_EOD_COORD, EQUATORIAL_EOD_COORD_REQUEST, HORIZONTAL_COORD, /* Telescope */ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
