Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-kde44 grimoire by Treeve Jelbert (af0447f6a0311496203f37fc4b94a84658466ad6)

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 devel-kde44 grimoire by Treeve Jelbert (af0447f6a0311496203f37fc4b94a84658466ad6)
  • Date: Sat, 28 Nov 2009 03:06:38 -0600

GIT changes to devel-kde44 grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

ChangeLog | 3 +
audio-libs/openal-soft/DETAILS | 6 +-
audio-libs/openal-soft/HISTORY | 4 +
database/firebird/CONFIGURE | 6 ++
database/firebird/DETAILS | 4 -
database/firebird/HISTORY | 7 +++
database/firebird/fb2.5.patch.bz2 |binary
database/firebird/init.d/firebird2 | 4 +
kde4-apps/koffice2/BUILD | 2
kde4-apps/koffice2/CONFIGURE | 8 ---
kde4-apps/koffice2/DEPENDS | 53
++++++++++++++++---------
kde4-apps/koffice2/HISTORY | 7 +++
kde4-support/shared-desktop-ontologies/BUILD | 2
kde4-support/shared-desktop-ontologies/DEPENDS | 1
kde4-support/shared-desktop-ontologies/DETAILS | 18 ++++++++
kde4-support/shared-desktop-ontologies/HISTORY | 4 +
kde4-support/soprano/DEPENDS | 6 +-
kde4-support/soprano/HISTORY | 3 +
kde4/FUNCTIONS | 5 +-
kde4/HISTORY | 3 +
kde4/kdebase4-runtime/DEPENDS | 10 +---
kde4/kdebase4-runtime/HISTORY | 7 +++
kde4/kdebase4/DEPENDS | 1
kde4/kdebase4/HISTORY | 3 +
kde4/kdelibs4/CONFLICTS | 2
kde4/kdelibs4/DEPENDS | 9 ++--
kde4/kdelibs4/HISTORY | 10 ++++
kde4/kdepim4-runtime/DEPENDS | 5 --
kde4/kdepim4-runtime/HISTORY | 3 +
kde4/kdepim4/DEPENDS | 5 --
kde4/kdepim4/HISTORY | 3 +
x11-toolkits/qt4/DEPENDS | 6 --
x11-toolkits/qt4/HISTORY | 3 +
33 files changed, 153 insertions(+), 60 deletions(-)

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

kdelibs4 - remove conflicts self
(cherry picked from commit d27d90c91f23b904ab6965464a24e33ec34385f7)

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

kde4/FUNCTIONS - fix for kdelibs4

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

shared-desktop-ontologies - new spell

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

kdelibs4 - more depends

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

kdepim4 - soprano is now required

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

kdepim4-runtime - soprano is now required

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

kdebase4-runtime - soprano is now required

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

kdebase4-runtime - update depends
(cherry picked from commit d1e47af8c7c078f9845d79830e88ddb72ffbd04a)

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

kdebase4 - update depends

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

qt4 - always needs zlib
(cherry picked from commit 37465c10ae481de13a9bebea9485195ee37c48fb)

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

soprano - adjust depends

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

kdelibs4 - extra depends

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

koffice2 - tiny buld

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

kdebase4-runtime - no longer depends clucene

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

koffice2 - extra depends

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

openal-soft: => 1.10.622
(cherry picked from commit 12c8da2609bb847f6221bba30e592049e797f9df)

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

firebird-2.5.0.25784-ReleaseCandidate1
(cherry picked from commit 8ec5a65a12592f9f5a6d178fd6eca2c924a78d8d)

diff --git a/ChangeLog b/ChangeLog
index 8ff2295..04bc591 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2009-11-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * kde4-support/shared-desktop-ontologies: new spell for semantic
desktop
+
2009-10-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* utils/zsync: new spell, a file transfer tool

