From bde9ae5ccd3a8adfcd755723018a32007f8926fd Mon Sep 17 00:00:00 2001 From: damage Date: Sat, 4 Jan 2025 19:55:55 +0100 Subject: [PATCH] removed xpconnect as it needs static linking also removed useflags and some dependencies --- games-simulation/littlenavmap/Manifest | 5 +- .../littlenavmap/littlenavmap-3.0.12.ebuild | 81 +++++++------------ 2 files changed, 31 insertions(+), 55 deletions(-) diff --git a/games-simulation/littlenavmap/Manifest b/games-simulation/littlenavmap/Manifest index 300b6b9..a4eb53d 100644 --- a/games-simulation/littlenavmap/Manifest +++ b/games-simulation/littlenavmap/Manifest @@ -1,7 +1,6 @@ -DIST XPSDK411.zip 1562372 BLAKE2B a8f5e2370683198ea0c72b6b5a96c7abbc0e80f96721327181c3282cd712f92e7db59529c62e6677a3b4268b80242e9557b92077462394bad447ed97052c2dd0 SHA512 3ad66ce34b9e1e6dfba0c4547f3976b4a9862bdea0c498f43f3eedfb164d4e1b357e631b72b572b7646bffaa4ffe38698000a63dea1ae8f4c50c4037b8b6471a DIST atools-4.0.13.zip 5596075 BLAKE2B 69827f7d8193f9ed52a6fe75767f0bfe1efd6cb6f80862106b3dbc803fc81fb7ceaa74d78c96b6b136b7a1c4effe92f8b4395562aeef3668a135fe10b04a6253 SHA512 e3b6184731405993e1d1d1e040021d24a5ec7b31247114a275e30d9f1e2a889d199d2d7f54709c7d3e44177f61287024295fe1d75b4d21691b550b9e0476ea90 DIST littlenavconnect-3.0.7.zip 8842210 BLAKE2B eb9796be462e0b3473da47fd1e445dcdd7cfcf65c100466350e960ba5193676bd5cafcca5ea1b724d3ecdb8e685b5fbeed80ba941f5ecd3d5ca993d1790754ee SHA512 81cb9080a4d20860c480af234fa6f1e5c367ff07d02f3392250262c111e73af84f4fa090f3f5ac3298f4e7ac84cae31e1368a3592865e5917fcf38f4569883a0 DIST littlenavmap-3.0.12.tar.gz 16770864 BLAKE2B b929bf09a9a68649bd0588dd97730963621814f7e6519b350314d07d92bea130685d2a7d617bf9ae77d961779e401ee6429be7cb4e8ddedb927321c096270f86 SHA512 ae81014d14c0e5b2d86bb9a68ce42b62fb422df79b2a2326e0cee71960fb4ce7b1fc7e1d97d121f3f985ad3a8e2b357bb2f631fedcb58206484c52f93c0984a0 -DIST littlexpconnect-1.2.1.zip 81333 BLAKE2B 2acc70874a3d363f37361722501e6fbc2ace21f6096ee7bc2f1e45ef318adbf204c6247191896036f43e6108c3a0eda2e58f0fef2e163dda429a2d32991633ec SHA512 85107340db5be921f14a70385313e35828008698f36ed2569723bfe78ed17508b756812518201ada9195550068381217cf79fb5063cb186fa41cff47d3becf98 DIST marble-lnm-1.1.zip 29014228 BLAKE2B 67c58c4e897261133d5aa3d9c7e19073009b9c476c352cb7bfa48019f97fe8b569dbb5a645bf2a4f6b40be3e6f0254e913fa4833910138004e045a77d5677b41 SHA512 d75497c35103ecf2b6e35bc74d9f10a177131cca195198315d7c81d1ff0c31320a1d0ece4cf089c91c663144c5f30e7bdcfff3b2f35b5642169fe2b9fc089921 -EBUILD littlenavmap-3.0.12.ebuild 4660 BLAKE2B 0796416cf84411e404207ebbddb85016ab02838a0d2c8dff7214917567c7baf8c82d83f50b411c6743c9ca50f03afc43881c1644f4cba79f8bd3bce4c5477263 SHA512 166b53c080f1fbbea13e9bde791e4a02408560624fe568ec256c7d72233314d493d23bf0b85db8524ae5fa1d026b45b94cc99cf97ab414425b606b287dcca15b +EBUILD littlenavmap-3.0.12.ebuild 3721 BLAKE2B 75b72e1673787c6f27cedf49affec383615f461e20ec6c56bca884ad41768a17cbaa79a4debce4dd8b2ffd262417ba12712a451eccd2d3f31edcbd3a807b67f0 SHA512 6af9de760bee124cd58cc7f642f5d420d04d4eb1517b0bef61bc0097e0b923374d65a0fc17dfde27b11171a070610bb82fd0d64606580fe1fc4fff0ff5cfbe0a +MISC littlenavmap-3.0.12.ebuild.bak 5571 BLAKE2B 508fe1e877f7bc5d75cb095d627a4491008a1ff52a683f879a7fb691c7961475d7da0c3f4efee5e7754cde04734bbd2c8442d26dee2d3297c48b60e559aa1ad8 SHA512 4210cbe5618a45e7de8f0edbfb9ae14266d90772b31ce6ab67f1f96e379935825cf051354c19287934144c8ad601a68391a92fa4515dd05ed7bc881d6c3aeab5 diff --git a/games-simulation/littlenavmap/littlenavmap-3.0.12.ebuild b/games-simulation/littlenavmap/littlenavmap-3.0.12.ebuild index 11aa5cd..8d6e490 100644 --- a/games-simulation/littlenavmap/littlenavmap-3.0.12.ebuild +++ b/games-simulation/littlenavmap/littlenavmap-3.0.12.ebuild @@ -7,9 +7,8 @@ inherit cmake qmake-utils desktop ATOOLS_VERSION="4.0.13" NAVCONNECT_VERSION="3.0.7" -XPCONNECT_VERSION="1.2.1" -RESTRICT="strip" +RESTRICT="mirror" DESCRIPTION="flight planner, navigation tool, moving map, \ airport search and airport information system" @@ -17,62 +16,33 @@ HOMEPAGE="https://albar965.github.io/littlenavmap.html" SRC_URI="https://github.com/albar965/littlenavmap/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" SRC_URI+=" https://github.com/albar965/marble/archive/refs/heads/lnm/1.1.zip -> marble-lnm-1.1.zip" SRC_URI+=" https://github.com/albar965/atools/archive/refs/tags/v${ATOOLS_VERSION}.zip -> atools-${ATOOLS_VERSION}.zip" -SRC_URI+=" https://developer.x-plane.com/wp-content/plugins/code-sample-generation/sdk_zip_files/XPSDK411.zip" -SRC_URI+=" navconnect? ( https://github.com/albar965/littlenavconnect/archive/refs/tags/v3.0.7.zip -> littlenavconnect-${NAVCONNECT_VERSION}.zip )" -SRC_URI+=" xpconnect? ( https://github.com/albar965/littlexpconnect/archive/refs/tags/v1.2.1.zip -> littlexpconnect-${XPCONNECT_VERSION}.zip )" +SRC_URI+=" https://github.com/albar965/littlenavconnect/archive/refs/tags/v3.0.7.zip -> littlenavconnect-${NAVCONNECT_VERSION}.zip" -LICENSE="" +LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="+navconnect +xpconnect" -DEPEND="" +DEPEND="dev-qt/qtsql:5 dev-qt/qtcore:5 dev-cpp/cpptrace dev-qt/qtimageformats:5" +DEPEND+=" dev-qt/qtgui:5[eglfs,linuxfb] dev-qt/qtsvg:5 dev-qt/qtdeclarative:5" +DEPEND+=" dev-qt/qttranslations:5 dev-qt/qtx11extras:5" RDEPEND="${DEPEND}" -BDEPEND="dev-qt/qtsql:5 dev-qt/qtcore:5 dev-cpp/cpptrace dev-qt/qtimageformats:5" -BDEPEND+=" dev-qt/qtgui:5[eglfs,linuxfb] dev-qt/qtsvg:5 dev-qt/qtdeclarative:5" -BDEPEND+=" dev-qt/qttranslations:5 dev-qt/qtx11extras:5" +BDEPEND="" S_MARBLE="${WORKDIR}/marble-lnm-1.1" S_MARBLE_BUILD="${S_MARBLE}_build" S_ATOOLS="${WORKDIR}/atools-${ATOOLS_VERSION}" +S_ATOOLS_BUILD="${S_ATOOLS}_build" S_NAVMAP="${WORKDIR}/${P}" S_NAVMAP_BUILD="${S_NAVMAP}_build" S_NAVCONNECT="${WORKDIR}/littlenavconnect-${NAVCONNECT_VERSION}" S_NAVCONNECT_BUILD="${S_NAVCONNECT}_build" -S_XPCONNECT="${WORKDIR}/littlexpconnect-${XPCONNECT_VERSION}" -S_XPCONNECT_BUILD="${S_XPCONNECT}_build" -S_XPSDK="${WORKDIR}/SDK" S="${WORKDIR}" CMAKE_USE_DIR="${S_MARBLE}" CMAKE_BUILD_TYPE="Release" src_configure() { - mkdir "${S_NAVMAP_BUILD}" - - eqmake5 -o "${S_ATOOLS}/Makefile" "${S_ATOOLS}/atools.pro" -spec linux-g++ CONFIG+=release - - ATOOLS_INC_PATH="${S_ATOOLS}/src" \ - ATOOLS_LIB_PATH="${S_ATOOLS}" \ - MARBLE_INC_PATH="${S_MARBLE_BUILD}/include" \ - MARBLE_LIB_PATH="${S_MARBLE_BUILD}/lib64" \ - XPSDK_BASE="${S_XPSDK}" \ - DEPLOY_BASE="${D}/opt" \ - eqmake5 -o "${S_NAVMAP_BUILD}/Makefile" "${S_NAVMAP}/littlenavmap.pro" -spec linux-g++ CONFIG+=release - - use navconnect && \ - ATOOLS_INC_PATH="${S_ATOOLS}/src" \ - ATOOLS_LIB_PATH="${S_ATOOLS}" \ - XPSDK_BASE="${S_XPSDK}" \ - DEPLOY_BASE="${D}/opt/Little Navmap" \ - eqmake5 -o "${S_NAVCONNECT_BUILD}/Makefile" "${S_NAVCONNECT}/littlenavconnect.pro" -spec linux-g++ CONFIG+=release - - use xpconnect && \ - ATOOLS_INC_PATH="${S_ATOOLS}/src" \ - ATOOLS_LIB_PATH="${S_ATOOLS}" \ - XPSDK_BASE="${S_XPSDK}" \ - DEPLOY_BASE="${D}/opt/Little Navmap" \ - eqmake5 -o "${S_XPCONNECT_BUILD}/Makefile" "${S_XPCONNECT}/littlexpconnect.pro" -spec linux-g++ CONFIG+=release + eqmake5 -o "${S_ATOOLS_BUILD}/Makefile" "${S_ATOOLS}/atools.pro" -spec linux-g++ CONFIG+=release local mycmakeargs=( -DSTATIC_BUILD=TRUE @@ -98,8 +68,19 @@ src_configure() { -DWITH_libwlocate=NO -DCMAKE_INSTALL_PREFIX=/marble ) - cmake_src_configure + + ATOOLS_INC_PATH="${S_ATOOLS}/src" \ + ATOOLS_LIB_PATH="${S_ATOOLS_BUILD}" \ + MARBLE_INC_PATH="${S_MARBLE_BUILD}/include" \ + MARBLE_LIB_PATH="${S_MARBLE_BUILD}/lib64" \ + DEPLOY_BASE="${D}/opt" \ + eqmake5 -o "${S_NAVMAP_BUILD}/Makefile" "${S_NAVMAP}/littlenavmap.pro" -spec linux-g++ CONFIG+=release + + ATOOLS_INC_PATH="${S_ATOOLS}/src" \ + ATOOLS_LIB_PATH="${S_ATOOLS_BUILD}" \ + DEPLOY_BASE="${D}/opt/Little Navmap" \ + eqmake5 -o "${S_NAVCONNECT_BUILD}/Makefile" "${S_NAVCONNECT}/littlenavconnect.pro" -spec linux-g++ CONFIG+=release } src_compile() { @@ -110,10 +91,10 @@ src_compile() { rm -rf "${S_MARBLE_BUILD}" mv "${D}/marble" "${S_MARBLE_BUILD}" - emake -C "${S_ATOOLS}" + emake -C "${S_ATOOLS_BUILD}" + emake -C "${S_NAVMAP_BUILD}" - use navconnect && emake -C "${S_NAVCONNECT_BUILD}" - use xpconnect && emake -C "${S_XPCONNECT_BUILD}" + emake -C "${S_NAVCONNECT_BUILD}" } src_install() { @@ -122,13 +103,9 @@ src_install() { sed -ie "s;YOUR_PATH_TO_LITTLENAVMAP;/opt/Little Navmap;g" "${D}/opt/Little Navmap/Little Navmap.desktop" domenu "${D}/opt/Little Navmap/Little Navmap.desktop" - if use navconnect; then - emake -C "${S_NAVCONNECT_BUILD}" copydata - emake -C "${S_NAVCONNECT_BUILD}" deploy - sed -ie "s;YOUR_PATH;/opt;g" "${D}/opt/Little Navmap/Little Navconnect/Little Navconnect.desktop" - sed -ie "s;\\\\s; ;g" "${D}/opt/Little Navmap/Little Navconnect/Little Navconnect.desktop" - domenu "${D}/opt/Little Navmap/Little Navconnect/Little Navconnect.desktop" - fi - - use xpconnect && emake -C "${S_XPCONNECT_BUILD}" deploy + emake -C "${S_NAVCONNECT_BUILD}" copydata + emake -C "${S_NAVCONNECT_BUILD}" deploy + sed -ie "s;YOUR_PATH;/opt;g" "${D}/opt/Little Navmap/Little Navconnect/Little Navconnect.desktop" + sed -ie "s;\\\\s; ;g" "${D}/opt/Little Navmap/Little Navconnect/Little Navconnect.desktop" + domenu "${D}/opt/Little Navmap/Little Navconnect/Little Navconnect.desktop" }