From 9ee6d97c2883d42f204a533a8bc1f4562df778fb Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 16 Sep 2020 09:32:48 +0100
Subject: gentoo resync : 16.09.2020

---
 x11-misc/xsensors/files/xsensors-0.80-Werror.patch | 14 +++++++++
 x11-misc/xsensors/files/xsensors-0.80-gtk220.patch | 34 ++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 x11-misc/xsensors/files/xsensors-0.80-Werror.patch
 create mode 100644 x11-misc/xsensors/files/xsensors-0.80-gtk220.patch

(limited to 'x11-misc/xsensors/files')

diff --git a/x11-misc/xsensors/files/xsensors-0.80-Werror.patch b/x11-misc/xsensors/files/xsensors-0.80-Werror.patch
new file mode 100644
index 000000000000..b903404256ac
--- /dev/null
+++ b/x11-misc/xsensors/files/xsensors-0.80-Werror.patch
@@ -0,0 +1,14 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -4,10 +4,7 @@
+ 	-DG_LOG_DOMAIN=\"GnomeCPUInfoApplet\"				\
+ 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"		\
+ 	-DDATADIR=\""$(datadir)"\"					\
+-	-DG_DISABLE_DEPRECATED		-DGTK_DISABLE_DEPRECATED	\
+-	-DGDK_DISABLE_DEPRECATED	-DGNOME_DISABLE_DEPRECATED	\
+-	-ansi	-Wall	-Wmissing-prototypes	-Wmissing-declarations \
+-    -Werror
++	-ansi	-Wall	-Wmissing-prototypes	-Wmissing-declarations
+ 
+ bin_PROGRAMS = xsensors
+ 
diff --git a/x11-misc/xsensors/files/xsensors-0.80-gtk220.patch b/x11-misc/xsensors/files/xsensors-0.80-gtk220.patch
new file mode 100644
index 000000000000..9b53de088647
--- /dev/null
+++ b/x11-misc/xsensors/files/xsensors-0.80-gtk220.patch
@@ -0,0 +1,34 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -29,7 +29,7 @@
+             [Force GTK2 GUI, even if GTK3 is available @<:@default=check@:>@])],
+             [], [with_gtk2=no])
+ 
+-if [ test "x$with_gtk2" == xno ]; then
++if [ test "x$with_gtk2" = xno ]; then
+     PKG_CHECK_MODULES([GTK],[gtk+-3.0],foundgtk3=true,foundgtk3=false)
+ else
+     echo "Using GTK2..."
+@@ -37,18 +37,13 @@
+ fi
+ 
+ if [ $foundgtk3 ]; then
+-	XSENSORS_CFLAGS="`pkg-config --cflags gtk+-3.0` -Werror -Wall"
+-	XSENSORS_LIBS="`pkg-config --libs gtk+-3.0`"
++	XSENSORS_CFLAGS="`${PKG_CONFIG} --cflags gtk+-3.0` -Wall -Wall"
++	XSENSORS_LIBS="`${PKG_CONFIG} --libs gtk+-3.0`"
+ else
+-    if [ test "x$with_gtk2" == xno ]; then
+-        echo "GTK3 is not installed, checking for GTK2 instead..."
+-    fi
+-	AM_PATH_GTK_2_0(2.8.0,,AC_MSG_ERROR([
++    AC_MSG_ERROR([
+ *** GTK+ is required to build xsensors; please make sure you have the GTK+
+ *** development headers installed. The latest version of GTK+ is
+-*** always available at http://www.gtk.org/.]))
+-	XSENSORS_CFLAGS="`pkg-config --cflags gtk+-2.0` -Werror -Wall"
+-	XSENSORS_LIBS="`pkg-config --libs gtk+-2.0`"
++*** always available at http://www.gtk.org/.])
+ fi
+ 
+ AC_SUBST(XSENSORS_CFLAGS)
-- 
cgit v1.2.3