[SCM] kstars packaging branch, master, updated. debian/4.8.4-1-6-g5528afa

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kstars.git;a=commitdiff;h=b6a9ea6

The following commit has been merged in the master branch:
commit b6a9ea6cbdc10747f38848b8ba8fe9940e39fd48
Author: Maximiliano Curia <maxy at debian.org>
Date:   Thu Jun 20 15:05:26 2013 +0200

    New patch: upstream_#undef-TIME_UTC-to-fix-conflict-with-glibc.diff.
---
 debian/changelog                                   |    7 ++++++
 debian/patches/series                              |    1 +
 ...#undef-TIME_UTC-to-fix-conflict-with-glibc.diff |   24 ++++++++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 438843e..c286814 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kstars (4:4.8.4-2) UNRELEASED; urgency=low
+
+  * New patch: upstream_#undef-TIME_UTC-to-fix-conflict-with-glibc.diff.
+    (Closes: #701303)
+
+ -- Maximiliano Curia <maxy at debian.org>  Thu, 20 Jun 2013 14:49:46 +0200
+
 kstars (4:4.8.4-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a35bc52
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+debian/patches/upstream_#undef-TIME_UTC-to-fix-conflict-with-glibc.diff
diff --git a/debian/patches/upstream_#undef-TIME_UTC-to-fix-conflict-with-glibc.diff b/debian/patches/upstream_#undef-TIME_UTC-to-fix-conflict-with-glibc.diff
new file mode 100644
index 0000000..bae01b6
--- /dev/null
+++ b/debian/patches/upstream_#undef-TIME_UTC-to-fix-conflict-with-glibc.diff
@@ -0,0 +1,24 @@
+commit a3dfa72dada14952d3477712c758ad6d884173e5
+Author: Kevin Kofler <kevin.kofler at chello.at>
+Date:   Sun Jun 10 23:41:42 2012 +0200
+
+    #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.
+
+diff --git a/kstars/indi/indielement.h b/kstars/indi/indielement.h
+index cd05717..93be2ba 100644
+--- a/kstars/indi/indielement.h
++++ b/kstars/indi/indielement.h
+@@ -44,6 +44,8 @@ typedef enum {PG_NONE = 0, PG_TEXT, PG_NUMERIC, PG_BUTTONS,
+               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 */

-- 
kstars packaging