Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (790b0c9c07e4df3000f47c76b66e7368d1fbba2f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (790b0c9c07e4df3000f47c76b66e7368d1fbba2f)
  • Date: Wed, 21 Jun 2006 13:31:02 -0500

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 5 ++
archive/dar/HISTORY | 3 +
archive/dar/UP_TRIGGERS | 2 -
audio-libs/wavpack/HISTORY | 3 +
audio-libs/wavpack/UP_TRIGGERS | 2 -
crypto/openssl/HISTORY | 3 +
crypto/openssl/UP_TRIGGERS | 2 -
database/db/HISTORY | 3 +
database/db/UP_TRIGGERS | 2 -
database/firebird/HISTORY | 3 +
database/firebird/UP_TRIGGERS | 2 -
disk/parted/HISTORY | 3 +
disk/parted/UP_TRIGGERS | 2 -
gnome2-libs/libgsf/HISTORY | 3 +
gnome2-libs/libgsf/UP_TRIGGERS | 2 -
gnome2-libs/libgtop2/HISTORY | 3 +
gnome2-libs/libgtop2/UP_TRIGGERS | 2 -
gnome2-libs/nautilus-cd-burner/HISTORY | 3 +
gnome2-libs/nautilus-cd-burner/UP_TRIGGERS | 2 -
graphics/exiv2/HISTORY | 3 +
graphics/exiv2/UP_TRIGGERS | 2 -
i18n/skim/BUILD | 3 +
i18n/skim/DEPENDS | 3 +
i18n/skim/DETAILS | 18 ++++++++++
i18n/skim/FINAL | 13 +++++++
i18n/skim/HISTORY | 3 +
i18n/skim/INSTALL | 1
i18n/skim/PRE_BUILD | 3 +
i18n/skim/compile.patch | 50
+++++++++++++++++++++++++++++
kde-apps/KDE_DEPENDS | 11 +++++-
kde-apps/kdiff3/DEPENDS | 2 +
kde-apps/kdiff3/DETAILS | 16 +++++++++
kde-apps/kdiff3/HISTORY | 2 +
kde-core/kde-i18n/CONFIGURE | 4 +-
libcompat | 4 +-
libs/expat/HISTORY | 3 +
libs/expat/UP_TRIGGERS | 2 -
libs/libtasn1/HISTORY | 3 +
libs/libtasn1/UP_TRIGGERS | 2 -
libs/newt/HISTORY | 3 +
libs/newt/UP_TRIGGERS | 2 -
libs/uds/DETAILS | 5 --
perl-cpan/perl/HISTORY | 3 +
perl-cpan/perl/UP_TRIGGERS | 2 -
utils/dbus/HISTORY | 3 +
utils/dbus/UP_TRIGGERS | 2 -
video-libs/gstreamer/HISTORY | 3 +
video-libs/gstreamer/UP_TRIGGERS | 2 -
video/totem/HISTORY | 3 +
video/totem/UP_TRIGGERS | 2 -
50 files changed, 202 insertions(+), 26 deletions(-)

New commits:
commit 790b0c9c07e4df3000f47c76b66e7368d1fbba2f
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

replaced fast_up_depends with show_up_depends, bug #12665

commit 73d45aec3499ec57f9d0c9b1d8c6b253d6422c10
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

kde-i18n: made vars in CONFIGURE local

commit 54ce5696c7ccdd7d988ccd4055456baead3f1035
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

uds: fixed URL

commit 0c0d10538821bbf2816e3c29ccaf8f807a4a09c2
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

kdiff3, skim: new spells

commit a88a7241860fbc02af00365ce050dd43ea01e0b4
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

added fix for #8811 to kde-apps aswell

diff --git a/ChangeLog b/ChangeLog
index 8714871..1814f00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-21 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * skim: new spell, KDE scim interface
+ * kdiff3: new spell, a three way diff application
+ * libcompat: replaced fast_up_depends with show_up_depends, bug
#12665,
+
2006-06-21 Flavien Bridault <vlaaad AT sourcemage.org>
* wm-addons/glipper: Added, clipboard manager for Gnome and other WMs

diff --git a/archive/dar/HISTORY b/archive/dar/HISTORY
index 850e375..a421783 100644
--- a/archive/dar/HISTORY
+++ b/archive/dar/HISTORY
@@ -1,3 +1,6 @@
+2006-06-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * UP_TRIGGERS: replaced fast_up_depends with show_up_depends, bug
#12665
+
2006-06-04 Treeve Jelbert <treeve01 AT pi.be>
* DETAILS: version 2.3.0 only
* PREPARE: deleted
diff --git a/archive/dar/UP_TRIGGERS b/archive/dar/UP_TRIGGERS
index 63350a6..922bd10 100755
--- a/archive/dar/UP_TRIGGERS
+++ b/archive/dar/UP_TRIGGERS
@@ -6,7 +6,7 @@ if spell_ok $SPELL; then
if test "${VERSION:0:4}" != "${OLD_SPELL_VERSION:0:4}"; then
message "This is a possibly incompatible update of dar..."
message "Figuring out what spells need to be recast, this may take a
while."
- for each in $(fast_up_depends $SPELL); do
+ for each in $(show_up_depends $SPELL); do
if gaze install $each | xargs readelf -d 2> /dev/null |
grep -q "NEEDED.*libdar[36][24].so.3"; then
up_trigger $each cast_self
diff --git a/audio-libs/wavpack/HISTORY b/audio-libs/wavpack/HISTORY
index d16be8b..c64fe29 100644
--- a/audio-libs/wavpack/HISTORY
+++ b/audio-libs/wavpack/HISTORY
@@ -1,3 +1,6 @@
+2006-06-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * UP_TRIGGERS: replaced fast_up_depends with show_up_depends, bug
#12665
+
2006-05-23 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: updated SOURCE_HASH, see bug #11986
* PRE_BUILD, debug-fix.patch: removed, fixed in the updated tarball
diff --git a/audio-libs/wavpack/UP_TRIGGERS b/audio-libs/wavpack/UP_TRIGGERS
index 4d8337f..055b002 100755
--- a/audio-libs/wavpack/UP_TRIGGERS
+++ b/audio-libs/wavpack/UP_TRIGGERS
@@ -2,7 +2,7 @@ # upgrade 4.2 -> 4.3 isn't ABI compatibl
local OLD_SPELL_VERSION=""
spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
if [ "$VERSION" != "$OLD_SPELL_VERSION" ]; then
- for each in $(fast_up_depends $SPELL 1); do
+ for each in $(show_up_depends $SPELL 1); do
up_trigger $each cast_self
done
fi
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index 77eb97b..417fe39 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,6 @@
+2006-06-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * UP_TRIGGERS: replaced fast_up_depends with show_up_depends, bug
#12665
+
2006-05-04 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.9.8b

diff --git a/crypto/openssl/UP_TRIGGERS b/crypto/openssl/UP_TRIGGERS
index 8592136..d9b53dc 100755
--- a/crypto/openssl/UP_TRIGGERS
+++ b/crypto/openssl/UP_TRIGGERS
@@ -3,7 +3,7 @@ # this makes ABI changes automatically c
local OLD_SPELL_VERSION=""
spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
if [ "${VERSION/[a-z]*/}" != "${OLD_SPELL_VERSION/[a-z]*/}" ]; then
- for each in $(fast_up_depends $SPELL 1); do
+ for each in $(show_up_depends $SPELL 1); do
up_trigger $each cast_self
done
fi
diff --git a/database/db/HISTORY b/database/db/HISTORY
index a89d69a..3c4d849 100644
--- a/database/db/HISTORY
+++ b/database/db/HISTORY
@@ -1,3 +1,6 @@
+2006-06-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * UP_TRIGGERS: replaced fast_up_depends with show_up_depends, bug
#12665
+
2006-04-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
* UP_TRIGGERS: replaced 'gaze depends' call with
fast_up_depends, bug #10661
diff --git a/database/db/UP_TRIGGERS b/database/db/UP_TRIGGERS
index b0ccb43..5d79585 100755
--- a/database/db/UP_TRIGGERS
+++ b/database/db/UP_TRIGGERS
@@ -6,7 +6,7 @@ if spell_ok $SPELL; then
if test "${VERSION:0:3}" != "${OLD_SPELL_VERSION:0:3}"; then
message "This is a possibly incompatible update of libdb..."
message "Figuring out what spells need to be recast, this may take a
while."
- for each in $(fast_up_depends $SPELL); do
+ for each in $(show_up_depends $SPELL); do
if gaze install $each | xargs readelf -d 2> /dev/null |
grep -q "NEEDED.*libdb\(\|_cxx\)-${OLD_SPELL_VERSION:0:3}"; then
up_trigger $each cast_self
diff --git a/database/firebird/HISTORY b/database/firebird/HISTORY
index ef470c3..520cc35 100644
--- a/database/firebird/HISTORY
+++ b/database/firebird/HISTORY
@@ -1,3 +1,6 @@
+2006-06-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * UP_TRIGGERS: replaced fast_up_depends with show_up_depends, bug
#12665
+
2006-05-26 Treeve Jelbert <treeve01 AT pi.be>
* DETAILS: fix CVS address
change cvs version name to 'snapshot'
diff --git a/database/firebird/UP_TRIGGERS b/database/firebird/UP_TRIGGERS
index e0cf757..e9e98d5 100755
--- a/database/firebird/UP_TRIGGERS
+++ b/database/firebird/UP_TRIGGERS
@@ -6,7 +6,7 @@ if spell_ok $SPELL; then
if test "${VERSION:0:1}" != "${OLD_SPELL_VERSION:0:1}"; then
message "This is a possibly incompatible update of firebird..."
message "Figuring out what spells need to be recast, this may take a
while."
- for each in $(fast_up_depends $SPELL 1); do
+ for each in $(show_up_depends $SPELL 1); do
if gaze install $each | xargs readelf -d 2> /dev/null |
grep -q "NEEDED.*libfbclient.so.${OLD_SPELL_VERSION:0:1}"; then
up_trigger $each cast_self
diff --git a/disk/parted/HISTORY b/disk/parted/HISTORY
index 31e0f45..04118c5 100644
--- a/disk/parted/HISTORY
+++ b/disk/parted/HISTORY
@@ -1,3 +1,6 @@
+2006-06-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * UP_TRIGGERS: replaced fast_up_depends with show_up_depends, bug
#12665
+
2006-05-27 Flavien Bridault <vlaaad AT sourcemage.org>
* DETAILS: Updated to 1.7.1

diff --git a/disk/parted/UP_TRIGGERS b/disk/parted/UP_TRIGGERS
index c2e44e6..fa98035 100755
--- a/disk/parted/UP_TRIGGERS
+++ b/disk/parted/UP_TRIGGERS
@@ -6,7 +6,7 @@ if spell_ok $SPELL; then
if test "${VERSION:0:3}" != "${OLD_SPELL_VERSION:0:3}"; then
message "This is a possibly incompatible update of parted..."
message "Figuring out what spells need to be recast, this may take a
while."
- for each in $(fast_up_depends $SPELL 1); do
+ for each in $(show_up_depends $SPELL 1); do
if gaze install $each | xargs readelf -d 2> /dev/null |
grep -q "NEEDED.*libparted-${OLD_SPELL_VERSION:0:3}.so*"; then
up_trigger $each cast_self
diff --git a/gnome2-libs/libgsf/HISTORY b/gnome2-libs/libgsf/HISTORY
index 478ed68..3e3f819 100644
--- a/gnome2-libs/libgsf/HISTORY
+++ b/gnome2-libs/libgsf/HISTORY
@@ -1,3 +1,6 @@
+2006-06-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * UP_TRIGGERS: replaced fast_up_depends with show_up_depends, bug
#12665
+
2006-06-02 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.14.1

diff --git a/gnome2-libs/libgsf/UP_TRIGGERS b/gnome2-libs/libgsf/UP_TRIGGERS
index 277bb50..3a5e3aa 100755
--- a/gnome2-libs/libgsf/UP_TRIGGERS
+++ b/gnome2-libs/libgsf/UP_TRIGGERS
@@ -4,7 +4,7 @@ if spell_ok $SPELL; then
if test "${VERSION:0:4}" != "${OLD_SPELL_VERSION:0:4}"; then
message "This is a possibly incompatible update of libgsf..."
message "Figuring out what spells need to be recast."
- for each in $(fast_up_depends $SPELL); do
+ for each in $(show_up_depends $SPELL); do
if gaze install $each | xargs readelf -d 2> /dev/null |
grep -q "NEEDED.*libgsf-1.so.113"; then
up_trigger $each cast_self
diff --git a/gnome2-libs/libgtop2/HISTORY b/gnome2-libs/libgtop2/HISTORY
index 94f84c3..f688db3 100644
--- a/gnome2-libs/libgtop2/HISTORY
+++ b/gnome2-libs/libgtop2/HISTORY
@@ -1,3 +1,6 @@
+2006-06-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * UP_TRIGGERS: replaced fast_up_depends with show_up_depends, bug
#12665
+
2006-05-10 George Sherwood <george AT beernabeer.com>
* DEPENDS: Added depends popt. Bug 11410.

diff --git a/gnome2-libs/libgtop2/UP_TRIGGERS
b/gnome2-libs/libgtop2/UP_TRIGGERS
index cb1c0bb..93c94b4 100755
--- a/gnome2-libs/libgtop2/UP_TRIGGERS
+++ b/gnome2-libs/libgtop2/UP_TRIGGERS
@@ -4,7 +4,7 @@ if spell_ok $SPELL; then
if test "${VERSION:0:4}" != "${OLD_SPELL_VERSION:0:4}"; then
message "This is a possibly incompatible update of libgtop-2.0..."
message "Figuring out what spells need to be recast."
- for each in $(fast_up_depends $SPELL 1); do
+ for each in $(show_up_depends $SPELL 1); do
if gaze install $each | xargs readelf -d 2> /dev/null |
grep -q "NEEDED.*libgtop-2.0.so.5"; then
up_trigger $each cast_self
diff --git a/gnome2-libs/nautilus-cd-burner/HISTORY
b/gnome2-libs/nautilus-cd-burner/HISTORY
index 65687fc..3fa83a1 100644
--- a/gnome2-libs/nautilus-cd-burner/HISTORY
+++ b/gnome2-libs/nautilus-cd-burner/HISTORY
@@ -1,3 +1,6 @@
+2006-06-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * UP_TRIGGERS: replaced fast_up_depends with show_up_depends, bug
#12665
+
2006-05-30 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.14.2

diff --git a/gnome2-libs/nautilus-cd-burner/UP_TRIGGERS
b/gnome2-libs/nautilus-cd-burner/UP_TRIGGERS
index 897d6f1..871ba35 100755
--- a/gnome2-libs/nautilus-cd-burner/UP_TRIGGERS
+++ b/gnome2-libs/nautilus-cd-burner/UP_TRIGGERS
@@ -4,7 +4,7 @@ if spell_ok $SPELL; then
if test "${VERSION:0:4}" != "${OLD_SPELL_VERSION:0:4}"; then
message "This is a possibly incompatible update of libnautilus-burn..."
message "Figuring out what spells need to be recast."
- for each in $(fast_up_depends $SPELL 1); do
+ for each in $(show_up_depends $SPELL 1); do
if gaze install $each | xargs readelf -d 2> /dev/null |
grep -q "NEEDED.*libnautilus-burn.so.2"; then
up_trigger $each cast_self
diff --git a/graphics/exiv2/HISTORY b/graphics/exiv2/HISTORY
index 3f0b194..84cadc6 100644
--- a/graphics/exiv2/HISTORY
+++ b/graphics/exiv2/HISTORY
@@ -1,3 +1,6 @@
+2006-06-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * UP_TRIGGERS: replaced fast_up_depends with show_up_depends, bug
#12665
+
2006-06-03 Treeve Jelbert <treeve01 AT pi.be>
* DETAILS: version 0.10
* UP_TRIGGERS: addedd, test for use of old library name
diff --git a/graphics/exiv2/UP_TRIGGERS b/graphics/exiv2/UP_TRIGGERS
index 8be5d1f..eaedfbe 100755
--- a/graphics/exiv2/UP_TRIGGERS
+++ b/graphics/exiv2/UP_TRIGGERS
@@ -6,7 +6,7 @@ if spell_ok $SPELL; then
if test "${VERSION}" != "${OLD_SPELL_VERSION}"; then
message "This is a possibly incompatible update of exiv2..."
message "Figuring out what spells need to be recast, this may take a
while."
- for each in $(fast_up_depends $SPELL 1); do
+ for each in $(show_up_depends $SPELL 1); do
if gaze install $each | xargs readelf -d 2> /dev/null |
grep -q "NEEDED.*libexiv2-${OLD_SPELL_VERSION}.so"; then
up_trigger $each cast_self
diff --git a/i18n/skim/BUILD b/i18n/skim/BUILD
new file mode 100755
index 0000000..c51ae4f
--- /dev/null
+++ b/i18n/skim/BUILD
@@ -0,0 +1,3 @@
+./configure prefix=${INSTALL_ROOT}/usr \
+ qtincludes=${INSTALL_ROOT}/usr/include/qt &&
+scons
diff --git a/i18n/skim/DEPENDS b/i18n/skim/DEPENDS
new file mode 100755
index 0000000..0503566
--- /dev/null
+++ b/i18n/skim/DEPENDS
@@ -0,0 +1,3 @@
+depends scim &&
+depends kdelibs &&
+depends python
diff --git a/i18n/skim/DETAILS b/i18n/skim/DETAILS
new file mode 100755
index 0000000..679a907
--- /dev/null
+++ b/i18n/skim/DETAILS
@@ -0,0 +1,18 @@
+ SPELL=skim
+ VERSION=1.4.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://www.scim-im.org/projects/skim
+ SOURCE_URL[0]=$SOURCEFORGE_URL/scim/$SOURCE
+
SOURCE_HASH=sha512:bcb0706c1fa48d4a10beea49f2bbe8de1338f4c875c70e154805c39e484367e7ca69814bdea7a2984c6c8ca96dbc6d2239d20768fdbbcbd8a36b0383efe998fc
+ LICENSE[0]=GPL
+ ENTERED=20060429
+ KEYWORDS="i18n"
+ SHORT="Skim (SCIM for KDE)"
+cat << EOF
+Skim is an input method platform based upon scim-lib under *NIX systems
+(including GNU/Linux and FreeBSD) optimized for KDE. It provides a GUI
+panel (named scim-panel-kde), a KConfig config module and setup dialogs for
+itself and the libscim. It also has its own plugin system which supports
+on-demand loadable actions.
+EOF
diff --git a/i18n/skim/FINAL b/i18n/skim/FINAL
new file mode 100755
index 0000000..585c89a
--- /dev/null
+++ b/i18n/skim/FINAL
@@ -0,0 +1,13 @@
+message "
+$MESSAGE_COLOR
+After installing skim, you should also install at least an IMEngine (refer
to a
+ input method), such as scim-chinese (currently contains the Pinyin IMEngine
+for Simplified Chinese), scim-tables (contains table-based input methods,
+such as Wubi, Erbi for Simplified Chinese), scim-hangul (a popular Korean
input
+method), scim-uim (contains a lot of Janpanese IMEngines) or scim-m17n
+(contains more than 30 input methods for various languages).
+
+Before you can start to use the SCIM input method platform you have to
configure
+your system correctly. Please read
+http://www.scim-im.org/wiki/documentation/installation_and_configuration/all/system_configuration
+$DEFAULT_COLOR"
diff --git a/i18n/skim/HISTORY b/i18n/skim/HISTORY
new file mode 100644
index 0000000..e9f8c8d
--- /dev/null
+++ b/i18n/skim/HISTORY
@@ -0,0 +1,3 @@
+2006-04-29 Jaka Kranjc <lynx AT mages.ath.cx>
+ * Created spell.
+
diff --git a/i18n/skim/INSTALL b/i18n/skim/INSTALL
new file mode 100755
index 0000000..9f0c0eb
--- /dev/null
+++ b/i18n/skim/INSTALL
@@ -0,0 +1 @@
+scons install
diff --git a/i18n/skim/PRE_BUILD b/i18n/skim/PRE_BUILD
new file mode 100755
index 0000000..ea58b87
--- /dev/null
+++ b/i18n/skim/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/compile.patch
diff --git a/i18n/skim/compile.patch b/i18n/skim/compile.patch
new file mode 100644
index 0000000..ef6c2b7
--- /dev/null
+++ b/i18n/skim/compile.patch
@@ -0,0 +1,50 @@
+Index: plugins/setupwindow/scimimenginesettings.cpp
+===================================================================
+RCS file: /cvsroot/scim/skim/plugins/setupwindow/scimimenginesettings.cpp,v
+retrieving revision 1.27
+diff -u -r1.27 scimimenginesettings.cpp
+--- plugins/setupwindow/scimimenginesettings.cpp 29 Apr 2006 20:32:09
-0000 1.27
++++ plugins/setupwindow/scimimenginesettings.cpp 6 Jun 2006 14:25:44
-0000
+@@ -166,7 +166,7 @@
+ QStringList & uuids = d->uuids;
+ QStringList names;
+ QStringList langs;
+- std::vector <scim::String> icons;
++ QStringList icons;
+
+ std::map <QString, std::vector <size_t> > groups;
+
+@@ -207,7 +207,7 @@
+
+ item->setPixmap(PIX_COLUMN,
+ KGlobal::iconLoader()->loadIcon(
+- QString::fromUtf8(icons [id].c_str ()),
KIcon::User, ui->fontMetrics().height()));
++ icons [id], KIcon::User,
ui->fontMetrics().height()));
+ if(!disabledFactories.contains(uuids[id])) {
+ item->setOn(true);
+ info.enabled = true;
+@@ -464,7 +464,7 @@
+ void ScimIMEngineSettings::get_factory_list (QStringList &uuids,
+ QStringList &names,
+ QStringList &langs,
+- std::vector <scim::String> &icons)
++ QStringList &icons)
+ {
+ std::vector<scim::String> module_list;
+ scim::IMEngineFactoryPointer factory;
+Index: plugins/setupwindow/scimimenginesettings.h
+===================================================================
+RCS file: /cvsroot/scim/skim/plugins/setupwindow/scimimenginesettings.h,v
+retrieving revision 1.11
+diff -u -r1.11 scimimenginesettings.h
+--- plugins/setupwindow/scimimenginesettings.h 30 Jan 2006 11:56:42 -0000
1.11
++++ plugins/setupwindow/scimimenginesettings.h 6 Jun 2006 14:25:44 -0000
+@@ -46,7 +46,7 @@
+ void get_factory_list (QStringList &uuids,
+ QStringList &names,
+ QStringList &langs,
+- std::vector <scim::String> &icons);
++ QStringList &icons);
+ void setIMFilters(QCheckListItem * item, std::vector <scim::String> &
filter_list);
+ void checkModification();
+
diff --git a/kde-apps/KDE_DEPENDS b/kde-apps/KDE_DEPENDS
index ce4a34e..713cb13 100755
--- a/kde-apps/KDE_DEPENDS
+++ b/kde-apps/KDE_DEPENDS
@@ -1,4 +1,13 @@
optional_depends arts \
"--with-arts" \
"--without-arts" \
- "for aRts sound daemon"
+ "for aRts sound daemon" &&
+
+# is_enabled_depends is a 1.14 sorcery function, but not in libcompat,
+# so we only run it if it is actually available.
+# this is here for #8811
+if declare -f is_depends_enabled &> /dev/null; then
+ if is_depends_enabled $SPELL arts; then
+ sub_depends kdelibs ARTS
+ fi
+fi
diff --git a/kde-apps/kdiff3/DEPENDS b/kde-apps/kdiff3/DEPENDS
new file mode 100755
index 0000000..98434a3
--- /dev/null
+++ b/kde-apps/kdiff3/DEPENDS
@@ -0,0 +1,2 @@
+depends kdelibs &&
+source $SECTION_DIRECTORY/KDE_DEPENDS
diff --git a/kde-apps/kdiff3/DETAILS b/kde-apps/kdiff3/DETAILS
new file mode 100755
index 0000000..b493571
--- /dev/null
+++ b/kde-apps/kdiff3/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=kdiff3
+ VERSION=0.9.90
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:32f6961ac8fd30eff62c4b80641939c03afa8bd6516ba380799fd34dd10693331a91e29396911eb58995fd532dbff48a600f61d190dd9507c3e0288343962b84
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+ WEB_SITE=http://kdiff3.sourceforge.net
+ ENTERED=20060527
+ LICENSE[0]=GPL
+ SHORT="A graphical text and directory diff and merge tool."
+cat << EOF
+KDiff3 is a program that compares two or three text input files or
directories,
+shows the differences line by line and character by character, provides an
+automatic merge facility and an integrated editor for comfortable solving
+of merge conflicts, and has an intuitive graphical user interface.
+EOF
diff --git a/kde-apps/kdiff3/HISTORY b/kde-apps/kdiff3/HISTORY
new file mode 100644
index 0000000..11f8ed8
--- /dev/null
+++ b/kde-apps/kdiff3/HISTORY
@@ -0,0 +1,2 @@
+2006-05-27 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS, DEPENDS, HISTORY: created spell
diff --git a/kde-core/kde-i18n/CONFIGURE b/kde-core/kde-i18n/CONFIGURE
index 8a00645..8023e3b 100755
--- a/kde-core/kde-i18n/CONFIGURE
+++ b/kde-core/kde-i18n/CONFIGURE
@@ -1,6 +1,6 @@
source $SECTION_DIRECTORY/KDE_CONFIGURE &&

