Skip to Content.
Sympa Menu

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

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 (3dfac7ef2ad2b3ac0af882b6121249b09fd82bf2)
  • Date: Thu, 3 Mar 2016 13:22:05 +0000

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

kde5-utils/ark/DEPENDS | 11 ++++++-----
kde5-utils/ark/HISTORY | 3 +++
qt5-cmake/phonon4qt5/BUILD | 1 +
qt5-cmake/phonon4qt5/HISTORY | 3 +++
qt5-cmake/phonon4qt5/PRE_BUILD | 5 +++++
5 files changed, 18 insertions(+), 5 deletions(-)

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

phonon4qt5 - fix build

commit d976655ed9e7ab7d8a4e02a72441b807cc8caf5c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

ark - adjust depends

diff --git a/kde5-utils/ark/DEPENDS b/kde5-utils/ark/DEPENDS
index 95f97b9..30f2c75 100755
--- a/kde5-utils/ark/DEPENDS
+++ b/kde5-utils/ark/DEPENDS
@@ -1,17 +1,18 @@
-source $GRIMOIRE/KDE5_DEPENDS
+source $GRIMOIRE/KDE5_DEPENDS &&
depends karchive &&
-depends kdbusaddons
+depends kdbusaddons &&
depends kconfig &&
+depends kcrash &&
depends kdoctools &&
-depends khtml &&
depends ki18n &&
depends kiconthemes &&
depends kio &&
+depends kparts &&
depends kpty &&
depends kservice &&
depends kwidgetsaddons &&
depends libarchive &&
optional_depends bzip2 '' '' 'BZ2 support' &&
optional_depends xz-utils '' '' 'LZMA support' &&
-optional_depends zlib '' '' 'GZ support'
-#optional_depends qjson5 '' '' 'support serial JSON - build unit tests'
+optional_depends zlib '' '' 'GZ support' &&
+suggest_depends p7zip '' '' 'support unicode ZIP archives'
diff --git a/kde5-utils/ark/HISTORY b/kde5-utils/ark/HISTORY
index 80caa25..be5e553 100644
--- a/kde5-utils/ark/HISTORY
+++ b/kde5-utils/ark/HISTORY
@@ -1,3 +1,6 @@
+2016-03-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: adjust
+
2016-02-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 15.12.2

diff --git a/qt5-cmake/phonon4qt5/BUILD b/qt5-cmake/phonon4qt5/BUILD
index f3211a9..0f9e45d 100755
--- a/qt5-cmake/phonon4qt5/BUILD
+++ b/qt5-cmake/phonon4qt5/BUILD
@@ -1,3 +1,4 @@
OPTS+=" -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=1" &&
+OPTS+=" -D__KDE_HAVE_GCC_VISIBILITY=NO" &&
default_build

diff --git a/qt5-cmake/phonon4qt5/HISTORY b/qt5-cmake/phonon4qt5/HISTORY
index 9694be7..806e078 100644
--- a/qt5-cmake/phonon4qt5/HISTORY
+++ b/qt5-cmake/phonon4qt5/HISTORY
@@ -1,3 +1,6 @@
+2016-03-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD: fix build with qt-5.6
+
2015-04-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.8.3

diff --git a/qt5-cmake/phonon4qt5/PRE_BUILD b/qt5-cmake/phonon4qt5/PRE_BUILD
new file mode 100755
index 0000000..6bdb4c6
--- /dev/null
+++ b/qt5-cmake/phonon4qt5/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -i 's/fPIE/fPIC/' cmake/FindPhononInternal.cmake
+#sed -i '/FindPhononInternal/D' CMakeLists.txt
+#find_package(Phonon4qt5 REQUIRED)' CMakeLists.txt



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

Archive powered by MHonArc 2.6.24.

Top of Page