+++ /dev/null
-From 2c9d46a60bd8d35f132cb106e5255d590b13640b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 17 Apr 2018 23:03:56 +0200
-Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
-
----
- apps/launcher/CMakeLists.txt | 2 +-
- apps/opencs/CMakeLists.txt | 2 +-
- apps/wizard/CMakeLists.txt | 2 +-
- components/CMakeLists.txt | 2 +-
- extern/osgQt/CMakeLists.txt | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/apps/launcher/CMakeLists.txt b/apps/launcher/CMakeLists.txt
-index aec8c2533..99e7b4daa 100644
---- a/apps/launcher/CMakeLists.txt
-+++ b/apps/launcher/CMakeLists.txt
-@@ -106,7 +106,7 @@ if (DESIRED_QT_VERSION MATCHES 4)
- target_link_libraries(openmw-launcher ${QT_QTMAIN_LIBRARY})
- endif(WIN32)
- else()
-- qt5_use_modules(openmw-launcher Widgets Core)
-+ target_link_libraries(openmw-launcher Qt5::Widgets Qt5::Core)
- endif()
-
- if (BUILD_WITH_CODE_COVERAGE)
-diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
-index b9279bf91..f07b518a9 100644
---- a/apps/opencs/CMakeLists.txt
-+++ b/apps/opencs/CMakeLists.txt
-@@ -246,7 +246,7 @@ if (DESIRED_QT_VERSION MATCHES 4)
- target_link_libraries(openmw-cs ${QT_QTMAIN_LIBRARY})
- endif()
- else()
-- qt5_use_modules(openmw-cs Widgets Core Network OpenGL)
-+ target_link_libraries(openmw-cs Qt5::Widgets Qt5::Core Qt5::Network Qt5::OpenGL)
- endif()
-
- if (WIN32)
-diff --git a/apps/wizard/CMakeLists.txt b/apps/wizard/CMakeLists.txt
-index 5f7338e52..8d97bbcbf 100644
---- a/apps/wizard/CMakeLists.txt
-+++ b/apps/wizard/CMakeLists.txt
-@@ -118,7 +118,7 @@ if (DESIRED_QT_VERSION MATCHES 4)
- target_link_libraries(openmw-wizard ${QT_QTMAIN_LIBRARY})
- endif()
- else()
-- qt5_use_modules(openmw-wizard Widgets Core)
-+ target_link_libraries(openmw-wizard Qt5::Widgets Qt5::Core)
- endif()
-
- if (OPENMW_USE_UNSHIELD)
-diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
-index 8256f1443..ecb844a9b 100644
---- a/components/CMakeLists.txt
-+++ b/components/CMakeLists.txt
-@@ -216,7 +216,7 @@ if (USE_QT)
- ${QT_QTCORE_LIBRARY}
- ${QT_QTGUI_LIBRARY})
- else()
-- qt5_use_modules(components Widgets Core)
-+ target_link_libraries(components Qt5::Widgets Qt5::Core)
- endif()
- endif()
-
-diff --git a/extern/osgQt/CMakeLists.txt b/extern/osgQt/CMakeLists.txt
-index 3bd08a390..78a4e6034 100644
---- a/extern/osgQt/CMakeLists.txt
-+++ b/extern/osgQt/CMakeLists.txt
-@@ -12,7 +12,7 @@ if (DESIRED_QT_VERSION MATCHES 4)
- include(${QT_USE_FILE})
- target_link_libraries(${OSGQT_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTOPENGL_LIBRARY})
- else()
-- qt5_use_modules(${OSGQT_LIBRARY} Core OpenGL)
-+ target_link_libraries(${OSGQT_LIBRARY} Qt5::Core Qt5::OpenGL)
- endif()
-
- link_directories(${CMAKE_CURRENT_BINARY_DIR})
---
-2.17.0
-
+++ /dev/null
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils readme.gentoo-r1
-
-DESCRIPTION="Open source reimplementation of TES III: Morrowind"
-HOMEPAGE="https://openmw.org/"
-SRC_URI="https://github.com/OpenMW/openmw/archive/${P}.tar.gz"
-
-LICENSE="GPL-3 MIT BitstreamVera ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc devtools +qt5"
-
-RDEPEND="
- dev-games/mygui
- >=dev-games/openscenegraph-3.5.5[ffmpeg,jpeg,png,sdl,svg,truetype,zlib]
- dev-games/openscenegraph-qt
- dev-libs/boost:=[threads]
- dev-libs/tinyxml[stl]
- media-libs/libsdl2[joystick,opengl,video,X]
- media-libs/openal
- media-video/ffmpeg:=
- >=sci-physics/bullet-2.86
- virtual/opengl
- qt5? (
- app-arch/unshield
- dev-qt/qtcore:5
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
- )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen[doc] dev-python/sphinx )"
-
-S="${WORKDIR}/${PN}-${P}"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11b3.patch" )
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # We don't install license files
- sed -e '/LICDIR/d' \
- -i CMakeLists.txt || die
- # Use the system tinyxml headers
- sed -e 's/"tinyxml.h"/<tinyxml.h>/g' \
- -e 's/"tinystr.h"/<tinystr.h>/g' \
- -i extern/oics/ICSPrerequisites.h || die
-}
-
-src_configure() {
- use devtools && ! use qt5 && \
- elog "'qt5' USE flag is disabled, 'openmw-cs' will not be installed"
-
- local mycmakeargs=(
- -DBUILD_BSATOOL=$(usex devtools)
- -DBUILD_DOCS=$(usex doc)
- -DBUILD_ESMTOOL=$(usex devtools)
- -DBUILD_LAUNCHER=$(usex qt5)
- -DBUILD_NIFTEST=$(usex devtools)
- -DBUILD_OPENCS=$(usex devtools $(usex qt5))
- -DBUILD_WIZARD=$(usex qt5)
- -DBUILD_UNITTESTS=OFF
- -DGLOBAL_DATA_PATH=/usr/share
- -DICONDIR="/usr/share/icons/hicolor/256x256/apps"
- -DMORROWIND_DATA_FILES="/usr/share/morrowind-data"
- -DUSE_SYSTEM_TINYXML=ON
- -DDESIRED_QT_VERSION=5
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-
- if use doc ; then
- cmake-utils_src_compile doc
- find "${CMAKE_BUILD_DIR}"/docs/Doxygen/html \
- -name '*.md5' -type f -delete || die
- HTML_DOCS=( "${CMAKE_BUILD_DIR}"/docs/Doxygen/html/. )
- fi
-}
-
-src_install() {
- cmake-utils_src_install
-
- local DOC_CONTENTS="
- You need the original Morrowind data files. If you haven't
- installed them yet, you can install them straight via the
- installation wizard which is the officially supported method
- (either by using the launcher or by calling 'openmw-wizard'
- directly).\n"
-
- if ! use qt5; then
- local DOC_CONTENTS+="\n\n
- USE flag 'qt5' is disabled, 'openmw-launcher' and
- 'openmw-wizard' are not available. You are on your own for
- making the Morrowind data files available and pointing
- openmw at them.\n\n
- Additionally; you must import the Morrowind.ini file before
- running openmw with the Morrowind data files for the first
- time. Typically this can be done like so:\n\n
- \t mkdir -p ~/.config/openmw\n
- \t openmw-iniimporter /path/to/Morrowind.ini ~/.config/openmw/openmw.cfg"
- fi
-
- readme.gentoo_create_doc
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- readme.gentoo_print_elog
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
projects / gentoo.git / commitdiff