-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
9ba73b3
commit 6da02a2
Showing
2 changed files
with
166 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,92 @@ | ||
--- a/include/orcus/env.hpp | ||
+++ b/include/orcus/env.hpp | ||
@@ -11,10 +11,7 @@ | ||
// orcus | ||
|
||
#if defined _WIN32 || defined __CYGWIN__ | ||
- #if defined __MINGW32__ | ||
- #define ORCUS_DLLPUBLIC | ||
- #define ORCUS_DLLLOCAL | ||
- #elif defined __ORCUS_BUILDING_DLL | ||
+ #if defined __ORCUS_BUILDING_DLL | ||
#ifdef __GNUC__ | ||
#define ORCUS_DLLPUBLIC __attribute__ ((dllexport)) | ||
#else | ||
@@ -43,10 +40,7 @@ | ||
// orcus-parser | ||
|
||
#if defined _WIN32 || defined __CYGWIN__ | ||
- #if defined __MINGW32__ | ||
- #define ORCUS_PSR_DLLPUBLIC | ||
- #define ORCUS_PSR_DLLLOCAL | ||
- #elif defined __ORCUS_PSR_BUILDING_DLL | ||
+ #if defined __ORCUS_PSR_BUILDING_DLL | ||
#ifdef __GNUC__ | ||
#define ORCUS_PSR_DLLPUBLIC __attribute__ ((dllexport)) | ||
#else | ||
@@ -75,10 +69,7 @@ | ||
// orcus-spreadsheet-model | ||
|
||
#if defined _WIN32 || defined __CYGWIN__ | ||
- #if defined __MINGW32__ | ||
- #define ORCUS_SPM_DLLPUBLIC | ||
- #define ORCUS_SPM_DLLLOCAL | ||
- #elif defined __ORCUS_SPM_BUILDING_DLL | ||
+ #if defined __ORCUS_SPM_BUILDING_DLL | ||
#ifdef __GNUC__ | ||
#define ORCUS_SPM_DLLPUBLIC __attribute__ ((dllexport)) | ||
#else | ||
@@ -107,10 +98,7 @@ | ||
// orcus-mso | ||
|
||
#if defined _WIN32 || defined __CYGWIN__ | ||
- #if defined __MINGW32__ | ||
- #define ORCUS_MSO_DLLPUBLIC | ||
- #define ORCUS_MSO_DLLLOCAL | ||
- #elif defined __ORCUS_MSO_BUILDING_DLL | ||
+ #if defined __ORCUS_MSO_BUILDING_DLL | ||
#ifdef __GNUC__ | ||
#define ORCUS_MSO_DLLPUBLIC __attribute__ ((dllexport)) | ||
#else | ||
--- a/src/python/Makefile.am | ||
+++ b/src/python/Makefile.am | ||
@@ -29,7 +29,7 @@ | ||
gnumeric.hpp \ | ||
gnumeric.cpp | ||
|
||
-_orcus_la_LDFLAGS = -module -avoid-version -export-symbols-regex PyInit__orcus | ||
+_orcus_la_LDFLAGS = -no-undefined -module -avoid-version -export-symbols-regex PyInit__orcus | ||
_orcus_la_LIBADD = \ | ||
../liborcus/liborcus-@[email protected] \ | ||
../parser/liborcus-parser-@[email protected] \ | ||
@@ -64,7 +64,7 @@ | ||
_orcus_json_la_SOURCES = \ | ||
json.cpp | ||
|
||
-_orcus_json_la_LDFLAGS = -module -avoid-version -export-symbols-regex PyInit__orcus_json | ||
+_orcus_json_la_LDFLAGS = -no-undefined -module -avoid-version -export-symbols-regex PyInit__orcus_json | ||
_orcus_json_la_LIBADD = \ | ||
../liborcus/liborcus-@[email protected] \ | ||
../parser/liborcus-parser-@[email protected] \ | ||
--- a/src/python/json.cpp | ||
+++ b/src/python/json.cpp | ||
@@ -279,7 +279,7 @@ | ||
|
||
extern "C" { | ||
|
||
-ORCUS_DLLPUBLIC PyObject* PyInit__orcus_json() | ||
+PyObject* PyInit__orcus_json() | ||
{ | ||
PyObject* m = PyModule_Create(&orcus::python::moduledef); | ||
return m; | ||
--- a/src/python/python.cpp | ||
+++ b/src/python/python.cpp | ||
@@ -146,7 +146,7 @@ | ||
|
||
extern "C" { | ||
|
||
-ORCUS_DLLPUBLIC PyObject* PyInit__orcus() | ||
+PyObject* PyInit__orcus() | ||
{ | ||
PyObject* m = PyModule_Create(&orcus::python::moduledef); | ||
if (!orcus::python::populate_module_attributes(m)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
# Contributor: Mehdi Chinoune <[email protected]> | ||
|
||
_realname=orcus | ||
pkgbase=mingw-w64-${_realname} | ||
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") | ||
pkgver=0.19.2 | ||
pkgrel=1 | ||
pkgdesc="Standalone file import filter library for spreadsheet documents (ODS, XLSX and CSV). (mingw-w64)" | ||
arch=('any') | ||
mingw_arch=('ucrt64' 'clang64' 'clangarm64') | ||
url='https://gitlab.com/orcus/orcus' | ||
msys2_references=( | ||
'archlinux: liborcus' | ||
) | ||
license=('spdx:MPL-2.0') | ||
depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" | ||
"${MINGW_PACKAGE_PREFIX}-boost" | ||
"${MINGW_PACKAGE_PREFIX}-ixion" | ||
"${MINGW_PACKAGE_PREFIX}-zlib") | ||
makedepends=("${MINGW_PACKAGE_PREFIX}-cc" | ||
"${MINGW_PACKAGE_PREFIX}-autotools" | ||
"${MINGW_PACKAGE_PREFIX}-mdds" | ||
"${MINGW_PACKAGE_PREFIX}-python") | ||
optdepends=("${MINGW_PACKAGE_PREFIX}-python: Python bindings") | ||
source=("https://gitlab.com/orcus/orcus/-/archive/${pkgver}/${_realname}-${pkgver}.tar.bz2" | ||
"001-fix-build-on-mingw.patch") | ||
sha256sums=('d5e443bc5dbfd2271eee792bbd7048bc3675da41007b0c410e9c8dca56433638' | ||
'1b86bbb84e69f5ea0d5de766537acc5108f299b2a3cfa1732341c9bd2eb32d41') | ||
|
||
prepare() { | ||
cd ${_realname}-${pkgver} | ||
patch -p1 -i "${srcdir}"/001-fix-build-on-mingw.patch | ||
|
||
autoreconf -fiv | ||
} | ||
|
||
build() { | ||
mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" | ||
|
||
../${_realname}-${pkgver}/configure \ | ||
--prefix=${MINGW_PREFIX} \ | ||
--with-cpu-features \ | ||
--without-benchmark | ||
|
||
make | ||
} | ||
|
||
check() { | ||
cd "${srcdir}/build-${MSYSTEM}" | ||
|
||
make check || true | ||
} | ||
|
||
package() { | ||
cd "${srcdir}/build-${MSYSTEM}" | ||
|
||
DESTDIR="${pkgdir}" make install | ||
|
||
MSYS2_ARG_CONV_EXCL="-p" python -m compileall \ | ||
-o 0 -o 1 -q -s"${pkgdir}" -p"/" "${pkgdir}${MINGW_PREFIX}/lib/python"* | ||
|
||
PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX}) | ||
find "${pkgdir}${MINGW_PREFIX}/lib/pkgconfig" -type f -name '*.pc' \ | ||
-exec sed -i -e "s|${PREFIX_WIN}|\$\{prefix\}|g" {} \; | ||
|
||
# Use *.pyd extension for python modules | ||
for _dll in "${pkgdir}${MINGW_PREFIX}"/lib/python3.11/site-packages/*.dll; do | ||
mv ${_dll} ${_dll/.dll/.pyd} | ||
done | ||
# remove unused import libraries | ||
rm -f "${pkgdir}${MINGW_PREFIX}"/lib/python3.11/site-packages/*.dll.a | ||
|
||
install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" | ||
} |