Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Graphics
Okular
Commits
e989200d
Commit
e989200d
authored
Sep 13, 2020
by
Albert Astals Cid
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Increase minimum supported versions to those provided by Ubuntu 20.04
parent
d5210db5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
24 deletions
+7
-24
.gitlab-ci.yml
.gitlab-ci.yml
+0
-15
CMakeLists.txt
CMakeLists.txt
+6
-8
generators/ooo/CMakeLists.txt
generators/ooo/CMakeLists.txt
+1
-1
No files found.
.gitlab-ci.yml
View file @
e989200d
...
...
@@ -5,21 +5,6 @@ include:
-
https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-before.yml
-
https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-applications-linux.yml
build_ubuntu_18_04
:
stage
:
build
image
:
ubuntu:bionic
only
:
-
merge_requests
before_script
:
-
sed -i -e 's/# deb-src/deb-src/g' /etc/apt/sources.list
-
apt-get update
-
apt-get build-dep --yes --no-install-recommends okular
-
apt-get install --yes --no-install-recommends ninja-build libkf5crash-dev
script
:
-
mkdir -p build && cd build
-
cmake -G Ninja ..
-
ninja
build_ubuntu_20_04
:
stage
:
build
image
:
ubuntu:focal
...
...
CMakeLists.txt
View file @
e989200d
cmake_minimum_required
(
VERSION 3.
5
)
cmake_minimum_required
(
VERSION 3.
16
)
# KDE Application Version, managed by release script
set
(
RELEASE_SERVICE_VERSION_MAJOR
"20"
)
...
...
@@ -8,8 +8,8 @@ set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE
project
(
okular VERSION
${
RELEASE_SERVICE_VERSION
}
)
set
(
QT_REQUIRED_VERSION
"5.
9
.0"
)
# Remember to update the QT_DEPRECATED_WARNINGS_SINCE below
set
(
KF5_REQUIRED_VERSION
"5.
44
.0"
)
# Remember to update the KF_DEPRECATED_WARNINGS_SINCE below
set
(
QT_REQUIRED_VERSION
"5.
12
.0"
)
# Remember to update the QT_DEPRECATED_WARNINGS_SINCE below
set
(
KF5_REQUIRED_VERSION
"5.
68
.0"
)
# Remember to update the KF_DEPRECATED_WARNINGS_SINCE below
set
(
OKULAR_UI
"desktop"
CACHE STRING
"Which Okular user interface to build. Possible values: desktop, mobile, both. Default: desktop"
)
...
...
@@ -26,8 +26,6 @@ endif()
if
(
ANDROID
)
set
(
QT_REQUIRED_VERSION
"5.13.0"
)
elseif
(
BUILD_MOBILE
)
set
(
QT_REQUIRED_VERSION
"5.12.0"
)
endif
()
find_package
(
ECM
${
KF5_REQUIRED_VERSION
}
CONFIG REQUIRED
)
...
...
@@ -153,7 +151,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules)
find_package
(
ZLIB REQUIRED
)
# This is here instead of in generators since we use if(Poppler_Qt5_FOUND) in autotests/
find_package
(
Poppler
"0.6
2
.0"
COMPONENTS Qt5
)
find_package
(
Poppler
"0.
8
6.0"
COMPONENTS Qt5
)
set_package_properties
(
"Poppler"
PROPERTIES
TYPE RECOMMENDED
PURPOSE
"Support for PDF files in okular."
)
...
...
@@ -161,8 +159,8 @@ set_package_properties("Poppler" PROPERTIES
add_definitions
(
-DQT_USE_FAST_OPERATOR_PLUS
)
add_definitions
(
-DTRANSLATION_DOMAIN=
"okular"
)
add_definitions
(
-DQT_NO_URL_CAST_FROM_STRING
)
add_definitions
(
-DQT_DEPRECATED_WARNINGS_SINCE=0x050
9
00
)
add_definitions
(
-DKF_DEPRECATED_WARNINGS_SINCE=0x05
2C
00
)
add_definitions
(
-DQT_DEPRECATED_WARNINGS_SINCE=0x050
C
00
)
add_definitions
(
-DKF_DEPRECATED_WARNINGS_SINCE=0x05
44
00
)
include_directories
(
${
CMAKE_CURRENT_SOURCE_DIR
}
${
PHONON_INCLUDES
}
core/synctex
${
ZLIB_INCLUDE_DIR
}
${
CMAKE_BINARY_DIR
}
/core
)
...
...
generators/ooo/CMakeLists.txt
View file @
e989200d
...
...
@@ -5,7 +5,7 @@ include_directories(
${
CMAKE_CURRENT_SOURCE_DIR
}
/../..
)
find_package
(
Qca-qt5 2.
1
.0
)
find_package
(
Qca-qt5 2.
2
.0
)
set_package_properties
(
Qca-qt5 PROPERTIES DESCRIPTION
"Support for encryption"
URL
"https://download.kde.org/stable/qca-qt5/"
TYPE RECOMMENDED
)
...
...
Oliver Sander
@sander
mentioned in merge request
!241 (merged)
·
Dec 12, 2020
mentioned in merge request
!241 (merged)
mentioned in merge request !241
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment