Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Christoph Roick
kdevelop
Commits
0e1cacb4
Commit
0e1cacb4
authored
Oct 24, 2018
by
Kevin Funk
☕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
appimage: Generalize patch handling
parent
240040c0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
22 deletions
+21
-22
appimage/kdevelop-recipe-centos6.sh
appimage/kdevelop-recipe-centos6.sh
+7
-22
appimage/knotifications_no_phonon.patch
appimage/knotifications_no_phonon.patch
+14
-0
No files found.
appimage/kdevelop-recipe-centos6.sh
View file @
0e1cacb4
...
...
@@ -120,27 +120,12 @@ function build_project
git stash pop
||
true
cd
..
if
[
"
$PROJECT
"
=
"knotifications"
]
;
then
cd
$PROJECT
echo
"patching knotifications"
git reset
--hard
cat
>
no_phonon.patch
<<
EOF
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa2926f..60f4277 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,7 +77,7 @@ else()
set_package_properties(Phonon4Qt5 PROPERTIES
DESCRIPTION "Qt-based audio library"
# This is REQUIRED since you cannot tell CMake "either one of those two optional ones are required"
- TYPE REQUIRED
+ TYPE OPTIONAL
PURPOSE "Needed to build audio notification support when Canberra isn't available")
if (Phonon4Qt5_FOUND)
add_definitions(-DHAVE_PHONON4QT5)
EOF
cat
no_phonon.patch |patch
-p1
cd
..
if
[
-z
"
$PATCH_FILE
"
]
;
then
pushd
$PROJECT
echo
"patching
$PROJECT
"
git reset
--hard
patch
-p1
<
$PATCH_FILE
popd
fi
# create build dir
...
...
@@ -202,7 +187,7 @@ build_framework ktexteditor
build_framework kpackage
build_framework kdeclarative
build_framework kcmutils
build_framework knotifications
(
PATCH_FILE
=
knotifications_no_phonon.patch
build_framework knotifications
)
build_framework knotifyconfig
build_framework kdoctools
build_framework breeze-icons
-DBINARY_ICONS_RESOURCE
=
1
...
...
appimage/knotifications_no_phonon.patch
0 → 100644
View file @
0e1cacb4
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa2926f..60f4277 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,7 +77,7 @@
else()
set_package_properties(Phonon4Qt5 PROPERTIES
DESCRIPTION "Qt-based audio library"
# This is REQUIRED since you cannot tell CMake "either one of those two optional ones are required"
- TYPE REQUIRED
+ TYPE OPTIONAL
PURPOSE "Needed to build audio notification support when Canberra isn't available")
if (Phonon4Qt5_FOUND)
add_definitions(-DHAVE_PHONON4QT5)
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