[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (47d210c1c805d258d9351b69a92f2fb8d7048abf)

Treeve Jelbert scm at sourcemage.org
Mon Jul 6 03:21:52 EDT 2009


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

 kde4-apps/digikam4/DETAILS      |    4 ++--
 kde4-apps/digikam4/HISTORY      |    4 ++++
 kde4-apps/digikam4/PRE_BUILD    |    4 ++++
 kde4/kdebase4-runtime/HISTORY   |    3 +++
 kde4/kdebase4-runtime/PRE_BUILD |    3 +++
 kde4/kdenetwork4/DEPENDS        |    3 ++-
 kde4/kdenetwork4/HISTORY        |    3 +++
 kde4/kdepimlibs4/HISTORY        |    3 +++
 kde4/kdepimlibs4/PRE_BUILD      |    3 +++
 mobile/geoclue/DEPENDS          |    6 +++---
 mobile/geoclue/HISTORY          |    2 +-
 11 files changed, 31 insertions(+), 7 deletions(-)

New commits:
commit 47d210c1c805d258d9351b69a92f2fb8d7048abf
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    digikam4: => 1.0.0-beta2

commit 36306f0c96740b4546e31b26cd226b6a81c10398
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdebase4-runtime - prevent update of mime db

commit 302754b0363fe45a208b474109c87d86918a3af1
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdepimlibs4 - prevent update of mime db

commit 7987c73ec4d9530d81cea65e35c281f2fa3b5d4d
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdenetwork4 - extra depends

commit 445f8338cea3697b35ccb92de2bfd64ecd430901
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    geoclue - extra depends

diff --git a/kde4-apps/digikam4/DETAILS b/kde4-apps/digikam4/DETAILS
index 644216e..c795d69 100755
--- a/kde4-apps/digikam4/DETAILS
+++ b/kde4-apps/digikam4/DETAILS
@@ -7,8 +7,8 @@ if [[ $DIG_SVN == y ]];then
           SOURCE=${SPELLX}-$VERSION.tar.bz2
    SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk/extragear/graphics/$SPELLX:$SPELLX
 else
-         VERSION=1.0.0-beta1
-     SOURCE_HASH=sha512:578e045410db8381d4951505ef07afec8b98f4ba170882b56fbe9fa11e660fe6278676f0be56d5ea2ce4e2e030f29c081cd196e80e4eb3666536d2588b2faaad
+         VERSION=1.0.0-beta2
+     SOURCE_HASH=sha512:05be87f68e9e645234ef7f94ce622d8b2dd067a5f6fcd9d233c8ac1963da7d5b5601255d2206afad358ee55f553efc5a89b7baeb47a136f903bdd14ef22140dc
           SOURCE=${SPELLX}-$VERSION.tar.bz2
    SOURCE_URL[0]=$SOURCEFORGE_URL/digikam/$SOURCE
 fi
diff --git a/kde4-apps/digikam4/HISTORY b/kde4-apps/digikam4/HISTORY
index 8e221a3..502b244 100644
--- a/kde4-apps/digikam4/HISTORY
+++ b/kde4-apps/digikam4/HISTORY
@@ -1,3 +1,7 @@
+2009-07-06 Treeve Jelbert <treevesourcemage.org>
+	* DETAILS: version 1.0.0-beta2
+	* PRE_BUILD: added, to fix broken cmake
+
 2009-07-01 Treeve Jelbert <treevesourcemage.org>
 	* DEPENDS: add optional liblqr
 
diff --git a/kde4-apps/digikam4/PRE_BUILD b/kde4-apps/digikam4/PRE_BUILD
new file mode 100755
index 0000000..52f2270
--- /dev/null
+++ b/kde4-apps/digikam4/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build    &&
+cd $SOURCE_DIRECTORY &&
+# fix broken cmake - beta2
+sed -i '/(tests)/D' CMakeLists.txt
diff --git a/kde4/kdebase4-runtime/HISTORY b/kde4/kdebase4-runtime/HISTORY
index d25efe7..543ee0d 100644
--- a/kde4/kdebase4-runtime/HISTORY
+++ b/kde4/kdebase4-runtime/HISTORY
@@ -1,3 +1,6 @@
+2009-07-06 Treeve Jelbert <treeve at sourcemage.org>
+	* PRE_BUILD: added, prevent update of mime database
+
 2009-07-01 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 4.2.95 (unstable)
 
diff --git a/kde4/kdebase4-runtime/PRE_BUILD b/kde4/kdebase4-runtime/PRE_BUILD
new file mode 100755
index 0000000..660015f
--- /dev/null
+++ b/kde4/kdebase4-runtime/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build    &&
+cd $SOURCE_DIRECTORY &&
+sed -i '/update_xdg_mimetypes/D' kioslave/network/mimetypes/CMakeLists.txt
diff --git a/kde4/kdenetwork4/DEPENDS b/kde4/kdenetwork4/DEPENDS
index ff5afc5..e46937a 100755
--- a/kde4/kdenetwork4/DEPENDS
+++ b/kde4/kdenetwork4/DEPENDS
@@ -16,4 +16,5 @@ optional_depends  jpeg       '' '' 'JPEG images in krdc'                &&
 optional_depends  sqlite     '' '' 'build kopete statistics and kget history plugins'  &&
 optional_depends  libotr     '' '' 'build kopete OTR (Off-the-Record encryption) plugin' &&
 optional_depends  ortp       '' '' 'Jingle support in Kopete'           &&
-optional_depends  libmsn     '' '' 'MSN Messaging support in Kopete'
+optional_depends  libmsn     '' '' 'MSN Messaging support in Kopete'    &&
+optional_depends  meanwhile  '' '' 'connection to Sametime servers'
diff --git a/kde4/kdenetwork4/HISTORY b/kde4/kdenetwork4/HISTORY
index 85e95f9..1c74650 100644
--- a/kde4/kdenetwork4/HISTORY
+++ b/kde4/kdenetwork4/HISTORY
@@ -1,3 +1,6 @@
+2009-07-05 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: add optional meanwhile
+
 2009-07-01 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 4.2.95 (unstable)
 
diff --git a/kde4/kdepimlibs4/HISTORY b/kde4/kdepimlibs4/HISTORY
index 3de174d..d025b2d 100644
--- a/kde4/kdepimlibs4/HISTORY
+++ b/kde4/kdepimlibs4/HISTORY
@@ -1,3 +1,6 @@
+2009-07-06 Treeve Jelbert <treeve at sourcemage.org>
+	* PRE_BUILD: added, prevent update of mime database
+
 2009-07-01 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 4.2.95 (unstable)
 
diff --git a/kde4/kdepimlibs4/PRE_BUILD b/kde4/kdepimlibs4/PRE_BUILD
new file mode 100755
index 0000000..d0ea6d7
--- /dev/null
+++ b/kde4/kdepimlibs4/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build    &&
+cd $SOURCE_DIRECTORY &&
+sed -i '/update_xdg_mimetypes/D' CMakeLists.txt
diff --git a/mobile/geoclue/DEPENDS b/mobile/geoclue/DEPENDS
index dcde05d..e988d51 100755
--- a/mobile/geoclue/DEPENDS
+++ b/mobile/geoclue/DEPENDS
@@ -6,6 +6,6 @@ depends pkgconfig  &&
 depends glib2      &&
 optional_depends gtk+2 '' '' 'gui' &&
 optional_depends gammu '' '' 'GSM location' &&
-optional_depends gpsd  '' '' 'GPS location'
-#optional_depends gypsy '' '' 'GPS location'
-# http://gypsy.freedesktop.org
+optional_depends gypsy '' '' 'GPS location' &&
+optional_depends gpsd  '' '' 'GPS location' &&
+optional_depends gtk-doc '' '' 'build docs'
diff --git a/mobile/geoclue/HISTORY b/mobile/geoclue/HISTORY
index c5ce36a..e3413fe 100644
--- a/mobile/geoclue/HISTORY
+++ b/mobile/geoclue/HISTORY
@@ -1,4 +1,4 @@
 2009-07-05 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.11,1
 	  spell created
-
+	* DEPENDS: add optional gypsy, gtk-doc



More information about the SM-Commit mailing list