Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (55642f55b7df1eec5a37816d220990cd9f33b368)

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 devel-kde47 grimoire by Bor Kraljič (55642f55b7df1eec5a37816d220990cd9f33b368)
  • Date: Fri, 19 Aug 2011 10:42:55 -0500

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

audio-creation/gtkpod/DEPENDS | 20 +++++++-------
audio-creation/gtkpod/HISTORY | 3 ++
audio-libs/taglib-extras/DEPENDS | 4 ++
audio-libs/taglib-extras/HISTORY | 3 ++
crypto/libassuan/DEPENDS | 3 --
crypto/libassuan/HISTORY | 3 ++
database/sqlite/BUILD | 15 ++++++----
database/sqlite/DEPENDS | 2 -
database/sqlite/HISTORY | 5 +++
http/nginx/BUILD | 7 +++++
http/nginx/DETAILS | 17 ++++++++++++
http/nginx/HISTORY | 3 ++
http/nginx/PREPARE | 9 +++++-
http/nginx/PRE_BUILD | 7 +++++
kde4-apps/amarok2/DEPENDS | 1
kde4-apps/amarok2/HISTORY | 3 ++
kde4-apps/digikam4/DEPENDS | 1
kde4-apps/digikam4/HISTORY | 3 ++
kde4-apps/kipi-plugins4/DEPENDS | 1
kde4-apps/kipi-plugins4/HISTORY | 3 ++
kde4-support/libdbusmenu-qt/DEPENDS | 3 +-
kde4-support/libdbusmenu-qt/HISTORY | 3 ++
kde4/kdevplatform4/DEPENDS | 1
kde4/kdevplatform4/HISTORY | 3 ++
libs/libusb/BUILD | 4 --
libs/libusb/CONFIGURE | 13 ---------
libs/libusb/HISTORY | 3 ++
libs/sdl_mixer/CONFIGURE | 2 -
libs/sdl_mixer/DEPENDS | 7 -----
libs/sdl_mixer/HISTORY | 5 +++
libs/sdl_mixer/PRE_SUB_DEPENDS | 4 --
libs/sdl_mixer/SUB_DEPENDS | 6 ----
libs/tbb/CONFLICTS | 1
libs/tbb/HISTORY | 3 ++
science/qalculate/BUILD | 1
science/qalculate/HISTORY | 3 ++
smgl/linux-initramfs/DETAILS | 2 -
smgl/linux-initramfs/HISTORY | 4 ++
smgl/linux-initramfs/installkernel | 4 ++
smgl/linux-initramfs/mkinitrd | 2 -
utils/bluez/CONFIGURE | 4 +-
utils/bluez/DEPENDS | 8 ++---
utils/bluez/DETAILS | 2 -
utils/bluez/HISTORY | 4 ++
video/vlc/BUILD | 5 ---
video/vlc/CONFIGURE | 1
video/vlc/DEPENDS | 42
+++++++++++++++++-------------
video/vlc/HISTORY | 3 ++
xorg-data/xkeyboard-config/BUILD | 2 -
xorg-data/xkeyboard-config/HISTORY | 3 ++
xorg-driver/xf86-input-keyboard/BUILD | 3 --
xorg-driver/xf86-input-keyboard/CONFIGURE | 5 ---
xorg-driver/xf86-input-keyboard/HISTORY | 3 ++
53 files changed, 175 insertions(+), 97 deletions(-)

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

kdevplatform4: added qjson as optional dependency

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

libdbusmenu-qt: added optional dependency on qjson

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

kipi-plugins4: added qjson as optional dependency

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

digikam4: added qjson as optional dependency

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

amarok2: added optional dependency on qjson

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

sdl_mixer: removed {PRE,}SUB_DEPENDS, no longer available

commit ebc2a168620aefd021271e5fd04312aeecd81dda
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

nginx: added modules framework (modules added: push, auth_ldap)

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

