Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-kde3_removal grimoire by Bor Kraljič (546b6e6934a6110bcb0e355d2b6978b771356b66)

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-kde3_removal grimoire by Bor Kraljič (546b6e6934a6110bcb0e355d2b6978b771356b66)
  • Date: Wed, 5 Oct 2011 06:27:35 -0500

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

audio-creation/rosegarden/BUILD | 7 -
audio-creation/rosegarden/DEPENDS | 59 +--------
audio-creation/rosegarden/DETAILS | 4
audio-creation/rosegarden/HISTORY | 6
audio-creation/rosegarden/INSTALL | 1
audio-creation/rosegarden/PRE_BUILD | 3
audio-libs/liblrdf/BUILD | 4
audio-libs/liblrdf/HISTORY | 4
audio-libs/liblrdf/PRE_BUILD | 4
audio-libs/liblrdf/liblrdf-raptor2.diff | 198
++++++++++++++++++++++++++++++++
disk/mdadm/HISTORY | 3
disk/mdadm/PRE_BUILD | 3
disk/mdadm/linux-3.0.patch | 45 +++++++
gnome2-apps/gnomesu/DEPENDS | 2
gnome2-apps/gnomesu/HISTORY | 3
gnome2-libs/nautilus-sendto/DEPENDS | 2
gnome2-libs/nautilus-sendto/HISTORY | 3
graphics/gimp/HISTORY | 6
graphics/gimp/INSTALL | 4
graphics/gimp/PRE_BUILD | 2
python-pypi/paramiko/DETAILS | 12 +
python-pypi/paramiko/HISTORY | 6
python-pypi/paramiko/paramiko.gpg |binary
windowmanagers/fvwm/DEPENDS | 2
windowmanagers/fvwm/DETAILS | 4
windowmanagers/fvwm/HISTORY | 4
26 files changed, 327 insertions(+), 64 deletions(-)

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

