Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to devel-kde44 grimoire by Treeve Jelbert (6fd5eddb52f4b5d31d1cfa9321d2028d3bb13399)

Chronological Thread  
    < 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 (6fd5eddb52f4b5d31d1cfa9321d2028d3bb13399)
  • Date: Mon, 30 Nov 2009 09:17:31 -0600
GIT changes to devel-kde44 grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

database/firebird/HISTORY | 3 +++
database/firebird/init.d/firebird2 | 2 +-
kde4-support/shared-desktop-ontologies/DETAILS | 4 ++--
kde4-support/shared-desktop-ontologies/HISTORY | 3 +++
kde4/kdebase-workspace4/DEPENDS | 2 +-
kde4/kdebase-workspace4/HISTORY | 3 +++
kde4/kdebase4-runtime/DEPENDS | 1 +
kde4/kdebase4-runtime/HISTORY | 3 +++
kde4/kdebase4/DEPENDS | 1 +
kde4/kdebase4/HISTORY | 3 +++
kde4/kdegraphics4/DEPENDS | 3 +--
kde4/kdegraphics4/HISTORY | 8 ++++++++
kde4/kdelibs4/HISTORY | 9 +++++++++
kde4/kdelibs4/PRE_SUB_DEPENDS | 5 -----
kde4/kdelibs4/SUB_DEPENDS | 10 +---------
kde4/kdenetwork4/DEPENDS | 4 +++-
kde4/kdenetwork4/HISTORY | 4 ++++
kde4/kdepim4/DEPENDS | 1 +
kde4/kdepim4/HISTORY | 3 +++
kde4/kdeplasmoids4/DEPENDS | 3 +++
kde4/kdeplasmoids4/HISTORY | 3 +++
21 files changed, 57 insertions(+), 21 deletions(-)

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

kdegraphics4 -depends shared-desktop-ontologies
(cherry picked from commit 323e5ec231896bde4b8161215cfd084446d521fe)

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

kdebase4 -depends shared-desktop-ontologies
(cherry picked from commit 5b7300b293ce28f25f91a749752dd4c10430878f)

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

kdebase-workspace4 -depends shared-desktop-ontologies
(cherry picked from commit b38ea01ac8f4f828cca8ca656b5b9080539f9e31)

Conflicts:

kde4/kdebase-workspace4/HISTORY

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

kdebase4-runtime -depends shared-desktop-ontologies
(cherry picked from commit 2c105553878de3987132e43423df1ff52eabe082)

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

kdepim4 -depends shared-desktop-ontologies
(cherry picked from commit 040cc57565d7668343f31809b646b908a3521ee2)

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

shared-desktop-ontologies: => 0.2
(cherry picked from commit 5ff005bca17325967a497576e8e390265bcb391e)

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

kdenetwork4 - more depends changes
(cherry picked from commit d264c6deb1d0a331b9479dcfb00ac46ba0735301)

Conflicts:

kde4/kdenetwork4/HISTORY

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

firebird2 - fix init script typo
(cherry picked from commit 4ac4effbeb3abbc96056eacfbd8c6a719a51cec8)

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

kdeplasmoids4 - more depends
(cherry picked from commit c294957a755568f124e4da1018eabc2388ccf73c)

Conflicts:

kde4/kdeplasmoids4/HISTORY

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

kdelibs4 - add a dummy SUB_DEPENDS
(cherry picked from commit f3a3da193981aa242a4cf0d6e9d7119623655be9)

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

kdegraphics4 - remove obsolete depends
(cherry picked from commit 6d4ea1b0b6a4032a99cae0adaa754516f49f13e0)

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

kdelibs4 - remove obsolete SUB_DEPENDS
(cherry picked from commit 2786d0fa208709246258f630aa0e94264e83eb16)

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

kdegraphics4 - remove obsolete sub_depends
(cherry picked from commit ff75a54fce3b9f78a4410c011241721fd84cc8cb)

Conflicts:

kde4/kdegraphics4/HISTORY

