Skip to content

Commit 6053ec2

Browse files
committed
odrcore 5.1.0
1 parent 3372558 commit 6053ec2

File tree

4 files changed

+12
-1
lines changed

4 files changed

+12
-1
lines changed

defaults.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ packages:
1111
- "wvware/1.2.9-odr"
1212
- "poppler/24.08.0-odr"
1313
- "pdf2htmlex/0.18.8.rc1-odr-git-eb5d291"
14-
- "odrcore/5.0.7"
14+
- "odrcore/5.1.0"
1515

1616
platforms:
1717
include: "*"

recipes/odrcore/5/conandata.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,6 @@ sources:
2323
"5.0.7":
2424
source:
2525
url: "https://github.com/opendocument-app/OpenDocument.core/archive/refs/tags/v5.0.7.tar.gz"
26+
"5.1.0":
27+
source:
28+
url: "https://github.com/opendocument-app/OpenDocument.core/archive/refs/tags/v5.1.0.tar.gz"

recipes/odrcore/5/conanfile.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,14 @@ class OpenDocumentCoreConan(ConanFile):
2121
"fPIC": [True, False],
2222
"with_pdf2htmlEX": [True, False],
2323
"with_wvWare": [True, False],
24+
"with_libmagic": [True, False],
2425
}
2526
default_options = {
2627
"shared": False,
2728
"fPIC": True,
2829
"with_pdf2htmlEX": True,
2930
"with_wvWare": True,
31+
"with_libmagic": True,
3032
}
3133

3234
def config_options(self):
@@ -36,6 +38,7 @@ def config_options(self):
3638
# But by the time config_options() is executed, default_options is already done parsed.
3739
del self.options.with_pdf2htmlEX
3840
del self.options.with_wvWare
41+
del self.options.with_libmagic
3942

4043
def configure(self):
4144
if self.options.shared:
@@ -56,6 +59,8 @@ def requirements(self):
5659
self.requires("pdf2htmlex/0.18.8.rc1-odr-git-eb5d291")
5760
if self.options.get_safe("with_wvWare"):
5861
self.requires("wvware/1.2.9-odr")
62+
if self.options.get_safe("with_libmagic", False):
63+
self.requires("libmagic/5.45")
5964

6065
def build_requirements(self):
6166
self.test_requires("gtest/1.14.0")
@@ -80,6 +85,7 @@ def generate(self):
8085
tc.variables["ODR_TEST"] = False
8186
tc.variables["WITH_PDF2HTMLEX"] = self.options.get_safe("with_pdf2htmlEX", False)
8287
tc.variables["WITH_WVWARE"] = self.options.get_safe("with_wvWare", False)
88+
tc.variables["WITH_LIBMAGIC"] = self.options.get_safe("with_libmagic", False)
8389
tc.generate()
8490

8591
deps = CMakeDeps(self)

recipes/odrcore/config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,7 @@ versions:
3535
folder: "5"
3636
"5.0.7":
3737
folder: "5"
38+
"5.1.0":
39+
folder: "5"
3840
"9.9.9":
3941
folder: "main"

0 commit comments

Comments
 (0)