Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (7fcf6a14005b218995d17dcb364cff969ca26d6f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (7fcf6a14005b218995d17dcb364cff969ca26d6f)
  • Date: Sat, 13 Jul 2013 02:07:23 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

kde4-apps/digikam4/DEPENDS | 1 +
kde4-apps/digikam4/HISTORY | 3 +++
kde4-bindings/pykde4/DEPENDS | 1 +
kde4-bindings/pykde4/HISTORY | 3 +++
kde4-graphics/gwenview4/DEPENDS | 1 +
kde4-graphics/gwenview4/HISTORY | 3 +++
kde4-multimedia/audiocd-kio/DEPENDS | 1 +
kde4-multimedia/audiocd-kio/HISTORY | 3 +++
kde4/HISTORY | 9 +++++++++
kde4/KDE_DEPENDS | 10 ++++++++--
kde4/kdepimlibs4/DEPENDS | 1 -
kde4/kdepimlibs4/HISTORY | 3 +++
x11-libs/wine/DETAILS | 2 +-
x11-libs/wine/HISTORY | 3 +++
x11-toolkits/qt4/DETAILS | 2 +-
x11-toolkits/qt4/HISTORY | 7 +++++++
x11-toolkits/qt4/PRE_BUILD | 6 +++++-
x11-toolkits/qt4/boost.patch | 16 ++++++++++++++++
18 files changed, 69 insertions(+), 6 deletions(-)

New commits:
commit 7fcf6a14005b218995d17dcb364cff969ca26d6f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

wine: Updated devel to 1.6-rc5

commit 843a07772764e2a6f46a31ec0d1db165d03e31e7
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

digikam4: Depends on sane-backends
Also builds its own libksane instead of using the package.

-- Starting CMake configuration for: libksane
-- Could NOT find Sane (missing: SANE_LIBRARY SANE_INCLUDE_DIR)


-----------------------------------------------------------------------------
-- The following REQUIRED packages could NOT be located on your system.
-- You must install these packages before continuing.

-----------------------------------------------------------------------------
* SANE development toolkit <http://www.sane-project.org>
Scanner Access Now Easy (SANE) development package
Needed by libksane

commit 0fea06fefd415eaad17163e8842fe28bfe0ef2b2
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "akonadi: Fix compilation with boost 1.53+"

This reverts commit dffc810e973cfd6ed63cbbe79168cda0349807b7.

Not needed after 3b81f0f4605a4600904cb843c12f5bf4fdaa278e to just
apply the fix ahead of time to qt4.

commit 0c5455a9ae3587756a55f9466c432bf8da12218d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

qt4: Use message instead of echo

commit 3b81f0f4605a4600904cb843c12f5bf4fdaa278e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

qt4: Fix some compilation with boost 1.52+ for dependent spells.
e.g. akonadi and kdepim4
See https://bugreports.qt-project.org/browse/QTBUG-22829
PATCHLEVEL++

commit a9b69bd153139c06e2412ae4774253b8804ccc46
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gwenview4: Depends on kdebase4
http://forums.fedoraforum.org/showthread.php?t=226155


-----------------------------------------------------------------------------
-- The following REQUIRED packages could NOT be located on your system.
-- You must install these packages before continuing.

-----------------------------------------------------------------------------
* libkonq <http://www.kde.org>
Provides file management features

commit 8bd4f68c22400a57077d41c665530e3f61a1fac5
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

kde4/KDE_DEPENDS,kdepimlibs4: Add kdepimlibs4 depends case
Default KDE_DEPENDS case causes circular dependency with kdebase4-runtime
and optional circular dependency with kdebase-workspace4.

commit c8d390ed38182945ef82bdeaac9f06a2bd57ae17
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

audiocd-kio: Depends on cdparanoia

CMake Error: The following variables are used in this project, but they
are set to NOTFOUND.
Please set them or make sure they are set and tested correctly in the
CMake files:
CDPARANOIA_INCLUDE_DIR (ADVANCED)
used as include directory in directory /usr/src/audiocd-kio-4.10.1
used as include directory in directory
/usr/src/audiocd-kio-4.10.1/plugins
used as include directory in directory
/usr/src/audiocd-kio-4.10.1/plugins/flac
used as include directory in directory
/usr/src/audiocd-kio-4.10.1/plugins/vorbis
used as include directory in directory
/usr/src/audiocd-kio-4.10.1/plugins/wav
used as include directory in directory
/usr/src/audiocd-kio-4.10.1/plugins/lame
used as include directory in directory
/usr/src/audiocd-kio-4.10.1/kcmaudiocd
used as include directory in directory
/usr/src/audiocd-kio-4.10.1/doc

-- Configuring incomplete, errors occurred!

commit 97645a49942de15bd6e998584e35e6b3c15619c4
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

KDE_DEPENDS: kdepim4-runtime depends on phonon

CMake Error at
/usr/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:108
(message):
Could NOT find Phonon (missing: PHONON_INCLUDE_DIR PHONON_LIBRARY)
(Required is at least version "4.3.80")
Call Stack (most recent call first):
/usr/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:315
(_FPHSA_FAILURE_MESSAGE)
/usr/share/apps/cmake/modules/FindPhonon.cmake:35
(find_package_handle_standard_args)
/usr/share/apps/cmake/modules/FindKDE4Internal.cmake:705
(find_package)
/usr/share/cmake/Modules/FindKDE4.cmake:95 (find_package)
CMakeLists.txt:54 (find_package)

commit dffc810e973cfd6ed63cbbe79168cda0349807b7
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

akonadi: Fix compilation with boost 1.53+
See http://comments.gmane.org/gmane.linux.lfs.beyond.support/46883

commit 445a531f9e76da70375777123a535b08c0246ca6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

pykde4: Depends on phonon

CMake Error at
/usr/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:108
(message):
Could NOT find Phonon (missing: PHONON_INCLUDE_DIR PHONON_LIBRARY)
(Required is at least version "4.3.80")
Call Stack (most recent call first):
/usr/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:315
(_FPHSA_FAILURE_MESSAGE)
/usr/share/apps/cmake/modules/FindPhonon.cmake:35
(find_package_handle_standard_args)
/usr/share/apps/cmake/modules/FindKDE4Internal.cmake:705
(find_package)
/usr/share/cmake/Modules/FindKDE4.cmake:95 (find_package)
CMakeLists.txt:7 (find_package)

-- Configuring incomplete, errors occurred!

commit 389784688de664deb6628eeaa87d3870a3c11a65
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

kde4/KDE_DEPENDS: kdebase4-runtime depends on kdepimlibs4

$ sudo cast kdebase4-runtime
...

-----------------------------------------------------------------------------
-- The following REQUIRED packages could NOT be located on your system.
-- You must install these packages before continuing.

-----------------------------------------------------------------------------
* KdepimLibs <kdepimlibs>
KDE PIM Libraries
Required to build Drkonqi

diff --git a/kde4-apps/digikam4/DEPENDS b/kde4-apps/digikam4/DEPENDS
index d9784cf..11fb5bc 100755
--- a/kde4-apps/digikam4/DEPENDS
+++ b/kde4-apps/digikam4/DEPENDS
@@ -10,6 +10,7 @@ depends JPEG &&
depends opencv &&
depends qjson &&
depends marble &&
+depends sane-backends &&

optional_depends kdepimlibs4 '' '' 'PIM support' &&
# added optional dependencies from kipi-plugins4
diff --git a/kde4-apps/digikam4/HISTORY b/kde4-apps/digikam4/HISTORY
index 2b4a6d7..0fcbe47 100644
--- a/kde4-apps/digikam4/HISTORY
+++ b/kde4-apps/digikam4/HISTORY
@@ -1,3 +1,6 @@
+2013-07-12 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on sane-backends
+
2013-03-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.1.0, SOURCE_URL[0] updated

diff --git a/kde4-bindings/pykde4/DEPENDS b/kde4-bindings/pykde4/DEPENDS
index 82a5afe..2c42588 100755
--- a/kde4-bindings/pykde4/DEPENDS
+++ b/kde4-bindings/pykde4/DEPENDS
@@ -1,3 +1,4 @@
source $SECTION_DIRECTORY/KDE_DEPENDS &&
depends sip &&
+depends phonon &&
depends pyqt4
diff --git a/kde4-bindings/pykde4/HISTORY b/kde4-bindings/pykde4/HISTORY
index 96c61bf..7453e5b 100644
--- a/kde4-bindings/pykde4/HISTORY
+++ b/kde4-bindings/pykde4/HISTORY
@@ -1,3 +1,6 @@
+2013-07-10 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on phonon
+
2013-01-04 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.9.5
* PRE_BUILD, sip-4.14.patch: removed
diff --git a/kde4-graphics/gwenview4/DEPENDS b/kde4-graphics/gwenview4/DEPENDS
index a3ad106..bc9c3d0 100755
--- a/kde4-graphics/gwenview4/DEPENDS
+++ b/kde4-graphics/gwenview4/DEPENDS
@@ -1,4 +1,5 @@
source $SECTION_DIRECTORY/KDE_DEPENDS &&
+depends kdebase4 &&
depends libkipi4 &&
depends exiv2 &&
depends JPEG &&
diff --git a/kde4-graphics/gwenview4/HISTORY b/kde4-graphics/gwenview4/HISTORY
index d5580eb..b99c076 100644
--- a/kde4-graphics/gwenview4/HISTORY
+++ b/kde4-graphics/gwenview4/HISTORY
@@ -1,3 +1,6 @@
+2013-07-12 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on kdebase4
+
2013-03-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.10.1

diff --git a/kde4-multimedia/audiocd-kio/DEPENDS
b/kde4-multimedia/audiocd-kio/DEPENDS
index ae5f641..f6a7017 100755
--- a/kde4-multimedia/audiocd-kio/DEPENDS
+++ b/kde4-multimedia/audiocd-kio/DEPENDS
@@ -1,3 +1,4 @@
+depends cdparanoia &&
depends kdelibs4 &&
depends libkcompactdisc &&
depends libkcddb
diff --git a/kde4-multimedia/audiocd-kio/HISTORY
b/kde4-multimedia/audiocd-kio/HISTORY
index 605127f..238d88d 100644
--- a/kde4-multimedia/audiocd-kio/HISTORY
+++ b/kde4-multimedia/audiocd-kio/HISTORY
@@ -1,3 +1,6 @@
+2013-07-11 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on cdparanoia
+
2013-03-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.10.1

diff --git a/kde4/HISTORY b/kde4/HISTORY
index e9ea6ff..8421c1b 100644
--- a/kde4/HISTORY
+++ b/kde4/HISTORY
@@ -1,3 +1,12 @@
+2013-07-11 Eric Sandall <sandalle AT sourcemage.org>
+ * KDE_DEPENDS: Add kdepimlibs4 case
+ Default case causes circular dependency with kdebase4-runtime
+ and optional circular dependency with kdebase-workspace4.
+
+2013-07-10 Eric Sandall <sandalle AT sourcemage.org>
+ * KDE_DEPENDS: kdebase4-runtime depends on kdepimlibs4
+ kdepim4-runtime depends on phonon
+
2012-07-30 Sukneet Basuta <sukneet AT sourcemage.org>
* FUNCTIONS, ../kde4*/FUNCTIONS: added prepare_cmake_flags to
default_build, to allow
passing cmake flags.
diff --git a/kde4/KDE_DEPENDS b/kde4/KDE_DEPENDS
index 69e0ea7..087a0c57 100755
--- a/kde4/KDE_DEPENDS
+++ b/kde4/KDE_DEPENDS
@@ -25,14 +25,20 @@ case $SPELL in
;;

kdebase4-runtime)
- depends kdelibs4 &&
+ depends kdelibs4 &&
+ depends kdepimlibs4 &&
depends phonon
;;

