qemu: These are quick fixes, I need this recompiled for the updated nettle 3.5 that broke compatibility.

Dependencies changed since 2.11
Optionally uses gtk+3 >= 3.16 now. gtk+2 is not an option, there is no gtkabi parameter anymore.
Use list_find instead of case to more reliably check for "--enable-docs"
No pci.mak nor sound.mak, nor are they included, so just write
the configs out for now instead of sed, but they do nothing.

4 files changed, 34 insertions, 26 deletions

diff --git a/utils/qemu/CONFIGURE b/utils/qemu/CONFIGURE
index 2d13d07d2e..1c003100ab 100755
--- a/utils/qemu/CONFIGURE
+++ b/utils/qemu/CONFIGURE
@@ -44,7 +44,7 @@ config_query_option QEMU_OPTS "Enable VNC support?" y \
 config_query_multi QEMU_VNC_TLS "Enable TLS encryption in VNC?" 'none' 'nettle' 'gcrypt' &&
 
 config_query_option QEMU_OPTS \
-             'Build documentation? (requires: perl, python, texinfo)' y \
-	     '--enable-docs' \
-	     '--disable-docs'
+                    'Build documentation? (requires: perl, python, texinfo)' y \
+                    '--enable-docs' \
+                    '--disable-docs'
 
diff --git a/utils/qemu/DEPENDS b/utils/qemu/DEPENDS
index 0d11003fdf..2d733a2912 100755
--- a/utils/qemu/DEPENDS
+++ b/utils/qemu/DEPENDS
@@ -16,31 +16,22 @@ if list_find "esd" $QEMU_AUDIO; then
   depends  esound
 fi &&
 
-case "$QEMU_OPTS" in *--enable-docs*)
+if list_find '--enable-docs' ${QEMU_OPTS}; then
   depends texinfo &&
   depends python-sphinx &&
   depends perl &&
   depends podlators
-esac &&
+fi &&
 
+optional_depends gtk+3   \
+		 '--enable-gtk'  \
+		 '--disable-gtk' \
+		 'for GTK+ 3.x UI'  &&
 
-optional_depends gtk+3 \
-		 '--enable-gtk --with-gtkabi=3.0' \
-		 '' \
-		 'for GTK+ 3.x UI'
 if is_depends_enabled $SPELL gtk+3; then
   optional_depends vte3 '--enable-vte' '--disable-vte' \
 		   'VTE support for the GTK+ UI'
-else
-  optional_depends gtk+2 \
-		   '--enable-gtk --with-gtkabi=2.0'  \
-		   '--disable-gtk' \
-		   'for GTK+ 2.x UI' &&
-  if is_depends_enabled $SPELL gtk+2; then
-    optional_depends vte '--enable-vte' '--disable-vte' \
-		     'VTE support for the GTK+ UI'
-  fi
-fi
+fi  &&
 
 optional_depends sdl2                                  \
 		 '--enable-sdl'                        \
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index f187dbce59..0c67bf090b 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,11 @@
+2019-08-09 Eric Sandall <sandalle@sourcemage.org>
+	* These are quick fixes, I need this recompiled for the updated nettle 3.5 that broke compatibility.
+	* DEPENDS: Dependencies changed since 2.11
+	  Optionally uses gtk+3 >= 3.16 now. gtk+2 is not an option, there is no gtkabi parameter anymore.
+	  Use list_find instead of case to more reliably check for "--enable-docs"
+	* PRE_BUILD: No pci.mak nor sound.mak, nor are they included, so just write
+	  the configs out for now instead of sed, but they do nothing.
+
 2019-05-30 Ismael Luceno <ismael@sourcemage.org>
 	* DETAILS: updated spell to 4.0.0
 	* DEPENDS: removed SDL 1.x, not supported anymore
diff --git a/utils/qemu/PRE_BUILD b/utils/qemu/PRE_BUILD
index bb853635b7..547eddbe96 100755
--- a/utils/qemu/PRE_BUILD
+++ b/utils/qemu/PRE_BUILD
@@ -2,32 +2,41 @@ default_pre_build &&
 
 # Configure selected sound cards
 # Defaults are enabled in the configs, so only disable if not selected
