Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Mathieu Lonjaret (432fe4b8679b5235b7cee92c6dd758bf15d05684)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Mathieu Lonjaret <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Mathieu Lonjaret (432fe4b8679b5235b7cee92c6dd758bf15d05684)
  • Date: Sun, 28 Sep 2008 08:50:38 -0500

GIT changes to master grimoire by Mathieu Lonjaret <lejatorn AT sourcemage.org>:

audio-soft/beep/BUILD | 8 --
audio-soft/beep/DETAILS | 2
audio-soft/beep/HISTORY | 4 +
audio-soft/beep/PRE_BUILD | 5 +
ftp-libs/libtorrent/DETAILS | 4 -
ftp-libs/libtorrent/HISTORY | 3 +
ftp-libs/libtorrent/PRE_BUILD | 2
ftp-libs/libtorrent/gcc43.patch | 111
----------------------------------------
ftp/gtk-gnutella/BUILD | 17 +++++-
ftp/gtk-gnutella/CONFIGURE | 2
ftp/gtk-gnutella/DEPENDS | 5 +
ftp/gtk-gnutella/HISTORY | 3 +
ftp/rtorrent/DETAILS | 4 -
ftp/rtorrent/HISTORY | 4 +
ftp/rtorrent/PRE_BUILD | 3 -
ftp/rtorrent/gcc43.patch | 81 -----------------------------
16 files changed, 43 insertions(+), 215 deletions(-)

New commits:
commit 5c4a7eb5f5befa62ac2e9d0ed3292e3bfdc9e886
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

gtk-gnutella: deps reworked, bug 13130 fixed

commit 4de4609615f094f641bb824689cc95a0b09a7d94
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

rtorrent: update to 0.8.3

commit fe63e1495070986ceb758efdc7419236ada68d26
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

libtorrent: update to 0.12.3

commit 0410e041e68f519e27c36d2a58ed0fd696b4d3ca
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

beep: build_api 2 and fix man install path

diff --git a/audio-soft/beep/BUILD b/audio-soft/beep/BUILD
index 6c0a051..8f58e6d 100755
--- a/audio-soft/beep/BUILD
+++ b/audio-soft/beep/BUILD
@@ -1,7 +1 @@
-(
-
- make &&
- prepare_install &&
- make install
-
-) > $C_FIFO 2>&1
+make
diff --git a/audio-soft/beep/DETAILS b/audio-soft/beep/DETAILS
index 2c0bb5c..3c2c6f2 100755
--- a/audio-soft/beep/DETAILS
+++ b/audio-soft/beep/DETAILS
@@ -8,9 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
UPDATED=20020424

SOURCE_HASH=sha512:85e2288fc01322ad2b9ad59063ee61cc94edc6b712ef1af2f86bd7e52e08cfaa81a4d8aafd729791eb3e776dbaf8fff7298ccafb758a716a3bdc9a3c385a38e1
LICENSE[0]=GPL
- MAINTAINER=unet AT sourcemage.org
KEYWORDS="tools audio"
- BUILD_API=1
SHORT="Beep the pc speaker in any number of ways."
cat << EOF
Beep allows the user to control the pc-speaker with precision,
diff --git a/audio-soft/beep/HISTORY b/audio-soft/beep/HISTORY
index e326c33..00239d2 100644
--- a/audio-soft/beep/HISTORY
+++ b/audio-soft/beep/HISTORY
@@ -1,3 +1,7 @@
+2008-09-13 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * DETAILS: rm build_api and maintainer
+ * BUILD, add PRE_BUILD: build_api 2 and fix wrong man install path
+
2006-06-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: inserted BUILD_API=1 line

diff --git a/audio-soft/beep/PRE_BUILD b/audio-soft/beep/PRE_BUILD
new file mode 100755
index 0000000..a930daf
--- /dev/null
+++ b/audio-soft/beep/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -i -r '18d' Makefile &&
+sed -i -r 's:MAN_DIR=/usr/:MAN_DIR=/usr/share/:' \
+Makefile
diff --git a/ftp-libs/libtorrent/DETAILS b/ftp-libs/libtorrent/DETAILS
index 1ade5e8..3209eee 100755
--- a/ftp-libs/libtorrent/DETAILS
+++ b/ftp-libs/libtorrent/DETAILS
@@ -1,12 +1,12 @@
SPELL=libtorrent
- VERSION=0.12.2
+ VERSION=0.12.3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://libtorrent.rakshasa.no/downloads/$SOURCE
WEB_SITE=http://libtorrent.rakshasa.no
ENTERED=20050117
LICENSE[0]=GPL
-
SOURCE_HASH=sha512:bb13ac3ffc072cc9329100d077b392ea86dae7835d1a60055da490dfcf6235ab2ef19009d8ae2d64c499052ca65957e68e0cb59a327b5e31e12c8edebecda567
+
SOURCE_HASH=sha512:2c51247308317f4ea498c8da5bd4c07ed9f52bc9b38ada5908905bf4fced593d13287be40c703441d746b84c5db6adab0321475a04a9c1a2348bba34aff39640
KEYWORDS="bittorrent ftp libs"
SHORT='LibTorrent is a BitTorrent library written in C++ for
*nix.'
cat << EOF
diff --git a/ftp-libs/libtorrent/HISTORY b/ftp-libs/libtorrent/HISTORY
index dd6d1a0..c71f3e7 100644
--- a/ftp-libs/libtorrent/HISTORY
+++ b/ftp-libs/libtorrent/HISTORY
@@ -1,3 +1,6 @@
+2008-09-15 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * DETAILS, PRE_BUILD: update to 0.12.3, patch not needed anymore
+
2008-05-10 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DETAILS: corrected mistake (BUILD_API=2)

