Skip to Content.
Sympa Menu

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

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č (388bcf39c0699e36d5b13338110791be9afd79ad)
  • Date: Tue, 21 Sep 2010 09:52:30 -0500

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

kde4-apps/k3b4/HISTORY | 3 +++
kde4-apps/k3b4/PRE_BUILD | 3 +++
kde4-support/phonon/DEPENDS | 2 +-
kde4-support/phonon/HISTORY | 4 ++++
kde4-support/phonon/INSTALL | 2 ++
kde4/kdebase4-runtime/HISTORY | 3 +++
kde4/kdebase4-runtime/PRE_BUILD | 3 +++
kde4/kdegames4/HISTORY | 3 +++
kde4/kdegames4/PRE_BUILD | 3 +++
kde4/kdegraphics4/HISTORY | 3 +++
kde4/kdegraphics4/INSTALL | 4 ++++
kde4/kdelibs4/DEPENDS | 2 +-
kde4/kdelibs4/HISTORY | 4 ++++
kde4/kdelibs4/PRE_BUILD | 4 +---
kde4/kdesdk4/HISTORY | 3 +++
kde4/kdesdk4/PRE_BUILD | 1 +
kde4/kdeutils4/HISTORY | 3 +++
kde4/kdeutils4/PRE_BUILD | 3 +++
kde4/kdevelop4/HISTORY | 3 +++
kde4/kdevelop4/PRE_BUILD | 3 +++
x11-toolkits/qt4/BUILD | 1 +
x11-toolkits/qt4/CONFIGURE | 5 +++++
x11-toolkits/qt4/DEPENDS | 5 ++++-
x11-toolkits/qt4/HISTORY | 6 ++++++
x11-toolkits/qt4/PRE_SUB_DEPENDS | 2 ++
x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS | 2 ++
x11-toolkits/qt4/SUB_DEPENDS | 10 ++++++++++
27 files changed, 84 insertions(+), 6 deletions(-)

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

kdelibs4: xz-utils -> LZMA

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

