From 12c0a9c05e8c692598c8b933409ac623816bdbb1 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mar 26 2015 12:40:35 +0000 Subject: fix build with cmake-3.2+ Add explicit check-for and use-of X11 --- diff --git a/avogadro-cmake-3.2.patch b/avogadro-cmake-3.2.patch new file mode 100644 index 0000000..1c6a38d --- /dev/null +++ b/avogadro-cmake-3.2.patch @@ -0,0 +1,12 @@ +Index: avogadro-1.1.1/CMakeLists.txt +=================================================================== +--- avogadro-1.1.1.orig/CMakeLists.txt ++++ avogadro-1.1.1/CMakeLists.txt +@@ -225,6 +225,7 @@ set(I18N_LANGUAGE "" CACHE STRING "Build + + find_package(Qt4 4.6.0 REQUIRED) # find and setup Qt4 for this project + find_package(OpenGL REQUIRED) # find and setup OpenGL ++find_package(X11 REQUIRED) # find and setup X11 + find_package(Linguist) # find and setup Linguist + if(NOT Linguist_FOUND) + message(WARNING " Qt4 Linguist not found, please install it if you want Avogadro translations") diff --git a/avogadro.spec b/avogadro.spec index 77f467b..5112815 100644 --- a/avogadro.spec +++ b/avogadro.spec @@ -24,6 +24,11 @@ Patch2: avogadro-1.1.1-pkgconfig_eigen.patch # fix FTBFS on arm Patch3: 0029-Fix-compilation-on-ARM-where-qreal-can-be-defined-as.patch +## upstreamable +# fix build with cmake-3.2+ +# https://sourceforge.net/p/avogadro/bugs/746/ +Patch10: avogadro-cmake-3.2.patch + BuildRequires: boost-devel >= 1.35 BuildRequires: cmake >= 2.6.0 BuildRequires: desktop-file-utils @@ -71,6 +76,7 @@ Avogadro libraries. %patch1 -p1 -b .no-strip %patch2 -p1 -b .pkgconfig_eigen2 %patch3 -p1 -b .qreal +%patch10 -p1 -b .cmake_x11 %build