gentoo Easter resync : 12.04.2020

3 files changed, 104 insertions, 3 deletions

diff --git a/x11-plugins/wmcalendar/Manifest b/x11-plugins/wmcalendar/Manifest
index c1e6e877e9c5..6ea86c5cce99 100644
--- a/x11-plugins/wmcalendar/Manifest
+++ b/x11-plugins/wmcalendar/Manifest
@@ -1,6 +1,7 @@
 AUX wmcalendar-0.5.2-exit-sin-and-cos.patch 2051 BLAKE2B 2b24368f074ed9b806fb578a96d22c0479fff15607dcadcf71afa5f11f001543f69129bc1459e63062b3477cb19c19c5214705b51d2e23a2f581e367b7c82dc2 SHA512 55d2577e321d3261dcb8d9bf95e6d756d69952fd061109d4e93fa0cc5170cd1178efee1fa1d693aa826dbb5b659ca29e78b0f123af55ddfd83a37eef1c030d0e
+AUX wmcalendar-0.5.2-fno-common.patch 3891 BLAKE2B 73f2a7f6defc469f2130baafe5554716cf57f082e74b5dd9d2dd7442f95a94a4d0da50ee43d9f817c91938a66ac211a744d6fe015571e603ebfe1590dc87dc19 SHA512 a3c78e4af3236e31af9f7a597fbf8a0b52733bede9a2c3866a95b4fc886724e10d91899a973108555682d9e611f297316d4cd52d2ae584e7045ee4a6206adfed
 AUX wmcalendar-0.5.2-ical.patch 387 BLAKE2B a9e8f848f29a2c83aae4e7f0efaec3efdcad6e56488ce8856a3ff19883b3a2c2ddf948148a8d7c45a3ba358f16274881a3ac8c93a081f4dac48e1ddc93ed334d SHA512 e7460227db5ca45ba3f909eba1ea95244d6464f496cbcbdb96e7879a728dbdcf64e8c25625ef05fb8f19713e400fc4b5c8f879526f734dd3e637d179e7186917
 AUX wmcalendar-0.5.2-rename_kill_func.patch 638 BLAKE2B b29503b9a3c6cfcac5cc970a6185c7a5f536a59baa9c2aae25b0f60507e20e6115889894dc82c336392d02c08d8cab4870352f32f94c5cf8656f470789ee12f6 SHA512 f81f3cdf3ea085dbd43e7b81d80c3d44c17945116996171a90f5823d711675851877e5474acdbd0f73989eb071d11826914e83420c596d1484fb4410a489e857
 DIST wmcalendar-0.5.2.tar.gz 42720 BLAKE2B b2de08905b368322013c3fd6fb4d87b5f7a986bee7b7de24fe2ce3be0003acc5e888dd01d9dedba85fa60ad211be23fb8623b432e5687e4ff2592b514dc549f0 SHA512 8d60a46f26657bf4876057ed092440018055e5a1ab6e2811a9c27f351533bfe6c941dbec10880daafe0858766cb890863cb66bfb70412e025a8d59ab96c663d7