mdadm: added upstream patch for kernel 3.0 support (issue #230)

commit ba162c5a8778db47eb098ef5265ad7110b276777
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics/gimp: create gimp symlink for devel branch

commit b8ba6d97e7b04d1025bc3a7d963a651eb1fd807d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics/gimp: fixed patch error when devel branch is build

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

paramiko: => 1.7.7.1

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

gnomesu: changed gnome-2-desktop-profile -> gnome2-profile (fixes #269)

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

nautilus-sendto: changed sylpheed-claws -> claws-mail (fixes #268)

commit bcffa557312e6c6754d5e5c29d5d722e4955c4f0
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

fvwm: version 2.6.3 and corrected the electricfence dep

commit 65bcf1e2f78d33faa344cbe331e4fda878e9b8e0
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

rosegarden: version 11.06 and removed obsolete kde dep

commit 755dfbbaf590c1b806d03d2fc27e250fc187c56f
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

liblrdf: added fixes to rldf.h for raptor2 support

commit 044cfaa62cf5c5047ee06f96c330d3e509f897af
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

liblrdf: added upstream patch for raptor2

diff --git a/audio-creation/rosegarden/BUILD b/audio-creation/rosegarden/BUILD
index 420eb25..a5628d1 100755
--- a/audio-creation/rosegarden/BUILD
+++ b/audio-creation/rosegarden/BUILD
@@ -1,3 +1,4 @@
-cmake . $OPTS -DCMAKE_INSTALL_PREFIX=/usr \
- -DKDE3_INCLUDE_DIR=/usr/include/kde3 &&
-make
+QTDIR="${QTDIR:-/usr}"
+PATH="$QTDIR/bin/qt4:$PATH"
+OPTS="--with-qtdir=/usr ${OPTS}"
+default_build
diff --git a/audio-creation/rosegarden/DEPENDS
b/audio-creation/rosegarden/DEPENDS
index 61acf77..a9821e3 100755
--- a/audio-creation/rosegarden/DEPENDS
+++ b/audio-creation/rosegarden/DEPENDS
@@ -1,54 +1,19 @@
-depends cmake &&
-depends fftw &&
-depends -sub CXX gcc &&
-depends libsm &&
-depends libice &&
-depends libx11 &&
-depends libxext &&
-depends kdelibs &&
-depends pkgconfig &&
-depends qt-x11 &&
-
-optional_depends alsa-lib \
- "-DWANT_SOUND=1" \
- "-DWANT_SOUND=0" \
- "to enable sound and for ALSA MIDI support" &&
-
-
-if is_depends_enabled $SPELL alsa-lib
-then
- optional_depends JACK-DRIVER \
- "-DWANT_JACK=1" \
- "-DWANT_JACK=0" \
- "for JACK audio support" &&
-
- optional_depends ladspa \
- "" \
- "" \
- "for LADSPA plugin support" &&
-
- optional_depends dssi \
- "-DWANT_DSSI=1" \
- "-DWANT_DSSI=0" \
- "for DSSI plugin support" &&
-
- optional_depends liblo \
- "" \
- "" \
- "for audio plugin custom GUI support" &&
-
- optional_depends liblrdf \
- "" \
- "" \
- "for audio plugin metadata support"
-fi &&
-
+depends FFTW &&
+depends -sub CXX gcc &&
+depends libxt &&
+depends -sub QT3 qt4 &&
+depends alsa-lib &&
+depends JACK-DRIVER &&
+depends ladspa &&
+depends dssi &&
+depends liblo &&
+depends liblrdf &&
optional_depends libxft \
"" \
"" \
"for better score rendering quality" &&

optional_depends lirc \
- "-DWANT_LIRC=1" \
- "-DWANT_LIRC=0" \
+ "" \
+ "" \
"for remote control support"
diff --git a/audio-creation/rosegarden/DETAILS
b/audio-creation/rosegarden/DETAILS
index b68f216..0702bae 100755
--- a/audio-creation/rosegarden/DETAILS
+++ b/audio-creation/rosegarden/DETAILS
@@ -13,11 +13,11 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
else
- VERSION=1.7.2
+ VERSION=11.06
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:7a05d84a654ed6a9329941cc405e7e0ad567cdda83ae0f201ca435a6178fe46f8d0db31fa3a20ee6c88434364de0604b78c9c29ff75e0c89eaad4be8810ed614
+
SOURCE_HASH=sha512:cbfbfa0e0c46b75a5826ebd3b77ebc14196e7dc611de10c6388fbe1477bb6bba9ef17d08e62871fb97ebcf7ded74534564804cbedb25c24d7bfed179f0538905
fi
WEB_SITE=http://www.rosegardenmusic.com/
ENTERED=20020514
diff --git a/audio-creation/rosegarden/HISTORY
b/audio-creation/rosegarden/HISTORY
index 7fb84ab..57a255f 100644
--- a/audio-creation/rosegarden/HISTORY
+++ b/audio-creation/rosegarden/HISTORY
@@ -1,3 +1,9 @@
+2011-10-04 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 11.06
+ * DEPENDS: kdelibs is not needed and removed unneeded deps
+ * PRE_BUILD: added to make it find qt4
+ * INSTALL: removed, no longer needed
+
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/audio-creation/rosegarden/INSTALL
b/audio-creation/rosegarden/INSTALL
deleted file mode 100755
index 965fd47..0000000
--- a/audio-creation/rosegarden/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-make install DESTDIR="$INSTALL_ROOT"
diff --git a/audio-creation/rosegarden/PRE_BUILD
b/audio-creation/rosegarden/PRE_BUILD
new file mode 100755
index 0000000..c1d0332
--- /dev/null
+++ b/audio-creation/rosegarden/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+sedit 's#QTDIR/bin#QTDIR/bin/qt4#g' configure
diff --git a/audio-libs/liblrdf/BUILD b/audio-libs/liblrdf/BUILD
new file mode 100755
index 0000000..a21024e
--- /dev/null
+++ b/audio-libs/liblrdf/BUILD
@@ -0,0 +1,4 @@
+libtoolize &&
+aclocal &&
+autoconf &&
+default_build
diff --git a/audio-libs/liblrdf/HISTORY b/audio-libs/liblrdf/HISTORY
index b7d645c..324ff3c 100644
--- a/audio-libs/liblrdf/HISTORY
+++ b/audio-libs/liblrdf/HISTORY
@@ -1,3 +1,7 @@
+2011-10-04 Arjan Bouter <abouter AT sourcemage.org>
+ * BUILD, PRE_BUILD, liblrdf-raptor2.diff: add a patch from upstream
+ bugzilla for raptor2 support
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/audio-libs/liblrdf/PRE_BUILD b/audio-libs/liblrdf/PRE_BUILD
new file mode 100755
index 0000000..c50d1da
--- /dev/null
+++ b/audio-libs/liblrdf/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+patch -p1 < "${SCRIPT_DIRECTORY}/liblrdf-raptor2.diff" &&
+sedit 's#raptor.h#raptor2/raptor2.h#' lrdf.h
diff --git a/audio-libs/liblrdf/liblrdf-raptor2.diff
b/audio-libs/liblrdf/liblrdf-raptor2.diff
new file mode 100644
index 0000000..074d890
--- /dev/null
+++ b/audio-libs/liblrdf/liblrdf-raptor2.diff
@@ -0,0 +1,198 @@
+diff --git a/configure.ac b/configure.ac
+index 949acdf..e710b49 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -18,7 +18,7 @@ AM_PROG_LIBTOOL
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS([errno.h limits.h stdlib.h string.h unistd.h])
+
+-PKG_CHECK_MODULES(RAPTOR, raptor >= 0.9.11)
++PKG_CHECK_MODULES(RAPTOR, raptor2 >= 2.0.0)
+
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 71e164d..2237a29 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -4,5 +4,4 @@ lib_LTLIBRARIES = liblrdf.la
+ noinst_HEADERS = lrdf_md5.h md5_loc.h ladspa.h
+
+ liblrdf_la_SOURCES = lrdf.c lrdf_multi.c md5.c
+-liblrdf_la_LIBADD = -lraptor
+ liblrdf_la_LDFLAGS = -version-info @LRDF_LIBTOOL_VERSION@
+diff --git a/src/lrdf.c b/src/lrdf.c
+index 0bb7b22..8849e43 100644
+--- a/src/lrdf.c
++++ b/src/lrdf.c
+@@ -18,6 +18,7 @@
+ static unsigned int lrdf_uid = 0; /* A unique(ish) id to append to
genid's to
+ * avoid clashses */
+
++static raptor_world *world = NULL;
+ static lrdf_statement *triples = NULL;
+ static lrdf_statement *free_triples;
+ static lrdf_string_hash *resources_hash[LRDF_HASH_SIZE];
+@@ -43,8 +44,7 @@ static void lrdf_remove_triple_hash(lrdf_triple_hash **
tbl,
+ lrdf_hash hash, lrdf_statement * s);
+ static void lrdf_add_closure_hash(lrdf_closure_hash ** tbl,
+ lrdf_hash subject, lrdf_hash object);
+-static void lrdf_store(void *user_data,
+- const raptor_statement * statement);
++static void lrdf_store(void *user_data, raptor_statement * statement);
+ void lrdf_free_statements(lrdf_statement * s);
+ void lrdf_copy_statement(lrdf_statement * from, lrdf_statement * to);
+ void lrdf_rebuild_taxonomic_closure(lrdf_closure_hash ** fwd_tbl,
+@@ -71,7 +71,7 @@ void lrdf_init()
+ unsigned int i;
+ struct timeval tv;
+
+- raptor_init();
++ world = raptor_new_world();
+ lrdf_more_triples(256);
+
+ /* A UID to add to genids to make them safer */
+@@ -112,7 +112,8 @@ void lrdf_more_triples(int count)
+
+ void lrdf_cleanup()
+ {
+- raptor_finish();
++ raptor_free_world(world);
++ world = NULL;
+
+ lrdf_free_string_hash(resources_hash);
+ lrdf_free_string_hash(literals_hash);
+@@ -232,26 +233,29 @@ void lrdf_remove_matches(lrdf_statement *pattern)
+ }
+ }
+
+-static void lrdf_store(void *user_data, const raptor_statement * statement)
++static const char *lrdf_term_as_string(char *tmp, int tmp_len,
++ const raptor_term *term)
++{
++ switch (term->type) {
++ case RAPTOR_TERM_TYPE_URI:
++ return (const char *) raptor_uri_as_string(term->value.uri);
++ case RAPTOR_TERM_TYPE_LITERAL:
++ return (const char *) term->value.literal.string;
++ case RAPTOR_TERM_TYPE_BLANK:
++ snprintf(tmp, tmp_len, "_:%s.%x", term->value.blank.string, lrdf_uid);
++ return tmp;
++ default:
++ return "(?)";
++ }
++}
++
++static void lrdf_store(void *user_data, raptor_statement * statement)
+ {
+ lrdf_statement *s = lrdf_alloc_statement();
+ char tmps[128], tmpp[128], tmpo[128];
+- char *subj = (char *) statement->subject,
+- *pred = (char *) statement->predicate,
+- *obj = (char *) statement->object;
+-
+- if (statement->subject_type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS) {
+- snprintf(tmps, 127, "_:%s.%x", subj, lrdf_uid);
+- subj = tmps;
+- }
+- if (statement->predicate_type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS) {
+- snprintf(tmpp, 127, "_:%s.%x", pred, lrdf_uid);
+- pred = tmpp;
+- }
+- if (statement->object_type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS) {
+- snprintf(tmpo, 127, "_:%s.%x", obj, lrdf_uid);
+- obj = tmpo;
+- }
++ const char *subj = lrdf_term_as_string(tmps, 128, statement->subject),
++ *pred = lrdf_term_as_string(tmpp, 128, statement->predicate),
++ *obj = lrdf_term_as_string(tmpo, 128, statement->object);
+
+ s->shash = lrdf_gen_hash(subj);
+ s->phash = lrdf_gen_hash(pred);
+@@ -261,7 +265,7 @@ static void lrdf_store(void *user_data, const
raptor_statement * statement)
+
+ s->subject = lrdf_check_hash(resources_hash, s->shash, subj);
+ s->predicate = lrdf_check_hash(resources_hash, s->phash, pred);
+- if (statement->object_type == RAPTOR_IDENTIFIER_TYPE_LITERAL) {
++ if (statement->object->type == RAPTOR_TERM_TYPE_LITERAL) {
+ s->object = lrdf_check_hash(literals_hash, s->ohash, obj);
+ s->object_type = lrdf_literal;
+ } else {
+@@ -537,28 +541,22 @@ void lrdf_rebuild_taxonomic_closure(lrdf_closure_hash
** fwd_tbl,
+ free(pathto);
+ }
+
+-static void lrdf_error_handler(void *data, raptor_locator * locator,
+- const char *message);
++static void lrdf_log_handler(void *data, raptor_log_message *message);
+
+-static void lrdf_error_handler(void *data, raptor_locator * locator,
+- const char *message)
++static void lrdf_log_handler(void *data, raptor_log_message *message)
+ {
+- fprintf(stderr, "liblrdf: error - ");
+- raptor_print_locator(stderr, locator);
+- fprintf(stderr, " - %s\n", message);
+-
+- raptor_parse_abort((raptor_parser*)data);
+-}
++ const char *severity = "error";
++ if (message->level == RAPTOR_LOG_LEVEL_WARN) {
++ severity = "warning";
++ }
+
+-static void lrdf_warning_handler(void *data, raptor_locator * locator,
+- const char *message);
++ fprintf(stderr, "liblrdf: %s - ", severity);
++ raptor_locator_print(message->locator, stderr);
++ fprintf(stderr, " - %s\n", message->text);
+
+-static void lrdf_warning_handler(void *data, raptor_locator * locator,
+- const char *message)
+-{
+- fprintf(stderr, "liblrdf: warning - ");
+- raptor_print_locator(stderr, locator);
+- fprintf(stderr, " - %s\n", message);
++ if (message->level != RAPTOR_LOG_LEVEL_WARN) {
++ raptor_parser_parse_abort((raptor_parser*)data);
++ }
+ }
+
+
+@@ -593,15 +591,15 @@ int lrdf_read_file_intl(const char *uri)
+ lrdf_hash source;
+
+ //printf("lrdf: reading %s\n", uri);
+- ruri = raptor_new_uri(uri);
+- furi = raptor_new_uri(uri);
++ ruri = raptor_new_uri(world, (const unsigned char *) uri);
++ furi = raptor_new_uri(world, (const unsigned char *) uri);
+ source = lrdf_gen_hash(uri);
+ lrdf_check_hash(resources_hash, source, uri);
+
+ if (strstr(uri, ".rdf")) {
+- parser = raptor_new_parser("rdfxml");
++ parser = raptor_new_parser(world, "rdfxml");
+ } else {
+- parser = raptor_new_parser("ntriples");
++ parser = raptor_new_parser(world, "ntriples");
+ }
+ if (!parser) {
+ fprintf(stderr, "liblrdf: failed to create parser\n");
+@@ -609,12 +607,11 @@ int lrdf_read_file_intl(const char *uri)
+ return 1;
+ }
+
+- raptor_set_error_handler(parser, parser, lrdf_error_handler);
+- raptor_set_warning_handler(parser, NULL, lrdf_warning_handler);
+- raptor_set_statement_handler(parser, &source, lrdf_store);
+- raptor_set_default_generate_id_parameters(parser, NULL, ++lrdf_uid);
++ raptor_world_set_log_handler(world, parser, lrdf_log_handler);
++ raptor_parser_set_statement_handler(parser, &source, lrdf_store);
++ raptor_world_set_generate_bnodeid_parameters(world, NULL, ++lrdf_uid);
+
+- if (raptor_parse_file(parser, furi, ruri)) {
++ if (raptor_parser_parse_file(parser, furi, ruri)) {
+ raptor_free_uri(furi);
+ raptor_free_uri(ruri);
+ raptor_free_parser(parser);
diff --git a/disk/mdadm/HISTORY b/disk/mdadm/HISTORY
index d4ce62d..84e72fe 100644
--- a/disk/mdadm/HISTORY
+++ b/disk/mdadm/HISTORY
@@ -1,3 +1,6 @@
+2011-10-05 Bor Kraljič <pyrobor AT ver.si>
+ * linux-3.0.patch: added upstream patch for kernel 3.0 support (issue
#230)
+
2011-03-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD: remove compiler warnings/errors to fix build with
gcc 4.6
diff --git a/disk/mdadm/PRE_BUILD b/disk/mdadm/PRE_BUILD
index 1dc3479..c4886fd 100755
--- a/disk/mdadm/PRE_BUILD
+++ b/disk/mdadm/PRE_BUILD
@@ -2,4 +2,5 @@ default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
sedit 's:-Wall::' Makefile &&
sedit 's:-Wextra::' Makefile &&
-sedit 's:-Werror::' Makefile
+sedit 's:-Werror::' Makefile &&
+patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/linux-3.0.patch
diff --git a/disk/mdadm/linux-3.0.patch b/disk/mdadm/linux-3.0.patch
new file mode 100644
index 0000000..b8111b6
--- /dev/null
+++ b/disk/mdadm/linux-3.0.patch
@@ -0,0 +1,45 @@
+From f161d047eed634b3380262767f955eb888502e88 Mon Sep 17 00:00:00 2001
+From: NeilBrown <neilb AT suse.de>
+Date: Fri, 17 Jun 2011 22:49:24 +1000
+Subject: [PATCH] util: correctly parse shorter linux version numbers.
+
+The next version of Linux might be 3.0. If it is, get_linux_version
+will fail.
+So make it more robust.
+
+Reported-by: Namhyung Kim <namhyung AT gmail.com>
+Reported-by: Milan Broz <mbroz AT redhat.com>
+Signed-off-by: NeilBrown <neilb AT suse.de>
+---
+ util.c | 10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/util.c b/util.c
+index 10bbe56..55d171a 100644
+--- a/util.c
++++ b/util.c
+@@ -146,16 +146,16 @@ int get_linux_version()
+ {
+ struct utsname name;
+ char *cp;
+- int a,b,c;
++ int a = 0, b = 0,c = 0;
+ if (uname(&name) <0)
+ return -1;
+
+ cp = name.release;
+ a = strtoul(cp, &cp, 10);
+- if (*cp != '.') return -1;
+- b = strtoul(cp+1, &cp, 10);
+- if (*cp != '.') return -1;
+- c = strtoul(cp+1, NULL, 10);
++ if (*cp == '.')
++ b = strtoul(cp+1, &cp, 10);
++ if (*cp == '.')
++ c = strtoul(cp+1, &cp, 10);
+
+ return (a*1000000)+(b*1000)+c;
+ }
+--
+1.7.6.3
+
diff --git a/gnome2-apps/gnomesu/DEPENDS b/gnome2-apps/gnomesu/DEPENDS
index 21bc3cb..3aefb29 100755
--- a/gnome2-apps/gnomesu/DEPENDS
+++ b/gnome2-apps/gnomesu/DEPENDS
@@ -2,4 +2,4 @@ depends libzvt &&
depends libgnomeui &&
depends libzvt &&
depends libglade2 &&
-depends gnome-2-desktop-profile
+depends gnome2-profile
diff --git a/gnome2-apps/gnomesu/HISTORY b/gnome2-apps/gnomesu/HISTORY
index cdb9269..b773c95 100644
--- a/gnome2-apps/gnomesu/HISTORY
+++ b/gnome2-apps/gnomesu/HISTORY
@@ -1,3 +1,6 @@
+2011-10-04 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: changed gnome-2-desktop-profile -> gnome2-profile (fixes
#269)
+
2007-03-24 Jeremy Blosser <jblosser-smgl AT firinn.org>
* DEPENDS: Add libgnomeui, libzvt, libglade2; fix bug 11648.

diff --git a/gnome2-libs/nautilus-sendto/DEPENDS
b/gnome2-libs/nautilus-sendto/DEPENDS
index 4cd7bc2..3abf1b2 100755
--- a/gnome2-libs/nautilus-sendto/DEPENDS
+++ b/gnome2-libs/nautilus-sendto/DEPENDS
@@ -4,6 +4,6 @@ depends evolution-data-server &&

optional_depends pidgin "" "" "Enable gaim support" &&
optional_depends gajim "" "" "Enable gajim support" &&
-optional_depends sylpheed-claws "" "" "Enable sylpheed-claws support" &&
+optional_depends claws-mail "" "" "Enable claws-mail support" &&
optional_depends thunderbird "" "" "Enable thunderbird support" &&
optional_depends balsa "" "" "Enable balsa support"
diff --git a/gnome2-libs/nautilus-sendto/HISTORY
b/gnome2-libs/nautilus-sendto/HISTORY
index decda2c..c9bfb54 100644
--- a/gnome2-libs/nautilus-sendto/HISTORY
+++ b/gnome2-libs/nautilus-sendto/HISTORY
@@ -1,3 +1,6 @@
+2011-10-04 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: changed sylpheed-claws -> claws-mail (fixes #268)
+
2010-09-30 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.32.0

diff --git a/graphics/gimp/HISTORY b/graphics/gimp/HISTORY
index 24dd84f..607c0cd 100644
--- a/graphics/gimp/HISTORY
+++ b/graphics/gimp/HISTORY
@@ -1,3 +1,9 @@
+2011-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD: don't apply gimp-poppler-0.18.patch.bz2 if
+ devel branch is built
+ * INSTALL: create /usr/bin/gimp symlink if devel version
+ is built
+
2011-10-01 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: added, to apply the patch
* gimp-poppler-0.18.patch.bz2: added, fixes compilation with poppler
0.18
diff --git a/graphics/gimp/INSTALL b/graphics/gimp/INSTALL
new file mode 100755
index 0000000..e81a84d
--- /dev/null
+++ b/graphics/gimp/INSTALL
@@ -0,0 +1,4 @@
+default_install &&
+if [[ $GIMP_DEVEL == y ]]; then
+ ln -sf /usr/bin/gimp-$(echo ${VERSION}|sed -e 's/\.[0-9]\+$//')
${INSTALL_ROOT}/usr/bin/gimp
+fi
diff --git a/graphics/gimp/PRE_BUILD b/graphics/gimp/PRE_BUILD
index 011c1ef..e068fe8 100755
--- a/graphics/gimp/PRE_BUILD
+++ b/graphics/gimp/PRE_BUILD
@@ -1,6 +1,8 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

+if [[ $GIMP_DEVEL == n ]]; then
if is_depends_enabled $SPELL poppler; then
bzcat "$SPELL_DIRECTORY/gimp-poppler-0.18.patch.bz2" | patch -p1
fi
+fi
diff --git a/python-pypi/paramiko/DETAILS b/python-pypi/paramiko/DETAILS
index 145b48f..9c05731 100755
--- a/python-pypi/paramiko/DETAILS
+++ b/python-pypi/paramiko/DETAILS
@@ -1,10 +1,12 @@
SPELL=paramiko
- VERSION=1.7.5
-
SOURCE_HASH=sha512:051aebc07a70a2997d2654b8aa2d2c2b0f30a33dcec1390772d2b8399ac241f8b418005c96d2ae2913ead3083628396283520e8a1f50584446ea1c3f19ae6639
- SOURCE=$SPELL-$VERSION.zip
+ VERSION=1.7.7.1
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://www.lag.net/paramiko/download/$SOURCE
- SOURCE_URL[1]=http://gentoo.mirrors.pair.com/distfiles/$SOURCE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE2_URL[0]=$SOURCE_URL.asc
+ SOURCE_GPG=paramiko.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.lag.net/paramiko/
ENTERED=20060403
LICENSE=LGPL
diff --git a/python-pypi/paramiko/HISTORY b/python-pypi/paramiko/HISTORY
index 69fa49b..c5f2ed3 100644
--- a/python-pypi/paramiko/HISTORY
+++ b/python-pypi/paramiko/HISTORY
@@ -1,3 +1,9 @@
+2011-10-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.7.7.1; converted to upstream signature
+ checking; changed tarball extension; quoting paths
+ * paramiko.gpg: added, upstream key FC89E9C3 (Robey Pointer
+ <robey AT danger.com>)
+
2011-05-23 Sukneet Basuta <sukneet AT sourcemage.org>
* DEPENDS: updated setuptools dependency to SETUPTOOLS provider

diff --git a/python-pypi/paramiko/paramiko.gpg
b/python-pypi/paramiko/paramiko.gpg
new file mode 100644
index 0000000..84a90e6
Binary files /dev/null and b/python-pypi/paramiko/paramiko.gpg differ
diff --git a/windowmanagers/fvwm/DEPENDS b/windowmanagers/fvwm/DEPENDS
index 689d721..a06154a 100755
--- a/windowmanagers/fvwm/DEPENDS
+++ b/windowmanagers/fvwm/DEPENDS
@@ -9,7 +9,7 @@ optional_depends dmalloc \
"for dmalloc debugging (don't)" &&
optional_depends electricfence \
"--enable-efence" \
- "--disable-efemce" \
+ "--disable-efence" \
"for electric fence debugging (don't)" &&

optional_depends libsm \
diff --git a/windowmanagers/fvwm/DETAILS b/windowmanagers/fvwm/DETAILS
index 59b5b07..a845ef8 100755
--- a/windowmanagers/fvwm/DETAILS
+++ b/windowmanagers/fvwm/DETAILS
@@ -15,8 +15,8 @@ else
VERSION=2.7.0

SOURCE_HASH=sha512:45ca6ff8c4303e11a916aeeedbef070066e216804be165a6fc36129314927818efe720024b69eb248a0a7884ca869cf47854a4ecfad7bdfaeb9b392c0bd2d6a1
else
- VERSION=2.6.2
-
SOURCE_HASH=sha512:25cce9d4081be91f97b60e5bb15cda856adb9081b19e8d9746e5618ecb2579b80656cca3e3eb0ea07ce2401e4c9386cae4ad62029f4df84968933d4203cf6c7b
+ VERSION=2.6.3
+
SOURCE_HASH=sha512:edb613f8d4073a874d99d676bd316809a6fc769496b82b6e3cbfe702f45fe0d580ded0885b3033057010f3be32415415c6d99fbf7fa0e664b4d6ca38fd56cd6b
fi
SOURCE=fvwm-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/fvwm-${VERSION}
diff --git a/windowmanagers/fvwm/HISTORY b/windowmanagers/fvwm/HISTORY
index 451f1a2..03c446c 100644
--- a/windowmanagers/fvwm/HISTORY
+++ b/windowmanagers/fvwm/HISTORY
@@ -1,3 +1,7 @@
+2011-10-04 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 2.6.3
+ * DEPENDS: corrected the optional efence dep
+
2011-09-22 Ismael Luceno <ismael AT sourcemage.org>
* BUILD, DEPENDS, DETAILS, PREPARE: Use prepare_select_branch




  • [SM-Commit] GIT changes to devel-kde3_removal grimoire by Bor Kraljič (546b6e6934a6110bcb0e355d2b6978b771356b66), Bor Kraljič, 10/05/2011

Archive powered by MHonArc 2.6.24.

Top of Page