Merge branch 'master' into 'master'
Fix Mapper for Qt5.7 See merge request !1930
This commit is contained in:
Boris Kraut
commit
6c43a5f0d0
|
|
@ -17,9 +17,11 @@ Repo:https://github.com/OpenOrienteering/mapper/
|
|||
|
||||
Build:0.6.7,607
|
||||
commit=v0.6.7
|
||||
patch=doxygen-update.patch
|
||||
output=src/build/bin/QtApp-release-unsigned.apk
|
||||
prebuild=sed -i '/libqjp2.so/d' src/src.pro src/src.pro.in && \
|
||||
sed -i '/DOXYGEN = $$system(doxygen -v/d' oo-mapper.pro
|
||||
prebuild=sed -i -e '/libqjp2.so/d' -e '/QtAndroidAccessibility-bundled.jar/d' src/src.pro src/src.pro.in && \
|
||||
sed -i 's/android:minSdkVersion="9"/android:minSdkVersion="16"/' android/AndroidManifest.xml && \
|
||||
sed -i '/DOXYGEN = $$system(doxygen -v/d' oo-mapper.pro && \
|
||||
target=android-19
|
||||
build=export Qt5_android=$$QT$$/android_armv7 && \
|
||||
export ANDROID_NDK_ROOT=$$NDK$$ && \
|
||||
|
|
|
|||
181
metadata/org.openorienteering.mapper/doxygen-update.patch
Normal file
181
metadata/org.openorienteering.mapper/doxygen-update.patch
Normal file
|
|
@ -0,0 +1,181 @@
|
|||
From 8f008ae3a5a4fba74b0d3ea071f94ce258079e37 Mon Sep 17 00:00:00 2001
|
||||
From: Gautier Pelloux-Prayer <gautier+git@damsy.net>
|
||||
Date: Tue, 3 Jan 2017 10:42:31 +0100
|
||||
Subject: [PATCH] Update doxygen version to 1.8.13 to fix issue with flex 1.6.X
|
||||
|
||||
---
|
||||
3rd-party/doxygen/CMakeLists.txt | 8 ++++----
|
||||
3rd-party/doxygen/LICENSE | 43 ++++++++++++++++++++--------------------
|
||||
2 files changed, 25 insertions(+), 26 deletions(-)
|
||||
|
||||
diff --git a/3rd-party/doxygen/CMakeLists.txt b/3rd-party/doxygen/CMakeLists.txt
|
||||
index ad737ac9..44632967 100644
|
||||
--- a/3rd-party/doxygen/CMakeLists.txt
|
||||
+++ b/3rd-party/doxygen/CMakeLists.txt
|
||||
@@ -23,7 +23,7 @@ cmake_minimum_required(VERSION 2.8.3)
|
||||
|
||||
# Configuration options
|
||||
|
||||
-set(DOXYGEN_VERSION_DEFAULT 1.8.8)
|
||||
+set(DOXYGEN_VERSION_DEFAULT 1.8.13)
|
||||
set(DOXYGEN_VERSION ${DOXYGEN_VERSION_DEFAULT} CACHE STRING
|
||||
"Version number of the doxygen library")
|
||||
mark_as_advanced(DOXYGEN_VERSION)
|
||||
@@ -31,14 +31,14 @@ mark_as_advanced(DOXYGEN_VERSION)
|
||||
message(STATUS "Configuring doxygen ${DOXYGEN_VERSION}")
|
||||
|
||||
if (NOT ${DOXYGEN_VERSION} STREQUAL ${DOXYGEN_VERSION_DEFAULT})
|
||||
- message(WARNING
|
||||
+ message(WARNING
|
||||
"The doxygen library version is different from the current recommended version "
|
||||
"(${DOXYGEN_VERSION} vs. ${DOXYGEN_VERSION_DEFAULT}).")
|
||||
endif()
|
||||
|
||||
set(DOXYGEN_MD5SUMS
|
||||
# Schema: VERSION:MD5
|
||||
- 1.8.8:453892def7b378df387585a9358c23d4
|
||||
+ 1.8.13:0fa414975f8cd6d30e126c28327c1f7c
|
||||
)
|
||||
foreach(line ${DOXYGEN_MD5SUMS})
|
||||
if(${line} MATCHES "^${DOXYGEN_VERSION}:")
|
||||
@@ -80,7 +80,7 @@ ExternalProject_Add(
|
||||
# Check that the license hasn't changed.
|
||||
${CMAKE_COMMAND} -E compare_files <SOURCE_DIR>/LICENSE "${DOXYGEN_LICENSE_FILE}"
|
||||
COMMAND
|
||||
- "<SOURCE_DIR>/configure" "--release" "--prefix" "<INSTALL_DIR>"
|
||||
+ ${CMAKE_COMMAND} "<SOURCE_DIR>" "-DCMAKE_BUILD_TYPE=RELEASE" "-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>"
|
||||
BUILD_IN_SOURCE 1
|
||||
)
|
||||
ExternalProject_Get_Property(doxygen-project INSTALL_DIR)
|
||||
diff --git a/3rd-party/doxygen/LICENSE b/3rd-party/doxygen/LICENSE
|
||||
index 219ec285..d159169d 100644
|
||||
--- a/3rd-party/doxygen/LICENSE
|
||||
+++ b/3rd-party/doxygen/LICENSE
|
||||
@@ -1,12 +1,12 @@
|
||||
- GNU GENERAL PUBLIC LICENSE
|
||||
- Version 2, June 1991
|
||||
+ GNU GENERAL PUBLIC LICENSE
|
||||
+ Version 2, June 1991
|
||||
|
||||
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
|
||||
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
|
||||
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
- Preamble
|
||||
+ Preamble
|
||||
|
||||
The licenses for most software are designed to take away your
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This
|
||||
General Public License applies to most of the Free Software
|
||||
Foundation's software and to any other program whose authors commit to
|
||||
using it. (Some other Free Software Foundation software is covered by
|
||||
-the GNU Library General Public License instead.) You can apply it to
|
||||
+the GNU Lesser General Public License instead.) You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
-
|
||||
- GNU GENERAL PUBLIC LICENSE
|
||||
+
|
||||
+ GNU GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. This License applies to any program or other work which contains
|
||||
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
|
||||
License. (Exception: if the Program itself is interactive but
|
||||
does not normally print such an announcement, your work based on
|
||||
the Program is not required to print an announcement.)
|
||||
-
|
||||
+
|
||||
These requirements apply to the modified work as a whole. If
|
||||
identifiable sections of that work are not derived from the Program,
|
||||
and can be reasonably considered independent and separate works in
|
||||
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
|
||||
access to copy the source code from the same place counts as
|
||||
distribution of the source code, even though third parties are not
|
||||
compelled to copy the source along with the object code.
|
||||
-
|
||||
+
|
||||
4. You may not copy, modify, sublicense, or distribute the Program
|
||||
except as expressly provided under this License. Any attempt
|
||||
otherwise to copy, modify, sublicense or distribute the Program is
|
||||
@@ -225,7 +225,7 @@ impose that choice.
|
||||
|
||||
This section is intended to make thoroughly clear what is believed to
|
||||
be a consequence of the rest of this License.
|
||||
-
|
||||
+
|
||||
8. If the distribution and/or use of the Program is restricted in
|
||||
certain countries either by patents or by copyrighted interfaces, the
|
||||
original copyright holder who places the Program under this License
|
||||
@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals
|
||||
of preserving the free status of all derivatives of our free software and
|
||||
of promoting the sharing and reuse of software generally.
|
||||
|
||||
- NO WARRANTY
|
||||
+ NO WARRANTY
|
||||
|
||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
||||
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
||||
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGES.
|
||||
|
||||
- END OF TERMS AND CONDITIONS
|
||||
-
|
||||
- How to Apply These Terms to Your New Programs
|
||||
+ END OF TERMS AND CONDITIONS
|
||||
+
|
||||
+ How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
- Copyright (C) yyyy <name of author>
|
||||
+ Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
- You should have received a copy of the GNU General Public License
|
||||
- along with this program; if not, write to the Free Software
|
||||
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
-
|
||||
+ You should have received a copy of the GNU General Public License along
|
||||
+ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program is interactive, make it output a short notice like this
|
||||
when it starts in an interactive mode:
|
||||
|
||||
- Gnomovision version 69, Copyright (C) yyyy name of author
|
||||
+ Gnomovision version 69, Copyright (C) year name of author
|
||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names:
|
||||
This General Public License does not permit incorporating your program into
|
||||
proprietary programs. If your program is a subroutine library, you may
|
||||
consider it more useful to permit linking proprietary applications with the
|
||||
-library. If this is what you want to do, use the GNU Library General
|
||||
+library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License.
|
||||
--
|
||||
2.11.0
|
||||
|
||||
Loading…
Reference in a new issue