-CFG=$SPELL_CONFIG
+local CFG=$SPELL_CONFIG

get_kdelanguages() {
local i LANGUAGE LANGUAGES &&
@@ -21,7 +21,7 @@ get_kdelanguages() {
if [[ $LANGUAGES == ${LANGUAGES/ALL/} ]]
then
echo MD5[0]="IGNORE" >> $CFG &&
- i=1 &&
+ local i=1 &&
for LANGUAGE in $LANGUAGES
do
# BUG HERE LANGUAGE=${LANGUAGE:1:${#LANGUAGE}-2}
diff --git a/libcompat b/libcompat
index 7e9a314..515697f 100755
--- a/libcompat
+++ b/libcompat
@@ -26,8 +26,8 @@ #---------------------------------------
## Grimoire gaze depends alternative
## Uses gaze depends if the internal sorcery function isn't available
#-------------------------------------------------------------------------
-declare -f fast_up_depends &> /dev/null ||
-function fast_up_depends() {
+declare -f show_up_depends &> /dev/null ||
+function show_up_depends() {
gaze -q depends --fast "$@"
}

diff --git a/libs/expat/HISTORY b/libs/expat/HISTORY
index 7e859b4..2758a8e 100644
--- a/libs/expat/HISTORY
+++ b/libs/expat/HISTORY
@@ -1,3 +1,6 @@
+2006-06-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * UP_TRIGGERS: replaced fast_up_depends with show_up_depends, bug
#12665
+
2006-04-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
* UP_TRIGGERS: replaced 'gaze depends' call with
fast_up_depends, bug #10661
diff --git a/libs/expat/UP_TRIGGERS b/libs/expat/UP_TRIGGERS
index 9dfcdee..cc2f879 100755
--- a/libs/expat/UP_TRIGGERS
+++ b/libs/expat/UP_TRIGGERS
@@ -6,7 +6,7 @@ if spell_ok $SPELL; then
if test "${VERSION:0:3}" != "${OLD_SPELL_VERSION:0:3}"; then
message "This is a possibly incompatible update of libexpat..."
message "Figuring out what spells need to be recast, this may take a
while."
- for each in $(fast_up_depends $SPELL); do
+ for each in $(show_up_depends $SPELL); do
if gaze install $each | xargs readelf -d 2> /dev/null |
grep -q "NEEDED.*libexpat.so.0"; then
up_trigger $each cast_self
diff --git a/libs/libtasn1/HISTORY b/libs/libtasn1/HISTORY
index 88b673c..59b088f 100644
--- a/libs/libtasn1/HISTORY
+++ b/libs/libtasn1/HISTORY
@@ -1,3 +1,6 @@
+2006-06-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * UP_TRIGGERS: replaced fast_up_depends with show_up_depends, bug
#12665
+
2006-05-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
* UP_TRIGGERS: check the full up_depends tree, not only the first
level

diff --git a/libs/libtasn1/UP_TRIGGERS b/libs/libtasn1/UP_TRIGGERS
index 89b6b06..749d414 100755
--- a/libs/libtasn1/UP_TRIGGERS
+++ b/libs/libtasn1/UP_TRIGGERS
@@ -3,7 +3,7 @@ spell_ok $SPELL && OLD_SPELL_VERSION="$(
if [ "${VERSION:0:3}" != "${OLD_SPELL_VERSION:0:3}" ]; then
message "This is a possibly incompatible update of libtasn1..."
message "Figuring out what spells need to be recast, this may take a
while."
- for each in $(fast_up_depends $SPELL); do
+ for each in $(show_up_depends $SPELL); do
up_trigger $each cast_self
done
fi
diff --git a/libs/newt/HISTORY b/libs/newt/HISTORY
index 1eef773..d0b4a0d 100644
--- a/libs/newt/HISTORY
+++ b/libs/newt/HISTORY
@@ -1,3 +1,6 @@
+2006-06-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * UP_TRIGGERS: replaced fast_up_depends with show_up_depends, bug
#12665
+
2006-04-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
* UP_TRIGGERS: replaced 'gaze depends' call with
fast_up_depends, bug #10661
diff --git a/libs/newt/UP_TRIGGERS b/libs/newt/UP_TRIGGERS
index b43eedb..4e24cea 100755
--- a/libs/newt/UP_TRIGGERS
+++ b/libs/newt/UP_TRIGGERS
@@ -6,7 +6,7 @@ if spell_ok $SPELL; then
if test "${VERSION:0:4}" != "${OLD_SPELL_VERSION:0:4}"; then
message "This is a possibly incompatible update of newt..."
message "Figuring out what spells need to be recast, this may take a
while."
- for each in $(fast_up_depends $SPELL 1); do
+ for each in $(show_up_depends $SPELL 1); do
if gaze install $each | xargs readelf -d 2> /dev/null |
grep -q "NEEDED.*libnewt.so.${OLD_SPELL_VERSION:0:4}"; then
up_trigger $each cast_self
diff --git a/libs/uds/DETAILS b/libs/uds/DETAILS
index c3769d4..df4b659 100755
--- a/libs/uds/DETAILS
+++ b/libs/uds/DETAILS
@@ -5,13 +5,10 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=http://frost.flewid.de/dist/$SOURCE

SOURCE_HASH=sha512:9fe5db8905775e758ad85cf00ef7a707b0841d7eb5bc6465b6e9f0b3c23157f1b66535735aabe401489f72de685b6c405653ddc92b74fe61395110967d41bf75
LICENSE[0]=GPL
- WEB_SITE=http://frost.flewid.de/uds
+ WEB_SITE=http://src.wongr.net/uds/
KEYWORDS="debugger libs"
SHORT="C++ development and debugging support library"
ENTERED=20021107
- UPDATED=20021107
- MAINTAINER=julian AT wongr.net
-
cat << EOF
The UDS (Useful Development Stuff) Collection is a C++ library that
provides development and debugging facilities such as automatic
diff --git a/perl-cpan/perl/HISTORY b/perl-cpan/perl/HISTORY
index c68fdbc..525196c 100644
--- a/perl-cpan/perl/HISTORY
+++ b/perl-cpan/perl/HISTORY
@@ -1,3 +1,6 @@
+2006-06-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * UP_TRIGGERS: replaced fast_up_depends with show_up_depends, bug
#12665
+
2006-04-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
* UP_TRIGGERS: replaced 'gaze depends' call with
fast_up_depends, bug #10661
diff --git a/perl-cpan/perl/UP_TRIGGERS b/perl-cpan/perl/UP_TRIGGERS
index b7bff5d..ec58396 100755
--- a/perl-cpan/perl/UP_TRIGGERS
+++ b/perl-cpan/perl/UP_TRIGGERS
@@ -1,7 +1,7 @@
local OLD_SPELL_VERSION=""
spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
if [ "$VERSION" != "$OLD_SPELL_VERSION" ]; then
- for name in $(fast_up_depends perl); do
+ for name in $(show_up_depends perl); do
if test -f $INSTALL_LOGS/$name-$(installed_version $name); then
if grep -q "$TRACK_ROOT/usr/lib/perl5.*\.pm$" \
$INSTALL_LOGS/$name-$(installed_version $name); then
diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
index 512aa40..be9c236 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,6 @@
+2006-06-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * UP_TRIGGERS: replaced fast_up_depends with show_up_depends, bug
#12665
+
2006-04-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS, PRE_BUILD: changed gtk-sharp to mono, remove the example
in PRE_BUILD so it compiles without gtk-sharp
diff --git a/utils/dbus/UP_TRIGGERS b/utils/dbus/UP_TRIGGERS
index 4142667..2b54d06 100755
--- a/utils/dbus/UP_TRIGGERS
+++ b/utils/dbus/UP_TRIGGERS
@@ -6,7 +6,7 @@ if spell_ok $SPELL; then
if test "${VERSION:0:3}" != "${OLD_SPELL_VERSION:0:3}"; then
message "This is a possibly incompatible update of libdbus..."
message "Figuring out what spells need to be recast, this may take a
while."
- for each in $(fast_up_depends $SPELL); do
+ for each in $(show_up_depends $SPELL); do
if gaze install $each | xargs readelf -d 2> /dev/null |
grep -q "NEEDED.*libdbus\(\|_cxx\)-1.so.1"; then
up_trigger $each cast_self
diff --git a/video-libs/gstreamer/HISTORY b/video-libs/gstreamer/HISTORY
index 00abfe4..36d8e1b 100644
--- a/video-libs/gstreamer/HISTORY
+++ b/video-libs/gstreamer/HISTORY
@@ -1,3 +1,6 @@
+2006-06-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * UP_TRIGGERS: replaced fast_up_depends with show_up_depends, bug
#12665
+
2006-06-11 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: updated to 0.10.8

diff --git a/video-libs/gstreamer/UP_TRIGGERS
b/video-libs/gstreamer/UP_TRIGGERS
index 0461c39..a086fb3 100755
--- a/video-libs/gstreamer/UP_TRIGGERS
+++ b/video-libs/gstreamer/UP_TRIGGERS
@@ -4,7 +4,7 @@ # to depend on gstreamer-0.8 now
local OLD_SPELL_VERSION=""
spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
if [ "${OLD_SPELL_VERSION:0:3}" = "0.8" ]; then
- for each in $(fast_up_depends $SPELL 1); do
+ for each in $(show_up_depends $SPELL 1); do
up_trigger $each cast_self
done
fi
diff --git a/video/totem/HISTORY b/video/totem/HISTORY
index 019d818..dcf69a0 100644
--- a/video/totem/HISTORY
+++ b/video/totem/HISTORY
@@ -1,3 +1,6 @@
+2006-06-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * UP_TRIGGERS: replaced fast_up_depends with show_up_depends, bug
#12665
+
2006-06-08 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS: added dependencies on glib2, gtk+2, libglade2, gnome-vfs2,
gnome-desktop, gnome-icon-theme and optional_depends on dbus,
diff --git a/video/totem/UP_TRIGGERS b/video/totem/UP_TRIGGERS
index af40235..0147972 100755
--- a/video/totem/UP_TRIGGERS
+++ b/video/totem/UP_TRIGGERS
@@ -4,7 +4,7 @@ if spell_ok $SPELL; then
if test "${VERSION:0:3}" != "${OLD_SPELL_VERSION:0:3}"; then
message "This is a possibly incompatible update of libtotem-plparser..."
message "Figuring out what spells need to be recast."
- for each in $(fast_up_depends $SPELL 1); do
+ for each in $(show_up_depends $SPELL 1); do
if gaze install $each | xargs readelf -d 2> /dev/null |
grep -q "NEEDED.*libtotem-plparser.so.0"; then
up_trigger $each cast_self



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (790b0c9c07e4df3000f47c76b66e7368d1fbba2f), Jaka Kranjc, 06/21/2006

Archive powered by MHonArc 2.6.24.

Top of Page