diff --git a/database/firebird/HISTORY b/database/firebird/HISTORY
index 71db44f..a0fe66c 100644
--- a/database/firebird/HISTORY
+++ b/database/firebird/HISTORY
@@ -1,3 +1,6 @@
+2009-11-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * init.d/firebird2: fic typo
+
2009-11-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.5.0.25784-ReleaseCandidate1
* fb2.5.patch.bz2: updated
diff --git a/database/firebird/init.d/firebird2
b/database/firebird/init.d/firebird2
index 9f8dacd..e68436e 100755
--- a/database/firebird/init.d/firebird2
+++ b/database/firebird/init.d/firebird2
@@ -8,7 +8,7 @@

FB_DIR=/opt/firebird/bin
FB=fbserver
-if [[ ! -f $FB_DIR/$FB]];then
+if [[ ! -f $FB_DIR/$FB ]];then
# 2.5 has a combined classic-super server using libfbembed.so
FB=fb_smp_server
fi
diff --git a/kde4-support/shared-desktop-ontologies/DETAILS
b/kde4-support/shared-desktop-ontologies/DETAILS
index b4e78b5..2520823 100755
--- a/kde4-support/shared-desktop-ontologies/DETAILS
+++ b/kde4-support/shared-desktop-ontologies/DETAILS
@@ -1,6 +1,6 @@
SPELL=shared-desktop-ontologies
- VERSION=0.1
-
SOURCE_HASH=sha512:b1b883585d19a2f77ce861d9c34f985be3088f92b9f02d82cfc81c555efc9984442592d71004689df22883e17d78d36f9f380ae0bae831e13c7ef90f6c0841ed
+ VERSION=0.2
+
SOURCE_HASH=sha512:1b56305fcb33de9f92a2726d9ada067805892c3b1241af0b523b75d92cfbb56bb782bfbf23348bfecb4576dc19adc0e866cafa3c2bce87edd984b61118d7acc9
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/oscaf/files/$SPELL/$VERSION/$SOURCE
diff --git a/kde4-support/shared-desktop-ontologies/HISTORY
b/kde4-support/shared-desktop-ontologies/HISTORY
index e5dc591..1e6f73d 100644
--- a/kde4-support/shared-desktop-ontologies/HISTORY
+++ b/kde4-support/shared-desktop-ontologies/HISTORY
@@ -1,3 +1,6 @@
+2009-11-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.2
+
2009-11-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.1
spell created
diff --git a/kde4/kdebase-workspace4/DEPENDS b/kde4/kdebase-workspace4/DEPENDS
index c1b56e8..f0f0505 100755
--- a/kde4/kdebase-workspace4/DEPENDS
+++ b/kde4/kdebase-workspace4/DEPENDS
@@ -5,7 +5,7 @@ depends xextproto &&
depends xmessage &&
depends libxdmcp &&
depends libxrandr &&
-
+depends shared-desktop-ontologies &&
runtime_depends xprop &&

suggest_depends xrdb '' '' "update the X resource database"
&&
diff --git a/kde4/kdebase-workspace4/HISTORY b/kde4/kdebase-workspace4/HISTORY
index 93d8347..d9533fb 100644
--- a/kde4/kdebase-workspace4/HISTORY
+++ b/kde4/kdebase-workspace4/HISTORY
@@ -1,3 +1,6 @@
+2009-11-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add shared-desktop-ontologies
+
2009-11-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.3.75svn1048496 (unstable)

diff --git a/kde4/kdebase4-runtime/DEPENDS b/kde4/kdebase4-runtime/DEPENDS
index 67e6394..6940435 100755
--- a/kde4/kdebase4-runtime/DEPENDS
+++ b/kde4/kdebase4-runtime/DEPENDS
@@ -8,6 +8,7 @@ depends libxfixes &&
depends libxft &&
depends libxrandr &&
depends libxtst &&
+depends shared-desktop-ontologies &&
depends soprano &&
depends xine-lib &&
optional_depends libssh '' '' 'build kio_sftp slave' &&
diff --git a/kde4/kdebase4-runtime/HISTORY b/kde4/kdebase4-runtime/HISTORY
index 5374148..4c58d0a 100644
--- a/kde4/kdebase4-runtime/HISTORY
+++ b/kde4/kdebase4-runtime/HISTORY
@@ -1,3 +1,6 @@
+2009-11-30Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add shared-desktop-ontologies
+
2009-11-25 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: remove qimagebllitz
soprano is now required
diff --git a/kde4/kdebase4/DEPENDS b/kde4/kdebase4/DEPENDS
index 43885be..3fb2862 100755
--- a/kde4/kdebase4/DEPENDS
+++ b/kde4/kdebase4/DEPENDS
@@ -9,6 +9,7 @@ depends libxfixes &&
depends libxft &&
depends libxrandr &&
depends libxtst &&
+depends shared-desktop-ontologies &&

