diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2019-08-27 18:23:47 +0200 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2019-08-27 18:23:47 +0200 |
| commit | ac37b47bed071059642750defb0ff7bc4bdc9fb5 (patch) | |
| tree | 125a728a047dc4b38a09ed35754f0eabb1cc05d1 | |
| parent | dev-util/netbeans-9999: some fixes (by Marco Genasci <fedeliallalinea@gmail.c... (diff) | |
| download | fordfrog-ac37b47bed071059642750defb0ff7bc4bdc9fb5.tar.gz fordfrog-ac37b47bed071059642750defb0ff7bc4bdc9fb5.tar.bz2 fordfrog-ac37b47bed071059642750defb0ff7bc4bdc9fb5.zip | |
media-gfx/freecad-9999: fixes
Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
| -rw-r--r-- | media-gfx/freecad/Manifest | 3 | ||||
| -rw-r--r-- | media-gfx/freecad/files/freecad-9999-install-paths.patch | 23 | ||||
| -rw-r--r-- | media-gfx/freecad/freecad-9999.ebuild | 10 |
3 files changed, 4 insertions, 32 deletions
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest index d1a6dd8cc..4a1d8c98e 100644 --- a/media-gfx/freecad/Manifest +++ b/media-gfx/freecad/Manifest @@ -1,4 +1,3 @@ -AUX freecad-9999-install-paths.patch 1195 BLAKE2B 4bb847fae9ab1e097423a8b0df2860cf9883ca5a4c7c4505cf532fc9c403098dd0d82e701a6488f5ea501fa7b03dceda3c53a966e3766f06ec40453453c45712 SHA512 81d81da9d6f00e2955e7861fcc481e6c9c452022cac081ff077ca274b8e2207ba6424ff9da3d7d2f4d92ea6a8fa547340ca2556bb7d575bf903a9c7608a8a7f6 AUX freecad.sharedmimeinfo 312 BLAKE2B 731f28f904bebac03c8a64778d5e36f9b26fa33c347fa0b67113752aea12568f5a19968e730a53da89a7c7d08db6f8d80f11ab30d011e6b4db973c8549f710bd SHA512 bb55cad8387032af0e06ce7f1b4cab4354a34a915b9f550de25e05bf24d4161d9ea152d5692d65df4b362622f76a11d78894deaf7fee60c7a3fc0bfec38fa10c -EBUILD freecad-9999.ebuild 7378 BLAKE2B 2db4c4af07570a326a15b75936ecefad94e2eb81a5d19dd9a0fa99cb6c5000e3fcead51dbf17ec36ca955c6db5ebbc166e6f164c0ea18b22d68d0e8ead346af3 SHA512 7bcd0efc08cd4c25bebedfd3aa2a9a149949a99a2cc30f866a0fd4052776baa3fd91287ad036c0ceb30a0f78cfa38ed7190a4d461e570cd0da0d0aca44733c6e +EBUILD freecad-9999.ebuild 7388 BLAKE2B 526438e1d537e807c93c3272e980d1654a5069abdbd4b8d3e1308c4675d3b493ec529b6b6b9dd34d626fd494b7154fc6079e4f87fb62a09bca5ad0957161b443 SHA512 0748884267418898c5d18e50b68e814dc90c35ec92dc5ca755e2d3acb5ad7375274acd70e787034a8be1d66fa0af09df85bb72902bc0dd9c01b783a4bdaf0bb9 MISC metadata.xml 3503 BLAKE2B 839015c3b661f9105b7c172759bd7c9d120ff5c5e0c1a5a5c1c8309d9460b33dc3cd79b6ffe56bb9a25c5d0e3787b4e0ee8d253896fece96726bed8f130dbde6 SHA512 a45523d4f059df0f9257517f24763bb94ec8fa0400967295e43ca8747e174ff3183166f279962d2e3f23054c5db9d7e43bfa610e06068ccc4eb4884edf922a9d diff --git a/media-gfx/freecad/files/freecad-9999-install-paths.patch b/media-gfx/freecad/files/freecad-9999-install-paths.patch deleted file mode 100644 index 3dc5d921a..000000000 --- a/media-gfx/freecad/files/freecad-9999-install-paths.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a3f53c029..c97e05862 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -140,9 +140,15 @@ else(WIN32) - set(CMAKE_INSTALL_PREFIX "/usr/lib${LIB_SUFFIX}/freecad" CACHE PATH "Installation root directory") - endif(WIN32) - --set(CMAKE_INSTALL_DATADIR data CACHE PATH "Output directory for data and resource files") --set(CMAKE_INSTALL_INCLUDEDIR include CACHE PATH "Output directory for header files") --set(CMAKE_INSTALL_DOCDIR doc CACHE PATH "Output directory for documentation and license files") -+if(NOT CMAKE_INSTALL_DATADIR) -+ set(CMAKE_INSTALL_DATADIR data CACHE PATH "Output directory for data and resource files") -+endif(NOT CMAKE_INSTALL_DATADIR) -+if(NOT CMAKE_INSTALL_INCLUDEDIR) -+ set(CMAKE_INSTALL_INCLUDEDIR include CACHE PATH "Output directory for header files") -+endif(NOT CMAKE_INSTALL_INCLUDEDIR) -+if(NOT CMAKE_INSTALL_DOCDIR) -+ set(CMAKE_INSTALL_DOCDIR doc CACHE PATH "Output directory for documentation and license files") -+endif(NOT CMAKE_INSTALL_DOCDIR) - # Don't set it without manual adoption of LibDir variable in src/App/FreeCADInit.py - set(CMAKE_INSTALL_LIBDIR lib CACHE PATH "Output directory for libraries") - diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild index acb08a01d..26afb5f10 100644 --- a/media-gfx/freecad/freecad-9999.ebuild +++ b/media-gfx/freecad/freecad-9999.ebuild @@ -116,10 +116,6 @@ DEPEND="${COMMON_DEPEND} REQUIRED_USE="${PYTHON_REQUIRED_USE}" -PATCHES=( - "${FILESDIR}"/${P}-install-paths.patch -) - DOCS=( README.md ChangeLog.txt ) enable_module() { @@ -250,10 +246,10 @@ src_install() { pushd "${ED%/}"/usr/share/${P} || die local size for size in 16 32 48 64; do - newicon -s ${size} freecad-icon-${size}.png freecad.png + newicon -s ${size} "${S}"/src/Gui/Icons/freecad-icon-${size}.png freecad.png done - doicon -s scalable freecad.svg - newicon -s 64 -c mimetypes freecad-doc.png application-x-extension-fcstd.png + doicon -s scalable "${S}"/src/Gui/Icons/freecad.svg + newicon -s 64 -c mimetypes "${S}"/src/Gui/Icons/freecad-doc.png application-x-extension-fcstd.png popd || die if use doc; then |