From f937b5eb7a64a51cc47b4835da768556317facc6 Mon Sep 17 00:00:00 2001
From: Juergen Spitzmueller <spitz@lyx.org>
Date: Wed, 14 Aug 2019 15:16:10 +0200
Subject: [PATCH] Load rotfloat and rotating after graphicx.

Fixes: #11502
---
 src/LaTeXFeatures.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 7a74291b75..251f5bf8f2 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -956,7 +956,6 @@ char const * simplefeatures[] = {
 	"verbatim",
 	"cprotect",
 	"longtable",
-	"rotating",
 	"latexsym",
 	"pifont",
 	// subfig is handled in BufferParams.cpp
@@ -968,7 +967,6 @@ char const * simplefeatures[] = {
 	  the `float' package. See the caption package documentation
 	  for explanation.*/
 	"float",
-	"rotfloat",
 	"wrapfig",
 	"booktabs",
 	"dvipost",
@@ -1244,6 +1242,13 @@ string const LaTeXFeatures::getPackages() const
 				 << "]{graphicx}\n";
 	}
 
+	// These must be loaded after graphicx, since they try
+	// to load graphicx without options
+	if (mustProvide("rotating"))
+		packages << "\\usepackage{rotating}\n";
+	if (mustProvide("rotfloat"))
+		packages << "\\usepackage{rotfloat}\n";
+
 	// lyxskak.sty --- newer chess support based on skak.sty
 	if (mustProvide("chess"))
 		packages << "\\usepackage[ps,mover]{lyxskak}\n";