+ kdepimlibs4)
+ depends kdelibs4
+ ;;
+
kdepim4-runtime)
depends kdelibs4 &&
depends kdepimlibs4 &&
- depends kdebase4-runtime
+ depends kdebase4-runtime &&
+ depends phonon
;;

kdebase-workspace4)
diff --git a/kde4/kdepimlibs4/DEPENDS b/kde4/kdepimlibs4/DEPENDS
index 8f1229a..6e5f263 100755
--- a/kde4/kdepimlibs4/DEPENDS
+++ b/kde4/kdepimlibs4/DEPENDS
@@ -1,5 +1,4 @@
source $SECTION_DIRECTORY/KDE_DEPENDS &&
-depends kdelibs4 &&
depends -sub GRAPH boost &&
depends gpgme &&
depends akonadi &&
diff --git a/kde4/kdepimlibs4/HISTORY b/kde4/kdepimlibs4/HISTORY
index 50729c7..fe82016 100644
--- a/kde4/kdepimlibs4/HISTORY
+++ b/kde4/kdepimlibs4/HISTORY
@@ -1,3 +1,6 @@
+2013-07-11 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Move kdelibs4 dependency to KDE_DEPENDS case
+
2013-03-05 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.10.1

diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index 8f9c2ab..c1ffd46 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
else
if [[ $WINE_BRANCH == devel ]]; then
- VERSION=1.6-rc4
+ VERSION=1.6-rc5
else
VERSION=1.4.1
fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 14f1f35..78a6acf 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2013-07-12 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated devel to 1.6-rc5
+
2013-06-28 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated devel to 1.6-rc4

diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index d5ca68e..50cbcad 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -3,7 +3,7 @@ persistent_remove QT_VER
TMPFS=off
SPELLX=qt-everywhere-opensource-src
VERSION=4.8.5
- PATCHLEVEL=0
+ PATCHLEVEL=1

SOURCE_HASH=sha512:47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb
SOURCE=$SPELLX-$VERSION.tar.gz
SECURITY_PATCH=5
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index e78e8f1..7bf8270 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,10 @@
+2013-07-12 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD: Apply boost.patch
+ Use message instead of echo
+ * boost.patch: Fix some compilation with boost 1.52+ for dependent
+ spells. See https://bugreports.qt-project.org/browse/QTBUG-22829
+
2013-07-04 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.8.5, SECURITY_PATCH=5
WEB_SITE and SOURCE_URL[0] updated
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index 4efb000..5b4e4a7 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -1,6 +1,10 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

+message "${MESSAGE_COLOR}Fix moc using boost headers...${DEFAULT_COLOR}" &&
+patch "${SOURCE_DIRECTORY}"/src/tools/moc/main.cpp \
+ "${SPELL_DIRECTORY}"/boost.patch &&
+
sed -i '/-Werror/d' src/3rdparty/webkit/Source/WebKit.pri &&

# fix bad .pro file for 4.6.0-beta1
@@ -35,7 +39,7 @@ sed -i "s/-lgds/-lfbclient/"
config.tests/unix/ibase/ibase.pro \
src/plugins/sqldrivers/ibase/ibase.pro &&

