zepto-forks/meta-qt5-extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

molequeue: Upgrade 0.8.0 -> 0.9.0

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2018-11-16 13:47:44 +01:00
parent fea0a7cbce
commit 8a5f66ade8
4 changed files with 54 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
recipes-misc/recipes-chemistry/molequeue/files/0001-GenerateExportHeader.cmake-do-not-perform-compiler-t.patch
View File

@@ -1,42 +0,0 @@
From a96dbfcb6d8214d4225ceeacc38397ae98d7cbc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Fri, 16 Dec 2016 23:19:14 +0100
Subject: [PATCH] GenerateExportHeader.cmake: do not perform compiler tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
they fail and our compiler is up to date and pretty cool
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
cmake/GenerateExportHeader.cmake | 5 -----
1 file changed, 5 deletions(-)
diff --git a/cmake/GenerateExportHeader.cmake b/cmake/GenerateExportHeader.cmake
index a91da06..a20905b 100644
--- a/cmake/GenerateExportHeader.cmake
+++ b/cmake/GenerateExportHeader.cmake
@@ -343,17 +343,12 @@ function(GENERATE_EXPORT_HEADER TARGET_LIBRARY)
message(WARNING "This macro can only be used with libraries")
return()
endif()
- _test_compiler_hidden_visibility()
- _test_compiler_has_deprecated()
_do_set_macro_values(${TARGET_LIBRARY})
_do_generate_export_header(${TARGET_LIBRARY} ${ARGN})
endfunction()
function(add_compiler_export_flags)
- _test_compiler_hidden_visibility()
- _test_compiler_has_deprecated()
-
if(NOT (USE_COMPILER_HIDDEN_VISIBILITY AND COMPILER_HAS_HIDDEN_VISIBILITY))
# Just return if there are no flags to add.
return()
--
2.5.5

35
recipes-misc/recipes-chemistry/molequeue/molequeue/0001-Avoid-RPATH-if-not-configured.patch Normal file
View File

@@ -0,0 +1,35 @@
From 2f43dc82563eef7fe844315939231f3fcb4b7817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Fri, 16 Nov 2018 13:42:48 +0100
Subject: [PATCH] Avoid RPATH if not configured
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
cmake/InstallLocation.cmake | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/cmake/InstallLocation.cmake b/cmake/InstallLocation.cmake
index ca9e375..6061201 100644
--- a/cmake/InstallLocation.cmake
+++ b/cmake/InstallLocation.cmake
@@ -39,8 +39,10 @@ endif()
# Set up RPATH for the project too.
option(ENABLE_RPATH "Enable rpath support on Linux and Mac" ON)
-if(NOT CMAKE_INSTALL_RPATH)
- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIBRARY_DIR}")
+if(ENABLE_RPATH)
+ if(NOT CMAKE_INSTALL_RPATH)
+ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIBRARY_DIR}")
+ endif()
endif()
if(APPLE AND NOT CMAKE_INSTALL_NAME_DIR)
set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIBRARY_DIR}")
--
2.14.4

18
recipes-misc/recipes-chemistry/molequeue/molequeue_0.8.0.bb
View File

@@ -1,18 +0,0 @@
SUMMARY = "Desktop integration of high performance computing resources"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=7ecaf7ba5c6acb29d489639dd3a7c1b9"
inherit cmake_qt5 cmake_lib
SRC_URI = " \
https://github.com/OpenChemistry/${BPN}/archive/${PV}.tar.gz \
file://0001-GenerateExportHeader.cmake-do-not-perform-compiler-t.patch \
"
SRC_URI[md5sum] = "2f49f3e28965af6fec8a6df37d8ec697"
SRC_URI[sha256sum] = "c191e396f3d882c911e331e6325ed4e2666b70d4316e458964e61d5af7c8cbba"
CMAKE_ALIGN_SYSROOT[1] = "molequeue, -S${prefix}, -S${STAGING_DIR_HOST}/${prefix}"
FILES_SOLIBSDEV = ""
FILES_${PN} += "${libdir}/libMoleQueue*.so"
FILES_${PN}-dev += "${libdir}/cmake"

19
recipes-misc/recipes-chemistry/molequeue/molequeue_0.9.0.bb Normal file
View File

@@ -0,0 +1,19 @@
SUMMARY = "Desktop integration of high performance computing resources"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=e64c567d31d109fd44cbe6f1fe113daa"
inherit cmake_qt5 cmake_lib
SRC_URI = " \
https://github.com/OpenChemistry/${BPN}/archive/${PV}.tar.gz \
file://0001-Avoid-RPATH-if-not-configured.patch \
"
SRC_URI[md5sum] = "28e707668bfaf2ebc615da54fc98002f"
SRC_URI[sha256sum] = "7dd234742c8d73be95281fedf4ed9d09648ecc351afb5f098cd32f48c3df3bd5"
EXTRA_OECMAKE += "-DENABLE_RPATH=OFF"
CMAKE_ALIGN_SYSROOT[1] = "molequeue, -S${prefix}, -S${STAGING_DIR_HOST}/${prefix}"
FILES_SOLIBSDEV = ""
FILES_${PN} += "${libdir}/libMoleQueue*.so"