kdevelop4: added, prevent update_xdg_mimetypes (fixes bug #14918)

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

kdeutils4: added, prevent update_xdg_mimetypes (fixes bug #14918)

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

kdesdk4: changed, prevent update_xdg_mimetypes (fixes bug #14918)

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

kdegames4: added, prevent update_xdg_mimetypes (fixes bug #14918)

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

kdebase4-runtime: added, prevent update_xdg_mimetypes (fixes bug #14918)

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

k3b4: added, prevent update_xdg_mimetypes (fixes bug #14918)

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

kdelibs4: removed hack to search for phonon in /opt/kde4

Now phonon install pc file in right place so that hack is not needed
anymore.

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

kdegraphics4: added, create symlink to pc files in /usr/lib/pkgconfig

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

phonon: added, create link to pc file in /usr/lib/pkgconfig

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

qt4: only ask about GStreamer support if phonon is build too

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

qt4: added $QT_PHONON to $OPTS

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

phonon: depends on qt4 without phonon

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

qt4: added option PHONON and NO_PHONON

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

qt4: added query to build phonon or not

diff --git a/kde4-apps/k3b4/HISTORY b/kde4-apps/k3b4/HISTORY
index 7f1acec..870d998 100644
--- a/kde4-apps/k3b4/HISTORY
+++ b/kde4-apps/k3b4/HISTORY
@@ -1,3 +1,6 @@
+2010-09-18 Bor Kraljič <pyrobor AT ver.si>
+ * PRE_BUILD: added, prevent update_xdg_mimetypes (fixes bug #14918)
+
2010-08-17 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 2.0.1

diff --git a/kde4-apps/k3b4/PRE_BUILD b/kde4-apps/k3b4/PRE_BUILD
new file mode 100755
index 0000000..a2d2a57
--- /dev/null
+++ b/kde4-apps/k3b4/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit '/update_xdg_mimetypes/D' src/CMakeLists.txt
diff --git a/kde4-support/phonon/DEPENDS b/kde4-support/phonon/DEPENDS
index bcdd73c..b01db38 100755
--- a/kde4-support/phonon/DEPENDS
+++ b/kde4-support/phonon/DEPENDS
@@ -5,7 +5,7 @@ depends cmake &&
depends automoc &&
depends g++ &&

-depends -sub DBUS qt4 &&
+depends -sub "DBUS NO_PHONON" qt4 &&
depends libx11 &&
depends libice &&
depends libxext &&
diff --git a/kde4-support/phonon/HISTORY b/kde4-support/phonon/HISTORY
index 529ca07..bd09797 100644
--- a/kde4-support/phonon/HISTORY
+++ b/kde4-support/phonon/HISTORY
@@ -1,3 +1,7 @@
+2010-09-18 Bor Kraljič <pyrobor AT ver.si>
+ * INSTALL: added, create link to pc file in /usr/lib/pkgconfig
+ * DEPENDS: depends on qt4 without phonon
+
2010-09-01 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: Fixed SOURCE & updated spell to 4.4.2

diff --git a/kde4-support/phonon/INSTALL b/kde4-support/phonon/INSTALL
new file mode 100755
index 0000000..719a7cf
--- /dev/null
+++ b/kde4-support/phonon/INSTALL
@@ -0,0 +1,2 @@
+default_install &&
+ln -sf ${INSTALL_ROOT}/opt/kde4/lib/pkgconfig/phonon.pc
${INSTALL_ROOT}/usr/lib/pkgconfig/
diff --git a/kde4/kdebase4-runtime/HISTORY b/kde4/kdebase4-runtime/HISTORY
index a3f8b10..7967710 100644
--- a/kde4/kdebase4-runtime/HISTORY
+++ b/kde4/kdebase4-runtime/HISTORY
@@ -1,3 +1,6 @@
+2010-09-18 Bor Kraljič <pyrobor AT ver.si>
+ * PRE_BUILD: added, prevent update_xdg_mimetypes (fixes bug #14918)
+
2010-08-31 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 4.5.1

diff --git a/kde4/kdebase4-runtime/PRE_BUILD b/kde4/kdebase4-runtime/PRE_BUILD
new file mode 100755
index 0000000..4f687d3
--- /dev/null
+++ b/kde4/kdebase4-runtime/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit '/update_xdg_mimetypes/D' kioslave/network/mimetypes/CMakeLists.txt
diff --git a/kde4/kdegames4/HISTORY b/kde4/kdegames4/HISTORY
index 471d189..f619189 100644
--- a/kde4/kdegames4/HISTORY
+++ b/kde4/kdegames4/HISTORY
@@ -1,3 +1,6 @@
+2010-09-18 Bor Kraljič <pyrobor AT ver.si>
+ * PRE_BUILD: added, prevent update_xdg_mimetypes (fixes bug #14918)
+
2010-08-31 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 4.5.1

diff --git a/kde4/kdegames4/PRE_BUILD b/kde4/kdegames4/PRE_BUILD
new file mode 100755
index 0000000..a00c0be
--- /dev/null
+++ b/kde4/kdegames4/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit '/update_xdg_mimetypes/D' palapeli/mime/CMakeLists.txt
diff --git a/kde4/kdegraphics4/HISTORY b/kde4/kdegraphics4/HISTORY
index 88929a0..78c4ea6 100644
--- a/kde4/kdegraphics4/HISTORY
+++ b/kde4/kdegraphics4/HISTORY
@@ -1,3 +1,6 @@
+2010-09-18 Bor Kraljič <pyrobor AT ver.si>
+ * INSTALL: added, create symlink to pc files in /usr/lib/pkgconfig
+
2010-08-31 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 4.5.1

diff --git a/kde4/kdegraphics4/INSTALL b/kde4/kdegraphics4/INSTALL
new file mode 100755
index 0000000..b935451
--- /dev/null
+++ b/kde4/kdegraphics4/INSTALL
@@ -0,0 +1,4 @@
+default_install &&
+for pcfile in libkdcraw.pc libkexiv2.pc libkipi.pc libksane.pc; do
+ ln -sf $INSTALL_ROOT/opt/kde4/lib/pkgconfig/$pcfile
$INSTALL_ROOT/usr/lib/pkgconfig/
+done
diff --git a/kde4/kdelibs4/DEPENDS b/kde4/kdelibs4/DEPENDS
index bede7a6..4153d8e 100755
--- a/kde4/kdelibs4/DEPENDS
+++ b/kde4/kdelibs4/DEPENDS
@@ -23,4 +23,4 @@ optional_depends python '' '' 'kross scripting
support' &&
optional_depends libmng '' '' 'for animated PNG' &&
optional_depends jasper '' '' 'jpeg 2000 support' &&
optional_depends openexr '' '' 'high dynamic-range images' &&
-optional_depends xz-utils '' '' 'very high compression utility'
+optional_depends LZMA '' '' 'very high compression utility'
diff --git a/kde4/kdelibs4/HISTORY b/kde4/kdelibs4/HISTORY
index a6e6ff3..d1adf98 100644
--- a/kde4/kdelibs4/HISTORY
+++ b/kde4/kdelibs4/HISTORY
@@ -1,3 +1,7 @@
+2010-09-18 Bor Kraljič <pyrobor AT ver.si>
+ * PRE_BUILD: removed that hack. It is not needed anymore
+ * DEPENDS: xz-utils -> LZMA
+
2010-09-01 Bor Kraljič <pyrobor AT ver.si>
* PRE_BUILD: removed lines to apply patch
added hack to search for phonon in /opt/kde4 first
diff --git a/kde4/kdelibs4/PRE_BUILD b/kde4/kdelibs4/PRE_BUILD
index 0524c09..0dcce2d 100755
--- a/kde4/kdelibs4/PRE_BUILD
+++ b/kde4/kdelibs4/PRE_BUILD
@@ -1,5 +1,3 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-sed -i '/update_xdg_mimetypes/D' mimetypes/CMakeLists.txt &&
-sedit "s:\${KDE4_LIB_INSTALL_DIR}:$INSTALL_ROOT/opt/kde4/lib
\${KDE4_LIB_INSTALL_DIR}:" cmake/modules/FindPhonon.cmake &&
-sedit "s:\${KDE4_INCLUDE_INSTALL_DIR}:$INSTALL_ROOT/opt/kde4/include
\${KDE4_INCLUDE_INSTALL_DIR}:" cmake/modules/FindPhonon.cmake
+sed -i '/update_xdg_mimetypes/D' mimetypes/CMakeLists.txt
diff --git a/kde4/kdesdk4/HISTORY b/kde4/kdesdk4/HISTORY
index 97e03c2..1ec8b09 100644
--- a/kde4/kdesdk4/HISTORY
+++ b/kde4/kdesdk4/HISTORY
@@ -1,3 +1,6 @@
+2010-09-18 Bor Kraljič <pyrobor AT ver.si>
+ * PRE_BUILD: changed, prevent update_xdg_mimetypes (fixes bug #14918)
+
2010-09-01 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 4.5.1

diff --git a/kde4/kdesdk4/PRE_BUILD b/kde4/kdesdk4/PRE_BUILD
index d3a6396..ad7a21a 100755
--- a/kde4/kdesdk4/PRE_BUILD
+++ b/kde4/kdesdk4/PRE_BUILD
@@ -1,5 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+sedit '/update_xdg_mimetypes/D' kate/plugins/snippets_tng/CMakeLists.txt

# fix compilation issue of 4.1.x version with apr-util
# see http://bugs.kde.org/show_bug.cgi?id=161005
diff --git a/kde4/kdeutils4/HISTORY b/kde4/kdeutils4/HISTORY
index e2c2c88..9137f3d 100644
--- a/kde4/kdeutils4/HISTORY
+++ b/kde4/kdeutils4/HISTORY
@@ -1,3 +1,6 @@
+2010-09-18 Bor Kraljič <pyrobor AT ver.si>
+ * PRE_BUILD: added, prevent update_xdg_mimetypes (fixes bug #14918)
+
2010-08-31 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 4.5.1

diff --git a/kde4/kdeutils4/PRE_BUILD b/kde4/kdeutils4/PRE_BUILD
new file mode 100755
index 0000000..6aa97d4
--- /dev/null
+++ b/kde4/kdeutils4/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit '/update_xdg_mimetypes/D' okteta/mimetypes/CMakeLists.txt
diff --git a/kde4/kdevelop4/HISTORY b/kde4/kdevelop4/HISTORY
index 644077a..d783bc6 100644
--- a/kde4/kdevelop4/HISTORY
+++ b/kde4/kdevelop4/HISTORY
@@ -1,3 +1,6 @@
+2010-09-18 Bor Kraljič <pyrobor AT ver.si>
+ * PRE_BUILD: added, prevent update_xdg_mimetypes (fixes bug #14918)
+
2010-09-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 4.0.1

diff --git a/kde4/kdevelop4/PRE_BUILD b/kde4/kdevelop4/PRE_BUILD
new file mode 100755
index 0000000..9f3efd4
--- /dev/null
+++ b/kde4/kdevelop4/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit '/update_xdg_mimetypes/D' app/CMakeLists.txt
diff --git a/x11-toolkits/qt4/BUILD b/x11-toolkits/qt4/BUILD
index 582c63c..b73f9dc 100755
--- a/x11-toolkits/qt4/BUILD
+++ b/x11-toolkits/qt4/BUILD
@@ -20,6 +20,7 @@ OPTS="$QT_DEBUG \
$QT_MEDIA \
$QT_GTK \
$QT_ACCESS \
+ $QT_PHONON \
$OPTS" &&

./configure -opensource -confirm-license
\
diff --git a/x11-toolkits/qt4/CONFIGURE b/x11-toolkits/qt4/CONFIGURE
index bdaf1ed..bdacf68 100755
--- a/x11-toolkits/qt4/CONFIGURE
+++ b/x11-toolkits/qt4/CONFIGURE
@@ -55,10 +55,15 @@ config_query_option QT_WEBKIT 'Build the WebKit
module?' y \
config_query_option QT_MEDIA 'Build Multimedia support?' y \
'-multimedia' \
'-no-multimedia' &&
+
config_query_option QT_GTK 'Build the GTK theme integration?' y \
'-gtkstyle' \
'-no-gtkstyle' &&

+config_query_option QT_PHONON 'Buiild phonon backend?' n \
+ '-phonon -phonon-backend' \
+ '-no-phonon -no-phonon-backend' &&
+
config_query_option QT_ACCESS 'Compile Accessibility support' n \
'-accessibility' \
'-no-accessibility'
diff --git a/x11-toolkits/qt4/DEPENDS b/x11-toolkits/qt4/DEPENDS
index 941f33c..55f5e21 100755
--- a/x11-toolkits/qt4/DEPENDS
+++ b/x11-toolkits/qt4/DEPENDS
@@ -78,10 +78,13 @@ optional_depends glib2 \
'-no-glib' \
'glib support' &&

+# qt4 only compiles with gstreamer if there phonon build too
+if [[ $QT_PHONON == "-phonon -phonon-backend" ]]; then
optional_depends gst-plugins-base \
'-gstreamer' \
'-no-gstreamer' \
- 'video streaming' &&
+ 'video streaming'
+fi &&

optional_depends nas \
'-system-nas-sound' \
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 7037131..ae22b19 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,9 @@
+2010-09-18 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: only ask about GStreamer support if phonon is build too
+ * BUILD: added $QT_PHONON to $OPTS
+ * {,PRE_,REPAIR^all^PRE_}SUB_DEPENDS: added option PHONON and
NO_PHONON
+ * CONFIGURE: added query to build phonon or not
+
2010-09-13 Bor Kraljič <pyrobor AT ver.si>
* {,PRE_,REPAIR^all^PRE_}SUB_DEPENDS: added option EXCEPT
needed to fix bug #15551
diff --git a/x11-toolkits/qt4/PRE_SUB_DEPENDS
b/x11-toolkits/qt4/PRE_SUB_DEPENDS
index 639e358..63cdd62 100755
--- a/x11-toolkits/qt4/PRE_SUB_DEPENDS
+++ b/x11-toolkits/qt4/PRE_SUB_DEPENDS
@@ -14,6 +14,8 @@ case $THIS_SUB_DEPENDS in
MEDIA) [[ $QT_MEDIA == "-multimedia" ]] && return 0;;
GTK ) [[ $QT_GTK == "-gtkstyle" ]] && return 0;;
EXCEPT) [[ $QT_EXCEPT == "-exceptions" ]] && return 0;;
+ PHONON) [[ $QT_PHONON == "-phonon -phonon-backend" ]] && return 0;;
+ NO_PHONON) [[ $QT_PHONON == "-no-phonon -no-phonon-backend" ]] && return
0;;
*) echo "Eek, unknown subdependency requested!"; return 1;;
esac
return 1
diff --git a/x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS
b/x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS
index 639e358..63cdd62 100755
--- a/x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS
+++ b/x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS
@@ -14,6 +14,8 @@ case $THIS_SUB_DEPENDS in
MEDIA) [[ $QT_MEDIA == "-multimedia" ]] && return 0;;
GTK ) [[ $QT_GTK == "-gtkstyle" ]] && return 0;;
EXCEPT) [[ $QT_EXCEPT == "-exceptions" ]] && return 0;;
+ PHONON) [[ $QT_PHONON == "-phonon -phonon-backend" ]] && return 0;;
+ NO_PHONON) [[ $QT_PHONON == "-no-phonon -no-phonon-backend" ]] && return
0;;
*) echo "Eek, unknown subdependency requested!"; return 1;;
esac
return 1
diff --git a/x11-toolkits/qt4/SUB_DEPENDS b/x11-toolkits/qt4/SUB_DEPENDS
index f36d044..3b1b54c 100755
--- a/x11-toolkits/qt4/SUB_DEPENDS
+++ b/x11-toolkits/qt4/SUB_DEPENDS
@@ -68,6 +68,16 @@ EXCEPT) if [[ $QT_EXCEPT == "-no-exceptions" ]]; then
QT_EXCEPT="-exceptions"
fi
;;
+PHONON) if [[ $QT_PHONON == "-no-phonon -no-phonon-backend" ]]; then
+ echo "Phonon backend requested, forcing build."
+ QT_PHONON="-phonon -phonon-backend"
+ fi
+ ;;
+NO_PHONON) if [[ $QT_PHONON == "-phonon -phonon-backend" ]]; then
+ echo "Without phonon requested, forcing build."
+ QT_PHONON="-no-phonon -no-phonon-backend"
+ fi
+ ;;

*) echo unknown sub-depends!!! ; return 1 ;;
esac



  • [SM-Commit] GIT changes to master grimoire by Bor Kraljič (388bcf39c0699e36d5b13338110791be9afd79ad), Bor Kraljič, 09/21/2010

Archive powered by MHonArc 2.6.24.

Top of Page