diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-12-22 20:46:12 +0300 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-02-03 07:49:12 +0100 |
commit | 585d9806961342e95f7318fb947bd31e9f86dee0 (patch) | |
tree | 99e31f1d2a7ec385540a405053e05cc6c109defd /download.lst | |
parent | a1c36eff089c3cd695bd78090575ca1c7677121e (diff) |
tdf#114635: Add TWAINDSM.DLL to 64-bit Windows package
This patch allows us to use our own bundled TWAINDSM.dll (from
twain-dsm project, http://www.twain.org, https://github.com/twain/twain-dsm)
on 64-bit Windows systems that don't have their own TWAIN DLL,
and without requiring users to install it from some other source.
The DLL is put into INSTALLOCATION/program along soffice.bin.
Of course, TWAIN sources still need to be 64-bit themselves (i.e.,
true 64-bit TWAIN drivers required) to be usable by 64-bit program.
Also this drops external/twain/inc/twain/twain.h, which is an old
version copied from twain-dsm, and instead uses the tarball to get
the header (required by Library_scn on both 32- and 64-bit Windows).
Change-Id: I191027f3221ce46db17f50db91c9cb9315900810
Reviewed-on: https://gerrit.libreoffice.org/46992
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'download.lst')
-rw-r--r-- | download.lst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/download.lst b/download.lst index c19ddcbef60a..70b6833e7e63 100644 --- a/download.lst +++ b/download.lst @@ -228,6 +228,8 @@ export STAROFFICE_VERSION_MICRO := 5 export STAROFFICE_TARBALL := libstaroffice-0.0.$(STAROFFICE_VERSION_MICRO).tar.xz export SWING_SHA256SUM := 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 export SWING_TARBALL := 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip +export TWAIN_DSM_SHA256SUM := 82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6 +export TWAIN_DSM_TARBALL := twaindsm_2.4.1.orig.tar.gz export UCPP_SHA256SUM := 983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776 export UCPP_TARBALL := 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz export VISIO_SHA256SUM := fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9 |