Merge branch 'master' into openoffice

11 files changed, 105 insertions, 25 deletions

diff --git a/ftp-libs/libtorrent/DETAILS b/ftp-libs/libtorrent/DETAILS
index 21d3e4e293..bd5468fcf7 100755
--- a/ftp-libs/libtorrent/DETAILS
+++ b/ftp-libs/libtorrent/DETAILS
@@ -1,13 +1,12 @@
            SPELL=libtorrent
-         VERSION=0.12.0
+         VERSION=0.12.1
           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
-	   BUILD_API=2
-     SOURCE_HASH=sha512:9b192c6b14c3403fd6d12f8e2b3a464c02174861224eef2fd73ebe3c53ebed5ba24245755ce06b6d04da0c410b76155d6d02086d31a1dd3e682cf151816d9406
+     SOURCE_HASH=sha512:3a69e196a9c9b04e49e9d2cb4d38b0eb653364c0cb8f57882162bad72db3416cdb26231c44a13bcfe146942318f82a5e7231136d4d8f5e0905e5b4f1003a0efd
         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 9c731f70e8..c3fe75e883 100644
--- a/ftp-libs/libtorrent/HISTORY
+++ b/ftp-libs/libtorrent/HISTORY
@@ -1,3 +1,6 @@
+2008-04-24 Elisamuel Resto <ryuji@sourcemage.org>
+	* DETAILS: updated to 0.12.1; removed BUILD_API
+
 2008-03-22 Eric Sandall <sandalle@sourcemage.org>
 	* PRE_BUILD: Apply gcc43.patch
 	* gcc43.patch: Upstream patch to fix compilation with gcc 4.3.0
diff --git a/ftp/rtorrent/DETAILS b/ftp/rtorrent/DETAILS
index 7612e1a8b7..20390badae 100755
--- a/ftp/rtorrent/DETAILS
+++ b/ftp/rtorrent/DETAILS
@@ -1,14 +1,12 @@
            SPELL=rtorrent
-         VERSION=0.8.0
+         VERSION=0.8.1
           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	
-         UPDATED=20050214
       LICENSE[0]=GPL
-	   BUILD_API=2
-     SOURCE_HASH=sha512:7ed25abde9aa0116ac386dbcc95b63fc25cb87d5f5c34bc3499ac8c093cb3b4d57473dceb0c41e3abdf87203a33f2e3cdc300c76dfcd3b6af67029ba414b6ada
+     SOURCE_HASH=sha512:732850194bc19704047950ed2770832ff1ea8c73316126843ad3fb75fcf1335394ebe7eaa9d36820cd6733ccb397847cf57d4bf762c54785a554911ceb10d6a4
         KEYWORDS="bittorrent ftp"
            SHORT='Rtorrent is a bittorrent client using libTorrent.'
 cat << EOF
diff --git a/ftp/rtorrent/HISTORY b/ftp/rtorrent/HISTORY
index 40d32a5975..8c988ab639 100644
--- a/ftp/rtorrent/HISTORY
+++ b/ftp/rtorrent/HISTORY
@@ -1,3 +1,6 @@
+2008-04-24 Elisamuel Resto <ryuji@sourcemage.org>
+	* DETAILS: updated to 0.8.1; removed UPDATED and BUILD_API
+
 2008-03-22 Eric Sandall <sandalle@sourcemage.org>
 	* PRE_BUILD: Apply gcc43.patch
 	* gcc43.patch: Patch to fix compilation with gcc 4.3.0
diff --git a/gnome2-apps/epiphany/BUILD b/gnome2-apps/epiphany/BUILD
index 88aba20410..bb3a968b24 100755
--- a/gnome2-apps/epiphany/BUILD
+++ b/gnome2-apps/epiphany/BUILD
@@ -1,18 +1,23 @@
-if test "$(get_spell_provider $SPELL GECKO)" = firefox; then
-   OPTS="$OPTS --with-gecko=firefox"
-elif test "$(get_spell_provider $SPELL GECKO)" = seamonkey; then
-   OPTS="$OPTS --with-gecko=seamonkey"
-elif test "$(get_spell_provider $SPELL GECKO)" = xulrunner; then
-   OPTS="$OPTS --with-gecko=xulrunner"
+if [[ "${EPIPHANY_WEBKIT}" == "y" ]]; then
+   OPTS="${OPTS} --with-engine=webkit"
 else
-   OPTS="$OPTS --with-gecko=mozilla"
+   if test "$(get_spell_provider $SPELL GECKO)" = firefox; then
+      OPTS="${OPTS} --with-gecko=firefox"
+   elif test "$(get_spell_provider $SPELL GECKO)" = seamonkey; then
+      OPTS="${OPTS} --with-gecko=seamonkey"
+   elif test "$(get_spell_provider $SPELL GECKO)" = xulrunner; then
+      OPTS="${OPTS} --with-gecko=xulrunner"
+   else
+      OPTS="${OPTS} --with-gecko=mozilla"
+   fi
 fi &&
 
 # requires at least -O2 to not segfault on startup with gcc 4.0
 if ! echo "$CFLAGS" | grep -q -- '-O3'; then
   CFLAGS="$CFLAGS -O2"      &&
   CXXFLAGS="$CXXFLAGS -O2"
-fi  &&
-make_single    &&
-default_build  &&
+fi &&
+
+make_single   &&
+default_build &&
 make_normal
