[gentoo-commits] gentoo-x86 commit in gnome-extra/gnome-games/files: gnome-games-2.91.90-fix-conditional-ac-prog-cxx.patch gnome-games-fix-staging-games.patch

[gentoo-commits] gentoo-x86 commit in gnome-extra/gnome-games/files: gnome-games-2.91.90-fix-conditional-ac-prog-cxx.patch gnome-games-fix-staging-games.patch

[Nirbheek Chauhan (nirbheek)]

nirbheek    11/08/19 12:51:19

  Added:               
                        gnome-games-2.91.90-fix-conditional-ac-prog-cxx.patch
                        gnome-games-fix-staging-games.patch
  Log:
  Bump to 3.0.2, from gnome overlay for GNOME 3
  
  (Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  gnome-extra/gnome-games/files/gnome-games-2.91.90-fix-conditional-ac-prog-cxx.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-games/files/gnome-games-2.91.90-fix-conditional-ac-prog-cxx.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-games/files/gnome-games-2.91.90-fix-conditional-ac-prog-cxx.patch?rev=1.1&content-type=text/plain

Index: gnome-games-2.91.90-fix-conditional-ac-prog-cxx.patch
===================================================================
Don't call AC_PROG_CXX conditionally

Results in the following error during configure:

"""
configure: error: conditional "am__fastdepCXX" was never defined.
Usually this means the macro was only invoked conditionally.
"""

When need_cxx=no because quadrapassel isn't being built.

--- configure.in
+++ configure.in
@@ -227,6 +227,7 @@
 PKG_PROG_PKG_CONFIG([0.15])
 
 AC_PROG_CC
+AC_PROG_CXX
 AC_PROG_CPP
 AC_PROG_LN_S
 AC_PROG_SED
@@ -236,8 +237,6 @@
 fi
 
 if test "$need_cxx" = "yes"; then
-  AC_PROG_CXX
-
   # Check whether a C++ was found (AC_PROG_CXX sets $CXX to "g++" even when it
   # doesn't exist)
   AC_LANG_PUSH([C++])



1.1                  gnome-extra/gnome-games/files/gnome-games-fix-staging-games.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-games/files/gnome-games-fix-staging-games.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-games/files/gnome-games-fix-staging-games.patch?rev=1.1&content-type=text/plain

Index: gnome-games-fix-staging-games.patch
===================================================================
The --enable-staging flag was enabling *all* games, regardless of what
$enable_omitgames contained.

---
--- configure.in
+++ configure.in
@@ -60,6 +60,18 @@
   gamelist="$allgames"   
 fi
 
+## This is the staging area
+## These games aren't quite ready for prime-time
+
+AC_MSG_CHECKING([whether to enable staging games])
+AC_ARG_ENABLE([staging],
+  [AS_HELP_STRING([--enable-staging],[whether to enable beta game support (default: disabled)])],[],[])
+AC_MSG_RESULT([$enable_staging])
+
+if test "$enable_staging" = "yes"; then
+	allgames="${allgames} ${staginggames}"
+fi
+
 ## This has a particularly silly name because autoconf doesn't allow 
 ## --disable-foo to have arguments so we have to use an --enable-fubar form.
 AC_ARG_ENABLE(omitgames,
@@ -90,18 +102,6 @@
    gamelist=${allgames}
 fi
 
-## This is the staging area
-## These games aren't quite ready for prime-time
-
-AC_MSG_CHECKING([whether to enable staging games])
-AC_ARG_ENABLE([staging],
-  [AS_HELP_STRING([--enable-staging],[whether to enable beta game support (default: disabled)])],[],[])
-AC_MSG_RESULT([$enable_staging])
-
-if test "$enable_staging" = "yes"; then
-	gamelist="${gamelist} ${staginggames}"
-fi
-
 AC_MSG_RESULT([$gamelist])
 
 AC_SUBST([gamelist])