Skip to content

Commit 850ad49

Browse files
committed
[new-package] avogadroapp 1.99.0
1 parent 459ad17 commit 850ad49

File tree

2 files changed

+105
-0
lines changed

2 files changed

+105
-0
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
--- a/avogadro/CMakeLists.txt
2+
+++ b/avogadro/CMakeLists.txt
3+
@@ -67,7 +67,7 @@
4+
FILES_MATCHING PATTERN "*.qm"
5+
)
6+
7+
-if(APPLE OR WIN32 OR INSTALL_BUNDLE_FILES)
8+
+if(APPLE OR MSVC OR INSTALL_BUNDLE_FILES)
9+
# copy the qt translation files
10+
get_filename_component(_qttranslationdir "${Qt5_DIR}/../../../translations" ABSOLUTE)
11+
message(STATUS "Install Qt translations ${_qttranslationdir}")
12+
@@ -181,7 +181,7 @@
13+
add_executable(avogadro WIN32 MACOSX_BUNDLE
14+
${avogadro_srcs} ${ui_srcs} ${rcc_srcs})
15+
target_link_libraries(avogadro Qt::Widgets Qt::Network Qt::Concurrent)
16+
-if(WIN32)
17+
+if(MSVC)
18+
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:MSVCRTD")
19+
if(QT_VERSION EQUAL 5)
20+
target_link_libraries(avogadro Qt::WinMain)
21+
--- a/avogadro/lastinstall/CMakeLists.txt
22+
+++ b/avogadro/lastinstall/CMakeLists.txt
23+
@@ -1,4 +1,4 @@
24+
-if((APPLE OR WIN32) AND NOT ${CMAKE_VERSION} VERSION_LESS 2.8.8)
25+
+if((APPLE OR MSVC) AND NOT ${CMAKE_VERSION} VERSION_LESS 2.8.8)
26+
set(pfx "")
27+
if(NOT APPLE)
28+
set(pfx "bin/")
29+
--- a/cmake/AvogadroCPack.cmake
30+
+++ b/cmake/AvogadroCPack.cmake
31+
@@ -36,7 +36,7 @@
32+
33+
# Should we add extra install rules to make a self-contained bundle, this is
34+
# usually only required when attempting to create self-contained installers.
35+
-if(APPLE OR WIN32)
36+
+if(APPLE OR MSVC)
37+
set(INSTALL_BUNDLE_FILES ON)
38+
else()
39+
option(INSTALL_BUNDLE_FILES "Add install rules to bundle files" OFF)

mingw-w64-avogadroapp/PKGBUILD

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# Contributor: Mehdi Chinoune <[email protected]>
2+
3+
_realname=avogadroapp
4+
pkgbase=mingw-w64-${_realname}
5+
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
6+
pkgver=1.99.0
7+
pkgrel=1
8+
pkgdesc='Advanced molecular editor designed for cross-platform use in computational chemistry, molecular modeling, bioinformatics, materials science, and related areas (mingw-w64)'
9+
arch=(any)
10+
mingw_arch=(ucrt64 clang64 clangarm64)
11+
url='https://www.openchemistry.org/'
12+
msys2_repository_url="https://github.com/OpenChemistry/avogadroapp"
13+
license=(spdx:BSD-3-Clause)
14+
depends=("${MINGW_PACKAGE_PREFIX}-avogadrolibs"
15+
"${MINGW_PACKAGE_PREFIX}-avogadrolibs-qt6"
16+
"${MINGW_PACKAGE_PREFIX}-molequeue"
17+
"${MINGW_PACKAGE_PREFIX}-qt6-5compat"
18+
"${MINGW_PACKAGE_PREFIX}-qt6-base")
19+
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
20+
"${MINGW_PACKAGE_PREFIX}-cmake"
21+
"${MINGW_PACKAGE_PREFIX}-eigen3"
22+
"${MINGW_PACKAGE_PREFIX}-vtk"
23+
"${MINGW_PACKAGE_PREFIX}-fast_float"
24+
"${MINGW_PACKAGE_PREFIX}-utf8cpp")
25+
source=(https://github.com/OpenChemistry/avogadroapp/archive/${pkgver}/${_realname}-${pkgver}.tar.gz
26+
https://github.com/OpenChemistry/avogadro-i18n/archive/${pkgver}/avogadro-i18n-${pkgver}.tar.gz
27+
001-fix-build-on-mingw.patch)
28+
sha256sums=('4713faa4e755433947924a381fd1631dfe46a9f27065765cfa04c120ed603189'
29+
'0ca56e3ffd065f4981f2d5185c6de13fa7b9f6e78e98e9e3014ed9512d7c80ae'
30+
'dd4f67e8f80ca96f024a142831ef1ba5cd6c57dca6590230a44b9268e6302508')
31+
32+
prepare() {
33+
mv avogadro-i18n-${pkgver} avogadro-i18n
34+
35+
cd ${_realname}-${pkgver}
36+
patch -p1 -i "${srcdir}"/001-fix-build-on-mingw.patch
37+
}
38+
39+
build() {
40+
declare -a _extra_config
41+
if check_option "debug" "n"; then
42+
_extra_config+=("-DCMAKE_BUILD_TYPE=Release")
43+
else
44+
_extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
45+
fi
46+
47+
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
48+
${MINGW_PREFIX}/bin/cmake \
49+
-GNinja \
50+
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
51+
-DCMAKE_DLL_NAME_WITH_SOVERSION=ON \
52+
"${_extra_config[@]}" \
53+
-DAvogadro_ENABLE_RPC=OFF \
54+
-DUSE_VTK=ON \
55+
-DQT_VERSION=6 \
56+
-B build-${MSYSTEM} \
57+
-S ${_realname}-${pkgver}
58+
59+
${MINGW_PREFIX}/bin/cmake --build build-${MSYSTEM}
60+
}
61+
62+
package() {
63+
DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install build-${MSYSTEM}
64+
65+
install -Dm644 ${_realname}-${pkgver}/LICENSE -t "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}
66+
}

0 commit comments

Comments
 (0)