[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (5dc4f188a0a736b14adce806eec23050a8b27e8c)

Treeve Jelbert scm at sourcemage.org
Fri Nov 28 08:11:21 EST 2008


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

 kde4-apps/kdenlive4/HISTORY   |    5 +++++
 kde4-apps/kdenlive4/PRE_BUILD |    3 +--
 kde4-apps/koffice2/HISTORY    |    4 ++++
 kde4-apps/koffice2/PRE_BUILD  |    3 +++
 kde4/akonadi/HISTORY          |    4 ++++
 kde4/akonadi/PRE_BUILD        |    3 +++
 kde4/kdelibs4/HISTORY         |    4 ++++
 kde4/kdelibs4/PRE_BUILD       |    3 +++
 kde4/kdeplasmoids4/HISTORY    |    4 ++++
 kde4/kdeplasmoids4/PRE_BUILD  |    3 +++
 10 files changed, 34 insertions(+), 2 deletions(-)

New commits:
commit 5abeffe2fd5a9cbc6ca7b7514e0454c53f7bbf4d
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    koffice2 - fix bug #14918

commit 4f1e3499da49f598405b3c4c54716ddf834d4b99
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdenlive4 - fix bug #14918

commit 3c29c0e91f728b26be4985497432ed225d048151
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdelibs4 - fix bug #14918

commit 2c2a2709ff26f8906f0be8baea6066d92ee16ea6
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdeplasmoids4 - fix bug #14918

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

    akonadi - fix bug #14918

diff --git a/kde4-apps/kdenlive4/HISTORY b/kde4-apps/kdenlive4/HISTORY
index f5182f9..511d082 100755
--- a/kde4-apps/kdenlive4/HISTORY
+++ b/kde4-apps/kdenlive4/HISTORY
@@ -1,3 +1,8 @@
+2008-11-28 Treeve Jelbert <treeve at sourcemage.org>
+	* PRE_BUILD: added, prevent update_xdg_mimetypes
+	  fixes bug #14918
+	  remove ffmpeg-svn fix
+
 2008-11-12 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.7
 
diff --git a/kde4-apps/kdenlive4/PRE_BUILD b/kde4-apps/kdenlive4/PRE_BUILD
index f818b90..f20b8bc 100755
--- a/kde4-apps/kdenlive4/PRE_BUILD
+++ b/kde4-apps/kdenlive4/PRE_BUILD
@@ -1,4 +1,3 @@
 default_pre_build    &&
 cd $SOURCE_DIRECTORY &&
-# fix for ffmpeg-svn
-sed -i 's|/ffmpeg||' cmake/modules/FindLIBFFMPEG.cmake
+sed -i '/update_xdg_mimetypes/D' src/mimetypes/CMakeLists.txt
diff --git a/kde4-apps/koffice2/HISTORY b/kde4-apps/koffice2/HISTORY
index ab32f46..3fd7273 100644
--- a/kde4-apps/koffice2/HISTORY
+++ b/kde4-apps/koffice2/HISTORY
@@ -1,3 +1,7 @@
+2008-11-28 Treeve Jelbert <treeve at sourcemage.org>
+	* PRE_BUILD: added, prevent update_xdg_mimetypes
+	  fixes bug #14918
+
 2008-11-20 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.9.98.2
 
diff --git a/kde4-apps/koffice2/PRE_BUILD b/kde4-apps/koffice2/PRE_BUILD
new file mode 100755
index 0000000..a59c484
--- /dev/null
+++ b/kde4-apps/koffice2/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build    &&
+cd $SOURCE_DIRECTORY &&
+sed -i '/update_xdg_mimetypes/D' filters/krita/ora/CMakeLists.txt
diff --git a/kde4/akonadi/HISTORY b/kde4/akonadi/HISTORY
index c5e23d9..28c0efc 100644
--- a/kde4/akonadi/HISTORY
+++ b/kde4/akonadi/HISTORY
@@ -1,3 +1,7 @@
+2008-11-28 Treeve Jelbert <treeve at sourcemage.org>
+	* PRE_BUILD: added, prevent update_xdg_mimetypes
+	  fixes bug #14918
+
 2008-11-27 Treeve Jelbert <treeve at sourcemage.org>
 	* DEPENDS: add optional mysql
 
diff --git a/kde4/akonadi/PRE_BUILD b/kde4/akonadi/PRE_BUILD
new file mode 100755
index 0000000..d0ea6d7
--- /dev/null
+++ b/kde4/akonadi/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build    &&
+cd $SOURCE_DIRECTORY &&
+sed -i '/update_xdg_mimetypes/D' CMakeLists.txt
diff --git a/kde4/kdelibs4/HISTORY b/kde4/kdelibs4/HISTORY
index e0b0788..e40e6fb 100644
--- a/kde4/kdelibs4/HISTORY
+++ b/kde4/kdelibs4/HISTORY
@@ -1,3 +1,7 @@
+2008-11-28 Treeve Jelbert <treeve at sourcemage.org>
+	* PRE_BUILD: added, prevent update_xdg_mimetypes
+	  fixes bug #14918
+
 2008-11-26 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 4.1.80 (devel)
 
diff --git a/kde4/kdelibs4/PRE_BUILD b/kde4/kdelibs4/PRE_BUILD
new file mode 100755
index 0000000..0dcce2d
--- /dev/null
+++ b/kde4/kdelibs4/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build    &&
+cd $SOURCE_DIRECTORY &&
+sed -i '/update_xdg_mimetypes/D' mimetypes/CMakeLists.txt
diff --git a/kde4/kdeplasmoids4/HISTORY b/kde4/kdeplasmoids4/HISTORY
index ca5f3ef..ce43646 100644
--- a/kde4/kdeplasmoids4/HISTORY
+++ b/kde4/kdeplasmoids4/HISTORY
@@ -1,3 +1,7 @@
+2008-11-28 Treeve Jelbert <treeve at sourcemage.org>
+	* PRE_BUILD: added, prevent update_xdg_mimetypes
+	  fixes bug #14918
+
 2008-11-26 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 4.1.80 (devel)
 
diff --git a/kde4/kdeplasmoids4/PRE_BUILD b/kde4/kdeplasmoids4/PRE_BUILD
new file mode 100755
index 0000000..8043093
--- /dev/null
+++ b/kde4/kdeplasmoids4/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build    &&
+cd $SOURCE_DIRECTORY &&
+sed -i '/update_xdg_mimetypes/D' applets/lancelot/app/src/CMakeLists.txt



More information about the SM-Commit mailing list