case "${SMGL_COMPAT_ARCHS[1]}" in
- x86_64) VERSION13=4.9.1 ARCH13=x86_64 ;;
+ x86_64) VERSION13=5.1.0 ARCH13=x86_64 ;;
*) VERSION13=4.7.1 ARCH13=i686 ;;
esac
SOURCE13=ada-$VERSION13-$ARCH13-pc-linux-gnu.tar.bz2
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index 57788d2..759d487 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,8 @@
+2015-06-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, integer_parameter_restrictions.patch: fix build of
gprbuild 2015
+ * DETAILS: PATCHLEVEL++
+ * INSTALL: create versioned symlinks for libgnat and libgnarl
+
2015-05-29 Remko van der Vossen <wich AT sourcemage.org>
* UP_TRIGGERS: find C++ ELF objects based on ELF DT_NEEDED entries
Probably more successful at finding all C++ ELF objects
diff --git a/gnu/gcc/INSTALL b/gnu/gcc/INSTALL
index 1887095..56151fa 100755
--- a/gnu/gcc/INSTALL
+++ b/gnu/gcc/INSTALL
@@ -17,4 +17,12 @@ if [[ "$HOST" == x86_64-* ]]; then
true # see bug 8626 for info about this conditional
fi &&
-ln -vsf ${TRACK_ROOT}/usr/bin/cpp ${INSTALL_ROOT}/lib/cpp
+ln -vsf ${TRACK_ROOT}/usr/bin/cpp ${INSTALL_ROOT}/lib/cpp &&
+
+if list_find "$GCC_COMPILER" "ada" ; then
+ cd ${INSTALL_ROOT}/usr/lib/gcc/${BUILD}/${VERSION}/adalib &&
+ local MAJOR_VERSION="$(echo $VERSION | cut -f1 -d.)" &&
+ local MINOR_VERSION="$(echo $VERSION | cut -f2 -d.)" &&
+ ln -sfn libgnat-${MAJOR_VERSION}.so
libgnat-${MAJOR_VERSION}.${MINOR_VERSION}.so &&
+ ln -sfn libgnarl-${MAJOR_VERSION}.so
libgnarl-${MAJOR_VERSION}.${MINOR_VERSION}.so
+fi
diff --git a/gnu/gcc/PRE_BUILD b/gnu/gcc/PRE_BUILD
index 781e3b4..e383466 100755
--- a/gnu/gcc/PRE_BUILD
+++ b/gnu/gcc/PRE_BUILD
@@ -45,4 +45,7 @@ if list_find "$GCC_COMPILER" "go"; then
patch -p1 < "$SPELL_DIRECTORY/0003-fix-header-generation-for-libgo.patch"
fi &&
-patch -p1 < "$SPELL_DIRECTORY/0001-remove-libffi.patch"
+patch -p1 < "$SPELL_DIRECTORY/0001-remove-libffi.patch" &&
+
+# fix build of gprbuild
+patch -p1 < "$SPELL_DIRECTORY/integer_parameter_restrictions.patch"
diff --git a/gnu/gcc/integer_parameter_restrictions.patch
b/gnu/gcc/integer_parameter_restrictions.patch
new file mode 100644
index 0000000..7516ee5
--- /dev/null
+++ b/gnu/gcc/integer_parameter_restrictions.patch
@@ -0,0 +1,36 @@
+--- a/gcc/ada/s-rident.ads 2014-07-17 09:04:32.000000000 +0200
++++ b/src/ada/s-rident.ads 2015-05-06 12:53:32.000000000 +0200
+@@ -6,7 +6,7 @@
+ --
--
+ -- S p e c
--
+ --
--
+--- Copyright (C) 1992-2014, Free Software Foundation, Inc.
--
++-- Copyright (C) 1992-2015, Free Software Foundation, Inc.
--
+ --
--
+ -- GNAT is free software; you can redistribute it and/or modify it under
--
+ -- terms of the GNU General Public License as published by the Free Soft-
--
+@@ -15,9 +15,9 @@
+ -- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
--
+ -- or FITNESS FOR A PARTICULAR PURPOSE.
--
+ --
--
+--- As a special exception under Section 7 of GPL version 3, you are granted
--
+--- additional permissions described in the GCC Runtime Library Exception,
--
+--- version 3.1, as published by the Free Software Foundation.
--
++--
--
++--
--
++--
--
+ --
--
+ -- You should have received a copy of the GNU General Public License and
--
+ -- a copy of the GCC Runtime Library Exception along with this program;
--
+@@ -255,6 +255,11 @@ package System.Rident is
+ No_Specification_Of_Aspect .. Max_Storage_At_Blocking;
+ -- All restrictions that take a parameter
+
++ subtype Integer_Parameter_Restrictions is
++ Restriction_Id range
++ Max_Protected_Entries .. Max_Storage_At_Blocking;
++ -- All restrictions taking an integer parameter
++
+ subtype Checked_Parameter_Restrictions is
+ All_Parameter_Restrictions range
+ Max_Protected_Entries .. Max_Entry_Queue_Length;
diff --git a/graphics-libs/poppler/BUILD b/graphics-libs/poppler/BUILD
index eceb7a1..12ff40d 100755
--- a/graphics-libs/poppler/BUILD
+++ b/graphics-libs/poppler/BUILD
@@ -4,7 +4,8 @@ OPTS="$POPPLER_OPTS $OPTS" &&
LDFLAGS="-lm $LDFLAGS" &&
if is_depends_enabled $SPELL qt4; then
- export PATH="$INSTALL_ROOT/usr/bin/qt4:$PATH"
+ export PATH="$INSTALL_ROOT/opt/qt4/bin:$PATH" &&
+ export PKG_CONFIG_PATH="$INSTALL_ROOT/opt/qt4/lib/pkgconfig/"
fi &&
default_build
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index 63a5e1c..b8c0423 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,6 @@
+2015-06-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: fix build with qt4 in /opt
+
2015-03-24 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: corrected glib2/gtk+3 dependencies
diff --git a/libs/xmlada/DETAILS b/libs/xmlada/DETAILS
index b640099..2558783 100755
--- a/libs/xmlada/DETAILS
+++ b/libs/xmlada/DETAILS
@@ -1,13 +1,13 @@
SPELL=xmlada
- VERSION=2014
+ VERSION=2015
SOURCE="${SPELL}-gpl-${VERSION}-src.tgz"
-
SOURCE_URL[0]='http://mirrors.cdn.adacore.com/art/065e0e6750288d9ecc2f7780d3ed8ef3c86ab991'
-
SOURCE_HASH=sha512:62cd3ade631e3536ce7e5812acc594a17409a6bdd2eba7c8687691027abb9102783f3beaa0df4d85c40effa1880a1365c4a29e6cd66b788b7ec39ecb2862341c
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}-src"
+
SOURCE_URL[0]='http://mirrors.cdn.adacore.com/art/949752df2432aed8d06c48d57cea71f38d0517cc'
+
SOURCE_HASH=sha512:22ba70b2835aec02e525494dbd80a28c07cea3cff2ddaff886b6a15dd13b38f32d2ea5b871de1fed0a8e9e88f0b63b9335fe6dfdb0ad8d324065ba40459e7ac4
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-gpl-${VERSION}-src"
WEB_SITE="http://libre.adacore.com"
LICENSE[0]=GPL
ENTERED=20100310
SHORT="an XML parser for Ada95"
cat << EOF
-An XML parsing library for Ada95
+An XML parsing library for Ada2012
EOF
diff --git a/libs/xmlada/HISTORY b/libs/xmlada/HISTORY
index 7136118..03b6146 100644
--- a/libs/xmlada/HISTORY
+++ b/libs/xmlada/HISTORY
@@ -1,3 +1,6 @@
+2015-06-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2015
+
2015-04-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2014