diff --git a/gnome2-apps/epiphany/CONFIGURE b/gnome2-apps/epiphany/CONFIGURE
new file mode 100644
index 0000000000..e48ff0a018
--- /dev/null
+++ b/gnome2-apps/epiphany/CONFIGURE
@@ -0,0 +1,2 @@
+message "${PROBLEM_COLOR}WebKit support is still experimental, and many features are still not implemented!${DEFAULT_COLOR}" &&
+config_query EPIPHANY_WEBKIT "Do you want to use the (experimental) WebKit rendering engine?" n
diff --git a/gnome2-apps/epiphany/DEPENDS b/gnome2-apps/epiphany/DEPENDS
index 9c83846492..19cb4e0409 100755
--- a/gnome2-apps/epiphany/DEPENDS
+++ b/gnome2-apps/epiphany/DEPENDS
@@ -1,10 +1,9 @@
-depends  GECKO            &&
-depends  libgnomeui       &&
-depends  gnome-desktop    &&
-depends  libgnomeprint    &&
-depends  libgnomeprintui  &&
-depends  iso-codes        &&
-depends  dbus-glib        &&
+depends libgnomeui      &&
+depends gnome-desktop   &&
+depends libgnomeprint   &&
+depends libgnomeprintui &&
+depends iso-codes       &&
+depends dbus-glib       &&
 
 optional_depends gtk-doc                                \
                  "--enable-gtk-doc"                     \
@@ -14,5 +13,10 @@ optional_depends gtk-doc                                \
 optional_depends gnome-python2                          \
                  "--enable-python"                      \
                  "--disable-python"                     \
-                 "Enable Python support"                
+                 "Enable Python support"                &&
 
+if [[ "${EPIPHANY_WEBKIT}" == "y" ]]; then
+   depends webkitgtk
+else
+   depends GECKO
+fi
diff --git a/gnome2-apps/epiphany/HISTORY b/gnome2-apps/epiphany/HISTORY
index df652f7e97..6c96e69ae3 100644
--- a/gnome2-apps/epiphany/HISTORY
+++ b/gnome2-apps/epiphany/HISTORY
@@ -1,3 +1,6 @@
+2008-04-24 Elisamuel Resto <ryuji@sourcemage.org>
+	* BUILD, CONFIGURE, DEPENDS: added prompts for WebKit engine support
+
 2008-04-10 Robin Cook <rcook@wyrms.net>
 	* DETAILS: updated VERSION to 2.22.1.1
 
diff --git a/libs/boost/HISTORY b/libs/boost/HISTORY
index f163d150a0..2cadd88018 100644
--- a/libs/boost/HISTORY
+++ b/libs/boost/HISTORY
@@ -1,3 +1,7 @@
+2008-04-24 Elisamuel Resto <ryuji@sourcemage.org>
+	* PRE_BUILD, boost-1_35_0-serialization_gcc43_64bit.patch: added, the combination
+	  x86_64 + boost-1_35_0 + gcc-4.3 breaks compiling of boost. Applied in upstream scm.
+
 2008-03-29  Treeeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 1_35_0
 	* PRE_BUILD, gcc43.patch: deleted, not needed
diff --git a/libs/boost/PRE_BUILD b/libs/boost/PRE_BUILD
new file mode 100755
index 0000000000..f32561003c
--- /dev/null
+++ b/libs/boost/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+if [[ "$(installed_version gcc | sed 's:\.::g')" -ge "430" ]] && \
+   [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
+  patch -p1 < ${SPELL_DIRECTORY}/boost-1_35_0-serialization_gcc43_64bit.patch
+fi
diff --git a/libs/boost/boost-1_35_0-serialization_gcc43_64bit.patch b/libs/boost/boost-1_35_0-serialization_gcc43_64bit.patch
new file mode 100644
index 0000000000..7f959d8b34
--- /dev/null
+++ b/libs/boost/boost-1_35_0-serialization_gcc43_64bit.patch
@@ -0,0 +1,52 @@
+--- trunk/boost/archive/polymorphic_iarchive.hpp (revision 43694)
++++ trunk/boost/archive/polymorphic_iarchive.hpp (revision 43958)
+@@ -18,4 +18,5 @@
+ 
+ #include <cstddef> // std::size_t
++#include <climits> // ULONG_MAX 
+ #include <boost/config.hpp>
+ 
+@@ -39,7 +40,14 @@
+ // if there is no 64 bit int or if its the same as a long
+ // we shouldn't define separate functions for int64 data types.
+-#if defined(BOOST_NO_INT64_T) \
+-    || (ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
+-#   define BOOST_NO_INTRINSIC_INT64_T
++#if defined(BOOST_NO_INT64_T)
++    #define BOOST_NO_INTRINSIC_INT64_T
++#else 
++    #if defined(ULONG_MAX)
++        #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
++            #define BOOST_NO_INTRINSIC_INT64_T
++        #endif
++    #else 
++        #define BOOST_NO_INTRINSIC_INT64_T
++    #endif
+ #endif
+ 
+--- trunk/boost/archive/polymorphic_oarchive.hpp (revision 43694)
++++ trunk/boost/archive/polymorphic_oarchive.hpp (revision 43958)
+@@ -18,4 +18,5 @@
+ 
+ #include <cstddef> // size_t
++#include <climits> // ULONG_MAX 
+ #include <string>
+ 
+@@ -38,7 +39,14 @@
+ // if there is no 64 bit int or if its the same as a long
+ // we shouldn't define separate functions for int64 data types.
+-#if defined(BOOST_NO_INT64_T) \
+-    || (ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
+-#   define BOOST_NO_INTRINSIC_INT64_T
++#if defined(BOOST_NO_INT64_T)
++    #define BOOST_NO_INTRINSIC_INT64_T
++#else 
++    #if defined(ULONG_MAX)
++        #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
++            #define BOOST_NO_INTRINSIC_INT64_T
++        #endif
++    #else 
++        #define BOOST_NO_INTRINSIC_INT64_T
++    #endif
+ #endif
+