# fix icu support
-echo "fixing icu support" &&
+message "${MESSAGE_COLOR}Fixing ICU support${DEFAULT_COLOR}..." &&
sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \
src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri &&

diff --git a/x11-toolkits/qt4/boost.patch b/x11-toolkits/qt4/boost.patch
new file mode 100644
index 0000000..bf30552
--- /dev/null
+++ b/x11-toolkits/qt4/boost.patch
@@ -0,0 +1,16 @@
+# Modified from
https://build.opensuse.org/package/view_file/openSUSE:Factory/libqt4?file=fix-moc-from-choking-on-boost-headers.patch&rev=94537fcad086b40817f06d56bf3d3a2c
+# using information from https://bugreports.qt-project.org/browse/QTBUG-22829
+--- qt-everywhere-opensource-src-4.8.5/src/tools/moc/main.cpp.orig
2013-07-12 15:18:04.079264426 -0700
++++ qt-everywhere-opensource-src-4.8.5/src/tools/moc/main.cpp 2013-07-12
15:24:35.581197919 -0700
+@@ -188,8 +188,10 @@
+ pp.macros["Q_MOC_RUN"];
+ pp.macros["__cplusplus"];
+
+- // Workaround a bug while parsing the
boost/type_traits/has_operator.hpp header. See QTBUG-22829
++ // Workaround a bug while parsing the
boost/type_traits/has_operator.hpp header. See QTBUG-22829
(https://bugreports.qt-project.org/browse/QTBUG-22829)
+ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
++ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
++ pp.macros["BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION"];
+
+ QByteArray filename;
+ QByteArray output;



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (7fcf6a14005b218995d17dcb364cff969ca26d6f), Eric Sandall, 07/13/2013

Archive powered by MHonArc 2.6.24.

Top of Page