diff --git a/audio-libs/openal-soft/DETAILS b/audio-libs/openal-soft/DETAILS
index 87af372..6930a49 100755
--- a/audio-libs/openal-soft/DETAILS
+++ b/audio-libs/openal-soft/DETAILS
@@ -1,11 +1,11 @@
SPELL=openal-soft
- VERSION=1.8.466
+ VERSION=1.10.622
+
SOURCE_HASH=sha512:156db97ac24b92f8365f51dab259e3db82e7c44aefff9a3efebbd17ab41cf923c156ee7ee65d2a7699f022ae3140e7f2187530a864b520cbacd7820e5b343f2a
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=http://kcat.strangesoft.net/openal-releases/${SOURCE}
-
SOURCE_HASH=sha512:352b3cd934d052c2741a1a85e4e6921847dcde15ac8c185d1bf9e67a508b17c49a0d5370bd928af262a56978ef70f0e140d8937e4ac181bd1c93a825f98b9793
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://kcat.strangesoft.net/openal.html";
- LICENSE[0]=foomatic
+ LICENSE[0]=LGPL
ENTERED=20090421
SHORT="software implementation of the OpenAL 3D audio API."
cat << EOF
diff --git a/audio-libs/openal-soft/HISTORY b/audio-libs/openal-soft/HISTORY
index 2aba9b5..3e5f5cb 100644
--- a/audio-libs/openal-soft/HISTORY
+++ b/audio-libs/openal-soft/HISTORY
@@ -1,3 +1,7 @@
+2009-11-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.10.622
+ LICENSE = LGPL
+
2009-07-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DEPENDS: fixed syntax error

diff --git a/database/firebird/CONFIGURE b/database/firebird/CONFIGURE
index e53b3a7..707f24a 100755
--- a/database/firebird/CONFIGURE
+++ b/database/firebird/CONFIGURE
@@ -4,5 +4,9 @@ if [ $FB_CLIENT == n ]; then
config_query_multi FB_GPRE "which additional GPRE languages to support?" \
none ada cobol pascal fortran &&
config_query_option FB_STAT "build static libraries?" n "--enable-static"
"--disable-static" &&
- config_query_option FB_SS "Build Superserver?" y "--enable-superserver" ""
+ if [[ $FB_VER != 2.5 ]];then
+ config_query_option FB_SS "Build Superserver?" y "--enable-superserver"
""
+ else
+ FB_SS=""
+ fi
fi
diff --git a/database/firebird/DETAILS b/database/firebird/DETAILS
index 5939dc8..b73c17e 100755
--- a/database/firebird/DETAILS
+++ b/database/firebird/DETAILS
@@ -1,8 +1,8 @@
SPELL=firebird
case $FB_VER in
2.5)
- VERSION=2.5.0.24643-Beta2
-
SOURCE_HASH=sha512:816144a2baac37d077864f7d809c3b0b2351703e4ab0a034b33fe51e8e1593fb3ddc12454ab249cab9f227360443c526f5d6c92eba2d69aa75d743354dc46c7d
+ VERSION=2.5.0.25784-ReleaseCandidate1
+
SOURCE_HASH=sha512:7227b39cd73477dc50123999f819b52cdaaf19a37bc583bae77b4ae68743a7fff51b67eebab28e4faa8ba15af47e9560b94d5284fac639ac74e882879f652fd0
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/f/F}-${VERSION/-0\.RC?/}
SECURITY_PATCH=1
;;
diff --git a/database/firebird/HISTORY b/database/firebird/HISTORY
index 9191fcd..71db44f 100644
--- a/database/firebird/HISTORY
+++ b/database/firebird/HISTORY
@@ -1,3 +1,10 @@
+2009-11-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.5.0.25784-ReleaseCandidate1
+ * fb2.5.patch.bz2: updated
+ * CONFIGURE: disable superserver query
+ there is now one super-classic build
+ * init.d/firebird2: name of server has changed
+
2009-09-20 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.1.3.18185-0

diff --git a/database/firebird/fb2.5.patch.bz2
b/database/firebird/fb2.5.patch.bz2
index 05f2d07..db885b4 100644
Binary files a/database/firebird/fb2.5.patch.bz2 and
b/database/firebird/fb2.5.patch.bz2 differ
diff --git a/database/firebird/init.d/firebird2
b/database/firebird/init.d/firebird2
index 0dbcb40..9f8dacd 100755
--- a/database/firebird/init.d/firebird2
+++ b/database/firebird/init.d/firebird2
@@ -8,6 +8,10 @@

