Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e01c72e607ae9e5af8703c8b4a241f1996613535)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e01c72e607ae9e5af8703c8b4a241f1996613535)
  • Date: Thu, 3 Mar 2016 10:59:59 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

kde-frameworks/knotifications/HISTORY | 3 +++
kde-frameworks/knotifications/PRE_BUILD | 3 +++
kde-frameworks/knotifications/phonon.patch | 18 ++++++++++++++++++
3 files changed, 24 insertions(+)

New commits:
commit e01c72e607ae9e5af8703c8b4a241f1996613535
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

knotifications - build without phonon4qt5

diff --git a/kde-frameworks/knotifications/HISTORY
b/kde-frameworks/knotifications/HISTORY
index bc69888..ac7b0f0 100644
--- a/kde-frameworks/knotifications/HISTORY
+++ b/kde-frameworks/knotifications/HISTORY
@@ -1,3 +1,6 @@
+2016-03-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD, phonon.patch: added, fix build without phonon4qt5
+
2016-02-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.19.0

diff --git a/kde-frameworks/knotifications/PRE_BUILD
b/kde-frameworks/knotifications/PRE_BUILD
new file mode 100755
index 0000000..516cc58
--- /dev/null
+++ b/kde-frameworks/knotifications/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1< $SPELL_DIRECTORY/phonon.patch
diff --git a/kde-frameworks/knotifications/phonon.patch
b/kde-frameworks/knotifications/phonon.patch
new file mode 100644
index 0000000..9d0c28d
--- /dev/null
+++ b/kde-frameworks/knotifications/phonon.patch
@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b415e26..a711d48 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -59,10 +59,10 @@ find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5Codecs ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED)
+
+-find_package(Phonon4Qt5 4.6.60 REQUIRED NO_MODULE)
++find_package(Phonon4Qt5 4.6.60 NO_MODULE)
+ set_package_properties(Phonon4Qt5 PROPERTIES
+ DESCRIPTION "Qt-based audio library"
+- TYPE REQUIRED
++ TYPE OPTIONAL
+ PURPOSE "Required to build audio notification support")
+ if (Phonon4Qt5_FOUND)
+ add_definitions(-DHAVE_PHONON4QT5)
+



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e01c72e607ae9e5af8703c8b4a241f1996613535), Treeve Jelbert, 03/03/2016

Archive powered by MHonArc 2.6.24.

Top of Page