Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Bor Kraljič (6bc672f3829e91968811eaa9c6e45a0ba79ea2bd)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Bor Kraljič <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Bor Kraljič (6bc672f3829e91968811eaa9c6e45a0ba79ea2bd)
  • Date: Thu, 22 Sep 2011 13:21:57 -0500

GIT changes to master grimoire by Bor Kraljič <pyrobor AT ver.si>:

kde4-apps/bluedevil/HISTORY | 3 +++
kde4-apps/bluedevil/PRE_BUILD | 3 +++
kde4/kate/HISTORY | 3 +++
kde4/kate/PRE_BUILD | 3 +++
kde4/kdepim4-runtime/HISTORY | 3 +++
kde4/kdepim4-runtime/PRE_BUILD | 1 +
kde4/kdesdk4/HISTORY | 3 +++
kde4/kdesdk4/PRE_BUILD | 1 +
video/openshot/FINAL | 3 +++
video/openshot/HISTORY | 3 +++
video/openshot/PRE_BUILD | 3 +++
11 files changed, 29 insertions(+)

New commits:
commit 6bc672f3829e91968811eaa9c6e45a0ba79ea2bd
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

openshot: update mime database in FINAL not during build

commit ac229af540b6a9df010d0eff9b641f8a49835e90
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kdesdk4: prevent update_xdg_mimetypes

commit 697d02790de0b73008979e9ab9d49a6e56d45fdc
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kdepim4-runtime: prevent update_xdg_mimetypes

commit 3a4590eeb976d0bd4e2957545f6d364be7e54c0b
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kate: added PRE_BUILD to prevent update_xdg_mimetypes

commit 8470236bf3aa2069f78393672956f82fdc22151e
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

bluedevil: added PRE_BUILD to prevent update_xdg_mimetypes

diff --git a/kde4-apps/bluedevil/HISTORY b/kde4-apps/bluedevil/HISTORY
index de79fe1..a21df75 100644
--- a/kde4-apps/bluedevil/HISTORY
+++ b/kde4-apps/bluedevil/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Bor Kraljič <pyrobor AT ver.si>
+ * PRE_BUILD: added, prevent update_xdg_mimetypes
+
2011-09-13 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 1.2

diff --git a/kde4-apps/bluedevil/PRE_BUILD b/kde4-apps/bluedevil/PRE_BUILD
new file mode 100755
index 0000000..5fb1b3f
--- /dev/null
+++ b/kde4-apps/bluedevil/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit '/update_xdg_mimetypes/D' src/CMakeLists.txt
diff --git a/kde4/kate/HISTORY b/kde4/kate/HISTORY
index 28875c0..4eb2f31 100644
--- a/kde4/kate/HISTORY
+++ b/kde4/kate/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Bor Kraljič <pyrobor AT ver.si>
+ * PRE_BUILD: added, prevent update_xdg_mimetypes
+
2011-09-07 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 4.7.1

diff --git a/kde4/kate/PRE_BUILD b/kde4/kate/PRE_BUILD
new file mode 100755
index 0000000..9a1e568
--- /dev/null
+++ b/kde4/kate/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit '/update_xdg_mimetypes/D' kate/plugins/snippets_tng/CMakeLists.txt
diff --git a/kde4/kdepim4-runtime/HISTORY b/kde4/kdepim4-runtime/HISTORY
index 4c45424..099d0ac 100644
--- a/kde4/kdepim4-runtime/HISTORY
+++ b/kde4/kdepim4-runtime/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Bor Kraljič <pyrobor AT ver.si>
+ * PRE_BUILD: prevent update_xdg_mimetypes
+
2011-09-07 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 4.7.1

diff --git a/kde4/kdepim4-runtime/PRE_BUILD b/kde4/kdepim4-runtime/PRE_BUILD
index d0ea6d7..3d8fd07 100755
--- a/kde4/kdepim4-runtime/PRE_BUILD
+++ b/kde4/kdepim4-runtime/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+sed -i '/update_xdg_mimetypes/D' accountwizard/CMakeLists.txt &&
sed -i '/update_xdg_mimetypes/D' CMakeLists.txt
diff --git a/kde4/kdesdk4/HISTORY b/kde4/kdesdk4/HISTORY
index b205130..b21071b 100644
--- a/kde4/kdesdk4/HISTORY
+++ b/kde4/kdesdk4/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Bor Kraljič <pyrobor AT ver.si>
+ * PRE_BUILD: prevent update_xdg_mimetypes
+
2011-09-07 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 4.7.1

diff --git a/kde4/kdesdk4/PRE_BUILD b/kde4/kdesdk4/PRE_BUILD
index d3a6396..a282d74 100755
--- a/kde4/kdesdk4/PRE_BUILD
+++ b/kde4/kdesdk4/PRE_BUILD
@@ -1,6 +1,7 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

+sedit '/update_xdg_mimetypes/D' okteta/mimetypes/CMakeLists.txt &&
# fix compilation issue of 4.1.x version with apr-util
# see http://bugs.kde.org/show_bug.cgi?id=161005
if [ "$KDESDK_SUBVERSION" == "y" ]; then
diff --git a/video/openshot/FINAL b/video/openshot/FINAL
new file mode 100755
index 0000000..d931710
--- /dev/null
+++ b/video/openshot/FINAL
@@ -0,0 +1,3 @@
+update-mime-database /usr/share/mime/ &&
+update-desktop-database
+
diff --git a/video/openshot/HISTORY b/video/openshot/HISTORY
index 545126a..b32ad5c 100644
--- a/video/openshot/HISTORY
+++ b/video/openshot/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Bor Kraljič <pyrobor AT ver.si>
+ * FINAL,PRE_BUILD: update mime database in FINAL not during build
+
2011-02-27 Bor Kraljič <pyrobor AT ver.si>
* DEPENDS: request mlt with python bindings, pyxdg is also needed

diff --git a/video/openshot/PRE_BUILD b/video/openshot/PRE_BUILD
new file mode 100755
index 0000000..efd3267
--- /dev/null
+++ b/video/openshot/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit '/update-mime/D' setup.py



  • [SM-Commit] GIT changes to master grimoire by Bor Kraljič (6bc672f3829e91968811eaa9c6e45a0ba79ea2bd), Bor Kraljič, 09/22/2011

Archive powered by MHonArc 2.6.24.

Top of Page