Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
kaidan
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
38
Issues
38
List
Boards
Labels
Milestones
Merge Requests
11
Merge Requests
11
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
KDE
kaidan
Commits
9668d218
Commit
9668d218
authored
Jul 16, 2019
by
LNJ
🖖
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix SSL problems for the AppImage (the hacky way)
parent
08f6c75b
Pipeline
#5331
passed with stages
in 22 minutes and 37 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
CMakeLists.txt
CMakeLists.txt
+3
-2
src/main.cpp
src/main.cpp
+4
-0
utils/build-linux-appimage.sh
utils/build-linux-appimage.sh
+1
-1
No files found.
CMakeLists.txt
View file @
9668d218
...
...
@@ -22,6 +22,7 @@ set(ANDROID_VERSION_CODE 4)
# CMake options
option
(
I18N
"Enable i18n support"
FALSE
)
option
(
STATIC_BUILD
"Build Kaidan statically"
)
option
(
APPIMAGE
"Build Kaidan as AppImage (will only work in the appimage script)"
FALSE
)
option
(
UBUNTU_TOUCH
"Building an Ubuntu Touch click (internal use only!)"
FALSE
)
option
(
CLICK_ARCH
"Architecture that will be used in the click's manifest"
)
option
(
CLICK_DATE
"Date used in the version number in the click's manifest"
)
...
...
@@ -323,8 +324,8 @@ endif()
if
(
UBUNTU_TOUCH
)
set
(
KAIDAN_COMPILE_DEFINITIONS UBUNTU_TOUCH=True
)
elseif
(
NOT ANDROID AND NOT IOS AND NOT WIN32 AND NOT APPL
E
)
set
(
KAIDAN_COMPILE_DEFINITIONS
NOTIFICATIONS_LIBNOTIFY
=True
)
elseif
(
APPIMAG
E
)
set
(
KAIDAN_COMPILE_DEFINITIONS
APPIMAGE
=True
)
endif
()
if
(
STATIC_BUILD
)
...
...
src/main.cpp
View file @
9668d218
...
...
@@ -142,6 +142,10 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
qputenv
(
"QT_QUICK_CONTROLS_MOBILE"
,
"true"
);
#endif
#ifdef APPIMAGE
qputenv
(
"OPENSSL_CONF"
,
""
);
#endif
// name, display name, description
QGuiApplication
::
setApplicationName
(
APPLICATION_NAME
);
QGuiApplication
::
setApplicationDisplayName
(
APPLICATION_DISPLAY_NAME
);
...
...
utils/build-linux-appimage.sh
View file @
9668d218
...
...
@@ -101,7 +101,7 @@ echo "*****************************************"
-DCMAKE_PREFIX_PATH
=
$QT_LINUX
\;
$KIRIGAMI_BUILD
\;
$QXMPP_BUILD
\
-DI18N
=
1
\
-DCMAKE_BUILD_TYPE
=
$BUILD_TYPE
-DCMAKE_INSTALL_PREFIX
=
/usr
\
-DQUICK_COMPILER
=
1
-DQUICK_COMPILER
=
ON
-DAPPIMAGE
=
ON
make
-j
$(
nproc
)
}
...
...
LNJ
🖖
@lnj
mentioned in issue
#303 (closed)
·
Jul 17, 2019
mentioned in issue
#303 (closed)
mentioned in issue #303
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