diff --git a/ftp-libs/libtorrent/PRE_BUILD b/ftp-libs/libtorrent/PRE_BUILD
index 302a723..ea304d2 100755
--- a/ftp-libs/libtorrent/PRE_BUILD
+++ b/ftp-libs/libtorrent/PRE_BUILD
@@ -1,5 +1,3 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-# fix problems on amd64 with libtool versions (bug #13943)
-patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch &&
./autogen.sh
diff --git a/ftp-libs/libtorrent/gcc43.patch b/ftp-libs/libtorrent/gcc43.patch
deleted file mode 100644
index 7d26e29..0000000
--- a/ftp-libs/libtorrent/gcc43.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-#
-# From
http://rakshasa.no/pipermail/libtorrent-devel/2008-February/001503.html
-#
-[Libtorrent-devel] fix building with gcc 4.3 and above
-Serge Belyshev belyshev at depni.sinp.msu.ru
-Fri Feb 29 07:30:00 UTC 2008
-
- * Previous message: [Libtorrent-devel] Total incoming incorrect
- * Next message: [Libtorrent-devel] fix building rtorrent HEAD without
xmlrpc
- * Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
-
-In gcc 4.3 header dependencies were cleaned up, so libtorrent/rtorrent
-do not build anymore. Fixed by the following patches, for libtorrent:
-
-Index: libtorrent-0.12.0/rak/functional.h
-===================================================================
---- libtorrent-0.12.0.orig/rak/functional.h
-+++ libtorrent-0.12.0/rak/functional.h
-@@ -37,6 +37,7 @@
- #ifndef RAK_FUNCTIONAL_H
- #define RAK_FUNCTIONAL_H
-
-+#include <stddef.h>
- #include <functional>
-
- namespace rak {
-Index: libtorrent-0.12.0/src/data/chunk.cc
-===================================================================
---- libtorrent-0.12.0.orig/src/data/chunk.cc
-+++ libtorrent-0.12.0/src/data/chunk.cc
-@@ -38,6 +38,7 @@
-
- #include <algorithm>
- #include <functional>
-+#include <cstring>
-
- #include "torrent/exceptions.h"
-
-Index: libtorrent-0.12.0/src/data/chunk_list.h
-===================================================================
---- libtorrent-0.12.0.orig/src/data/chunk_list.h
-+++ libtorrent-0.12.0/src/data/chunk_list.h
-@@ -38,6 +38,7 @@
- #define LIBTORRENT_DATA_CHUNK_LIST_H
-
- #include <vector>
-+#include <string>
- #include <rak/error_number.h>
- #include <rak/functional.h>
-
-Index: libtorrent-0.12.0/src/net/address_list.cc
-===================================================================
---- libtorrent-0.12.0.orig/src/net/address_list.cc
-+++ libtorrent-0.12.0/src/net/address_list.cc
-@@ -37,6 +37,7 @@
- #include "config.h"
-
- #include <rak/functional.h>
-+#include <algorithm>
-
- #include "download/download_info.h" // for SocketAddressCompact
-
-Index: libtorrent-0.12.0/src/torrent/data/file_list.h
-===================================================================
---- libtorrent-0.12.0.orig/src/torrent/data/file_list.h
-+++ libtorrent-0.12.0/src/torrent/data/file_list.h
-@@ -38,6 +38,7 @@
- #define LIBTORRENT_FILE_LIST_H
-
- #include <vector>
-+#include <cstdlib>
- #include <torrent/common.h>
- #include <torrent/bitfield.h>
- #include <torrent/path.h>
-Index: libtorrent-0.12.0/src/torrent/exceptions.cc
-===================================================================
---- libtorrent-0.12.0.orig/src/torrent/exceptions.cc
-+++ libtorrent-0.12.0/src/torrent/exceptions.cc
-@@ -37,6 +37,7 @@
- #include "config.h"
-
- #include <cerrno>
-+#include <cstring>
-
- #include "exceptions.h"
-
-Index: libtorrent-0.12.0/src/torrent/tracker_list.h
-===================================================================
---- libtorrent-0.12.0.orig/src/torrent/tracker_list.h
-+++ libtorrent-0.12.0/src/torrent/tracker_list.h
-@@ -40,6 +40,7 @@
- #include <algorithm>
- #include <vector>
- #include <torrent/common.h>
-+#include <string>
-
- namespace torrent {
-
-Index: libtorrent-0.12.0/src/utils/diffie_hellman.cc
-===================================================================
---- libtorrent-0.12.0.orig/src/utils/diffie_hellman.cc
-+++ libtorrent-0.12.0/src/utils/diffie_hellman.cc
-@@ -37,6 +37,7 @@
- #include "config.h"
-
- #include <string>
-+#include <cstring>
-
- #ifdef USE_OPENSSL
- #include <openssl/bn.h>
-
diff --git a/ftp/gtk-gnutella/BUILD b/ftp/gtk-gnutella/BUILD
index 01e0730..5d0d8b1 100755
--- a/ftp/gtk-gnutella/BUILD
+++ b/ftp/gtk-gnutella/BUILD
@@ -1,7 +1,19 @@
if [ "$GNUTELLA_GTK_IP6" == "y" ]; then
- OPTS="-D ipv6='true' ${OPTS}"
+ OPTS="-Dd_ipv6='true' ${OPTS}"
else
- OPTS="-D ipv6='false' ${OPTS}"
+ OPTS="-Dd_ipv6=undef ${OPTS}"
+fi &&
+
+if [ "$GNUTELLA_GTK_FAST_ASSERT" == "y" ]; then
+ OPTS="-Dd_fast_assert='yes' ${OPTS}"
+else
+ OPTS="-Dd_fast_assert=undef ${OPTS}"
+fi &&
+
+if [ "$GNUTELLA_GTK_NLS" == "y" ]; then
+ OPTS="-Dd_nls='yes' ${OPTS}"
+else
+ OPTS="-Dd_nls=undef ${OPTS}"
fi &&

if [ "$GNUTELLA_GTK_RMTCTRL" == "y" ]; then
@@ -15,6 +27,5 @@ fi &&
-Dsysconfdir=${INSTALL_ROOT}/etc \
-Dlocalstatedir=${INSTALL_ROOT}/var \
-Dcc=/usr/bin/gcc \
- -Dd_nls=undef \
$OPTS &&
make
diff --git a/ftp/gtk-gnutella/CONFIGURE b/ftp/gtk-gnutella/CONFIGURE
index d7035d0..86b3046 100755
--- a/ftp/gtk-gnutella/CONFIGURE
+++ b/ftp/gtk-gnutella/CONFIGURE
@@ -2,4 +2,6 @@ message "${MESSAGE_COLOR}GTK+2 interface is
slower${DEFAULT_COLOR}" &&
config_query_list GNUTELLA_GTK "Which gtk+ interface do you want?" \
1.x 2.x &&
config_query GNUTELLA_GTK_IP6 "Use IPv6?" y &&
+config_query GNUTELLA_GTK_FAST_ASSERT "Enable fast assertions?" y &&
+config_query GNUTELLA_GTK_NLS "Enable NLS support?" y &&
config_query GNUTELLA_GTK_RMTCTRL "Experimental remote control?" n
diff --git a/ftp/gtk-gnutella/DEPENDS b/ftp/gtk-gnutella/DEPENDS
index 9ce07e1..a67ef3e 100755
--- a/ftp/gtk-gnutella/DEPENDS
+++ b/ftp/gtk-gnutella/DEPENDS
@@ -1,5 +1,6 @@
-depends libxml2 &&
-optional_depends "dbus" "-D dbus='true'" "-D dbus='false'" &&
+depends libxml2 &&
+optional_depends "dbus" "-Dd_dbus='true'" "-Dd_dbus=undef" &&
+optional_depends "gnutls" "-Dd_gnutls='true'" "-Dd_gnutls=undef" &&
if [ "$GNUTELLA_GTK" = "1.x" ]; then
depends gtk+ "-Dgtkversion=1"
else
diff --git a/ftp/gtk-gnutella/HISTORY b/ftp/gtk-gnutella/HISTORY
index 792ae99..03871a6 100644
--- a/ftp/gtk-gnutella/HISTORY
+++ b/ftp/gtk-gnutella/HISTORY
@@ -1,3 +1,6 @@
+2008-09-28 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * DEPENDS, CONFIGURE, BUILD: reworks the deps, fixes bug 13130
+
2008-04-02 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DETAILS: update to 0.96.5

diff --git a/ftp/rtorrent/DETAILS b/ftp/rtorrent/DETAILS
index 7711344..5f2e266 100755
--- a/ftp/rtorrent/DETAILS
+++ b/ftp/rtorrent/DETAILS
@@ -1,12 +1,12 @@
SPELL=rtorrent
- VERSION=0.8.2
+ VERSION=0.8.3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://libtorrent.rakshasa.no/downloads/$SOURCE
WEB_SITE=http://libtorrent.rakshasa.no
ENTERED=20050214
LICENSE[0]=GPL
-
SOURCE_HASH=sha512:ff939b81c07024e42eb5fcea25176da98d5a4af83f400c9104d4f7e310e4a3748edb1d4b224ff88da2e94cd9dd384687862613555682d7312f54e85b382cb2c1
+
SOURCE_HASH=sha512:704804ada1e3a22b9c53af1d85db596d8e6bf535bcaadc89a068cb946031c7edc10027e21b34660cfb4c825fa24975cd0004935e207804274389b92dcb83d8f3
KEYWORDS="bittorrent ftp"
SHORT='Rtorrent is a bittorrent client using libTorrent.'
cat << EOF
diff --git a/ftp/rtorrent/HISTORY b/ftp/rtorrent/HISTORY
index f6bbf5c..f068cfd 100644
--- a/ftp/rtorrent/HISTORY
+++ b/ftp/rtorrent/HISTORY
@@ -1,3 +1,7 @@
+2008-09-15 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * DETAILS, rm gcc43.patch, rm PRE_BUILD: update to 0.8.3, patch not
+ needed anymore.
+
2008-05-10 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DETAILS: corrected mistake (UPDATED and BUILD_API)

diff --git a/ftp/rtorrent/PRE_BUILD b/ftp/rtorrent/PRE_BUILD
deleted file mode 100755
index 7528467..0000000
--- a/ftp/rtorrent/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch
diff --git a/ftp/rtorrent/gcc43.patch b/ftp/rtorrent/gcc43.patch
deleted file mode 100644
index 17eeee6..0000000
--- a/ftp/rtorrent/gcc43.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# From
http://rakshasa.no/pipermail/libtorrent-devel/2008-February/001503.html
-#
-[Libtorrent-devel] fix building with gcc 4.3 and above
-Serge Belyshev belyshev at depni.sinp.msu.ru
-Fri Feb 29 07:30:00 UTC 2008
-
- * Previous message: [Libtorrent-devel] Total incoming incorrect
- * Next message: [Libtorrent-devel] fix building rtorrent HEAD without
xmlrpc
- * Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
-
-In gcc 4.3 header dependencies were cleaned up, so libtorrent/rtorrent
-do not build anymore. Fixed by the following patches, for libtorrent:
-
-Index: rtorrent-0.8.0/rak/functional.h
-===================================================================
---- rtorrent-0.8.0.orig/rak/functional.h
-+++ rtorrent-0.8.0/rak/functional.h
-@@ -37,6 +37,7 @@
- #ifndef RAK_FUNCTIONAL_H
- #define RAK_FUNCTIONAL_H
-
-+#include <stddef.h>
- #include <functional>
-
- namespace rak {
-Index: rtorrent-0.8.0/src/command_ui.cc
-===================================================================
---- rtorrent-0.8.0.orig/src/command_ui.cc
-+++ rtorrent-0.8.0/src/command_ui.cc
-@@ -39,6 +39,7 @@
- #include <rak/functional.h>
- #include <rak/functional_fun.h>
- #include <sigc++/adaptors/bind.h>
-+#include <ctime>
-
- #include "core/manager.h"
- #include "core/view_manager.h"
-Index: rtorrent-0.8.0/src/display/text_element_value.cc
-===================================================================
---- rtorrent-0.8.0.orig/src/display/text_element_value.cc
-+++ rtorrent-0.8.0/src/display/text_element_value.cc
-@@ -38,6 +38,7 @@
-
- #include "globals.h"
- #include "text_element_value.h"
-+#include <ctime>
-
- namespace display {
-
-Index: rtorrent-0.8.0/src/rpc/exec_file.cc
-===================================================================
---- rtorrent-0.8.0.orig/src/rpc/exec_file.cc
-+++ rtorrent-0.8.0/src/rpc/exec_file.cc
-@@ -37,6 +37,7 @@
- #include "config.h"
-
- #include <string>
-+#include <cstring>
- #include <unistd.h>
- #include <rak/path.h>
- #include <sys/types.h>
-Index: rtorrent-0.8.0/src/rpc/parse.cc
-===================================================================
---- rtorrent-0.8.0.orig/src/rpc/parse.cc
-+++ rtorrent-0.8.0/src/rpc/parse.cc
-@@ -39,6 +39,7 @@
- #include <locale>
- #include <rak/path.h>
- #include <torrent/exceptions.h>
-+#include <cstring>
-
- #include "parse.h"
-
-
- * Previous message: [Libtorrent-devel] Total incoming incorrect
- * Next message: [Libtorrent-devel] fix building rtorrent HEAD without
xmlrpc
- * Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
-
-More information about the Libtorrent-devel mailing list
-



  • [SM-Commit] GIT changes to master grimoire by Mathieu Lonjaret (432fe4b8679b5235b7cee92c6dd758bf15d05684), Mathieu Lonjaret, 09/28/2008

Archive powered by MHonArc 2.6.24.

Top of Page