commit: a57cdb2cac51ad73069b1365045dd3d74e394c5b Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Sun Sep 6 11:37:15 2020 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Sun Sep 6 11:37:41 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a57cdb2c
x11-misc/xsensors: Patch configure.ac for missing AM_PATH_GTK_2_0 Package-Manager: Portage-3.0.5, Repoman-3.0.1 Closes: https://bugs.gentoo.org/740646 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> x11-misc/xsensors/files/xsensors-0.80-Werror.patch | 14 +++++++++ x11-misc/xsensors/files/xsensors-0.80-gtk220.patch | 34 ++++++++++++++++++++++ x11-misc/xsensors/xsensors-0.80.ebuild | 11 +++---- 3 files changed, 52 insertions(+), 7 deletions(-) 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 00000000000..b903404256a --- /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 00000000000..9b53de08864 --- /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) diff --git a/x11-misc/xsensors/xsensors-0.80.ebuild b/x11-misc/xsensors/xsensors-0.80.ebuild index 455f446c563..43258aef8b9 100644 --- a/x11-misc/xsensors/xsensors-0.80.ebuild +++ b/x11-misc/xsensors/xsensors-0.80.ebuild @@ -23,17 +23,14 @@ DEPEND=" BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${P}-gtk220.patch + "${FILESDIR}"/${P}-Werror.patch +) src_prepare() { default - sed -i \ - -e '/-DG.*_DISABLE_DEPRECATED/d' \ - -e 's#-Werror#-Wall#g' \ - -e 's#==#=#g' \ - -e 's#pkg-config#${PKG_CONFIG}#g' \ - src/Makefile.am configure.ac || die - eautoreconf }
