Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-gcc grimoire by Eric Sandall (af50d0a9540ad10d957c3b8efb36979c19eb9f88)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-gcc grimoire by Eric Sandall (af50d0a9540ad10d957c3b8efb36979c19eb9f88)
  • Date: Wed, 13 May 2009 03:37:31 -0500

GIT changes to devel-gcc grimoire by Eric Sandall <sandalle AT sourcemage.org>:

devel/git/DETAILS | 2 +-
devel/git/HISTORY | 3 +++
disk/e2fsprogs/DEPENDS | 3 +--
disk/e2fsprogs/HISTORY | 5 -----
kde4-apps/kdesvn4/DETAILS | 6 +++---
kde4-apps/kdesvn4/HISTORY | 3 +++
utils/util-linux/CONFLICTS | 1 -
utils/util-linux/DEPENDS | 1 +
utils/util-linux/HISTORY | 5 -----
9 files changed, 12 insertions(+), 17 deletions(-)

New commits:
commit 784fc35b1253cd8c6f15184d96a7daa4972453b5
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "e2fsprogs: Depends on util-linux for blkid"

This reverts commit c3ff13022ef5564b2c6dbc28226532ec7ee39a34.

I'm not sure what's going on, but putting the dependency order correct
breaks.

e2fsprogs 1.41.4 used to provide blkid.
util-linux 2.15 now provides blkid.
e2fsprogs 1.41.5 requires blkid from util-linux 2.15

e2fsprogs 1.41.5 no longer provides blkid and needs it from util-linux.
util-linux 2.15 cannot compile without e2fsprogs.

Currently:
update e2fsprogs from 1.41.4 -> 1.41.5, removing libblkid.so.
mount (from util-linux) now fails as it cannot find libblkid.so.1.
update util-linux to 2.15, now providing libblkid.so.
mount is happy.
e2fsprogs is built with its old libblkid.so and seems to still be happy.
with util-linux's libblkid.so as they are ABI compatible (just moved
packages, AFAIK).

After this fun switch:
e2fsprogs will need to be cast after util-linux, since future updates to
libblkid.so will come from util-linux and are required by e2fsprogs.

Possible resolution:
Leave in current state (as above) and only fix the dependencies after
this switch has been in a few stable releases.

commit e654ba711e9707c2d1e2688ab5adf5d4e6fc6e5d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "util-linux: No longer depends on e2fsprogs for blkid"

This reverts commit 3396ebff9d9ad7bf0ea7b6f985edfcdb18f7f268.

But if e2fsprogs isn't installed when util-linux is cast, we get:
read.c:28:23: error: uuid/uuid.h: No such file or directory

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

kdesvn4: updated version to 1.3.0

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

git: => 1.6.3.1

commit 3396ebff9d9ad7bf0ea7b6f985edfcdb18f7f268
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

util-linux: No longer depends on e2fsprogs for blkid

commit b1f610100b37a80557cd3cbe91b929129fbce96f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "util-linux: No longer depends on e2fsprogs for blkid"

This reverts commit 1b70ea9a3082b3fde8f590c5a80f3a8b329aac5d.

Conflicting with e2fsprogs doesn't work as it's sustained...crap

diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index 7fb0c64..7b36f51 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -1,5 +1,5 @@
SPELL=git
- VERSION=1.6.3
+ VERSION=1.6.3.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index 8437f3e..622ac96 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,6 @@
+2009-05-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.6.3.1
+
2009-05-07 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.6.3