FB_DIR=/opt/firebird/bin
FB=fbserver
+if [[ ! -f $FB_DIR/$FB]];then
+# 2.5 has a combined classic-super server using libfbembed.so
+ FB=fb_smp_server
+fi
# as of rc2, preferred method of stopping is to kill the process

source /etc/init.d/smgl_functions
diff --git a/kde4-apps/koffice2/BUILD b/kde4-apps/koffice2/BUILD
new file mode 100755
index 0000000..305886e
--- /dev/null
+++ b/kde4-apps/koffice2/BUILD
@@ -0,0 +1,2 @@
+OPTS+=" $KTINY" &&
+default_build
diff --git a/kde4-apps/koffice2/CONFIGURE b/kde4-apps/koffice2/CONFIGURE
index 6fab675..6b7722f 100755
--- a/kde4-apps/koffice2/CONFIGURE
+++ b/kde4-apps/koffice2/CONFIGURE
@@ -1,7 +1,3 @@
-source $SECTION_DIRECTORY/KDE_CONFIGURE
+source $SECTION_DIRECTORY/KDE_CONFIGURE &&
+config_query_option KTINY 'build tiny koffice - kword/kspread/kpresenter' y
'-DTINY=1' ''

-#
-# Fails to build
-#
-#config_query_option KOFFICE_KROSS 'build Kross scripting support' n \
-# '--enable-scripting' '--disable-scripting'
diff --git a/kde4-apps/koffice2/DEPENDS b/kde4-apps/koffice2/DEPENDS
index 94e3062..43d04cc 100755
--- a/kde4-apps/koffice2/DEPENDS
+++ b/kde4-apps/koffice2/DEPENDS
@@ -1,28 +1,45 @@
source $SECTION_DIRECTORY/KDE_DEPENDS &&
-depends OPENGL &&
-optional_depends kdegraphics4 '' '' 'process RAW photos' &&
-optional_depends eigen2 '-DEIGEN2_INCLUDE_DIR=/usr/include/eigen2'
'' \
- 'for KSpread' &&
-optional_depends freetype2 '' '' '' &&
-optional_depends fontconfig '' '' '' &&
-optional_depends gsl '' '' 'improved maths' &&
-optional_depends lcms '' '' 'colour management' &&
+depends perl &&
+depends libpng &&
+depends zlib &&
+
+depends OPENGL &&
+optional_depends freetype2 '' '' 'font support' &&
+optional_depends fontconfig '' '' '' &&
+
+if [[ -z "$KTINY" ]];then
+#Karbon
+optional_depends pstoedit '' '' 'Karbon eps import filter' &&
+# Kexi
+depends bzip2 &&
optional_depends sqlite '' '' 'kexi database' &&
-optional_depends mysql '' '' 'import MySql to Kexi' &&
-optional_depends postgresql '' '' 'import to Postgresql to Kexi' &&
-optional_depends xbase '' '' 'import dbase to Kexi' &&
+optional_depends mysql '' '' 'import MySql to Kexi' &&
+optional_depends postgresql '' '' 'import Postgresql to Kexi' &&
+optional_depends xbase '' '' 'import dbase to Kexi' &&
+#Krita
+optional_depends kdegraphics4 '' '' 'process RAW photos' &&
optional_depends glew '' '' 'OpenGL shaders in Krita' &&
optional_depends gmm '' '' 'Krita panorama plugin' &&
optional_depends exiv2 '' '' 'decode photo tags' &&
-optional_depends poppler '' '' 'PDF support' &&
-optional_depends pstoedit '' '' 'Karbon eps import filter' &&
-optional_depends wv2 '' '' 'MS Word import' &&
-optional_depends tiff '' '' 'graphics support' &&
-optional_depends graphicsmagick '' '' 'various Krita filters' &&
+optional_depends lcms '' '' 'colour management' &&
optional_depends openexr '' '' 'Krita EXR filter' &&
-optional_depends qca2 '' '' 'crypto support' &&
+optional_depends openjpeg '' '' 'Krita graphics filters' &&
optional_depends qimageblitz '' '' 'graphics manipulation' &&
-optional_depends glpk '' '' 'painterly mixer plugin'&&
+optional_depends glpk '' '' 'painterly mixer plugin' &&
+optional_depends tiff '' '' 'graphics support' &&
+#KPlato
optional_depends kdepimlibs4 '' '' 'PIM support' &&
+#KPresenter
+optional_depends boost '' '' 'for KPresenter'
+fi &&
+#KSpread
+optional_depends eigen2 '-DEIGEN2_INCLUDE_DIR=/usr/include/eigen2'
'' \
+ 'for KSpread' &&
+optional_depends gsl '' '' 'improved maths' &&
+#KWord
+optional_depends poppler '' '' 'PDF support' &&
+optional_depends wv2 '' '' 'MS Word import' &&
+optional_depends qca2 '' '' 'crypto support' &&
optional_depends libwpg '' '' 'WordPerfect graphics' &&
optional_depends libwpd '' '' 'WordPerfect import'
+#
diff --git a/kde4-apps/koffice2/HISTORY b/kde4-apps/koffice2/HISTORY
index 0e96a9b..124015e 100644
--- a/kde4-apps/koffice2/HISTORY
+++ b/kde4-apps/koffice2/HISTORY
@@ -1,3 +1,10 @@
+2009-11-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFIGURE: added, prompt for tiny koffice
+ * BUILD: added
+ * DEPENDS: restructure for tiny build
+ * DEPENDS: remove graphicsmagick, no longer used
+ add openjpeg, boost
+
2009-10-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.0.91 (unstable)