xkeyboard-config: commented unrecognized option (issue #30)

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

gtkpod: fixed unrecognized options (issue #30)

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

xf86-input-keyboard: removed BUILD and CONFIGURE, it only contained
unrecognized options (issue #30)

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

libassuan: removed unrecognized options (issue #30)

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

bluez: fixed unrecognized options (issue #30)

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

bluez: updated spell to 4.96

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

libusb: removed BUILD and CONFIGURE, it only contained unrecognized
options (issue #30)

commit bc62b398e6767b529dca0ed9687b6dbb93df419a
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

taglib-extras: subversion is not needed to cast stable version of the
spell

commit a227ffd27cab646519df37da5aff79188e8dbfb3
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

sqlite: post-update corrections

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

vlc: fixed unrecognized options, part 2 (issue #30)

removed --enable-joystick

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

vlc: fixed unrecognized options (issue #30)

commit 02d47e7f96a85335c9012297a8034cc733a839fa
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

linux-initramfs: updated version to 0.6
added support for kernel 3.x in mkinitrd and installkernel scripts

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

tbb: conflict with self to avoid failure during INSTALL (fixes #46)

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

sdl_mixer: removing optional depenency on libmikmod

option --{disable,enable}-music-libmikmod is no longer available (bug #30)

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

qalculate: removed "--disable-clntest" (unrecognized option)

diff --git a/audio-creation/gtkpod/DEPENDS b/audio-creation/gtkpod/DEPENDS
index 28086cc..cdd10bf 100755
--- a/audio-creation/gtkpod/DEPENDS
+++ b/audio-creation/gtkpod/DEPENDS
@@ -13,19 +13,19 @@ optional_depends "curl" \
"--without-curl" \
"Coverart download support" &&

-optional_depends "gnome-vfs2" \
- "--with-gnome-vfs" \
- "--without-gnome-vfs" \
- "VFS device autodetection support" &&
+#optional_depends "gnome-vfs2" \
+# "--with-gnome-vfs" \
+# "--without-gnome-vfs" \
+# "VFS device autodetection support" &&

-optional_depends "hal" \
- "--with-hal" \
- "--without-hal" \
- "HAL device autodetection support" &&
+#optional_depends "hal" \
+# "--with-hal" \
+# "--without-hal" \
+# "HAL device autodetection support" &&

optional_depends "mp4v2" \
- "--with-mp4v2" \
- "--without-mp4v2" \
+ "" \
+ "" \
"MP4/AAC support" &&

optional_depends "libvorbis" \
diff --git a/audio-creation/gtkpod/HISTORY b/audio-creation/gtkpod/HISTORY
index fffa2bf..8f9aa60 100644
--- a/audio-creation/gtkpod/HISTORY
+++ b/audio-creation/gtkpod/HISTORY
@@ -1,3 +1,6 @@
+2011-08-19 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: fixed unrecognized options (issue #30)
+
2010-10-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.0

diff --git a/audio-libs/taglib-extras/DEPENDS
b/audio-libs/taglib-extras/DEPENDS
index e301dda..a91cf93 100755
--- a/audio-libs/taglib-extras/DEPENDS
+++ b/audio-libs/taglib-extras/DEPENDS
@@ -1,6 +1,8 @@
depends cmake &&
-depends subversion &&
depends taglib &&
+if [[ -n $TAGLIB_EXTRAS_SVN && $TAGLIB_EXTRAS_SVN == "y" ]]; then
+ depends subversion
+fi &&

optional_depends kdelibs4 \
'-DWITH_KDE=ON' \
diff --git a/audio-libs/taglib-extras/HISTORY
b/audio-libs/taglib-extras/HISTORY
index 142b44c..522ecb6 100644
--- a/audio-libs/taglib-extras/HISTORY
+++ b/audio-libs/taglib-extras/HISTORY
@@ -1,3 +1,6 @@
+2011-08-19 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DEPENDS: subversion is not needed to cast stable version of the
spell
+
2011-01-16 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: added WEB_SITE

diff --git a/crypto/libassuan/DEPENDS b/crypto/libassuan/DEPENDS
index 0046093..e4156b1 100755
--- a/crypto/libassuan/DEPENDS
+++ b/crypto/libassuan/DEPENDS
@@ -1,2 +1 @@
-depends texinfo &&
-optional_depends pth '--with-pth-prefix=/usr' '--without-pth' 'Enable pth
support?'
+depends texinfo
diff --git a/crypto/libassuan/HISTORY b/crypto/libassuan/HISTORY
index 5f28765..5eda039 100644
--- a/crypto/libassuan/HISTORY
+++ b/crypto/libassuan/HISTORY
@@ -1,3 +1,6 @@
+2011-08-19 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: removed unrecognized options (issue #30)
+
2011-06-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0.2

diff --git a/database/sqlite/BUILD b/database/sqlite/BUILD
index 323ab53..14e996a 100755
--- a/database/sqlite/BUILD
+++ b/database/sqlite/BUILD
@@ -12,15 +12,18 @@ fi &&

LDFLAGS="-ldl $LDFLAGS" &&
CFLAGS="${CFLAGS//-ffast-math}" &&
-OPTS="$SQLITE_TSAFE $OPTS" &&
-
-if [[ $SQLITE_VERSION != tea ]]; then
- OPTS="--enable-dynamic-extensions $OPTS"
-fi &&
+OPTS="--enable-dynamic-extensions $SQLITE_TSAFE $OPTS" &&

default_build &&

-if [[ $SQLITE_VERSION = tea ]]; then
+if [[ $SQLITE_VERSION == tea ]]; then
+ # reset options to these
+ OPTS="--with-tcl=$INSTALL_ROOT/usr/lib" &&
+
+ if list_find "$SQLITE_TSAFE" "--enable-threadsafe"; then
+ OPTS="--enable-threads $OPTS"
+ fi &&
+
cd tea &&
default_build
fi
diff --git a/database/sqlite/DEPENDS b/database/sqlite/DEPENDS
index d73aa45..0c6207f 100755
--- a/database/sqlite/DEPENDS
+++ b/database/sqlite/DEPENDS
@@ -1,7 +1,7 @@
depends -sub CXX gcc &&

if [[ $SQLITE_VERSION == tea ]]; then
- depends tcl "--enable-tcl"
+ depends tcl
fi &&

optional_depends readline \
diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index fe25c3f..6235138 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,8 @@
+2011-08-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: always enable dynamic extensions for sqlite binary (tea
library
+ is built for its own); corrected configure flags for tea version
+ * DEPENDS: tcl flag isn't required anymore
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/http/nginx/BUILD b/http/nginx/BUILD
index 15c6438..659a988 100755
--- a/http/nginx/BUILD
+++ b/http/nginx/BUILD
@@ -5,6 +5,13 @@ create_account nginx &&
persistent_add TEMP_DIR &&
local TEMP_DIR="$INSTALL_ROOT/var/spool/nginx" &&

+if list_find "$NGINX_MODULES" "push"; then
+ OPTS="--add-module=$SOURCE_DIRECTORY3 $OPTS"
+fi &&
+if list_find "$NGINX_MODULES" "auth_ldap"; then
+ OPTS="--add-module=$SOURCE_DIRECTORY4 $OPTS"
+fi &&
+
if [[ $NGINX_SYSLOG == n ]]; then
OPTS="--http-log-path=$INSTALL_ROOT/var/log/nginx/access.log \
--error-log-path=$INSTALL_ROOT/var/log/nginx/error.log \
diff --git a/http/nginx/DETAILS b/http/nginx/DETAILS
index fd494ef..87332ee 100755
--- a/http/nginx/DETAILS
+++ b/http/nginx/DETAILS
@@ -26,6 +26,23 @@ esac
SOURCE_GPG=sysoev.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+
+# optional modules
+if list_find "$NGINX_MODULES" "push"; then
+ ID_PUSH=nginx_http_push_module-0.692
+ SOURCE3=${ID_PUSH}.tar.gz
+ SOURCE3_URL[0]=http://pushmodule.slact.net/downloads/$SOURCE3
+
SOURCE3_HASH=sha512:79821cacf5db4b1309e3f1c8d6980f83b1093dd3f291db5298bfdeb0d889fc0629625dcf3135d1cf7554b43308ef7172a4f40596928ab3069426801177ed3c1c
+SOURCE_DIRECTORY3="$SOURCE_DIRECTORY/${ID_PUSH}"
+fi
+if list_find "$NGINX_MODULES" "auth_ldap"; then
+ ID_AUTH_LDAP=ngx_http_auth_ldap_module-1.0-a3
+ SOURCE4=${ID_AUTH_LDAP}.tar.gz
+ SOURCE4_URL[0]=http://nginx-auth-ldap.googlecode.com/files/$SOURCE4
+
SOURCE4_HASH=sha512:01629d1a002088da0fd3beb6fa73448a5e5f87838320253bb33f5a44292deca7b7ef9c185a7749a11f564a51cfbe7339b398012ec7a49f4973061702c0cae4c1
+SOURCE_DIRECTORY4="$SOURCE_DIRECTORY/${ID_AUTH_LDAP}"
+fi
+
WEB_SITE=http://nginx.org/
LICENSE[0]=BSD
ENTERED=20090203
diff --git a/http/nginx/HISTORY b/http/nginx/HISTORY
index 974e541..ecb35ac 100644
--- a/http/nginx/HISTORY
+++ b/http/nginx/HISTORY
@@ -1,3 +1,6 @@
+2011-08-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, {{PRE_,}BUILD,PREPARE}: added modules framework
+
2011-08-11 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.0.5 (stable), 0.8.54 (legacy), 0.7.69
(old), 1.1.0 (devel); renewed source urls
diff --git a/http/nginx/PREPARE b/http/nginx/PREPARE
index 5b30791..e2c5dfb 100755
--- a/http/nginx/PREPARE
+++ b/http/nginx/PREPARE
@@ -1,5 +1,12 @@
+. "$GRIMOIRE/config_query_multi.function" &&
+
config_query_list NGINX_RELEASE "Select which release to build:" \
stable \
legacy \
old \
- devel
+ devel &&
+
+config_query_multi NGINX_MODULES "What additional modules to build?" \
+ none \
+ push \
+ auth_ldap
diff --git a/http/nginx/PRE_BUILD b/http/nginx/PRE_BUILD
index d46cfa0..506db43 100755
--- a/http/nginx/PRE_BUILD
+++ b/http/nginx/PRE_BUILD
@@ -11,4 +11,11 @@ if [[ $NGINX_SYSLOG == y ]]; then
cp "$SPELL_DIRECTORY/syslog-0.8-1.0.config" syslog/config &&
patch -p1 < "$SPELL_DIRECTORY/syslog-0.8-1.0.patch"
fi
+fi &&
+
+if list_find "$NGINX_MODULES" "push"; then
+ unpack_file 3
+fi &&
+if list_find "$NGINX_MODULES" "auth_ldap"; then
+ unpack_file 4
fi
diff --git a/kde4-apps/amarok2/DEPENDS b/kde4-apps/amarok2/DEPENDS
index 847e585..ee892f4 100755
--- a/kde4-apps/amarok2/DEPENDS
+++ b/kde4-apps/amarok2/DEPENDS
@@ -7,6 +7,7 @@ depends taglib-extras &&
depends -sub STL qt4 &&
depends -sub EMBEDDED MYSQL &&
depends qtscriptgenerator &&
+optional_depends qjsone "" "" &&
optional_depends faac '' '' 'for M4A/AAC/MP4 tag support' &&
optional_depends libvisual '' '' 'to use libvisual plugins' &&
optional_depends gstreamer '' '' 'GStreamer support' &&
diff --git a/kde4-apps/amarok2/HISTORY b/kde4-apps/amarok2/HISTORY
index df794f0..d39759e 100644
--- a/kde4-apps/amarok2/HISTORY
+++ b/kde4-apps/amarok2/HISTORY
@@ -1,3 +1,6 @@
+2011-08-19 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: added optional dependency on qjson
+
2011-08-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 2.4.3
* qtscriptgenerator.patch: removed, no longer needed
diff --git a/kde4-apps/digikam4/DEPENDS b/kde4-apps/digikam4/DEPENDS
index 390b8c3..1ad6091 100755
--- a/kde4-apps/digikam4/DEPENDS
+++ b/kde4-apps/digikam4/DEPENDS
@@ -9,6 +9,7 @@ depends kipi-plugins4 &&
depends jasper &&
depends JPEG &&

+optional_depends qjson "" "" &&
optional_depends kdepimlibs4 '' '' 'PIM support' &&
optional_depends lensfun \
'-DWITH_LensFun=ON' \
diff --git a/kde4-apps/digikam4/HISTORY b/kde4-apps/digikam4/HISTORY
index cf0a70b..be55c97 100644
--- a/kde4-apps/digikam4/HISTORY
+++ b/kde4-apps/digikam4/HISTORY
@@ -1,3 +1,6 @@
+2011-08-19 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: added qjson as optional dependency
+
2011-08-16 Bor Kraljič <pyrobor AT ver.si>
* DEPENDS: kdegraphics4 -> libkdcraw4,libkexiv24,libkipi4

diff --git a/kde4-apps/kipi-plugins4/DEPENDS b/kde4-apps/kipi-plugins4/DEPENDS
index a4b19bc..5312ddf 100755
--- a/kde4-apps/kipi-plugins4/DEPENDS
+++ b/kde4-apps/kipi-plugins4/DEPENDS
@@ -3,6 +3,7 @@ depends JPEG &&
depends libkipi4 &&
depends libkdcraw4 &&
depends libkexiv24 &&
+optional_depends qjson "" "" &&
optional_depends libxslt "" "" "for HtmlExport plugin" &&
optional_depends libgphoto2 "" "" "for kameraklient plugin" &&
optional_depends libgpod "" "" "for iPod Export support" &&
diff --git a/kde4-apps/kipi-plugins4/HISTORY b/kde4-apps/kipi-plugins4/HISTORY
index 3118e3d..0f3ff03 100644
--- a/kde4-apps/kipi-plugins4/HISTORY
+++ b/kde4-apps/kipi-plugins4/HISTORY
@@ -1,3 +1,6 @@
+2011-08-19 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: added qjson as optional dependency
+
2011-08-16 Bor Kraljič <pyrobor AT ver.si>
* DEPENDS: kdegraphics4 -> libkipi4,libkdcraw4,libkexiv24

diff --git a/kde4-support/libdbusmenu-qt/DEPENDS
b/kde4-support/libdbusmenu-qt/DEPENDS
index 42b56fc..a1d545b 100755
--- a/kde4-support/libdbusmenu-qt/DEPENDS
+++ b/kde4-support/libdbusmenu-qt/DEPENDS
@@ -1,4 +1,5 @@
depends cmake &&
depends -sub CXX gcc &&
-optional_depends doxygen "-DWITH_DOC=ON" "-DWITH_DOC=OFF" &&
+optional_depends qjson "" "" &&
+optional_depends doxygen "-DWITH_DOC=ON" "-DWITH_DOC=OFF" "for installing
docs" &&
depends -sub DBUS qt4
diff --git a/kde4-support/libdbusmenu-qt/HISTORY
b/kde4-support/libdbusmenu-qt/HISTORY
index c06d34f..d306d35 100644
--- a/kde4-support/libdbusmenu-qt/HISTORY
+++ b/kde4-support/libdbusmenu-qt/HISTORY
@@ -1,3 +1,6 @@
+2011-08-19 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: added optional dependency on qjson
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/kde4/kdevplatform4/DEPENDS b/kde4/kdevplatform4/DEPENDS
index 0db596c..5ef2950 100755
--- a/kde4/kdevplatform4/DEPENDS
+++ b/kde4/kdevplatform4/DEPENDS
@@ -2,4 +2,5 @@ source $SECTION_DIRECTORY/KDE_DEPENDS &&
optional_depends subversion '' '' 'Subversion support' &&
optional_depends rapidsvn '' '' 'subversion support' &&
optional_depends -sub 'THREAD SERIALIZATION' boost '' '' 'Teamwork plugin'
&&
+optional_depends qjson "" "" "for Uploading Patches to
reviewboard" &&
optional_depends commoncpp2 '' '' 'Teamwork plugin'
diff --git a/kde4/kdevplatform4/HISTORY b/kde4/kdevplatform4/HISTORY
index 861a605..eefee85 100644
--- a/kde4/kdevplatform4/HISTORY
+++ b/kde4/kdevplatform4/HISTORY
@@ -1,3 +1,6 @@
+2011-08-19 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: added qjson as optional dependency
+
2011-04-06 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 1.2.2

diff --git a/libs/libusb/BUILD b/libs/libusb/BUILD
deleted file mode 100755
index 3923fbb..0000000
--- a/libs/libusb/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-OPTS="$LIBUSB_DOC \
- $OPTS" &&
-
-default_build
diff --git a/libs/libusb/CONFIGURE b/libs/libusb/CONFIGURE
deleted file mode 100755
index c09e029..0000000
--- a/libs/libusb/CONFIGURE
+++ /dev/null
@@ -1,13 +0,0 @@
-#if spell_ok openjade &&
-# spell_ok docbook-sgml-dtd; then
-# config_query_option LIBUSB_DOC "Enable building of documentation?" y \
-# '--enable-build-docs' '--disable-build-docs'
-#else
-
-config_query_option LIBUSB_DOC "Enable building of documentation?" n \
- '--enable-build-docs' '--disable-build-docs'
-
-#fi
-#above were commented out to disable docs in either case -- change back when
fixed
-# true
-# make sure we return true when otherwise empty
diff --git a/libs/libusb/HISTORY b/libs/libusb/HISTORY
index 987c89d..eb15c8c 100644
--- a/libs/libusb/HISTORY
+++ b/libs/libusb/HISTORY
@@ -1,3 +1,6 @@
+2011-08-19 Bor Kraljič <pyrobor AT ver.si>
+ * BUILD,CONFIGURE: removed, it only contained unrecognized options
(issue #30)
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/libs/sdl_mixer/CONFIGURE b/libs/sdl_mixer/CONFIGURE
index 7ab5ac3..9626462 100755
--- a/libs/sdl_mixer/CONFIGURE
+++ b/libs/sdl_mixer/CONFIGURE
@@ -15,7 +15,7 @@ config_query_option SDLMIXER_TIMIDITY_MIDI \
"Enable MIDI via timidity" \
y \
"--enable-music-midi" \
- "--disable-music--midi" &&
+ "--disable-music-midi" &&
if [[ "$SDLMIXER_TIMIDITY_MIDI" == "--enable-music-midi" ]]
then
config_query_option SDLMIXER_TIMIDITY_MIDI_OUTPUT \
diff --git a/libs/sdl_mixer/DEPENDS b/libs/sdl_mixer/DEPENDS
index d1d9893..2998320 100755
--- a/libs/sdl_mixer/DEPENDS
+++ b/libs/sdl_mixer/DEPENDS
@@ -1,15 +1,10 @@
depends sdl &&
depends audiofile &&

-optional_depends libmikmod \
- "--enable-music-libmikmod" \
- "--disable-music-libmikmod" \
- "to play mods via libmikmod"
-
optional_depends mikmod \
"--enable-music-mod" \
"--disable-music-mod" \
- "to play mods via mikmod"
+ "to play mods via mikmod" &&

if [[ "$SDLMIXER_TIMIDITY_MIDI" == "--enable-music-midi" ]]
then
diff --git a/libs/sdl_mixer/HISTORY b/libs/sdl_mixer/HISTORY
index 742de68..7ff2b6d 100644
--- a/libs/sdl_mixer/HISTORY
+++ b/libs/sdl_mixer/HISTORY
@@ -1,3 +1,8 @@
+2011-08-19 Bor Kraljič <pyrobor AT ver.si>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: removed, no longer available
+ * DEPENDS: removing optional depenency on libmikmod, fixed typo
+ option --{disable,enable}-music-libmikmod is no longer available
(bug #30)
+
2009-11-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.2.11

diff --git a/libs/sdl_mixer/PRE_SUB_DEPENDS b/libs/sdl_mixer/PRE_SUB_DEPENDS
deleted file mode 100755
index b7f0356..0000000
--- a/libs/sdl_mixer/PRE_SUB_DEPENDS
+++ /dev/null
@@ -1,4 +0,0 @@
-case $THIS_SUB_DEPENDS in
-LIBMIKMOD) is_depends_enabled $SPELL libmikmod && return 0;;
-esac
-return 1
diff --git a/libs/sdl_mixer/SUB_DEPENDS b/libs/sdl_mixer/SUB_DEPENDS
deleted file mode 100755
index b78d886..0000000
--- a/libs/sdl_mixer/SUB_DEPENDS
+++ /dev/null
@@ -1,6 +0,0 @@
-case $THIS_SUB_DEPENDS in
-LIBMIKMOD) echo "libmikmod support requested, forcing libmikmod dependency."
&&
- depends libmikmod
- ;;
-*) echo unknown sub-depends!!! ; return 1 ;;
-esac
diff --git a/libs/tbb/CONFLICTS b/libs/tbb/CONFLICTS
new file mode 100755
index 0000000..cdf9246
--- /dev/null
+++ b/libs/tbb/CONFLICTS
@@ -0,0 +1 @@
+conflicts $SPELL y
diff --git a/libs/tbb/HISTORY b/libs/tbb/HISTORY
index 0e0766c..e837cd0 100644
--- a/libs/tbb/HISTORY
+++ b/libs/tbb/HISTORY
@@ -1,3 +1,6 @@
+2011-08-19 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: conflict with self to avoid failure during INSTALL
(fixes #46)
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/science/qalculate/BUILD b/science/qalculate/BUILD
index f88004c..57f2ecd 100755
--- a/science/qalculate/BUILD
+++ b/science/qalculate/BUILD
@@ -3,6 +3,5 @@ autoconf
&&
OPTS="${!tempopts} $OPTS" &&
OPTS="$OPTS --build=${BUILD}" &&
./configure --prefix=${INSTALL_ROOT}/usr \
- --disable-clntest \
$OPTS &&
default_build_make
diff --git a/science/qalculate/HISTORY b/science/qalculate/HISTORY
index 1b13c05..6cf8352 100644
--- a/science/qalculate/HISTORY
+++ b/science/qalculate/HISTORY
@@ -1,3 +1,6 @@
+2011-08-19 Bor Kraljič <pyrobor AT ver.si>
+ * BUILD: removed "--disable-clntest" (unrecognized option)
+
2010-01-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.9.7
* PRE_BUILD, libqalculate*.patch: removed
diff --git a/smgl/linux-initramfs/DETAILS b/smgl/linux-initramfs/DETAILS
index 9629c8b..0f0444d 100755
--- a/smgl/linux-initramfs/DETAILS
+++ b/smgl/linux-initramfs/DETAILS
@@ -1,5 +1,5 @@
SPELL=linux-initramfs
- VERSION=0.5
+ VERSION=0.6
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
WEB_SITE="http://www.sourcemage.org/";
ENTERED=20030803
diff --git a/smgl/linux-initramfs/HISTORY b/smgl/linux-initramfs/HISTORY
index 84dda13..fb08969 100644
--- a/smgl/linux-initramfs/HISTORY
+++ b/smgl/linux-initramfs/HISTORY
@@ -1,3 +1,7 @@
+2011-08-16 Julien"_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 0.6
+ * mkinitrd, installkernel: added support for kernel 3.x
+
2010-07-28 Finn Haedicke <finn AT sourcemage.org>
* mkinitrd: use which to find static dmsetup, lvm, cryptsetup
* mkinitrd: read /proc/cmdline for root= and init=
diff --git a/smgl/linux-initramfs/installkernel
b/smgl/linux-initramfs/installkernel
index 6542e7e..819e05a 100755
--- a/smgl/linux-initramfs/installkernel
+++ b/smgl/linux-initramfs/installkernel
@@ -22,6 +22,10 @@ if grep 'CONFIG_MODULES=y' ./.config ; then
echo "installing for a 2.x kernel" &&
ARCH="$kernel_arch" make
INSTALL_MOD_PATH="${INSTALL_ROOT}" modules_install
;;
+ 3.*)
+ echo "installing for a 3.x kernel" &&
+ ARCH="$kernel_arch" make
INSTALL_MOD_PATH="${INSTALL_ROOT}" modules_install
+ ;;
*)
echo "I again don't know what version: $VERSION is" &&
return 1
diff --git a/smgl/linux-initramfs/mkinitrd b/smgl/linux-initramfs/mkinitrd
index 75ce834..2c4f82f 100755
--- a/smgl/linux-initramfs/mkinitrd
+++ b/smgl/linux-initramfs/mkinitrd
@@ -1326,7 +1326,7 @@ do
INITRD_FILE="${2}"
shift
;;
- 2.[46]*)
+ 2.[46]*|3.*)
KVERSION=$1
;;
*)
diff --git a/utils/bluez/CONFIGURE b/utils/bluez/CONFIGURE
index 5e84b97..996eb2f 100755
--- a/utils/bluez/CONFIGURE
+++ b/utils/bluez/CONFIGURE
@@ -8,8 +8,8 @@ config_query_option BLUEZOPTS "Build the test programs?" n
"--enable-test" "--di
config_query_option BLUEZOPTS "Build HID mode switching utility?" n
"--enable-hid2hci" "--disable-hid2hci" &&
config_query_option BLUEZOPTS "Build DFU firmware upgrade utility?" n
"--enable-dfutool" "--disable-dfutool" &&
config_query_option BLUEZOPTS "Build BCCMD interface utility?" n
"--enable-bccmd" "--disable-bccmd" &&
-config_query_option BLUEZOPTS "Install Bluetooth configuration files?" y
"--enable-configfiles" "--disable-configfiles" &&
-config_query_option BLUEZOPTS "Install udev rules?" y "--enable-udevrules"
"--disable-udevrules" &&
+config_query_option BLUEZOPTS "Install Bluetooth configuration files?" y
"--enable-datafiles" "--disable-datafiles" &&
+#config_query_option BLUEZOPTS "Install udev rules?" y "--enable-udevrules"
"--disable-udevrules" &&
config_query_option BLUEZOPTS "Install PCMCIA serial script?" n
"--enable-pcmcia" "--disable-pcmcia" &&
config_query_option BLUEZOPTS "Build the input plugin?" n "--enable-input"
"--disable-input" &&
config_query_option BLUEZOPTS "Build the network plugin?" n
"--enable-network" "--disable-network" &&
diff --git a/utils/bluez/DEPENDS b/utils/bluez/DEPENDS
index 89e28d8..2801cd3 100755
--- a/utils/bluez/DEPENDS
+++ b/utils/bluez/DEPENDS
@@ -23,10 +23,10 @@ optional_depends gstreamer \
"--disable-gstreamer" \
"for GStreamer support" &&

-optional_depends udev \
- "--enable-udevrules" \
- "--disable-udevrules" \
- "install the udev rules" &&
+#optional_depends udev \
+# "--enable-udevrules" \
+# "--disable-udevrules" \
+# "install the udev rules" &&

optional_depends hal \
"--enable-hal" \
diff --git a/utils/bluez/DETAILS b/utils/bluez/DETAILS
index 8cb8453..6a15099 100755
--- a/utils/bluez/DETAILS
+++ b/utils/bluez/DETAILS
@@ -1,5 +1,5 @@
SPELL=bluez
- VERSION=4.95
+ VERSION=4.96
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sign
SOURCE2_IGNORE=signature
diff --git a/utils/bluez/HISTORY b/utils/bluez/HISTORY
index f7c219f..17384ba 100644
--- a/utils/bluez/HISTORY
+++ b/utils/bluez/HISTORY
@@ -1,3 +1,7 @@
+2011-08-19 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 4.96
+ * DEPENDS, CONFIGURE: fixed unrecognized options (issue #30)
+
2011-08-12 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 4.95
* CONFIGURE: fixed minor typo (progams -> programs)
diff --git a/video/vlc/BUILD b/video/vlc/BUILD
index 535a385..739ebf9 100755
--- a/video/vlc/BUILD
+++ b/video/vlc/BUILD
@@ -1,8 +1,5 @@
-OPTS="--disable-dependency-tracking --disable-macosx-defaults
--enable-release $OPTS" &&
+OPTS="--disable-dependency-tracking --disable-macosx-defaults $OPTS" &&

-if [ "$JOYSTICK" = "y" ]; then
- OPTS="--enable-joystick $OPTS"
-fi &&
if [ "$V4L" = "y" ]; then
OPTS="--enable-v4l $OPTS"
fi &&
diff --git a/video/vlc/CONFIGURE b/video/vlc/CONFIGURE
index 077f7f3..60e3a59 100755
--- a/video/vlc/CONFIGURE
+++ b/video/vlc/CONFIGURE
@@ -1,2 +1 @@
-config_query JOYSTICK "Enable Joystick support?" y
config_query V4L "Enable Video4Linux input support?" y
diff --git a/video/vlc/DEPENDS b/video/vlc/DEPENDS
index 3edaaaf..ee95d83 100755
--- a/video/vlc/DEPENDS
+++ b/video/vlc/DEPENDS
@@ -98,7 +98,10 @@ optional_depends "libmad" \
"--disable-mad" \
"for fixed point mp3 decoder" &&

-optional_depends "libid3tag" "" "" "for id3 tag reading support" &&
+optional_depends "libid3tag" \
+ "--enable-id3tag" \
+ "--disable-id3tag" \
+ "for id3 tag reading support" &&

optional_depends "libvorbis" \
"--enable-vorbis" \
@@ -176,20 +179,25 @@ optional_depends "sdl_image" \
"--disable-sdl-image" \
"for image decoding with SDL_image" &&
# dvd options
-optional_depends "libdvdcss" \
- "--enable-dvd" \
- "--disable-dvd" \
- "for DVD support" &&
+#optional_depends "libdvdcss" \
+# "--enable-dvd" \
+# "--disable-dvd" \
+# "for DVD support" &&
+
+optional_depends "libdvdread" \
+ "--enable-dvdread" \
+ "--disable-dvdread" \
+ "for dvdread input module" &&

optional_depends "libdvdnav" \
"--enable-dvdnav" \
"--disable-dvdnav" \
"for new DVD navigation support" &&

-optional_depends "libdvdplay" \
- "--enable-dvdplay" \
- "--disable-dvdplay" \
- "for old DVD navigation support" &&
+#optional_depends "libdvdplay" \
+# "--enable-dvdplay" \
+# "--disable-dvdplay" \
+# "for old DVD navigation support" &&

# misc
optional_depends "libpng" \
@@ -212,10 +220,10 @@ optional_depends "zvbi" \
"--disable-zvbi" \
"for teletext support" &&

-optional_depends "libcdio" \
- "--enable-libcdio" \
- "--disable-libcdio" \
- "for enhanced audio cd support" &&
+#optional_depends "libcdio" \
+# "--enable-libcdio" \
+# "--disable-libcdio" \
+# "for enhanced audio cd support" &&

optional_depends "libcddb" \
"--enable-libcddb" \
@@ -227,10 +235,10 @@ optional_depends "vcdimager-unstable" \
"--disable-vcdx" \
"for VCD navigation support" &&

-optional_depends "hal" \
- "--enable-hal" \
- "--disable-hal" \
- "for device discovery through hal" &&
+optional_depends "udev" \
+ "--enable-udev" \
+ "--disable-udev" \
+ "for device discovery through udev" &&

optional_depends "dbus" \
"--enable-dbus" \
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index 5e5e7b2..318e8ab 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,6 @@
+2011-08-19 Bor Kraljič <pyrobor AT ver.si>
+ * BUILD, DEPENDS, CONFIGURE: fixed unrecognized options (issue #30)
+
2011-07-17 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 1.1.11, SECURITY_PATCH++
VideoLAN-SA-1105, VideoLAN-SA-1106
diff --git a/xorg-data/xkeyboard-config/BUILD
b/xorg-data/xkeyboard-config/BUILD
index 01fada7..ef901bd 100755
--- a/xorg-data/xkeyboard-config/BUILD
+++ b/xorg-data/xkeyboard-config/BUILD
@@ -1,4 +1,4 @@
-OPTS="$OPTS --enable-xkbcomp-symlink" &&
+#OPTS="$OPTS --enable-xkbcomp-symlink" &&
OPTS="$OPTS --enable-compat-rules" &&
OPTS="$OPTS --with-xkb-base=/usr/share/X11/xkb" &&
OPTS="$OPTS --with-xkb-rules-symlink=xorg,xfree86" &&
diff --git a/xorg-data/xkeyboard-config/HISTORY
b/xorg-data/xkeyboard-config/HISTORY
index d433b33..91b7634 100644
--- a/xorg-data/xkeyboard-config/HISTORY
+++ b/xorg-data/xkeyboard-config/HISTORY
@@ -1,3 +1,6 @@
+2011-08-19 Bor Kraljič <pyrobor AT ver.si>
+ * BUILD: commented unrecognized option (issue #30)
+
2010-11-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.0

diff --git a/xorg-driver/xf86-input-keyboard/BUILD
b/xorg-driver/xf86-input-keyboard/BUILD
deleted file mode 100755
index bc188cb..0000000
--- a/xorg-driver/xf86-input-keyboard/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-OPTS="$XF86_INPUT_KEYBOARD_OPTS $OPTS" &&
-
-default_build
diff --git a/xorg-driver/xf86-input-keyboard/CONFIGURE
b/xorg-driver/xf86-input-keyboard/CONFIGURE
deleted file mode 100755
index 28db57b..0000000
--- a/xorg-driver/xf86-input-keyboard/CONFIGURE
+++ /dev/null
@@ -1,5 +0,0 @@
-config_query_option XF86_INPUT_KEYBOARD_OPTS
\
- "Use ${WARNING_COLOR}DEPRECATED${DEFAULT_COLOR} keyboard driver?"
\
- n
\
- '--enable-depkbd'
\
- '--disable-depkbd'
diff --git a/xorg-driver/xf86-input-keyboard/HISTORY
b/xorg-driver/xf86-input-keyboard/HISTORY
index 6a4701d..9112933 100644
--- a/xorg-driver/xf86-input-keyboard/HISTORY
+++ b/xorg-driver/xf86-input-keyboard/HISTORY
@@ -1,3 +1,6 @@
+2011-08-19 Bor Kraljič <pyrobor AT ver.si>
+ * BUILD,CONFIGURE: removed, it only contained unrecognized options
(issue #30)
+
2011-03-09 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.6.0
SOURCE matches upstream posted SHA1



  • [SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (55642f55b7df1eec5a37816d220990cd9f33b368), Bor Kraljič, 08/19/2011

Archive powered by MHonArc 2.6.24.

Top of Page