gentoo resync : 28.11.2020

4 files changed, 45 insertions, 4 deletions

diff --git a/x11-plugins/gkwebmon/Manifest b/x11-plugins/gkwebmon/Manifest
index 9f3f79ef310c..6f92e1bc4896 100644
--- a/x11-plugins/gkwebmon/Manifest
+++ b/x11-plugins/gkwebmon/Manifest
@@ -1,4 +1,5 @@
-AUX respect-cc-cflags-ldflags.patch 1232 BLAKE2B e983a46154113d21586e0b59121f0798fc1d359dbbf7b5388421b88a46b018fcc740bcfc23fc6074ec985b7c377197fb431027d9a623ef381b540601e2908d72 SHA512 0ce0b0ed7832ede335447d4abb7cf3904e97f9dff334aeb14a03e09cfe042de47bca456b7fc38bd7171440bcefd0da8a17cc01f1d540b84ffbf644e216f273a2
+AUX gkwebmon-0.2-cc-cflags-ldflags.patch 1232 BLAKE2B e983a46154113d21586e0b59121f0798fc1d359dbbf7b5388421b88a46b018fcc740bcfc23fc6074ec985b7c377197fb431027d9a623ef381b540601e2908d72 SHA512 0ce0b0ed7832ede335447d4abb7cf3904e97f9dff334aeb14a03e09cfe042de47bca456b7fc38bd7171440bcefd0da8a17cc01f1d540b84ffbf644e216f273a2
+AUX gkwebmon-0.2-fno-common.patch 1058 BLAKE2B 68205c69c36e48678886c3bea5b0b14d4755d05a389daa6c2ee450f4fb543eb3fbf30618ec99d315b34d0de379af4c7ad13174de364ca4b46ce09c3be49a7176 SHA512 225b7767284aebfbc1437810930442c342f977abfe8cd3af8ac1b8122cb17964bf63388a56265febe20914bf4893a258d4fddb9d895abe0048239d8ab78e208f
 DIST gkwebmon-0.2.tgz 14163 BLAKE2B c6c0c9352e2f68eca56f981abb8188a7a300604c8c0fc05c1b0b95f0cdc117c12e55aeace66f9c3dcc16a13acb2b44683a77de36a83d9e9b7c273ec619173235 SHA512 0af4eaa8636b43232e209e6381a3852eb92b9505da4b19e31137766f4bee7977bf4e4bed40518df0fcc3aef2dc62767c85169e70f1fbfc738bb428ae8affac63
-EBUILD gkwebmon-0.2-r2.ebuild 577 BLAKE2B fbeb6d01de2e5f4d5f4b76e9e2327dba5b19e3611f58637fba2a8bcbde8451cd03676386fe885bce27a8d38a44e704918f34699db818e4bd61ce5eb63486a231 SHA512 b75da32bfd8505fcb7fac458a200b5cd8beaa504d68077a561f7cf066738c424a1cbaecfa9eed5a76e0cda6690d9d3e0b3e3a82a5e4d121123ccf5b72217afe2
+EBUILD gkwebmon-0.2-r2.ebuild 604 BLAKE2B d8189d1cca01153717074d194cd0b6c0b1adce69804b4e0f6a6f055b05d94daa02154c9ec86961f8a16b295be4495534850996d3c941f39b70002ae9f478600f SHA512 4ba51be9baf94fd3d3a5b0bf316cd8ee6e8eabfbfb0001ed3cccfa6d70f32669a74f808394df76a19413556799736ee9c266197017139823e9589b94d333b145
 MISC metadata.xml 245 BLAKE2B 75768cbacfd8436bec6cd03c95eaf6aea36aad0fff02f24e9be259be1a01722d32c3cc84a7f54ab7da842fbf036aa4ac6a65ee3ea77a01ad8d0e55b89303d49d SHA512 9059fda6f95a78a0bb5334c05a118b9159d8dd28701bf6986574bb95ba897f1ff03257a8a939c6353136e5ab28f4614cd927cc593c41558ec8826b9c1ca1a015
diff --git a/x11-plugins/gkwebmon/files/respect-cc-cflags-ldflags.patch b/x11-plugins/gkwebmon/files/gkwebmon-0.2-cc-cflags-ldflags.patch
index 7b3ee50f5321..7b3ee50f5321 100644
--- a/x11-plugins/gkwebmon/files/respect-cc-cflags-ldflags.patch
+++ b/x11-plugins/gkwebmon/files/gkwebmon-0.2-cc-cflags-ldflags.patch
diff --git a/x11-plugins/gkwebmon/files/gkwebmon-0.2-fno-common.patch b/x11-plugins/gkwebmon/files/gkwebmon-0.2-fno-common.patch
new file mode 100644
index 000000000000..9738177db6fe
--- /dev/null
+++ b/x11-plugins/gkwebmon/files/gkwebmon-0.2-fno-common.patch
@@ -0,0 +1,38 @@
+--- a/webmon.c
++++ b/webmon.c
+@@ -7,6 +7,8 @@
+ #include <openssl/md5.h>
+ #include <pthread.h>
+ 
++int updatetime;
++
+ 
+ void clear_entry(int i)
+ {
+--- a/webmon.h
++++ b/webmon.h
+@@ -6,7 +6,7 @@
+ 
+ /* this is included in the saved config file */
+ 
+-int	updatetime;   /* how often to check webpages (in hours) */
++extern int	updatetime;   /* how often to check webpages (in hours) */
+ 
+ struct webinfo {
+   char          *urlData;       /* full url, pointed into by pointers below, internal '\0' */
+@@ -21,11 +21,13 @@ struct webinfo {
+   char		use;
+   char		updated; /* new md5 checksum in place */
+   char		flagged; /* a changed has been posted to tooltips for this entry */
+-} wi[20];
++};
++
++extern struct webinfo wi[20];
+ 
+ /* end of data for config file */
+ 
+-char wheretostore;  /* 0 == webinfo.init_md5, 1 == webinfo.new_md5 */
++extern char wheretostore;  /* 0 == webinfo.init_md5, 1 == webinfo.new_md5 */
+ 
+ void parse_url_to_config_struct(int i, gchar *instr);  /* parse URL and store data in webinfo struct */
+ char *make_url_from_config_struct(int i);
diff --git a/x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild b/x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild
index d7fc617e9437..5a5387b6c02c 100644
--- a/x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild
+++ b/x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild
@@ -12,7 +12,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ppc ~sparc x86"
-IUSE=""
 
 # The Makefile links with -lssl.
 RDEPEND="
@@ -20,7 +19,10 @@ RDEPEND="
 	dev-libs/openssl:0="
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/respect-cc-cflags-ldflags.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-cc-cflags-ldflags.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
 src_compile() {
 	emake CC="$(tc-getCC)"