diff --git a/kde4-support/shared-desktop-ontologies/BUILD
b/kde4-support/shared-desktop-ontologies/BUILD
new file mode 100755
index 0000000..760e1eb
--- /dev/null
+++ b/kde4-support/shared-desktop-ontologies/BUILD
@@ -0,0 +1,2 @@
+cmake_build
+
diff --git a/kde4-support/shared-desktop-ontologies/DEPENDS
b/kde4-support/shared-desktop-ontologies/DEPENDS
new file mode 100755
index 0000000..60dd614
--- /dev/null
+++ b/kde4-support/shared-desktop-ontologies/DEPENDS
@@ -0,0 +1 @@
+depends cmake
diff --git a/kde4-support/shared-desktop-ontologies/DETAILS
b/kde4-support/shared-desktop-ontologies/DETAILS
new file mode 100755
index 0000000..b4e78b5
--- /dev/null
+++ b/kde4-support/shared-desktop-ontologies/DETAILS
@@ -0,0 +1,18 @@
+ SPELL=shared-desktop-ontologies
+ VERSION=0.1
+
SOURCE_HASH=sha512:b1b883585d19a2f77ce861d9c34f985be3088f92b9f02d82cfc81c555efc9984442592d71004689df22883e17d78d36f9f380ae0bae831e13c7ef90f6c0841ed
+ SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=$SOURCEFORGE_URL/oscaf/files/$SPELL/$VERSION/$SOURCE
+ WEB_SITE=http://sourceforge.net/projects/oscaf
+ LICENSE[0]=BSD
+ LICENSE[1]=BY-CC
+ ENTERED=20091126
+ KEYWORDS=""
+ SHORT="OSCAF ontologies and reference code"
+cat << EOF
+The shared-desktop-ontologies package brings the semantic web to the desktop
+in terms of vocabulary. It contains the well known core ontologies such as
RDF
+and RDFS as well as the Nepomuk ontologies which are used by projects like
KDE
+or Strigi.
+EOF
diff --git a/kde4-support/shared-desktop-ontologies/HISTORY
b/kde4-support/shared-desktop-ontologies/HISTORY
new file mode 100644
index 0000000..e5dc591
--- /dev/null
+++ b/kde4-support/shared-desktop-ontologies/HISTORY
@@ -0,0 +1,4 @@
+2009-11-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.1
+ spell created
+
diff --git a/kde4-support/soprano/DEPENDS b/kde4-support/soprano/DEPENDS
index 2a63696..bcd6a8c 100755
--- a/kde4-support/soprano/DEPENDS
+++ b/kde4-support/soprano/DEPENDS
@@ -5,9 +5,13 @@ if [[ $SOP_VER == devel ]];then
fi &&