-EBUILD wmcalendar-0.5.2-r2.ebuild 715 BLAKE2B 2b80467d7dcec1d1ba224561905eb7cb3dc241003483c173253607f17c97019b7e83939d247874841fbd80216c07f05ba3c1d243459f625f2ef30ed65b523016 SHA512 a15db6651cb7b0712817fe3015ce6da2038845d2e77d4eb8595c959c68e84d57cde24882f34d080209444bf372319751bd41c358c4035645f8fe09ecdaf64291
+EBUILD wmcalendar-0.5.2-r2.ebuild 758 BLAKE2B c2eed388d2dd42068284238e0a74da0d25fe621a7089c2f888eebafa8f308ee8609483c63f8af888bcce99955309794a218238bacfb5e7c6c50a660fde298ba9 SHA512 b0d3c9a8c316f754ce1b588b01758a38b79ce23f2152597da58bbff1546d48f3d27301e5784e99891677fdd79d53cd78cfa516778a507b09f02c0fe39e6caea6
 MISC metadata.xml 332 BLAKE2B 77b1bf5bab2fd180f0e7c7483abf79dcf5c7f12a8e8946f7b726e4509bef4b48d7dc9b9bb3977353cbce4c27a38009c12fec3c7ef3b1c0ab958dba59d9798ac1 SHA512 277dcef3109b86fdade36714655afc36c515fc0274f155bd598cca2ccb2c133870c966619aedf078c7eaf172d6850912c28793c349d30a1cdcaeb4a5698b2a9f
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
new file mode 100644
index 000000000000..9907634290a2
--- /dev/null
+++ b/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-fno-common.patch
@@ -0,0 +1,97 @@
+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
+@@ -1,5 +1,10 @@
+ #include "calendar.h"
+ 
++time_t  modtime;
++struct  calobj* calRoot;
++int     xr, yr;
++int     datetype[32][2];
++
+ 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
+@@ -24,6 +24,7 @@
+ #include <stdio.h>
+ 
+ 
++int     datemoon[200][2];
+ 
+ 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
+@@ -70,5 +70,5 @@
+ 
+ int Ceil(float number);
+ 
+-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
+@@ -5,10 +5,10 @@
+ #include <sys/stat.h>
+ 
+ 
+-time_t  modtime;              /* modified time of icalendar file */
+-struct  calobj* calRoot;  /* 1st element in list of calendar obj*/
+-int     xr, yr;               /*evil hack for moving dayview window*/
+-int     datetype[32][2];      /* hashtable for coloring days.[jdn%32][0] stores color of day jdn, 
++extern time_t  modtime;              /* modified time of icalendar file */
++extern struct  calobj* calRoot;  /* 1st element in list of calendar obj*/
++extern int     xr, yr;               /*evil hack for moving dayview window*/
++extern int     datetype[32][2];      /* hashtable for coloring days.[jdn%32][0] stores color of day jdn, 
+ 				 [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
+@@ -1,4 +1,14 @@
+ #include "settings.h"
++
++char    rcfile[250];
++char    icsfile[250];
++char    application[250];
++int     start_of_week;
++char*   daystr[8];
++int     appicon;
++int     lang;
++int     debug;
++
+ 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
+@@ -7,14 +7,14 @@
+ 
+ 
+ 
+-char    rcfile[250];       /* location of settings file */
+-char    icsfile[250];      /* location of icalendar file */
+-char    application[250];  /* command for starting external application */
+-int     start_of_week; /* defines the first day of week */
+-char*   daystr[8];
+-int     appicon;       /* sets the application icon evol(0) moz(1) other(2)*/
+-int     lang;          /* defines the language 0:english(default) 1:farsi */
+-int     debug;         /* debug mode off(0) or on(1) */
++extern char    rcfile[250];       /* location of settings file */
++extern char    icsfile[250];      /* location of icalendar file */
++extern char    application[250];  /* command for starting external application */
++extern int     start_of_week; /* defines the first day of week */
++extern char*   daystr[8];
++extern int     appicon;       /* sets the application icon evol(0) moz(1) other(2)*/
++extern int     lang;          /* defines the language 0:english(default) 1:farsi */
++extern int     debug;         /* debug mode off(0) or on(1) */
+ 
+ 
+ void destroy (GtkWidget * widget, gpointer data);
diff --git a/x11-plugins/wmcalendar/wmcalendar-0.5.2-r2.ebuild b/x11-plugins/wmcalendar/wmcalendar-0.5.2-r2.ebuild
index a3aae730cbba..1bbb79c3f80c 100644
--- a/x11-plugins/wmcalendar/wmcalendar-0.5.2-r2.ebuild
+++ b/x11-plugins/wmcalendar/wmcalendar-0.5.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,8 +27,11 @@ S=${WORKDIR}/${P}/Src
 
 PATCHES=( "${FILESDIR}"/${P}-exit-sin-and-cos.patch
 	"${FILESDIR}"/${P}-rename_kill_func.patch
-	"${FILESDIR}"/${P}-ical.patch )
+	"${FILESDIR}"/${P}-ical.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
 src_compile() {
 	tc-export CC PKG_CONFIG
+	default
 }