x11-plugins/wmcalendar: clean up patches

Signed-off-by: Sam James <sam@gentoo.org>

2 files changed, 18 insertions, 24 deletions

diff --git a/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-exit-sin-and-cos.patch b/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-exit-sin-and-cos.patch
index 1d68111fc261..6ea767a7a2da 100644
--- a/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-exit-sin-and-cos.patch
+++ b/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-exit-sin-and-cos.patch
@@ -1,5 +1,5 @@
---- a/calendarfunc.c	2003-07-13 17:41:02.000000000 +0300
-+++ b/calendarfunc.c	2008-05-03 10:03:06.000000000 +0300
+--- a/calendarfunc.c
++++ b/calendarfunc.c
 @@ -22,7 +22,7 @@
  
  #include "calendarfunc.h"
@@ -9,8 +9,8 @@
  
  
  long persian_jdn(struct icaltimetype dt)
---- a/dockapp.c	2003-07-15 18:15:12.000000000 +0300
-+++ b/dockapp.c	2008-05-03 10:03:34.000000000 +0300
+--- a/dockapp.c
++++ b/dockapp.c
 @@ -23,6 +23,7 @@
   * modified by Seiichi SATO <ssato@sh.rim.or.jp>
   */
@@ -19,8 +19,8 @@
  #include "dockapp.h"
  
  #define WINDOWED_SIZE_W 64
---- a/Makefile	2003-07-15 18:19:26.000000000 +0300
-+++ b/Makefile	2008-05-03 10:11:48.000000000 +0300
+--- a/Makefile
++++ b/Makefile
 @@ -1,19 +1,15 @@
 -CC     = gcc
 +CC     ?= gcc
diff --git a/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-fno-common.patch b/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-fno-common.patch
index 9907634290a2..603888241908 100644
--- a/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-fno-common.patch
+++ b/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-fno-common.patch
@@ -1,6 +1,5 @@
-diff -Naur Src.orig/calendar.c Src/calendar.c
---- Src.orig/calendar.c	2007-01-15 01:14:32.000000000 +0100
-+++ Src/calendar.c	2020-03-29 13:25:39.390760510 +0200
+--- a/src/calendar.c
++++ b/Src/calendar.c
 @@ -1,5 +1,10 @@
  #include "calendar.h"
  
@@ -12,9 +11,8 @@ diff -Naur Src.orig/calendar.c Src/calendar.c
  int  get_datetype(int day){return datetype[day][0];}
  
  /*------------------------------------------------------
-diff -Naur Src.orig/calendarfunc.c Src/calendarfunc.c
---- Src.orig/calendarfunc.c	2003-07-13 16:41:02.000000000 +0200
-+++ Src/calendarfunc.c	2020-03-29 13:24:07.630789052 +0200
+--- a/Src/calendarfunc.c
++++ b/Src/calendarfunc.c
 @@ -24,6 +24,7 @@
  #include <stdio.h>
  
@@ -23,9 +21,8 @@ diff -Naur Src.orig/calendarfunc.c Src/calendarfunc.c
  
  long persian_jdn(struct icaltimetype dt)
  {
-diff -Naur Src.orig/calendarfunc.h Src/calendarfunc.h
---- Src.orig/calendarfunc.h	2003-07-15 17:19:43.000000000 +0200
-+++ Src/calendarfunc.h	2020-03-29 13:23:23.468802848 +0200
+--- a/Src/calendarfunc.h
++++ b/Src/calendarfunc.h
 @@ -70,5 +70,5 @@
  
  int Ceil(float number);
@@ -33,9 +30,8 @@ diff -Naur Src.orig/calendarfunc.h Src/calendarfunc.h
 -int     datemoon[200][2];   /* hashtable for moonphase.[jdn%32][0] stores moonphase of day jdn, 
 +extern int     datemoon[200][2];   /* hashtable for moonphase.[jdn%32][0] stores moonphase of day jdn, 
  			    [jdn%32][1] stores jdn. */
-diff -Naur Src.orig/calendar.h Src/calendar.h
---- Src.orig/calendar.h	2007-01-15 01:13:50.000000000 +0100
-+++ Src/calendar.h	2020-03-29 13:25:57.657754851 +0200
+--- a/Src/calendar.h
++++ b/Src/calendar.h
 @@ -5,10 +5,10 @@
  #include <sys/stat.h>
  
@@ -51,9 +47,8 @@ diff -Naur Src.orig/calendar.h Src/calendar.h
  				 [jdn%32][1] stores jdn. */
  struct calobj{
      struct icaltimetype start;
-diff -Naur Src.orig/settings.c Src/settings.c
---- Src.orig/settings.c	2003-07-15 17:22:51.000000000 +0200
-+++ Src/settings.c	2020-03-29 13:26:31.673744323 +0200
+--- a/Src/settings.c
++++ b/Src/settings.c
 @@ -1,4 +1,14 @@
  #include "settings.h"
 +
@@ -69,9 +64,8 @@ diff -Naur Src.orig/settings.c Src/settings.c
  void set_lang(int language){lang = language;}
  void setAppicon(int app){appicon = app;}
  void enter_callback( GtkWidget *widget, GtkWidget *entry ){ 
-diff -Naur Src.orig/settings.h Src/settings.h
---- Src.orig/settings.h	2006-09-15 11:56:12.000000000 +0200
-+++ Src/settings.h	2020-03-29 13:26:37.732742450 +0200
+--- a/Src/settings.h
++++ b/Src/settings.h
 @@ -7,14 +7,14 @@