From db7fcf291bc485d6cc26cee939360d29ce4f5b87 Mon Sep 17 00:00:00 2001
From: Doug Torrance <dtorrance@monmouthcollege.edu>
Date: Thu, 11 Dec 2014 09:18:06 -0600
Subject: [PATCH] wmclock: Fix display when both -12 and -year are given.

Patch by Vino Fernando Crescini <jcrescin@cit.uws.edu.au>:
http://sources.debian.net/src/wmclock/1.0.14-6/debian/patches/fix_12_year_display.patch/

For more information, see:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=228985
---
 wmclock/wmclock.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/wmclock/wmclock.c b/wmclock/wmclock.c
index 9dfd287..d65e7e6 100644
--- a/wmclock/wmclock.c
+++ b/wmclock/wmclock.c
@@ -849,7 +849,14 @@ int main(int argc, char **argv)
 #endif /* !ONLY_SHAPED_WINDOW */
    for (i = 0; i < NUM_TIME_POSITIONS; i++)
     {
-       xPos[i] += enable12HourClock ? timePos24[i] : timePos12[i];
+      if (enable12HourClock && (!enableYearDisplay))
+       {
+         xPos[i] += timePos24[i];
+       }
+      else
+       {
+         xPos[i] += timePos12[i];
+       }
     }
    
    /* Open the display */