if [[ $SOP_KDE == y ]];then
+ depends redland &&
+ depends raptor
depends dbus &&
runtime_depends virtuoso
else
+ optional_depends redland '' '-DSOPRANO_DISABLE_REDLAND_BACKEND=1' 'Redland
backend' &&
+optional_depends raptor '' '-DSOPRANO_DISABLE_RAPTOR_PARSER=1' 'raptor
parser and serializer plugins' &&
suggest_depends virtuoso '' '-DSOPRANO_DISABLE_VIRTUOSO_BACKEND=1'
'full-text search database' &&
optional_depends dbus '' '-DSOPRANO_DISABLE_DBUS=1' 'dbus integration'
fi &&
@@ -18,6 +22,4 @@ fi &&
if is_depends_enabled $SPELL virtuoso;then
depends libiodbc
fi &&
-optional_depends redland '' '-DSOPRANO_DISABLE_REDLAND_BACKEND=1' 'Redland
backend' &&
-optional_depends raptor '' '-DSOPRANO_DISABLE_RAPTOR_PARSER=1' 'raptor
parser and serializer plugins' &&
optional_depends clucene '' '-DSOPRANO_DISABLE_CLUCENE_INDEX=1' 'full-text
search index'
diff --git a/kde4-support/soprano/HISTORY b/kde4-support/soprano/HISTORY
index 119e0a8..15cbe70 100644
--- a/kde4-support/soprano/HISTORY
+++ b/kde4-support/soprano/HISTORY
@@ -1,3 +1,6 @@
+2009-11-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: redland & raptor are required for kde
+
2009-10-18 Treeve Jelbert <treeve AT sourcemage.org>
* PREPARE: query about kde support
* DEPENDS: improve kde support
diff --git a/kde4/FUNCTIONS b/kde4/FUNCTIONS
index b4c2106..7fe261e 100755
--- a/kde4/FUNCTIONS
+++ b/kde4/FUNCTIONS
@@ -5,7 +5,10 @@ default_build() {
cd $SOURCE_DIRECTORY &&
mkdir -p build &&
cd build &&
- PATH=$KDE4DIR:$QTDIR:$PATH &&
+ PATH+=:$QTDIR &&
+ if [[ $SPELL != kdelibs4 ]];then
+ PATH+=:$KDE4DIR
+ fi &&
CMAKE_PREFIX_PATH=$KDE4DIR &&
cmake -DCMAKE_INSTALL_PREFIX=$KDE4DIR \
-DCMAKE_BUILD_TYPE=$KDE_DEBUG_OPTION \
diff --git a/kde4/HISTORY b/kde4/HISTORY
index 9bfae0c..821a3c3 100644
--- a/kde4/HISTORY
+++ b/kde4/HISTORY
@@ -1,3 +1,6 @@
+2009-11-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * FUNCTIONS: fix special case of kdelibs4
+
2009-11-18 Treeve Jelbert <treeve AT sourcemage.org>
* FUNCTIONS: add $OPTS to build
* KDE_DEPENDS: remove special case for kdeadmin4
diff --git a/kde4/kdebase4-runtime/DEPENDS b/kde4/kdebase4-runtime/DEPENDS
index aede552..67e6394 100755
--- a/kde4/kdebase4-runtime/DEPENDS
+++ b/kde4/kdebase4-runtime/DEPENDS
@@ -1,5 +1,4 @@
source $SECTION_DIRECTORY/KDE_DEPENDS &&
-depends qimageblitz &&
depends imake &&
depends libxau &&
depends libxcomposite &&
@@ -9,16 +8,13 @@ depends libxfixes &&
depends libxft &&
depends libxrandr &&
depends libxtst &&
-
+depends soprano &&
depends xine-lib &&
optional_depends libssh '' '' 'build kio_sftp slave' &&
optional_depends pulseaudio '' '' 'Pulseaudio server support' &&
optional_depends openexr '' '' 'EXR support for thumbnails' &&
optional_depends openslp '' '' 'Service Location Protocol' &&
optional_depends samba '' '' 'build smb-ioslave' &&
-optional_depends clucene '' '' 'fast text search' &&
-optional_depends soprano '' '' 'semantic desktop support' &&
-if is_depends_enabled $SPELL soprano;then
- sub_depends kdelibs4 SOPRANO
-fi &&
+optional_depends exiv2 '' '' 'access image metadata' &&
+optional_depends attica '' '' 'access Open Collaboration Services' &&
suggest_depends oxygen-icons 'default icons for kde4'
diff --git a/kde4/kdebase4-runtime/HISTORY b/kde4/kdebase4-runtime/HISTORY
index 903d713..5374148 100644
--- a/kde4/kdebase4-runtime/HISTORY
+++ b/kde4/kdebase4-runtime/HISTORY
@@ -1,3 +1,10 @@
+2009-11-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: remove qimagebllitz
+ soprano is now required
+
+2009-11-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: remove clucene, no longer used
+
2009-11-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.3.75svn1048496 (unstable)

diff --git a/kde4/kdebase4/DEPENDS b/kde4/kdebase4/DEPENDS
index ac6bd03..43885be 100755
--- a/kde4/kdebase4/DEPENDS
+++ b/kde4/kdebase4/DEPENDS
@@ -1,6 +1,5 @@
source $SECTION_DIRECTORY/KDE_DEPENDS &&

-depends qimageblitz &&
depends imake &&
depends libxau &&
depends libxcomposite &&
diff --git a/kde4/kdebase4/HISTORY b/kde4/kdebase4/HISTORY
index 18fe65f..d0df858 100644
--- a/kde4/kdebase4/HISTORY
+++ b/kde4/kdebase4/HISTORY
@@ -1,3 +1,6 @@
+2009-11-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: remove qimageblitz
+
2009-11-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.3.75svn1048496 (unstable)

diff --git a/kde4/kdelibs4/CONFLICTS b/kde4/kdelibs4/CONFLICTS
index 29587eb..819c9e4 100755
--- a/kde4/kdelibs4/CONFLICTS
+++ b/kde4/kdelibs4/CONFLICTS
@@ -1,3 +1 @@
-# prevent finding the existing install
-conflicts kdelibs4 y &&
conflicts kdelibs4-experimental y
diff --git a/kde4/kdelibs4/DEPENDS b/kde4/kdelibs4/DEPENDS
index ea458df..7475cf9 100755
--- a/kde4/kdelibs4/DEPENDS
+++ b/kde4/kdelibs4/DEPENDS
@@ -1,12 +1,13 @@
source $SECTION_DIRECTORY/KDE_DEPENDS &&
optional_depends hal '-DDONT_USE_HAL=0' '-DDONT_USE_HAL=1'
'hardware detection' &&
+depends shared-desktop-ontologies &&
+depends soprano &&
+depends redland &&
+depends raptor &&
+runtime_depends virtuoso &&
optional_depends libxscrnsaver '' '' 'screen saver support' &&
optional_depends FAM '' '' 'file change notification' &&
optional_depends acl '' '' 'access control lists support' &&
-optional_depends soprano '' '' 'Semantic Desktop support' &&
-if is_depends_enabled $SPELL soprano;then
- runtime_depends virtuoso
-fi &&
optional_depends tiff '' '' 'to view tiff graphics' &&
optional_depends alsa-lib '' '' 'for libKMid alsa support' &&
optional_depends cups '' '' 'to use cups printing' &&
diff --git a/kde4/kdelibs4/HISTORY b/kde4/kdelibs4/HISTORY
index 0cfd995..fd5e36f 100644
--- a/kde4/kdelibs4/HISTORY
+++ b/kde4/kdelibs4/HISTORY
@@ -1,3 +1,13 @@
+2009-11-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFLICTS: remove self
+
+2009-11-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add shared-desktop-ontologies
+ soprano is now required
+
+2009-11-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: soprano needs redland & raptor
+
2009-11-14 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS, PRE_BUILD: make hal optional - it always crashed for me
* hal.diff: added
diff --git a/kde4/kdepim4-runtime/DEPENDS b/kde4/kdepim4-runtime/DEPENDS
index 42be079..67763cb 100755
--- a/kde4/kdepim4-runtime/DEPENDS
+++ b/kde4/kdepim4-runtime/DEPENDS
@@ -2,8 +2,5 @@ source $SECTION_DIRECTORY/KDE_DEPENDS &&
depends kdepimlibs4 &&
depends akonadi &&
depends boost &&
-optional_depends soprano '' '' 'Nepomuk support' &&
-if is_depends_enabled $SPELL soprano;then
- sub_depends kdelibs4 SOPRANO
-fi
+depends soprano

diff --git a/kde4/kdepim4-runtime/HISTORY b/kde4/kdepim4-runtime/HISTORY
index a33995f..642a915 100644
--- a/kde4/kdepim4-runtime/HISTORY
+++ b/kde4/kdepim4-runtime/HISTORY
@@ -1,3 +1,6 @@
+2009-11-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: soprano is now required
+
2009-11-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.3.75svn1048496 (unstable)

diff --git a/kde4/kdepim4/DEPENDS b/kde4/kdepim4/DEPENDS
index 2b46e78..a3d7ffa 100755
--- a/kde4/kdepim4/DEPENDS
+++ b/kde4/kdepim4/DEPENDS
@@ -2,10 +2,7 @@ source $SECTION_DIRECTORY/KDE_DEPENDS
&&
depends kdepimlibs4 &&
depends -sub GRAPH boost &&
depends kdepim4-runtime &&
-optional_depends soprano '' '' 'Nepomuk support' &&
-if is_depends_enabled $SPELL soprano;then
- sub_depends kdelibs4 SOPRANO
-fi &&
+depends soprano &&
optional_depends qca2 '' '' 'crypto support' &&
optional_depends gpgme '' '' 'encrypted signatures' &&
optional_depends libassuan '' '' 'for kleopatra' &&
diff --git a/kde4/kdepim4/HISTORY b/kde4/kdepim4/HISTORY
index cbec136..43da80d 100644
--- a/kde4/kdepim4/HISTORY
+++ b/kde4/kdepim4/HISTORY
@@ -1,3 +1,6 @@
+2009-11-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: soprano is now required
+
2009-11-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.3.75svn1048496 (unstable)

diff --git a/x11-toolkits/qt4/DEPENDS b/x11-toolkits/qt4/DEPENDS
index 3774fa3..46addd9 100755
--- a/x11-toolkits/qt4/DEPENDS
+++ b/x11-toolkits/qt4/DEPENDS
@@ -1,4 +1,5 @@
depends g++ &&
+depends zlib &&
depends libx11 &&
depends libxcursor &&
depends libxfixes &&
@@ -17,11 +18,6 @@ optional_depends jpeg \
'-qt-libjpeg' \
'to use the system jpeg library' &&

-optional_depends zlib \
- '-system-zlib' \
- '-qt-zlib' \
- 'to use the system zlib library' &&
-
optional_depends openssl \
'-openssl' \
'-no-openssl' \
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 603b592..ca1504e 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,6 @@
+2009-11-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: zlib is always required now
+
2009-11-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.6.0-rc1




  • [SM-Commit] GIT changes to devel-kde44 grimoire by Treeve Jelbert (af0447f6a0311496203f37fc4b94a84658466ad6), Treeve Jelbert, 11/28/2009

Archive powered by MHonArc 2.6.24.

Top of Page