Skip to Content.
Sympa Menu

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

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č (898af1773bef7b01d2c57e330b127c701a35a782)
  • Date: Tue, 16 Aug 2011 05:38:57 -0500

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

audio-libs/libofa/HISTORY | 4 +++
audio-libs/libofa/PRE_BUILD | 3 +-
audio-libs/libofa/curl-7.21.7.patch | 11
++++++++++
audio-libs/libtunepimp/HISTORY | 6 ++++-
audio-libs/libtunepimp/PRE_BUILD | 4 ++-
audio-libs/libtunepimp/curl-7.21.7.patch | 11
++++++++++
kde4-apps/digikam4/DEPENDS | 4 ++-
kde4-apps/digikam4/HISTORY | 3 ++
kde4-apps/ktorrent4/DETAILS | 4 +--
kde4-apps/ktorrent4/HISTORY | 3 ++
kde4-apps/libktorrent/DETAILS | 4 +--
kde4-apps/libktorrent/HISTORY | 3 ++
kernels/linux/HISTORY | 6 +++++
kernels/linux/info/patches/maintenance_patches/patch-2.6.32.45 | 6 +++++
kernels/linux/info/patches/maintenance_patches/patch-2.6.33.18 | 6 +++++
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.2 | 6 +++++
kernels/linux/latest.defaults | 2 -
libs/clucene/BUILD | 2 -
libs/clucene/DEPENDS | 2 -
libs/clucene/HISTORY | 5 ++++
libs/gdbm/CONFLICTS | 1
libs/gdbm/HISTORY | 3 ++
22 files changed, 88 insertions(+), 11 deletions(-)

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

digikam4: kdegraphics4 -> libkdcraw4,libkexiv24,libkipi4

commit d69e878d30745d1655c9cae1f9e6239cf72a7efc
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

linux 2.6.32.45

commit a93e09a88ae9a14f0424b2276ad5e335e520a91b
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

linux 2.6.33.18

commit ba0b9850755d7b6fb7f91bb0a47fcd1095aa3c9b
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

linux 3.0.2

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

clucene: fixed compilation issue with stable version, when spell is
first casted after SCM support has been removed from it : CLUC_VER may
be unset in this case, and spell uses cmake to compile while stable
version does only compile with autotools

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

ktorrent4: updated version to 4.1.2

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

libktorrent: updated version to 1.1.2

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

gdbm: prevent linking with an old library on update

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

libtunepimp: added patch to fix compilation issue with latest curl

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

libofa: added a patch to fix compilation issue with latest curl

diff --git a/audio-libs/libofa/HISTORY b/audio-libs/libofa/HISTORY
index f1a65fd..ef06808 100644
--- a/audio-libs/libofa/HISTORY
+++ b/audio-libs/libofa/HISTORY
@@ -1,3 +1,7 @@
+2011-08-16 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * PRE_BUILD, curl-7.21.7.patch: added patch to fix compilation issue
+ with curl
+
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-libs/libofa/PRE_BUILD b/audio-libs/libofa/PRE_BUILD
index 87eb876..b01df8e 100755
--- a/audio-libs/libofa/PRE_BUILD
+++ b/audio-libs/libofa/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/gcc44.diff
+patch -p1 < $SPELL_DIRECTORY/gcc44.diff &&
+patch -p1 < $SPELL_DIRECTORY/curl-7.21.7.patch
diff --git a/audio-libs/libofa/curl-7.21.7.patch
b/audio-libs/libofa/curl-7.21.7.patch
new file mode 100644
index 0000000..688b6e0
--- /dev/null
+++ b/audio-libs/libofa/curl-7.21.7.patch
@@ -0,0 +1,11 @@
+diff -Naur libofa-0.9.4.orig/examples/protocol.cpp
libofa-0.9.4/examples/protocol.cpp
+--- libofa-0.9.4.orig/examples/protocol.cpp 2008-07-21 23:27:55.000000000
+0200
++++ libofa-0.9.4/examples/protocol.cpp 2011-08-13 16:03:36.377189931 +0200
+@@ -12,7 +12,6 @@
+ #include <map>
+ #include <expat.h>
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+
+ using namespace std;
diff --git a/audio-libs/libtunepimp/HISTORY b/audio-libs/libtunepimp/HISTORY
index e637019..ae582d1 100644
--- a/audio-libs/libtunepimp/HISTORY
+++ b/audio-libs/libtunepimp/HISTORY
@@ -1,5 +1,9 @@
+2011-08-16 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * PRE_BUILD, curl-7.21.7.patch: added patch to fix compilation issue
+ with curl
+
2010-05-20 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: add lopenssl
+ * DEPENDS: add openssl