diff --git a/disk/e2fsprogs/DEPENDS b/disk/e2fsprogs/DEPENDS
index c1758a4..95c4bbf 100755
--- a/disk/e2fsprogs/DEPENDS
+++ b/disk/e2fsprogs/DEPENDS
@@ -1,5 +1,4 @@
depends gawk &&
depends gnupg &&
depends init.d &&
-depends smgl-fhs &&
-depends util-linux
+depends smgl-fhs
diff --git a/disk/e2fsprogs/HISTORY b/disk/e2fsprogs/HISTORY
index b689d9d..d2307ee 100644
--- a/disk/e2fsprogs/HISTORY
+++ b/disk/e2fsprogs/HISTORY
@@ -1,8 +1,3 @@
-2009-05-12 Eric Sandall <sandalle AT sourcemage.org>
- * DEPENDS: Depends on util-linux for blkid
- checking for blkid_get_cache in -lblkid... configure: error:
external
- blkid library not found
-
2009-05-12 Ladislav Hagara <hgr AT vabo.cz>
* BUILD: added --disable-libblkid
blkid is provided by util-linux instead from e2fsprogs from now
diff --git a/kde4-apps/kdesvn4/DETAILS b/kde4-apps/kdesvn4/DETAILS
index f5eeee8..9b2788b 100755
--- a/kde4-apps/kdesvn4/DETAILS
+++ b/kde4-apps/kdesvn4/DETAILS
@@ -1,9 +1,9 @@
SPELL=kdesvn4
SPELLX=kdesvn
- VERSION=1.2.4
+ VERSION=1.3.0
SOURCE=${SPELLX}-$VERSION.tar.bz2
-
SOURCE_URL[0]=http://${SPELLX}.alwins-world.de/trac.fcgi/downloads/${SOURCE}
-
SOURCE_HASH=sha512:d76460f662d95c9bf2377dfdee41c03dfbca5a183991d0d19ffabd5b71996e95adc3c317f4f0e2db8c9e787ecf35c10e5ea76675f0bda0e1c31ffdbda9d8cea1
+ SOURCE_URL[0]=http://${SPELLX}.alwins-world.de/downloads/${SOURCE}
+
SOURCE_HASH=sha512:78e6b2805ca13a18b723d5cfee3b402bba9964400918752cbf13907dae7f063af23f6f1c0534b2c8a8fd2f812caa920f7a990211e8de5a2f9595b1c8beb96e04
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELLX}-$VERSION
WEB_SITE=http://${SPELLX}.alwins-world.de/
LICENSE[0]=LGPL
diff --git a/kde4-apps/kdesvn4/HISTORY b/kde4-apps/kdesvn4/HISTORY
index e35630f..d61b741 100644
--- a/kde4-apps/kdesvn4/HISTORY
+++ b/kde4-apps/kdesvn4/HISTORY
@@ -1,3 +1,6 @@
+2009-05-13 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 1.3.0, SOURCE_URL has moved
+
2009-03-05 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 1.2.4

diff --git a/utils/util-linux/CONFLICTS b/utils/util-linux/CONFLICTS
deleted file mode 100755
index 16919a0..0000000
--- a/utils/util-linux/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts e2fsprogs y
diff --git a/utils/util-linux/DEPENDS b/utils/util-linux/DEPENDS
index 1e23391..4f34676 100755
--- a/utils/util-linux/DEPENDS
+++ b/utils/util-linux/DEPENDS
@@ -1,4 +1,5 @@
depends CONSOLE-TOOLS &&
+depends e2fsprogs &&
depends gnupg &&
depends smgl-fhs &&
depends zlib
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index 7834727..8d5ee80 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,8 +1,3 @@
-2009-05-12 Eric Sandall <sandalle AT sourcemage.org>
- * DEPENDS: No longer depends on e2fsprogs for blkid
- * CONFLICTS: Autoconflicts with e2fsprogs so that blkid from e2fsprogs
- is removed before installing blkid from util-linux
-
2009-05-12 Ladislav Hagara <hgr AT vabo.cz>
* BUILD: added --with-fsprobe=builtin
blkid is provided by util-linux instead of e2fsprogs from now



  • [SM-Commit] GIT changes to devel-gcc grimoire by Eric Sandall (af50d0a9540ad10d957c3b8efb36979c19eb9f88), Eric Sandall, 05/13/2009

Archive powered by MHonArc 2.6.24.

Top of Page