optional_depends xine-lib '' '' 'video player' &&
if is_depends_enabled $SPELL xine-lib;then
diff --git a/kde4/kdebase4/HISTORY b/kde4/kdebase4/HISTORY
index d0df858..b5e3a46 100644
--- a/kde4/kdebase4/HISTORY
+++ b/kde4/kdebase4/HISTORY
@@ -1,3 +1,6 @@
+2009-11-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add shared-desktop-ontologies
+
2009-11-25 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: remove qimageblitz

diff --git a/kde4/kdegraphics4/DEPENDS b/kde4/kdegraphics4/DEPENDS
index 4ca27e3..8d91127 100755
--- a/kde4/kdegraphics4/DEPENDS
+++ b/kde4/kdegraphics4/DEPENDS
@@ -1,6 +1,6 @@
source $SECTION_DIRECTORY/KDE_DEPENDS &&
+depends shared-desktop-ontologies &&
depends soprano &&
-sub_depends kdelibs4 SOPRANO &&
depends freetype2 &&
depends lcms &&
optional_depends -sub LIBS ghostscript \
@@ -8,7 +8,6 @@ optional_depends -sub LIBS ghostscript \
optional_depends libgphoto2 '' '' 'build kamera' &&
optional_depends exiv2 '' '' 'build gwenview' &&
optional_depends sane-backends '' '' 'build kscanplugin' &&
-optional_depends OPENGL '' '' 'build kpovmodeler' &&
optional_depends libspectre '' '' 'render PS files' &&
optional_depends tiff '' '' 'okular TIFF plugin' &&
optional_depends jpeg '' '' 'okular djvu-plugin' &&
diff --git a/kde4/kdegraphics4/HISTORY b/kde4/kdegraphics4/HISTORY
index 722ad62..615479f 100644
--- a/kde4/kdegraphics4/HISTORY
+++ b/kde4/kdegraphics4/HISTORY
@@ -1,3 +1,11 @@
+2009-11-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add shared-desktop-ontologies
+
+2009-11-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: remove 'sub_depends kdelibs4 SOPRANO'
+ all of kde now depends on soprano
+ remove optional OPENGL - is required for all of kde
+
2009-11-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.3.75svn1048496 (unstable)

diff --git a/kde4/kdelibs4/HISTORY b/kde4/kdelibs4/HISTORY
index fd5e36f..d8a8008 100644
--- a/kde4/kdelibs4/HISTORY
+++ b/kde4/kdelibs4/HISTORY
@@ -1,3 +1,12 @@
+2009-11-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * SUB_DEPENDS: add back a dummy script
+ otherwise cast fails with no obvious error message
+
+2009-11-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: deleted
+ soprano is standard for kde4 now
+ libart_lgpl is not used by kde4 anyway
+
2009-11-27 Treeve Jelbert <treeve AT sourcemage.org>
* CONFLICTS: remove self

