ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Replace non-us-ascii characters that cause build failure on cp-950

Browse Source 
Change-Id: Ic3d09cbc20b6bbfcaa15d46bae332945e42ccb3d
Reviewed-on: https://gerrit.libreoffice.org/49560
Reviewed-by: Mark Hung <marklh9@gmail.com>
Tested-by: Mark Hung <marklh9@gmail.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski
2018-02-11 15:19:19 +01:00
parent f81f63aff6
commit 3a86fcbafd
3 changed files with 72 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
external/twain_dsm/UnpackedTarball_twain_dsm.mk
Vendored
+2
View File
@@ -16,6 +16,8 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,twain_dsm,1))
$(eval $(call gb_UnpackedTarball_add_patches,twain_dsm, \
external/twain_dsm/TWAIN_DSM_VS2015.vcxproj.patch \
external/twain_dsm/TWAIN_DSM_VS2015.vcxproj.filters.patch \
external/twain_dsm/fix-non-us-ascii-chars-part1.patch \
external/twain_dsm/fix-non-us-ascii-chars-part2.patch \
))
# vim: set noet sw=4 ts=4:
external/twain_dsm/fix-non-us-ascii-chars-part1.patch
Vendored
+26
View File
@@ -0,0 +1,26 @@
diff --git a/src/apps.cpp b/src/apps.cpp
index 54c6347573fa..45d169d5b148 100755
--- a/src/apps.cpp
+++ b/src/apps.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* TWAIN Data Source Manager version 2.1
* Manages image acquisition data sources used by a machine.
- * Copyright © 2007 TWAIN Working Group:
+ * Copyright (C) 2007 TWAIN Working Group:
* Adobe Systems Incorporated,AnyDoc Software Inc., Eastman Kodak Company,
* Fujitsu Computer Products of America, JFL Peripheral Solutions Inc.,
* Ricoh Corporation, and Xerox Corporation.
diff --git a/src/log.cpp b/src/log.cpp
index 496e9d9c52a1..3b05307981ad 100755
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* TWAIN Data Source Manager version 2.1
* Manages image acquisition data sources used by a machine.
- * Copyright © 2007 TWAIN Working Group:
+ * Copyright (C) 2007 TWAIN Working Group:
* Adobe Systems Incorporated,AnyDoc Software Inc., Eastman Kodak Company,
* Fujitsu Computer Products of America, JFL Peripheral Solutions Inc.,
* Ricoh Corporation, and Xerox Corporation.
external/twain_dsm/fix-non-us-ascii-chars-part2.patch
Vendored
+44
View File
@@ -0,0 +1,44 @@
diff --git a/src/dsm.cpp b/src/dsm.cpp
index 1b74285c5d72..efd8f443ca02 100755
--- a/src/dsm.cpp
+++ b/src/dsm.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* TWAIN Data Source Manager version 2.1
* Manages image acquisition data sources used by a machine.
- * Copyright © 2007 TWAIN Working Group:
+ * Copyright (C) 2007 TWAIN Working Group:
* Adobe Systems Incorporated,AnyDoc Software Inc., Eastman Kodak Company,
* Fujitsu Computer Products of America, JFL Peripheral Solutions Inc.,
* Ricoh Corporation, and Xerox Corporation.
@@ -38,7 +38,7 @@
/*! \mainpage Data Source Manager
*
* The Source Manager provides the communication path between the
- * Application and the Source, supports the user’s selection of a
+ * Application and the Source, supports the user's selection of a
* Source, and loads the Source for access by the Application.
* Communications from Application to Source Manager or the Source
* to Source Manager (via DAT_NULL) arrive in exclusively through
@@ -51,7 +51,7 @@
*
*
*
- * Copyright © 2007 TWAIN Working Group: Adobe Systems Incorporated,
+ * Copyright (C) 2007 TWAIN Working Group: Adobe Systems Incorporated,
* AnyDoc Software Inc., Eastman Kodak Company,
* Fujitsu Computer Products of America, JFL Peripheral Solutions Inc.,
* Ricoh Corporation, and Xerox Corporation.
diff --git a/src/dsm.h b/src/dsm.h
index f7afb316d3de..c156d3843a9e 100755
--- a/src/dsm.h
+++ b/src/dsm.h
@@ -1,7 +1,7 @@
/***************************************************************************
* TWAIN Data Source Manager version 2.1
* Manages image acquisition data sources used by a machine.
- * Copyright © 2007 TWAIN Working Group:
+ * Copyright (C) 2007 TWAIN Working Group:
* Adobe Systems Incorporated,AnyDoc Software Inc., Eastman Kodak Company,
* Fujitsu Computer Products of America, JFL Peripheral Solutions Inc.,
* Ricoh Corporation, and Xerox Corporation.