+# There are no pci.mak nor sound.mak files nor does any *.mak include them, even though docs/devel/build-system.txt says x86_64-softmmu.mak does as an example and running sed on a non-existent file returns an error.
+# So this really does nothing, but I just need QEMU to compile so I can run some headless and soundless VMs. :)
 if  !  list_find "${QEMU_CARDS}"  "ac97"; then
-	sedit  's:CONFIG_AC97=y:CONFIG_AC97=n:' "${SOURCE_DIRECTORY}"/default-configs/pci.mak
+	#sedit  's:CONFIG_AC97=y:CONFIG_AC97=n:' "${SOURCE_DIRECTORY}"/default-configs/pci.mak
+  echo 'CONFIG_AC97=n' >> "${SOURCE_DIRECTORY}"/default-configs/pci.mak
 fi &&
 
 if  !  list_find "${QEMU_CARDS}"  "adlib"; then
-	sedit  's:CONFIG_ADLIB=y:CONFIG_ADLIB=n:' "${SOURCE_DIRECTORY}"/default-configs/sound.mak
+#	sedit  's:CONFIG_ADLIB=y:CONFIG_ADLIB=n:' "${SOURCE_DIRECTORY}"/default-configs/sound.mak
+  echo 'CONFIG_ADLIB=n' >> "${SOURCE_DIRECTORY}"/default-configs/pci.mak
 fi  &&
 
 if  !  list_find "${QEMU_CARDS}"  "cs4231a"; then
-	sedit  's:CONFIG_CS4231A=y:CONFIG_CS4231A=n:' "${SOURCE_DIRECTORY}"/default-configs/sound.mak
+#	sedit  's:CONFIG_CS4231A=y:CONFIG_CS4231A=n:' "${SOURCE_DIRECTORY}"/default-configs/sound.mak
+  echo 'CONFIG_CS4231A=n' >> "${SOURCE_DIRECTORY}"/default-configs/pci.mak
 fi  &&
 
 if  !  list_find "${QEMU_CARDS}"  "es1370"; then
-	sedit  's:CONFIG_ES1370=y:CONFIG_ES1370=n:' "${SOURCE_DIRECTORY}"/default-configs/pci.mak
+#	sedit  's:CONFIG_ES1370=y:CONFIG_ES1370=n:' "${SOURCE_DIRECTORY}"/default-configs/pci.mak
+  echo 'CONFIG_ES1370=n' >> "${SOURCE_DIRECTORY}"/default-configs/pci.mak
 fi &&
 
 if  !  list_find "${QEMU_CARDS}"  "gus"; then
-	sedit  's:CONFIG_GUS=y:CONFIG_GUS=n:' "${SOURCE_DIRECTORY}"/default-configs/sound.mak
+#	sedit  's:CONFIG_GUS=y:CONFIG_GUS=n:' "${SOURCE_DIRECTORY}"/default-configs/sound.mak
+  echo 'CONFIG_GUS=n' >> "${SOURCE_DIRECTORY}"/default-configs/pci.mak
 fi  &&
 
 if  !  list_find "${QEMU_CARDS}"  "hda"; then
-	sedit  's:CONFIG_HDA=y:CONFIG_HDA=n:' "${SOURCE_DIRECTORY}"/default-configs/pci.mak
+#	sedit  's:CONFIG_HDA=y:CONFIG_HDA=n:' "${SOURCE_DIRECTORY}"/default-configs/pci.mak
+  echo 'CONFIG_HDA=n' >> "${SOURCE_DIRECTORY}"/default-configs/pci.mak
 fi &&
 
 if  !  list_find "${QEMU_CARDS}"  "sb16"; then
-	sedit  's:CONFIG_SB16=y:CONFIG_SB16=n:' "${SOURCE_DIRECTORY}"/default-configs/sound.mak
+#	sedit  's:CONFIG_SB16=y:CONFIG_SB16=n:' "${SOURCE_DIRECTORY}"/default-configs/sound.mak
+  echo 'CONFIG_SB16=n' >> "${SOURCE_DIRECTORY}"/default-configs/pci.mak
 fi &&
 
 cd "${SOURCE_DIRECTORY}" &&