diff --git a/kde4/kdelibs4/PRE_SUB_DEPENDS b/kde4/kdelibs4/PRE_SUB_DEPENDS
deleted file mode 100755
index d1bad73..0000000
--- a/kde4/kdelibs4/PRE_SUB_DEPENDS
+++ /dev/null
@@ -1,5 +0,0 @@
-case $THIS_SUB_DEPENDS in
- SVG) is_depends_enabled $SPELL libart_lgpl && return 0;;
- SOPRANO) is_depends_enabled $SPELL soprano && return 0;;
-esac
-return 1
diff --git a/kde4/kdelibs4/SUB_DEPENDS b/kde4/kdelibs4/SUB_DEPENDS
index 10a5f86..27ba77d 100755
--- a/kde4/kdelibs4/SUB_DEPENDS
+++ b/kde4/kdelibs4/SUB_DEPENDS
@@ -1,9 +1 @@
-case $THIS_SUB_DEPENDS in
-SVG) echo "SVG support requested, forcing libart_lgpl dependency." &&
- depends libart_lgpl
- ;;
-SOPRANO) echo "SOPRANO support requested, forcing soprano dependency." &&
- depends soprano
- ;;
-*) echo unknown sub-depends!!! ; return 1 ;;
-esac
+true
diff --git a/kde4/kdenetwork4/DEPENDS b/kde4/kdenetwork4/DEPENDS
index e46937a..085315f 100755
--- a/kde4/kdenetwork4/DEPENDS
+++ b/kde4/kdenetwork4/DEPENDS
@@ -8,7 +8,9 @@ optional_depends wireless_tools '' '' 'Wireless support'
&&
optional_depends libidn '' '' 'International Domain Name Support' &&
#optional_depends decibel '' '' 'Decibel support' &&
optional_depends qca2 '' '' 'needed to build kopete' &&
-optional_depends ktorrent4 '' '' 'use system torrent library' &&
+optional_depends ktorrent4 '-DENABLE_EMBEDDED_TORRENT_SUPPORT=false' ''
'use system torrent library' &&
+optional_depends libv4l '' '' 'better webcam suppor' &&
+optional_depends alsa-lib '' '' 'sound support' &&
optional_depends xmms '' '' 'nowlistening plugin' &&
optional_depends libvncserver '' '' 'build krfb and VNC suport in krdc' &&
optional_depends mdnsresponder '' '' 'krfb and krdc service discovery and
dnssd ioslave' &&
diff --git a/kde4/kdenetwork4/HISTORY b/kde4/kdenetwork4/HISTORY
index 0f1a53c..c720a9f 100644
--- a/kde4/kdenetwork4/HISTORY
+++ b/kde4/kdenetwork4/HISTORY
@@ -1,3 +1,7 @@
+2009-11-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: explicitly disbale internal torrent support
+ add alsa-lib, libv4l
+
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 a3d7ffa..91368a3 100755
--- a/kde4/kdepim4/DEPENDS
+++ b/kde4/kdepim4/DEPENDS
@@ -2,6 +2,7 @@ source $SECTION_DIRECTORY/KDE_DEPENDS
&&
depends kdepimlibs4 &&
depends -sub GRAPH boost &&
depends kdepim4-runtime &&
+depends shared-desktop-ontologies &&
depends soprano &&
optional_depends qca2 '' '' 'crypto support' &&
optional_depends gpgme '' '' 'encrypted signatures' &&
diff --git a/kde4/kdepim4/HISTORY b/kde4/kdepim4/HISTORY
index 43da80d..749bb3d 100644
--- a/kde4/kdepim4/HISTORY
+++ b/kde4/kdepim4/HISTORY
@@ -1,3 +1,6 @@
+2009-11-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add shared-desktop-ontologies
+
2009-11-25 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: soprano is now required

diff --git a/kde4/kdeplasmoids4/DEPENDS b/kde4/kdeplasmoids4/DEPENDS
index 8b7b532..1426d7c 100755
--- a/kde4/kdeplasmoids4/DEPENDS
+++ b/kde4/kdeplasmoids4/DEPENDS
@@ -1,4 +1,7 @@
source $SECTION_DIRECTORY/KDE_DEPENDS &&
+optional_depends attica '' '' 'Open Collaboration Service' &&
+optional_depends scim '' '' 'multibyte input' &&
+optional_depends qimageblitz '' '' 'image effects' &&
optional_depends eigen2 '' '' 'Mandelbrot wallpaper plugin' &&
optional_depends kdepimlibs4 '' '' 'PIM support' &&
optional_depends kdeedu4 '' '' 'Marble plasmoid' &&
diff --git a/kde4/kdeplasmoids4/HISTORY b/kde4/kdeplasmoids4/HISTORY
index 6020c6a..aaaa4fc 100644
--- a/kde4/kdeplasmoids4/HISTORY
+++ b/kde4/kdeplasmoids4/HISTORY
@@ -1,3 +1,6 @@
+2009-11-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add qimageblitz, attica, scim
+
2009-11-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.3.75svn1048496 (unstable)



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

Archive powered by MHonArc 2.6.24.

Top of Page