2010-05-19 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: libmp4v2 deprecated in favour of mp4v2 (Bug #15536)
diff --git a/audio-libs/libtunepimp/PRE_BUILD
b/audio-libs/libtunepimp/PRE_BUILD
index 9fd0f0a..715cabd 100755
--- a/audio-libs/libtunepimp/PRE_BUILD
+++ b/audio-libs/libtunepimp/PRE_BUILD
@@ -7,4 +7,6 @@ patch $SOURCE_DIRECTORY/lib/fileio.cpp \
$SCRIPT_DIRECTORY/gcc44.patch &&
message "${MESSAGE_COLOR}Patching for mp4v2...${DEFAULT_COLOR}" &&
patch $SOURCE_DIRECTORY/plugins/mp4/mp4.cpp \
- $SCRIPT_DIRECTORY/mp4v2-1.9.patch
+ $SCRIPT_DIRECTORY/mp4v2-1.9.patch &&
+message "${MESSAGE_COLOR}Patching for curl...${DEFAULT_COLOR}" &&
+patch -p1 < $SPELL_DIRECTORY/curl-7.21.7.patch
diff --git a/audio-libs/libtunepimp/curl-7.21.7.patch
b/audio-libs/libtunepimp/curl-7.21.7.patch
new file mode 100644
index 0000000..a9fe34f
--- /dev/null
+++ b/audio-libs/libtunepimp/curl-7.21.7.patch
@@ -0,0 +1,11 @@
+diff -Naur libtunepimp-0.5.3.orig/lib/protocol.cpp
libtunepimp-0.5.3/lib/protocol.cpp
+--- libtunepimp-0.5.3.orig/lib/protocol.cpp 2006-11-28 21:25:04.000000000
+0100
++++ libtunepimp-0.5.3/lib/protocol.cpp 2011-08-13 16:13:12.987080618 +0200
+@@ -12,7 +12,6 @@
+ #include <map>
+ #include <expat.h>
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ using namespace std;
+
diff --git a/kde4-apps/digikam4/DEPENDS b/kde4-apps/digikam4/DEPENDS
index 7dc04cc..390b8c3 100755
--- a/kde4-apps/digikam4/DEPENDS
+++ b/kde4-apps/digikam4/DEPENDS
@@ -2,7 +2,9 @@ source "$SECTION_DIRECTORY/KDE_DEPENDS" &&
sub_depends qt4 SQLITE &&
depends sqlite &&
depends lcms &&
-depends kdegraphics4 &&
+depends libkdcraw4 &&
+depends libkexiv24 &&
+depends libkipi4 &&
depends kipi-plugins4 &&
depends jasper &&
depends JPEG &&
diff --git a/kde4-apps/digikam4/HISTORY b/kde4-apps/digikam4/HISTORY
index 8ee3645..cf0a70b 100644
--- a/kde4-apps/digikam4/HISTORY
+++ b/kde4-apps/digikam4/HISTORY
@@ -1,3 +1,6 @@
+2011-08-16 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: kdegraphics4 -> libkdcraw4,libkexiv24,libkipi4
+
2011-07-31 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0.0

diff --git a/kde4-apps/ktorrent4/DETAILS b/kde4-apps/ktorrent4/DETAILS
index 08a6a49..8a391c6 100755
--- a/kde4-apps/ktorrent4/DETAILS
+++ b/kde4-apps/ktorrent4/DETAILS
@@ -1,6 +1,6 @@
SPELL=ktorrent4
- VERSION=4.1.1
-
SOURCE_HASH=sha512:3b599e101a5cfc5d1202cba325a02475e9fafe5a97e1cc91f774383c9cd3ee830d4838ae6c58c5c09dc28c6d76731843d7bf8a6074df540cffa468e552ed8b13
+ VERSION=4.1.2
+
SOURCE_HASH=sha512:ccb981686f2cb4fc7f1042ce237656a80d24793af88e335267504a5c4d15200a7eee6d4f4d613f80688a45e62f216b1dcb4ac7d186f3436c92490e0bfc0cc35f
# VX=4.0
SOURCE=${SPELL//4}-${VERSION}.tar.bz2
# SOURCE_URL=$KDE_URL/stable/${VERSION}/src/extragear/$SOURCE
diff --git a/kde4-apps/ktorrent4/HISTORY b/kde4-apps/ktorrent4/HISTORY
index 8c8e7d5..9c8aad0 100644
--- a/kde4-apps/ktorrent4/HISTORY
+++ b/kde4-apps/ktorrent4/HISTORY
@@ -1,3 +1,6 @@
+2011-08-16 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 4.1.2
+
2011-05-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 4.1.1

diff --git a/kde4-apps/libktorrent/DETAILS b/kde4-apps/libktorrent/DETAILS
index 6e2859a..82e1c6e 100755
--- a/kde4-apps/libktorrent/DETAILS
+++ b/kde4-apps/libktorrent/DETAILS
@@ -1,6 +1,6 @@
SPELL=libktorrent
- VERSION=1.1.1
-
SOURCE_HASH=sha512:fdee650796f9a6fe08f9c07a3a4095178cc431a35b8275ded85f4637a9f5a8152547d4c4fca08dbc6d922c942200758cf98c958d57d14a8af2d9bbca89dad307
+ VERSION=1.1.2
+
SOURCE_HASH=sha512:7ac7086133e925b9ef1cdd741be1c31ba549a8d6d464f713cf6c6dec62a9bcf169a204534f1a35deaab23896b95f18e064ca89c3674e506d8cb0aed09e32909e
VX=4${VERSION:1:4}
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL=http://ktorrent.org/downloads/$VX/$SOURCE
diff --git a/kde4-apps/libktorrent/HISTORY b/kde4-apps/libktorrent/HISTORY
index 4d01d48..ab490ba 100644
--- a/kde4-apps/libktorrent/HISTORY
+++ b/kde4-apps/libktorrent/HISTORY
@@ -1,3 +1,6 @@
+2011-08-16 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 1.1.2
+
2011-05-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 1.1.1

diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 9627ce7..5ac9ce2 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,9 @@
+2011-08-16 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=3.0.2
+ * info/patches/maintenance_patches_3/patch-3.0.2: added
+ * info/patches/maintenance_patches/patch-2.6.33.18: added
+ * info/patches/maintenance_patches/patch-2.6.32.45: added
+
2011-08-09 Ladislav Hagara <hgr AT vabo.cz>
* info/patches/maintenance_patches/patch-2.6.33.17: added
* info/patches/maintenance_patches/patch-2.6.32.44: added
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.32.45
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.32.45
new file mode 100755
index 0000000..578f6b6
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.32.45
@@ -0,0 +1,6 @@
+appliedkernels="2.6.32"
+patchversion="${appliedkernels}.45"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/longterm/v${appliedkernels}/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.33.18
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.33.18
new file mode 100755
index 0000000..18973b1
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.33.18
@@ -0,0 +1,6 @@
+appliedkernels="2.6.33"
+patchversion="${appliedkernels}.18"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/longterm/v${appliedkernels}/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.2
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.2
new file mode 100755
index 0000000..eeeed93
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.2
@@ -0,0 +1,6 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.2"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 40a591b..177af46 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -2,7 +2,7 @@ LATEST_3=3.0
LATEST_2_6=2.6.39
LATEST_PRE_2_6=patch-2.6.39
LATEST_maintenance_patches=patch-2.6.39.4
-LATEST_maintenance_patches_3=patch-3.0.1
+LATEST_maintenance_patches_3=patch-3.0.2
LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.37.9
LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/libs/clucene/BUILD b/libs/clucene/BUILD
index 2ae07ac..185b1ea 100755
--- a/libs/clucene/BUILD
+++ b/libs/clucene/BUILD
@@ -1,4 +1,4 @@
-if [[ $CLUC_VER != stable ]];then
+if [[ -n $CLUC_VER && $CLUC_VER != stable ]];then
cmake_build
else
OPTS="--disable-static $OPTS" &&
diff --git a/libs/clucene/DEPENDS b/libs/clucene/DEPENDS
index 20382a0..7161d17 100755
--- a/libs/clucene/DEPENDS
+++ b/libs/clucene/DEPENDS
@@ -1,4 +1,4 @@
depends -sub CXX gcc &&
-if [[ $CLUC_VER != stable ]];then
+if [[ -n $CLUC_VER && $CLUC_VER != stable ]];then
depends cmake
fi
diff --git a/libs/clucene/HISTORY b/libs/clucene/HISTORY
index 60c26b1..b62fef0 100644
--- a/libs/clucene/HISTORY
+++ b/libs/clucene/HISTORY
@@ -1,3 +1,8 @@
+2011-08-16 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * BUILD, DEPENDS: CLUC_VER may be unset, if first casted after scm
+ support has been removed. This fixes compilation issue with stable
+ version (autotools Vs. cmake)
+
2011-08-03 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS, PREPARE, DETAILS: remove svn support
they now use git
diff --git a/libs/gdbm/CONFLICTS b/libs/gdbm/CONFLICTS
new file mode 100755
index 0000000..ef8e010
--- /dev/null
+++ b/libs/gdbm/CONFLICTS
@@ -0,0 +1 @@
+conflicts gdbm y
diff --git a/libs/gdbm/HISTORY b/libs/gdbm/HISTORY
index d8b22d7..2f744ac 100644
--- a/libs/gdbm/HISTORY
+++ b/libs/gdbm/HISTORY
@@ -1,3 +1,6 @@
+2011-08-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFLICTS: added, to prevent linking with an old library version
+
2011-08-15 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.9.1; converted to upstream signature
checking



  • [SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (898af1773bef7b01d2c57e330b127c701a35a782), Bor Kraljič, 08/16/2011

Archive powered by MHonArc 2.6.24.

Top of Page