summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPol Vinogradov2013-04-17 00:12:19 -0400
committerPol Vinogradov2013-04-17 00:12:19 -0400
commit70a4d62d600b56487f577d02b312332ddf1bce0b (patch)
tree9e6125bef492650532c783ccecf6fe7a2fe18be2
parent1d43b938d033d1643390ffb0195a2a0038aec84f (diff)
parent43b691808fd284381ccd3318e2c5499d733c01ac (diff)
Merge branch 'devel-gcc-4.8' into devel-webkitgtkdevel-webkitgtk
Conflicts: gnu/gcc/0001-remove-libffi.patch gnu/gcc/DETAILS gnu/gcc/HISTORY gnu/gcc/PRE_BUILD gnu/gcc/gcc-4.4.0-ffast-math.patch
-rw-r--r--gnu/gcc/0001-remove-libffi.patch160
-rw-r--r--gnu/gcc/0002-4.8.0-ffast-math.patch64
-rwxr-xr-xgnu/gcc/DETAILS68
-rw-r--r--gnu/gcc/HISTORY37
-rwxr-xr-xgnu/gcc/PRE_BUILD38
-rwxr-xr-xpython-pypi/python-distutils-extra/DETAILS9
-rw-r--r--python-pypi/python-distutils-extra/HISTORY4
-rw-r--r--python-pypi/python-distutils-extra/dist-python-distutils-extra-2.18.tar.gz.sigbin287 -> 0 bytes
-rwxr-xr-xshell-term-fm/remmina/DEPENDS4
-rwxr-xr-xshell-term-fm/remmina/DETAILS8
-rw-r--r--shell-term-fm/remmina/HISTORY9
11 files changed, 295 insertions, 106 deletions
diff --git a/gnu/gcc/0001-remove-libffi.patch b/gnu/gcc/0001-remove-libffi.patch
new file mode 100644
index 0000000000..31d69fd24b
--- /dev/null
+++ b/gnu/gcc/0001-remove-libffi.patch
@@ -0,0 +1,160 @@
+From 1974f57c22229823dcde081f49e7d30e3fe4cd48 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+Date: Wed, 20 Mar 2013 11:25:28 +0100
+Subject: [PATCH] remove libffi
+
+---
+ Makefile.in | 18 ------------------
+ 1 file changed, 18 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 08049de..895b3ac 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -936,7 +936,6 @@ configure-target: \
+ maybe-configure-target-libtermcap \
+ maybe-configure-target-winsup \
+ maybe-configure-target-libgloss \
+- maybe-configure-target-libffi \
+ maybe-configure-target-libjava \
+ maybe-configure-target-zlib \
+ maybe-configure-target-boehm-gc \
+@@ -1089,7 +1088,6 @@ all-target: maybe-all-target-libgo
+ all-target: maybe-all-target-libtermcap
+ all-target: maybe-all-target-winsup
+ all-target: maybe-all-target-libgloss
+-all-target: maybe-all-target-libffi
+ all-target: maybe-all-target-libjava
+ all-target: maybe-all-target-zlib
+ all-target: maybe-all-target-boehm-gc
+@@ -1178,7 +1176,6 @@ info-target: maybe-info-target-libgo
+ info-target: maybe-info-target-libtermcap
+ info-target: maybe-info-target-winsup
+ info-target: maybe-info-target-libgloss
+-info-target: maybe-info-target-libffi
+ info-target: maybe-info-target-libjava
+ info-target: maybe-info-target-zlib
+ info-target: maybe-info-target-boehm-gc
+@@ -1260,7 +1257,6 @@ dvi-target: maybe-dvi-target-libgo
+ dvi-target: maybe-dvi-target-libtermcap
+ dvi-target: maybe-dvi-target-winsup
+ dvi-target: maybe-dvi-target-libgloss
+-dvi-target: maybe-dvi-target-libffi
+ dvi-target: maybe-dvi-target-libjava
+ dvi-target: maybe-dvi-target-zlib
+ dvi-target: maybe-dvi-target-boehm-gc
+@@ -1342,7 +1338,6 @@ pdf-target: maybe-pdf-target-libgo
+ pdf-target: maybe-pdf-target-libtermcap
+ pdf-target: maybe-pdf-target-winsup
+ pdf-target: maybe-pdf-target-libgloss
+-pdf-target: maybe-pdf-target-libffi
+ pdf-target: maybe-pdf-target-libjava
+ pdf-target: maybe-pdf-target-zlib
+ pdf-target: maybe-pdf-target-boehm-gc
+@@ -1424,7 +1419,6 @@ html-target: maybe-html-target-libgo
+ html-target: maybe-html-target-libtermcap
+ html-target: maybe-html-target-winsup
+ html-target: maybe-html-target-libgloss
+-html-target: maybe-html-target-libffi
+ html-target: maybe-html-target-libjava
+ html-target: maybe-html-target-zlib
+ html-target: maybe-html-target-boehm-gc
+@@ -1506,7 +1500,6 @@ TAGS-target: maybe-TAGS-target-libgo
+ TAGS-target: maybe-TAGS-target-libtermcap
+ TAGS-target: maybe-TAGS-target-winsup
+ TAGS-target: maybe-TAGS-target-libgloss
+-TAGS-target: maybe-TAGS-target-libffi
+ TAGS-target: maybe-TAGS-target-libjava
+ TAGS-target: maybe-TAGS-target-zlib
+ TAGS-target: maybe-TAGS-target-boehm-gc
+@@ -1588,7 +1581,6 @@ install-info-target: maybe-install-info-target-libgo
+ install-info-target: maybe-install-info-target-libtermcap
+ install-info-target: maybe-install-info-target-winsup
+ install-info-target: maybe-install-info-target-libgloss
+-install-info-target: maybe-install-info-target-libffi
+ install-info-target: maybe-install-info-target-libjava
+ install-info-target: maybe-install-info-target-zlib
+ install-info-target: maybe-install-info-target-boehm-gc
+@@ -1670,7 +1662,6 @@ install-pdf-target: maybe-install-pdf-target-libgo
+ install-pdf-target: maybe-install-pdf-target-libtermcap
+ install-pdf-target: maybe-install-pdf-target-winsup
+ install-pdf-target: maybe-install-pdf-target-libgloss
+-install-pdf-target: maybe-install-pdf-target-libffi
+ install-pdf-target: maybe-install-pdf-target-libjava
+ install-pdf-target: maybe-install-pdf-target-zlib
+ install-pdf-target: maybe-install-pdf-target-boehm-gc
+@@ -1752,7 +1743,6 @@ install-html-target: maybe-install-html-target-libgo
+ install-html-target: maybe-install-html-target-libtermcap
+ install-html-target: maybe-install-html-target-winsup
+ install-html-target: maybe-install-html-target-libgloss
+-install-html-target: maybe-install-html-target-libffi
+ install-html-target: maybe-install-html-target-libjava
+ install-html-target: maybe-install-html-target-zlib
+ install-html-target: maybe-install-html-target-boehm-gc
+@@ -1834,7 +1824,6 @@ installcheck-target: maybe-installcheck-target-libgo
+ installcheck-target: maybe-installcheck-target-libtermcap
+ installcheck-target: maybe-installcheck-target-winsup
+ installcheck-target: maybe-installcheck-target-libgloss
+-installcheck-target: maybe-installcheck-target-libffi
+ installcheck-target: maybe-installcheck-target-libjava
+ installcheck-target: maybe-installcheck-target-zlib
+ installcheck-target: maybe-installcheck-target-boehm-gc
+@@ -1916,7 +1905,6 @@ mostlyclean-target: maybe-mostlyclean-target-libgo
+ mostlyclean-target: maybe-mostlyclean-target-libtermcap
+ mostlyclean-target: maybe-mostlyclean-target-winsup
+ mostlyclean-target: maybe-mostlyclean-target-libgloss
+-mostlyclean-target: maybe-mostlyclean-target-libffi
+ mostlyclean-target: maybe-mostlyclean-target-libjava
+ mostlyclean-target: maybe-mostlyclean-target-zlib
+ mostlyclean-target: maybe-mostlyclean-target-boehm-gc
+@@ -1998,7 +1986,6 @@ clean-target: maybe-clean-target-libgo
+ clean-target: maybe-clean-target-libtermcap
+ clean-target: maybe-clean-target-winsup
+ clean-target: maybe-clean-target-libgloss
+-clean-target: maybe-clean-target-libffi
+ clean-target: maybe-clean-target-libjava
+ clean-target: maybe-clean-target-zlib
+ clean-target: maybe-clean-target-boehm-gc
+@@ -2080,7 +2067,6 @@ distclean-target: maybe-distclean-target-libgo
+ distclean-target: maybe-distclean-target-libtermcap
+ distclean-target: maybe-distclean-target-winsup
+ distclean-target: maybe-distclean-target-libgloss
+-distclean-target: maybe-distclean-target-libffi
+ distclean-target: maybe-distclean-target-libjava
+ distclean-target: maybe-distclean-target-zlib
+ distclean-target: maybe-distclean-target-boehm-gc
+@@ -2162,7 +2148,6 @@ maintainer-clean-target: maybe-maintainer-clean-target-libgo
+ maintainer-clean-target: maybe-maintainer-clean-target-libtermcap
+ maintainer-clean-target: maybe-maintainer-clean-target-winsup
+ maintainer-clean-target: maybe-maintainer-clean-target-libgloss
+-maintainer-clean-target: maybe-maintainer-clean-target-libffi
+ maintainer-clean-target: maybe-maintainer-clean-target-libjava
+ maintainer-clean-target: maybe-maintainer-clean-target-zlib
+ maintainer-clean-target: maybe-maintainer-clean-target-boehm-gc
+@@ -2299,7 +2284,6 @@ check-target: \
+ maybe-check-target-libtermcap \
+ maybe-check-target-winsup \
+ maybe-check-target-libgloss \
+- maybe-check-target-libffi \
+ maybe-check-target-libjava \
+ maybe-check-target-zlib \
+ maybe-check-target-boehm-gc \
+@@ -2454,7 +2438,6 @@ install-target: \
+ maybe-install-target-libtermcap \
+ maybe-install-target-winsup \
+ maybe-install-target-libgloss \
+- maybe-install-target-libffi \
+ maybe-install-target-libjava \
+ maybe-install-target-zlib \
+ maybe-install-target-boehm-gc \
+@@ -2556,7 +2539,6 @@ install-strip-target: \
+ maybe-install-strip-target-libtermcap \
+ maybe-install-strip-target-winsup \
+ maybe-install-strip-target-libgloss \
+- maybe-install-strip-target-libffi \
+ maybe-install-strip-target-libjava \
+ maybe-install-strip-target-zlib \
+ maybe-install-strip-target-boehm-gc \
+--
+1.8.1.3
+
diff --git a/gnu/gcc/0002-4.8.0-ffast-math.patch b/gnu/gcc/0002-4.8.0-ffast-math.patch
new file mode 100644
index 0000000000..d0dcdf9a12
--- /dev/null
+++ b/gnu/gcc/0002-4.8.0-ffast-math.patch
@@ -0,0 +1,64 @@
+From e63ab6470c6e0d397a5d0daa473599c7d9f5ad62 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+Date: Wed, 20 Mar 2013 11:22:37 +0100
+Subject: [PATCH] fix fastmath
+
+---
+ libgcc/config/i386/crtfastmath.c | 34 ++++++++++++++++++----------------
+ 1 file changed, 18 insertions(+), 16 deletions(-)
+
+diff --git a/libgcc/config/i386/crtfastmath.c b/libgcc/config/i386/crtfastmath.c
+index 991f531..44f2ba0 100644
+--- a/libgcc/config/i386/crtfastmath.c
++++ b/libgcc/config/i386/crtfastmath.c
+@@ -50,6 +50,24 @@ sigill_hdlr (int sig __attribute((unused)),
+ }
+ #endif
+
++struct
++{
++ unsigned short int cwd;
++ unsigned short int swd;
++ unsigned short int twd;
++ unsigned short int fop;
++ long int fip;
++ long int fcs;
++ long int foo;
++ long int fos;
++ long int mxcsr;
++ long int mxcsr_mask;
++ long int st_space[32];
++ long int xmm_space[32];
++ long int padding[56];
++} __attribute__ ((aligned (16))) fxsave;
++
++
+ static void __attribute__((constructor))
+ #ifndef __x86_64__
+ /* The i386 ABI only requires 4-byte stack alignment, so this is necessary
+@@ -94,22 +112,6 @@ set_fast_math (void)
+ if (edx & bit_FXSAVE)
+ {
+ /* Check if DAZ is available. */
+- struct
+- {
+- unsigned short cwd;
+- unsigned short swd;
+- unsigned short twd;
+- unsigned short fop;
+- unsigned int fip;
+- unsigned int fcs;
+- unsigned int foo;
+- unsigned int fos;
+- unsigned int mxcsr;
+- unsigned int mxcsr_mask;
+- unsigned int st_space[32];
+- unsigned int xmm_space[32];
+- unsigned int padding[56];
+- } __attribute__ ((aligned (16))) fxsave;
+
+ /* This is necessary since some implementations of FXSAVE
+ do not modify reserved areas within the image. */
+--
+1.8.1.3
+
diff --git a/gnu/gcc/DETAILS b/gnu/gcc/DETAILS
index 6e234e548f..3edcbaf988 100755
--- a/gnu/gcc/DETAILS
+++ b/gnu/gcc/DETAILS
@@ -1,42 +1,17 @@
SPELL=gcc
- VERSION=4.6.3
+ VERSION=4.8.0
PATCHLEVEL=0
- BASE_SOURCE_URL="ftp://gcc.gnu.org/gnu/gcc/${SPELL}-${VERSION}"
- SOURCE=gcc-core-$VERSION.tar.bz2
+ BASE_SOURCE_URL="ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$VERSION"
+ SOURCE=gcc-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
SOURCE_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE
- SOURCE_URL[1]=${BASE_SOURCE_URL}-$VERSION/$SOURCE
+ SOURCE_URL[1]=${BASE_SOURCE_URL}/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
SOURCE2_IGNORE=signature
-if list_find "$GCC_COMPILER" "c++" ; then
- SOURCE3=gcc-g++-$VERSION.tar.bz2
- SOURCE4=$SOURCE3.sig
- SOURCE3_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE3
- SOURCE3_URL[1]=${BASE_SOURCE_URL}-$VERSION/$SOURCE3
- SOURCE4_URL[0]=${SOURCE3_URL[0]}.sig
- SOURCE3_GPG=gnu.gpg:$SOURCE4:UPSTREAM_KEY
- SOURCE4_IGNORE=signature
-fi
-if list_find "$GCC_COMPILER" "objc" ; then
- SOURCE5=gcc-objc-$VERSION.tar.bz2
- SOURCE6=$SOURCE5.sig
- SOURCE5_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE5
- SOURCE5_URL[1]=${BASE_SOURCE_URL}-$VERSION/$SOURCE5
- SOURCE6_URL[0]=${SOURCE5_URL[0]}.sig
- SOURCE5_GPG=gnu.gpg:$SOURCE6:UPSTREAM_KEY
- SOURCE6_IGNORE=signature
-fi
if list_find "$GCC_COMPILER" "ada" ; then
- SOURCE7=gcc-ada-$VERSION.tar.bz2
- SOURCE8=$SOURCE7.sig
- SOURCE7_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE7
- SOURCE7_URL[1]=${BASE_SOURCE_URL}-$VERSION/$SOURCE7
- SOURCE8_URL[0]=${SOURCE7_URL[0]}.sig
- SOURCE7_GPG=gnu.gpg:$SOURCE8:UPSTREAM_KEY
- SOURCE8_IGNORE=signature
# howto generate the ada bootstraper
# step 1: make a backup of your existing gcc cache you'll lose things like libstdc++
@@ -54,14 +29,14 @@ if list_find "$GCC_COMPILER" "ada" ; then
if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]
then
- VERSION13=4.5.2
+ VERSION13=4.7.1
SOURCE13=ada-$VERSION13-i686-pc-linux-gnu.tar.bz2
elif [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]
then
VERSION13=4.3.3
SOURCE13=ada-$VERSION13-x86_64-pc-linux-gnu.tar.bz2
else
- VERSION13=4.5.2
+ VERSION13=4.7.1
SOURCE13=ada-$VERSION13-i686-pc-linux-gnu.tar.bz2
fi
@@ -71,37 +46,6 @@ fi
SOURCE14_URL[0]=${SOURCE13_URL[0]}.sig
SOURCE14_IGNORE=signature
fi
-if list_find "$GCC_COMPILER" "java" ; then
- SOURCE9=gcc-java-$VERSION.tar.bz2
- SOURCE10=$SOURCE9.sig
- SOURCE9_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE9
- SOURCE9_URL[1]=${BASE_SOURCE_URL}-$VERSION/$SOURCE9
- SOURCE10_URL[0]=${SOURCE9_URL[0]}.sig
- SOURCE9_GPG=gnu.gpg:$SOURCE10:UPSTREAM_KEY
- SOURCE10_IGNORE=signature
-# Eclipse compiler for Java (needed since 4.3)
- SOURCE15=ecj-4.3.jar
- SOURCE15_URL[0]=ftp://sourceware.org/pub/java/$SOURCE15
- SOURCE15_GPG=gurus.gpg:$SOURCE15.sig
-fi
-if list_find "$GCC_COMPILER" "fortran" ; then
- SOURCE11=gcc-fortran-$VERSION.tar.bz2
- SOURCE12=$SOURCE11.sig
- SOURCE11_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE11
- SOURCE11_URL[1]=${BASE_SOURCE_URL}-$VERSION/$SOURCE11
- SOURCE12_URL[0]=${SOURCE11_URL[0]}.sig
- SOURCE11_GPG=gnu.gpg:$SOURCE12:UPSTREAM_KEY
- SOURCE12_IGNORE=signature
-fi
-if list_find "$GCC_COMPILER" "go" ; then
- SOURCE16=gcc-go-$VERSION.tar.bz2
- SOURCE17=$SOURCE16.sig
- SOURCE16_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE16
- SOURCE16_URL[1]=${BASE_SOURCE_URL}-$VERSION/$SOURCE16
- SOURCE17_URL[0]=${SOURCE16_URL[0]}.sig
- SOURCE16_GPG=gnu.gpg:$SOURCE17:UPSTREAM_KEY
- SOURCE17_IGNORE=signature
-fi
LICENSE[0]=GPL
TMPFS=off
WEB_SITE=http://gcc.gnu.org/
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index 63fd4b4a70..8e7459f5e5 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,24 @@
+2013-03-22 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 4.8.0
+ * PRE_BUILD, 0001-remove-libffi.patch, 0002-4.8.0-ffast-math.patch:
+ renew patches
+ * 0002-4.7.2-ffast-math.patch: removed
+
+2013-02-24 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, 0001-remove-libffi.patch: add patch to remove
+ redundant libffi
+ * PRE_BUILD, 0002-4.7.2-ffast-math.patch: add patch to fix
+ -ffast-math
+ * PRE_BUILD, 0003-fix-header-generation-for-libgo.patch:
+ fix header generation for libgo
+
+2013-02-23 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * CONFIGURE, PRE_BUILD, PRE_SUB_DEPENDS, SUB_DEPENDS,
+ ada-symbolic-tracebacks.diff, glibc216.patch, mksysinfo.patch:
+ removed obsolete patches => cleanup for moving gcc 4.7.2 to
+ test grimoire
+ * txt00120.txt.gz, ecj-4.3.jar.sig: removed
+
2013-02-10 Vlad Glagolev <stealth@sourcemage.org>
* PRE_BUILD: apply go patch only if Go compiler was included into build
* EXPORTS: chmod +x
@@ -12,6 +33,22 @@
* PRE_BUILD: apply the patch
* glibc216.patch: added, to fix build with glibc 2.16
+2012-09-21 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 4.7.2
+
+2012-08-27 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS, BUILD: use new version of the ada bootstrap compiler
+
+2012-06-14 Treeve Jelbert <treeve01@oi.be>
+ * DETAILS: version 4.7.1
+
+2012-03-22 Treeve Jelbert <treeve01@oi.be>
+ * DETAILS: version 4.7.0
+ there is now one integrated tarball, so remove multiple source files
+ * PRE_BUILD: no need to unpack multiple files, except for ada
+ do not apply ffast-math.patch or remove-libffi.patch
+ * DEPENDS: add perl
+
2012-03-04 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 4.6.3
diff --git a/gnu/gcc/PRE_BUILD b/gnu/gcc/PRE_BUILD
index 841dca0614..7d257654ac 100755
--- a/gnu/gcc/PRE_BUILD
+++ b/gnu/gcc/PRE_BUILD
@@ -1,15 +1,5 @@
default_pre_build &&
-if list_find "$GCC_COMPILER" "c++" ; then
- cd $BUILD_DIRECTORY &&
- unpack_file 3
-fi &&
-if list_find "$GCC_COMPILER" "objc" ; then
- cd $BUILD_DIRECTORY &&
- unpack_file 5
-fi &&
if list_find "$GCC_COMPILER" "ada" ; then
- cd $BUILD_DIRECTORY &&
- unpack_file 7
cd $SOURCE_DIRECTORY &&
mkdir ${SOURCE13/.tar.bz2} &&
@@ -27,31 +17,10 @@ if list_find "$GCC_COMPILER" "ada" ; then
sedit 's:and Nam is "gnatgcc":and Nam is "gcc":' \
$SOURCE_DIRECTORY/gcc/ada/osint.ads &&
cd ${SOURCE_DIRECTORY}
-# if [[ "$GCC_ADA_BINDING_GENERATOR" == "y" ]]; then
-# zcat ${SCRIPT_DIRECTORY}/txt00120.txt.gz | patch -p0 || return 1
-# fi &&
-# if [[ "$GCC_ADA_LIBADDRLINE" == "y" ]]; then
-# patch -p1 < ${SCRIPT_DIRECTORY}/ada-symbolic-tracebacks.diff || return 1
-# fi
#
# End Ada bootstrap cache code
#
fi &&
-if list_find "$GCC_COMPILER" "java" ; then
- cd $BUILD_DIRECTORY &&
- unpack_file 9 &&
- verify_file 15 &&
-
- cp -v $SOURCE_CACHE/$SOURCE15 $SOURCE_DIRECTORY/ecj.jar
-fi &&
-if list_find "$GCC_COMPILER" "fortran" ; then
- cd $BUILD_DIRECTORY &&
- unpack_file 11
-fi &&
-if list_find "$GCC_COMPILER" "go" ; then
- cd $BUILD_DIRECTORY &&
- unpack_file 16
-fi &&
mk_source_dir $SOURCE_DIRECTORY.bld &&
cd $SOURCE_DIRECTORY &&
@@ -59,12 +28,11 @@ cd $SOURCE_DIRECTORY &&
sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in &&
sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in &&
-patch -p0 < "$SPELL_DIRECTORY/glibc216.patch" &&
patch -p0 < "$SPELL_DIRECTORY/python-gdb.patch" &&
if list_find "$GCC_COMPILER" "go"; then
- patch -p0 < "$SPELL_DIRECTORY/mksysinfo.patch"
+ patch -p1 < "$SPELL_DIRECTORY/0003-fix-header-generation-for-libgo.patch"
fi &&
-patch -p1 < "$SPELL_DIRECTORY/gcc-4.4.0-ffast-math.patch" &&
-patch -p1 < "$SPELL_DIRECTORY/remove-libffi.patch"
+patch -p1 < "$SPELL_DIRECTORY/0002-4.8.0-ffast-math.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/0001-remove-libffi.patch"
diff --git a/python-pypi/python-distutils-extra/DETAILS b/python-pypi/python-distutils-extra/DETAILS
index 7147586c6a..3152c13aa6 100755
--- a/python-pypi/python-distutils-extra/DETAILS
+++ b/python-pypi/python-distutils-extra/DETAILS
@@ -1,8 +1,11 @@
SPELL=python-distutils-extra
- VERSION=2.18
- SOURCE=dist-$SPELL-$VERSION.tar.gz
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+ VERSION=2.37
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE2=dist-$SOURCE.asc
+ SOURCE_GPG="canonical.gpg:$SOURCE2:UPSTREAM_KEY"
SOURCE_URL[0]=http://launchpad.net/$SPELL/trunk/${VERSION:0:4}/+download/$SOURCE
+ SOURCE2_URL[0]=http://launchpad.net/$SPELL/trunk/${VERSION:0:4}/+download/$SOURCE2
+ SOURCE2_IGNORE=signature
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/$SPELL-$VERSION
WEB_SITE=https://launchpad.net/python-distutils-extra
LICENSE[0]=GPLv2
diff --git a/python-pypi/python-distutils-extra/HISTORY b/python-pypi/python-distutils-extra/HISTORY
index 573f2740fa..c7203c8a02 100644
--- a/python-pypi/python-distutils-extra/HISTORY
+++ b/python-pypi/python-distutils-extra/HISTORY
@@ -1,3 +1,7 @@
+2013-03-10 Sukneet Basuta <sukneet@sourcemage.org>
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 2.37
+
2011-05-23 Sukneet Basuta <sukneet@sourcemage.org>
* DEPENDS: updated setuptools dependency to SETUPTOOLS provider
diff --git a/python-pypi/python-distutils-extra/dist-python-distutils-extra-2.18.tar.gz.sig b/python-pypi/python-distutils-extra/dist-python-distutils-extra-2.18.tar.gz.sig
deleted file mode 100644
index 372f5843d5..0000000000
--- a/python-pypi/python-distutils-extra/dist-python-distutils-extra-2.18.tar.gz.sig
+++ /dev/null
Binary files differ
diff --git a/shell-term-fm/remmina/DEPENDS b/shell-term-fm/remmina/DEPENDS
index 66821aa446..30c6365414 100755
--- a/shell-term-fm/remmina/DEPENDS
+++ b/shell-term-fm/remmina/DEPENDS
@@ -4,13 +4,13 @@ depends libpthread-stubs &&
depends zlib &&
depends JPEG &&
depends gnutls &&
-optional_depends libssh '--enable-ssh' '--disable-ssh' \
+optional_depends libssh '--enable-ssh -DWITH_FREERDP=OFF -DWITH_APPINDICATOR=OFF' '--disable-ssh' \
'for SSH support' &&
optional_depends vte '--enable-vte' '--disable-vte' \
'for vte terminal support' &&
optional_depends libgcrypt '--enable-gcrypt' '--disable-gcrypt' \
'for password encryption' &&
-optional_depends avahi '--enable-avahi' '--disable-avahi' \
+optional_depends avahi '-DWITH_AVAHI=OFF --enable-avahi' '--disable-avahi' \
'for avahi support' &&
optional_depends unique '--enable-unique' '--disable-unique' \
'for managing unique processes'
diff --git a/shell-term-fm/remmina/DETAILS b/shell-term-fm/remmina/DETAILS
index edc8c3f7c9..cfe95a0260 100755
--- a/shell-term-fm/remmina/DETAILS
+++ b/shell-term-fm/remmina/DETAILS
@@ -1,9 +1,9 @@
SPELL=remmina
- VERSION=0.9.1
+ VERSION=1.0.0
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- SOURCE_HASH=sha512:38fe18958e2cc032632c31a38e40ae3888c68f8874e7cd46528db11bba1a8c0ee5221e99d10a90ee305cd14306ea20f80c5ae9d937d05faf2bdcd6095ac32053
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=https://github.com/downloads/FreeRDP/Remmina/Remmina-1.0.0.tar.gz
+ SOURCE_HASH=sha512:585fff5eb4585978ee321e481fafa057052d39ca01690a4e3bb7e9add94bb968373ab30001ef18c7578bc98b24df25ff4ab7a0fc882d99770b2dce079c4d39a6
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/FreeRDP-Remmina-356c033
WEB_SITE=http://remmina.sourceforge.net/
ENTERED=20100305
LICENSE[0]=GPL
diff --git a/shell-term-fm/remmina/HISTORY b/shell-term-fm/remmina/HISTORY
index c3cbfa1bf0..9cd2da00ad 100644
--- a/shell-term-fm/remmina/HISTORY
+++ b/shell-term-fm/remmina/HISTORY
@@ -1,3 +1,12 @@
+2012-11-11 Sukneet Basuta <sukneet@sourcemage.org>
+ * Try it out: changed blabla
+ * Copy it back to the grimoire: changed blabla
+ * DEPENDS: changed blabla
+ * BUILD: added, bla bla!
+ * DETAILS: Fixed SOURCE_URL[0]
+ changed blabla
+ updated spell to 1.0.0
+
2010-12-14 Arjan Bouter <abouter@sourcemage.org>
* DETAILS: version 0.9.1