Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
digiKam
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Peter Becker
digiKam
Commits
8cc20a13
Commit
8cc20a13
authored
May 11, 2020
by
Gilles Caulier
🗼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adjust patch for KF5.70
parent
24f1674d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
11 deletions
+9
-11
project/bundles/3rdparty/ext_kf5_frameworks/knotifyconfig-drop-phonon.patch
...dparty/ext_kf5_frameworks/knotifyconfig-drop-phonon.patch
+9
-11
No files found.
project/bundles/3rdparty/ext_kf5_frameworks/knotifyconfig-drop-phonon.patch
View file @
8cc20a13
diff --git a/CMakeLists.txt b/CMakeLists.txt
index
155422d..b5d66d3
100644
index
bcd3f7b..0005250
100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3
9,11 +39,11 @@
if (Canberra_FOUND)
add_definitions(-DHAVE_CANBERRA
)
else(
)
@@ -3
7,10 +37,10 @@
set_package_properties(Canberra PROPERTIES
TYPE OPTIONAL
)
if (NOT Canberra_FOUND
)
# This is REQUIRED since you cannot tell CMake "either one of those two optional ones are required"
- find_package(Phonon4Qt5 4.6.60 NO_MODULE REQUIRED)
- set_package_properties(Phonon4Qt5 PROPERTIES
- DESCRIPTION "Qt-based audio library"
- PURPOSE "Needed to preview notification sounds when Canberra isn't available")
- add_definitions(-DHAVE_PHONON4QT5)
+# find_package(Phonon4Qt5 4.6.60 NO_MODULE REQUIRED)
+# set_package_properties(Phonon4Qt5 PROPERTIES
+# DESCRIPTION "Qt-based audio library"
+# PURPOSE "Needed to preview notification sounds when Canberra isn't available")
+# add_definitions(-DHAVE_PHONON4QT5)
endif()
# Includes
diff --git a/src/knotify-config.h.cmake b/src/knotify-config.h.cmake
index
1794afc..262bae4
100644
index
e42fc49..241a0d6
100644
--- a/src/knotify-config.h.cmake
+++ b/src/knotify-config.h.cmake
@@ -1,7 +1,5 @@
#ifndef KNOTIFY_CONFIG_H
@@ -2,7 +2,6 @@
#define KNOTIFY_CONFIG_H
-#cmakedefine01 HAVE_PHONON
-
#cmakedefine HAVE_CANBERRA
-#cmakedefine HAVE_PHONON
#endif /* KNOTIFY_CONFIG_H */
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