Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (4d86b22bc5a0165bbac12afa78125c4091d2f3b8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (4d86b22bc5a0165bbac12afa78125c4091d2f3b8)
  • Date: Sat, 27 Jun 2015 21:09:29 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

ChangeLog | 4
audio-drivers/ngjackspa/BUILD | 2
audio-drivers/ngjackspa/HISTORY | 3
audio-soft/qjackctl/BUILD | 2
audio-soft/qjackctl/DETAILS | 4
audio-soft/qjackctl/HISTORY | 4
crypto/pinentry/0001-fix-curses-include.patch | 25 +++++
crypto/pinentry/4F25E3B6.gpg |binary
crypto/pinentry/BUILD | 8 -
crypto/pinentry/CONFIGURE | 7 +
crypto/pinentry/DEPENDS | 19 ++--
crypto/pinentry/DETAILS | 6 -
crypto/pinentry/HISTORY | 5 +
crypto/pinentry/PRE_BUILD | 3
dev/null |binary
devel/florist/BUILD | 2
devel/florist/DETAILS | 8 -
devel/florist/HISTORY | 3
devel/florist/INSTALL | 6 -
devel/gnat_util/0001-fix-Makefile.patch | 43
++++++++++
devel/gnat_util/BUILD | 2
devel/gnat_util/DEPENDS | 2
devel/gnat_util/DETAILS | 19 ++++
devel/gnat_util/HISTORY | 4
devel/gnat_util/INSTALL | 2
devel/gnat_util/PRE_BUILD | 5 +
devel/gprbuild/0001-fix-compile-error.patch | 25 -----
devel/gprbuild/0002-always-assume-that-we-are-not-on-a-VMS.patch | 28
------
devel/gprbuild/DETAILS | 6 -
devel/gprbuild/HISTORY | 5 +
devel/gprbuild/PRE_BUILD | 4
gnome3-libs/gcr/DEPENDS | 2
gnome3-libs/gcr/DETAILS | 4
gnome3-libs/gcr/HISTORY | 4
gnu/gcc/DETAILS | 4
gnu/gcc/HISTORY | 5 +
gnu/gcc/INSTALL | 10 ++
gnu/gcc/PRE_BUILD | 5 -
gnu/gcc/integer_parameter_restrictions.patch | 36
++++++++
graphics-libs/poppler/BUILD | 3
graphics-libs/poppler/HISTORY | 3
libs/xmlada/DETAILS | 10 +-
libs/xmlada/HISTORY | 3
shell-term-fm/pcmanfm/DETAILS | 2
utils/i7z/BUILD | 4
utils/i7z/HISTORY | 3
utils/util-linux/DETAILS | 10 +-
utils/util-linux/HISTORY | 3
x11-toolkits/gtk+3/DEPENDS | 1
x11-toolkits/gtk+3/HISTORY | 3
x11-toolkits/qscintilla/BUILD | 2
x11-toolkits/qscintilla/DETAILS | 4
x11-toolkits/qscintilla/HISTORY | 4
53 files changed, 268 insertions(+), 113 deletions(-)

New commits:
commit 4d86b22bc5a0165bbac12afa78125c4091d2f3b8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

crypto/pinentry: version 0.9.4

commit 1ad5c665bb4fdce502966dbb881265956203cead
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

gnome3-libs/gcr: version 3.16.0

commit 5ba6d8a26fcf1da65c82413a418c8be575ff4325
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

shell-term-fm/pcmanfm: fix SOURCE_HASH

commit 4b096c36bf3405924ae45ee794889ac75d7766b2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/i7z: fix build with qt4 in /opt

commit 7d9b1b7e38c080440d7169abc39a7b54297db57d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

x11-toolkits/qscintilla: version 2.9

commit f770fb2c04becc261a1943abe775b16f9552efa5
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

audio-drivers/ngjackspa: fix build with qt4 in /opt

commit fd5cb74ed1c1e11ab7212fc5dbe7acdcd199ff2c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

audio-soft/qjackctl: version 0.3.13

commit 1b34e32fcee9ea300df8d89a7c44e21356e3fde9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics-libs/poppler: fix build with qt4 in /opt

commit bef371a0e83f1e295db842c012a1cb9a5d5ac051
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

x11-toolkits/gtk+3: add dependency on libepoxy

commit 1ba29b251bc7f891063a328c2c022e26389bfe7d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/gnat_util: new spell, a library uniting a number of GNAT sources
that are used by different tools

commit cbdf4d493ceb02ba821baef372b6ea650cf5f093
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/util-linux: version 2.26.2

commit d03ec61b9ea1694d110586a9b26dcea21ad1dcbb
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/florist: version 2015

commit b7adb9fd595d34f902ff1f3dc6425d74334dcc1c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/gprbuild: version 2015

commit d2699b153157ec682168865cf1a86f58dd47d6fa
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

gnu/gcc: fix build of gprbuild

commit 9dbd3a6fee08595555f83655b82439dc84853612
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/xmlada: version 2015

diff --git a/ChangeLog b/ChangeLog
index ac3b3fc..21f6852 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-06-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * devel/gnat_util: new spell, a library uniting a number of GNAT
+ sources that are used by different tools
+
2015-06-26 Ismael Luceno <ismael AT sourcemage.org>
* haskell/haskell-safe: new spell, Library of safe (exception free)
functions
diff --git a/audio-drivers/ngjackspa/BUILD b/audio-drivers/ngjackspa/BUILD
index dd385b0..9578887 100755
--- a/audio-drivers/ngjackspa/BUILD
+++ b/audio-drivers/ngjackspa/BUILD
@@ -1 +1 @@
-PATH=/usr/bin/qt4:$PATH default_build_make
+PATH=$INSTALL_ROOT/opt/qt4/bin:$PATH default_build_make
diff --git a/audio-drivers/ngjackspa/HISTORY b/audio-drivers/ngjackspa/HISTORY
index 18feed6..db5600d 100644
--- a/audio-drivers/ngjackspa/HISTORY
+++ b/audio-drivers/ngjackspa/HISTORY
@@ -1,3 +1,6 @@
+2015-06-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: fix build with qt4 in /opt
+
2014-03-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* INSTALL: install manpage

diff --git a/audio-soft/qjackctl/BUILD b/audio-soft/qjackctl/BUILD
index f92b50e..40b5eea 100755
--- a/audio-soft/qjackctl/BUILD
+++ b/audio-soft/qjackctl/BUILD
@@ -1,2 +1,2 @@
OPTS="$QJCTL_TRAY $QJCTL_JACK_MIDI $OPTS" &&
-PATH=${INSTALL_ROOT}/usr/bin/qt4:$PATH default_build
+PATH=${INSTALL_ROOT}/opt/qt4/bin:$PATH default_build
diff --git a/audio-soft/qjackctl/DETAILS b/audio-soft/qjackctl/DETAILS
index b04222b..ada2595 100755
--- a/audio-soft/qjackctl/DETAILS
+++ b/audio-soft/qjackctl/DETAILS
@@ -9,11 +9,11 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-cvs"
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
else
- VERSION=0.3.12
+ VERSION=0.3.13
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"

SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/$SPELL/$SPELL/$VERSION/$SOURCE
-
SOURCE_HASH=sha512:5afa61f4bef986601d9ee84d4c38128847f6160c827ca22abbe70c1a5b20fbd0e914ba00e0d4e16d118fb616d71618aa72d17507170dc9ca5bac6b5a8a2aa5a9
+
SOURCE_HASH=sha512:1e515783eea4cd628ee0195b9d711b2d1d5a2651f8a9c1c6077de06055053129019be0657b12bd01238ba7d39e38fd06a361128187ac32d52c16fe873bd50dea

fi
WEB_SITE=http://qjackctl.sf.net
diff --git a/audio-soft/qjackctl/HISTORY b/audio-soft/qjackctl/HISTORY
index aae56fd..f60f7cc 100644
--- a/audio-soft/qjackctl/HISTORY
+++ b/audio-soft/qjackctl/HISTORY
@@ -1,3 +1,7 @@
+2015-06-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.3.13
+ * BUILD: fix build with qt4 in /opt
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/crypto/pinentry/0001-fix-curses-include.patch
b/crypto/pinentry/0001-fix-curses-include.patch
new file mode 100644
index 0000000..5366179
--- /dev/null
+++ b/crypto/pinentry/0001-fix-curses-include.patch
@@ -0,0 +1,25 @@
+From 5031bce345b8393a28526477d1a065436d669dca Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.net>
+Date: Sat, 27 Jun 2015 23:02:33 +0200
+Subject: [PATCH] fix curses include
+
+---
+ pinentry/pinentry-curses.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pinentry/pinentry-curses.c b/pinentry/pinentry-curses.c
+index d25ab2e..40650ba 100644
+--- a/pinentry/pinentry-curses.c
++++ b/pinentry/pinentry-curses.c
+@@ -23,7 +23,7 @@
+ #endif
+ #include <assert.h>
+ #ifdef HAVE_NCURSESW
+-#include <ncursesw/curses.h>
++#include <curses.h>
+ #else
+ #include <curses.h>
+ #endif
+--
+2.4.1
+
diff --git a/crypto/pinentry/1CE0C630.gpg b/crypto/pinentry/1CE0C630.gpg
deleted file mode 100644
index 1c57c90..0000000
Binary files a/crypto/pinentry/1CE0C630.gpg and /dev/null differ
diff --git a/crypto/pinentry/4F25E3B6.gpg b/crypto/pinentry/4F25E3B6.gpg
new file mode 100644
index 0000000..cd1ce3d
Binary files /dev/null and b/crypto/pinentry/4F25E3B6.gpg differ
diff --git a/crypto/pinentry/BUILD b/crypto/pinentry/BUILD
index 3ffd5f2..5f65bd4 100755
--- a/crypto/pinentry/BUILD
+++ b/crypto/pinentry/BUILD
@@ -1,11 +1,11 @@
# fix bad moc files
if is_depends_enabled $SPELL qt4;then
- QTDIR=/usr/bin/qt4 &&
- PATH=$QTDIR:$PATH &&
+ export QTDIR=$INSTALL_ROOT/opt/qt4 &&
+ export PATH=$QTDIR/bin:$PATH &&
+ export PKG_CONFIG_PATH=$QTDIR/lib/pkgconfig/ &&
cd qt4 &&
moc pinentrydialog.h > pinentrydialog.moc &&
moc qsecurelineedit.h > qsecurelineedit.moc &&
cd ..
fi &&
-OPTS="$OPTS $PINENTRY_CURSES" &&
-default_build
+OPTS="$OPTS $PINENTRY_CURSES $PINENTRY_TTY" MOC="$QTDIR/bin/moc"
CXXFLAGS="-std=c++11 ${CXXFLAGS}" default_build
diff --git a/crypto/pinentry/CONFIGURE b/crypto/pinentry/CONFIGURE
index a33fa0e..2ba8abf 100755
--- a/crypto/pinentry/CONFIGURE
+++ b/crypto/pinentry/CONFIGURE
@@ -1,3 +1,6 @@
config_query_option PINENTRY_CURSES "Build Curses pinentry and fallback to
Curses?" y \
- ""
\
- "--disable-pinentry-curses --disable-fallback-curses"
+ "--enable-pinentry-curses --enable-fallback-curses"
\
+ "--disable-pinentry-curses --disable-fallback-curses" &&
+config_query_option PINENTRY_TTY "Build tty pinentry?" y \
+ "--enable-pinentry-tty" \
+ "--disable-pinentry-tty"
diff --git a/crypto/pinentry/DEPENDS b/crypto/pinentry/DEPENDS
index 97c8713..364bf66 100755
--- a/crypto/pinentry/DEPENDS
+++ b/crypto/pinentry/DEPENDS
@@ -1,19 +1,20 @@
depends -sub CXX gcc &&
depends pkgconfig &&
+depends gcr &&
+
+optional_depends libsecret \
+ "--enable-libsecret" \
+ "--disable-libsecret" \
+ "cache passphrases using libsecret" &&

optional_depends libx11
\
- "--with-x"
\
- "--without-x --disable-pinentry-gtk --disable-pinentry-gtk2
--disable-pinentry-qt --disable-pinentry-qt4" \
- "for X11 support (needed for GTK+/GTK+2/QT4 support)"
&&
+ ""
\
+ "--disable-pinentry-gtk2 --disable-pinentry-qt4" \
+ "for X11 support (needed for GTK+2/QT4 support)"
&&

if is_depends_enabled "$SPELL" "libx11"; then
- optional_depends gtk+ \
- "" \
- "--disable-pinentry-gtk" \
- "to build GTK+ pinentry" &&
-
optional_depends gtk+2 \
- "" \
+ "--enable-pinentry-gtk2" \
"--disable-pinentry-gtk2" \
"to build GTK+2 pinentry" &&

diff --git a/crypto/pinentry/DETAILS b/crypto/pinentry/DETAILS
index ab851f1..2f79ab4 100755
--- a/crypto/pinentry/DETAILS
+++ b/crypto/pinentry/DETAILS
@@ -1,9 +1,9 @@
SPELL=pinentry
- VERSION=0.8.1
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=0.9.4
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
- SOURCE_GPG=1CE0C630.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE_GPG=4F25E3B6.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/pinentry/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
diff --git a/crypto/pinentry/HISTORY b/crypto/pinentry/HISTORY
index 75ada37..6364ba0 100644
--- a/crypto/pinentry/HISTORY
+++ b/crypto/pinentry/HISTORY
@@ -1,3 +1,8 @@
+2015-06-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, CONFIGURE, DEPENDS: version 0.9.4
+ * BUILD: fix build with qt4 in /opt
+ * 0001-fix-curses-include.patch, PRE_BUILD: fix curses include
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: depends -sub CXX gcc (half-automated)

diff --git a/crypto/pinentry/PRE_BUILD b/crypto/pinentry/PRE_BUILD
new file mode 100755
index 0000000..0e6ecb9
--- /dev/null
+++ b/crypto/pinentry/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/0001-fix-curses-include.patch
diff --git a/devel/florist/BUILD b/devel/florist/BUILD
new file mode 100755
index 0000000..34e1167
--- /dev/null
+++ b/devel/florist/BUILD
@@ -0,0 +1,2 @@
+OPTS="--with-build-type=Production ${OPTS}" &&
+default_build
diff --git a/devel/florist/DETAILS b/devel/florist/DETAILS
index 9007028..17aa896 100755
--- a/devel/florist/DETAILS
+++ b/devel/florist/DETAILS
@@ -1,9 +1,9 @@
SPELL=florist
- VERSION=2014
+ VERSION=2015
SOURCE="${SPELL}-gpl-${VERSION}-src.tgz"
-
SOURCE_URL[0]='http://mirrors.cdn.adacore.com/art/224f73e1cd4afd1f0f6ca3bd1ad0191aa7f81e05'
-
SOURCE_HASH=sha512:3dedeadfddb60ba41a41d04eaa5ba045090501b7690bdfdd7859b988d0fdeb54059893450c5c31f82d0825d03465e800e6e5ccdbae2c7a4b8254037b2eeb31b5
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-src"
+
SOURCE_URL[0]='http://mirrors.cdn.adacore.com/art/01a5a83b6c52f1abc8ffa8983d0ad32b0d34ce4b'
+
SOURCE_HASH=sha512:b468dc5da66dd75f1f49c8d309ac4c5d7fe23846854461077c869ba50b9d6bbd34f0ad29ffa524ead0457940e8ac144746dfc206bf62dfe0897a5189535503a4
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-gpl-${VERSION}-src"
WEB_SITE="http://libre.adacore.com";
LICENSE[0]=GPL
ENTERED=20100830
diff --git a/devel/florist/HISTORY b/devel/florist/HISTORY
index 00d525c..4978bd1 100644
--- a/devel/florist/HISTORY
+++ b/devel/florist/HISTORY
@@ -1,3 +1,6 @@
+2015-06-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, BUILD, INSTALL: version 2015
+
2015-05-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2014

diff --git a/devel/florist/INSTALL b/devel/florist/INSTALL
index ea0b4f5..d184b6b 100755
--- a/devel/florist/INSTALL
+++ b/devel/florist/INSTALL
@@ -1,7 +1,7 @@
mkdir -p ${INSTALL_ROOT}/usr/share/ada/adainclude/florist &&
mkdir -p ${INSTALL_ROOT}/usr/lib/ada/adalib/florist &&
-install -m644 ${SOURCE_DIRECTORY}/floristlib/libflorist.a
${INSTALL_ROOT}/usr/lib &&
-install -m644 ${SOURCE_DIRECTORY}/floristlib/*.ad[bs]
${INSTALL_ROOT}/usr/share/ada/adainclude/florist &&
+install -m644 ${SOURCE_DIRECTORY}/lib/libflorist.a ${INSTALL_ROOT}/usr/lib &&
+install -m644 ${SOURCE_DIRECTORY}/libsrc/*.ad[bs]
${INSTALL_ROOT}/usr/share/ada/adainclude/florist &&
install -m644 ${SOURCE_DIRECTORY}/*.c ${SOURCE_DIRECTORY}/*.h
${INSTALL_ROOT}/usr/share/ada/adainclude/florist &&
-install -m644 ${SOURCE_DIRECTORY}/floristlib/*.ali
${INSTALL_ROOT}/usr/lib/ada/adalib/florist &&
+install -m644 ${SOURCE_DIRECTORY}/lib/*.ali
${INSTALL_ROOT}/usr/lib/ada/adalib/florist &&
install -m644 ${SCRIPT_DIRECTORY}/florist.gpr ${INSTALL_ROOT}/usr/lib/gnat
diff --git a/devel/gnat_util/0001-fix-Makefile.patch
b/devel/gnat_util/0001-fix-Makefile.patch
new file mode 100644
index 0000000..db6ed15
--- /dev/null
+++ b/devel/gnat_util/0001-fix-Makefile.patch
@@ -0,0 +1,43 @@
+From b9fe4d93203e0000072f5d02536e3e15f2b41b74 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.net>
+Date: Sun, 21 Jun 2015 12:16:09 +0200
+Subject: [PATCH] fix Makefile
+
+---
+ MANIFEST.gnat_util | 2 +-
+ Makefile | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/MANIFEST.gnat_util b/MANIFEST.gnat_util
+index 08406e2..e8eba73 100644
+--- a/MANIFEST.gnat_util
++++ b/MANIFEST.gnat_util
+@@ -1,4 +1,4 @@
+-Makefile.gnat_util
++Makefile
+ MANIFEST.gnat_util
+ README.gnat_util
+ ali-util.adb
+diff --git a/Makefile b/Makefile
+index cf515e3..91554bf 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,12 +1,12 @@
+ # This makefile is used to build and install Gnat_Util
+ # For information on building and installing Gnat_Util see README.gnat_util.
+
+-ENABLE_SHARED=no
++ENABLE_SHARED=yes
+ BUILD_TYPE=Production
+
+-prefix=/usr/local
++prefix=$(INSTALL_ROOT)/usr
+
+-BUILDER=gprbuild -j0
++BUILDER=gprbuild
+ INSTALLER=gprinstall
+
+ OS_TYPE=unix
+--
+2.4.1
+
diff --git a/devel/gnat_util/BUILD b/devel/gnat_util/BUILD
new file mode 100755
index 0000000..27fd02d
--- /dev/null
+++ b/devel/gnat_util/BUILD
@@ -0,0 +1,2 @@
+cd $SOURCE_DIRECTORY/build &&
+make ENABLE_SHARED=yes
diff --git a/devel/gnat_util/DEPENDS b/devel/gnat_util/DEPENDS
new file mode 100755
index 0000000..4cc3517
--- /dev/null
+++ b/devel/gnat_util/DEPENDS
@@ -0,0 +1,2 @@
+depends -sub ADA gcc &&
+depends gprbuild
diff --git a/devel/gnat_util/DETAILS b/devel/gnat_util/DETAILS
new file mode 100755
index 0000000..ff665b9
--- /dev/null
+++ b/devel/gnat_util/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=gnat_util
+ VERSION=2015
+ SOURCE="${SPELL}-gpl-${VERSION}-src.tar.gz"
+
SOURCE_URL[0]="http://mirrors.cdn.adacore.com/art/5169610cb11eba55fd102acf865b426d65c5e64f";
+
SOURCE_HASH=sha512:20028841d8c93da3f9cc3097feabbadb2418d69c64ea5a86b566060b353ae30cccf0434948192b979325322aeb8ce1317eda59aa060b05adfc994d8155881bf7
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-gpl-${VERSION}-src"
+ WEB_SITE="http://libre.adacore.com";
+ LICENSE[0]=GPL
+ ENTERED=20150621
+ SHORT="a library uniting a number of GNAT sources that are used
by different tools"
+cat << EOF
+Gnat_Util is a library uniting a number of GNAT sources that are used by
+different tools. At the moment Gnat_Util provides GNAT sources needed by
+ASIS, GNATCOLL and Gprbuild. Its main purpose is allowing to simultaneously
+use tools like ASIS and GNATCOLL (and other ones based on GNAT sources, if
+they are to come), which would normally cause name conflicts between the
+same GNAT sources that they use. Building both of them using same set of
+sources that is Gnat_Util solves this problem.
+EOF
diff --git a/devel/gnat_util/HISTORY b/devel/gnat_util/HISTORY
new file mode 100644
index 0000000..41ec9be
--- /dev/null
+++ b/devel/gnat_util/HISTORY
@@ -0,0 +1,4 @@
+2015-06-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * 0001-fix-Makefile.patch, BUILD, DEPENDS, DETAILS, INSTALL,
+ PRE_BUILD: spell created
+
diff --git a/devel/gnat_util/INSTALL b/devel/gnat_util/INSTALL
new file mode 100755
index 0000000..8de3186
--- /dev/null
+++ b/devel/gnat_util/INSTALL
@@ -0,0 +1,2 @@
+cd $SOURCE_DIRECTORY/build &&
+make install prefix=$INSTALL_ROOT/usr ENABLE_SHARED=yes
diff --git a/devel/gnat_util/PRE_BUILD b/devel/gnat_util/PRE_BUILD
new file mode 100755
index 0000000..3aa8635
--- /dev/null
+++ b/devel/gnat_util/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < $SPELL_DIRECTORY/0001-fix-Makefile.patch &&
+mkdir build &&
+cp $(cat MANIFEST.gnat_util) build/
diff --git a/devel/gprbuild/0001-fix-compile-error.patch
b/devel/gprbuild/0001-fix-compile-error.patch
deleted file mode 100644
index cce8e1f..0000000
--- a/devel/gprbuild/0001-fix-compile-error.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8786a9d34ed175bd18da182f53d939c446e743f9 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.net>
-Date: Thu, 30 Apr 2015 22:43:40 +0200
-Subject: [PATCH 1/2] fix compile error
-
----
- src/gprbuild-compilation-slave.adb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gprbuild-compilation-slave.adb
b/src/gprbuild-compilation-slave.adb
-index 73b4b93..33383c9 100644
---- a/src/gprbuild-compilation-slave.adb
-+++ b/src/gprbuild-compilation-slave.adb
-@@ -817,7 +817,7 @@ package body Gprbuild.Compilation.Slave is
- S : Slave := Slave_S.Element (C);
- begin
- Proc (S);
-- Pool (C) := S;
-+ Pool.Replace_Element(Position => C, New_Item => S);
- end;
- end loop;
- end Iterate;
---
-2.3.5
-
diff --git a/devel/gprbuild/0002-always-assume-that-we-are-not-on-a-VMS.patch
b/devel/gprbuild/0002-always-assume-that-we-are-not-on-a-VMS.patch
deleted file mode 100644
index c0b4edf..0000000
--- a/devel/gprbuild/0002-always-assume-that-we-are-not-on-a-VMS.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From ec9f15aeebd4f29f856e7a23153977f26d7818d0 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.net>
-Date: Thu, 30 Apr 2015 22:43:59 +0200
-Subject: [PATCH 2/2] always assume that we are not on a VMS
-
----
- gnat/hostparm.ads | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/gnat/hostparm.ads b/gnat/hostparm.ads
-index 16b4b39..814ae07 100644
---- a/gnat/hostparm.ads
-+++ b/gnat/hostparm.ads
-@@ -41,10 +41,7 @@ package Hostparm is
- -- HOST Parameters --
- ---------------------
-
-- Gnat_VMSp : Integer;
-- pragma Import (C, Gnat_VMSp, "__gnat_vmsp");
--
-- OpenVMS : Boolean := Gnat_VMSp /= 0;
-+ OpenVMS : Boolean := False;
- -- Set True for OpenVMS host. See also OpenVMS target boolean in
- -- system-vms.ads and system-vms_64.ads and OpenVMS_On_Target boolean in
- -- Targparm. This is not a constant, because it can be modified by
-gnatdm.
---
-2.3.5
-
diff --git a/devel/gprbuild/DETAILS b/devel/gprbuild/DETAILS
index 555d735..8d04a93 100755
--- a/devel/gprbuild/DETAILS
+++ b/devel/gprbuild/DETAILS
@@ -1,8 +1,8 @@
SPELL=gprbuild
- VERSION=2014
+ VERSION=2015
SOURCE="${SPELL}-gpl-${VERSION}-src.tar.gz"
-
SOURCE_URL[0]='http://mirrors.cdn.adacore.com/art/c9d9271952a829ff1d355a01285a8558f24baf93'
-
SOURCE_HASH=sha512:9fc7fd50ff516ccb610826b457df3a493325fc097055c0fb9e831adcf7b294c88356d50244cf773660ddff1eef7b3955aa0077725b5d30ad7f8df84a653eb319
+
SOURCE_URL[0]='http://mirrors.cdn.adacore.com/art/3c2da2f1d3335d39bc9ebb65a3a58264ddac6d41'
+
SOURCE_HASH=sha512:a10ae208633bf8f2f5b327a55cc709735c30c661fe4795354b46a7934c1cd178d8b08c494353b65246cca375ea2bcbe9ae1ba450944cea13c742a256a5b4e97d
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-gpl-${VERSION}-src"
WEB_SITE="http://libre.adacore.com";
LICENSE[0]=GPL
diff --git a/devel/gprbuild/HISTORY b/devel/gprbuild/HISTORY
index 64e1960..07c1c93 100644
--- a/devel/gprbuild/HISTORY
+++ b/devel/gprbuild/HISTORY
@@ -1,3 +1,8 @@
+2015-06-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2015
+ * PRE_BUILD, 0001-fix-compile-error.patch,
+ 0002-always-assume-that-we-are-not-on-a-VMS.patch: removed
+
2015-04-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2014
* PRE_BUILD, 0001-fix-compile-error.patch,
diff --git a/devel/gprbuild/PRE_BUILD b/devel/gprbuild/PRE_BUILD
deleted file mode 100755
index aae90ca..0000000
--- a/devel/gprbuild/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p1 < ${SPELL_DIRECTORY}/0001-fix-compile-error.patch &&
-patch -p1 <
${SPELL_DIRECTORY}/0002-always-assume-that-we-are-not-on-a-VMS.patch
diff --git a/gnome3-libs/gcr/DEPENDS b/gnome3-libs/gcr/DEPENDS
index ff7fcb8..0a07d97 100755
--- a/gnome3-libs/gcr/DEPENDS
+++ b/gnome3-libs/gcr/DEPENDS
@@ -1,6 +1,6 @@
depends -sub PYTHON glib2 &&
depends libgcrypt &&
-optional_depends p11-kit '' '' 'for P11 support' &&
+depends p11-kit &&
optional_depends gobject-introspection \
'--enable-introspection=yes' \
'--enable-introspection=no' \
diff --git a/gnome3-libs/gcr/DETAILS b/gnome3-libs/gcr/DETAILS
index f93aa76..4c2fc26 100755
--- a/gnome3-libs/gcr/DETAILS
+++ b/gnome3-libs/gcr/DETAILS
@@ -1,10 +1,10 @@
SPELL=gcr
- VERSION=3.12.2
+ VERSION=3.16.0
BRANCH=$(echo $VERSION|cut -d . -f 1,2)
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
-
SOURCE_HASH=sha512:7c74302a4485e6909e39721b0beeeeb5920d218c4e8ab5a1878be33457f2b6d59df165bf2e6b606efc8275b8e45dffe8d28ac202cf835f7f2483237258a4d6b2
+
SOURCE_HASH=sha512:1db6e2532d2d0ceb6f339551b009baae5815fcf8a12b76b0eb9e13f301d1205c2e2c9b8f555ae011a84521e55fe9cccb703c3dd539d638b476e0474c34672be4
LICENSE[0]=GPL
WEB_SITE=http://developer.gnome.org/gcr/
ENTERED=20120329
diff --git a/gnome3-libs/gcr/HISTORY b/gnome3-libs/gcr/HISTORY
index 3bb829c..d4de353 100644
--- a/gnome3-libs/gcr/HISTORY
+++ b/gnome3-libs/gcr/HISTORY
@@ -1,3 +1,7 @@
+2015-06-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.16.0
+ * DEPENDS: make the dependency on p11-kit mandatory
+
2014-07-12 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 3.12.2

diff --git a/gnu/gcc/DETAILS b/gnu/gcc/DETAILS
index 162f78f..458bfb7 100755
--- a/gnu/gcc/DETAILS
+++ b/gnu/gcc/DETAILS
@@ -1,6 +1,6 @@
SPELL=gcc
VERSION=5.1.0
- PATCHLEVEL=0
+ PATCHLEVEL=1
BASE_SOURCE_URL="ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$VERSION";
SOURCE=gcc-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
@@ -42,7 +42,7 @@ if list_find "$GCC_COMPILER" "ada" ; then
#

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

diff --git a/shell-term-fm/pcmanfm/DETAILS b/shell-term-fm/pcmanfm/DETAILS
index 21bd398..5f6804b 100755
--- a/shell-term-fm/pcmanfm/DETAILS
+++ b/shell-term-fm/pcmanfm/DETAILS
@@ -2,7 +2,7 @@
VERSION=1.2.3
SOURCE="${SPELL}-${VERSION}.tar.xz"

SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/${SPELL}/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/${SOURCE}
-
SOURCE_HASH=sha512:931b89ed3ec9fc86bf91b0bd5ea1119e72948a9882029fd3ab21b9c1ba6df3e6361304fd10391eb59145debf932b87a9fecd826f77b59121ff59d38bc6aba0bbb350566c3aee0fe857ed1f0df2ae7d2ce51caf1547b951b380145078ba60f2fe6e0490c4d4c19465c5b1e0a9966205db6f8fe4dafb7cb3e987b9157551df2b28
+
SOURCE_HASH=sha512:b350566c3aee0fe857ed1f0df2ae7d2ce51caf1547b951b380145078ba60f2fe6e0490c4d4c19465c5b1e0a9966205db6f8fe4dafb7cb3e987b9157551df2b28
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=http://wiki.lxde.org/en/PCManFM
LICENSE[0]=GPL
diff --git a/utils/i7z/BUILD b/utils/i7z/BUILD
index 4a6b344..0b9a814 100755
--- a/utils/i7z/BUILD
+++ b/utils/i7z/BUILD
@@ -2,8 +2,8 @@ make &&

if is_depends_enabled $SPELL qt4; then
cd GUI &&
- QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"
- PATH="$QTDIR/bin/qt4:$PATH"
+ QTDIR="${QTDIR:-$INSTALL_ROOT/opt/qt4}"
+ PATH="$QTDIR/bin:$PATH"
qmake PREFIX=$INSTALL_ROOT/usr &&
make clean &&
make
diff --git a/utils/i7z/HISTORY b/utils/i7z/HISTORY
index d67b1c8..db41e69 100644
--- a/utils/i7z/HISTORY
+++ b/utils/i7z/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-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: depends -sub CXX gcc (half-automated)

diff --git a/utils/util-linux/DETAILS b/utils/util-linux/DETAILS
index 19deb53..746163b 100755
--- a/utils/util-linux/DETAILS
+++ b/utils/util-linux/DETAILS
@@ -1,9 +1,9 @@
SPELL=util-linux
if [[ $UL_VERSION == aes ]]; then
- VERSION=2.24
+ VERSION=2.26
SECURITY_PATCH=2
-
SOURCE_HASH=sha512:9e1945646a64420226e5af4546022ee604fdba89f91ee474b941075fa55cc2c0d8731e485ef39d2a18e85e81f924790437656b75f1944512629817e4af4191d7
- SOURCE3=$SPELL-$VERSION-20131026.diff.bz2
+
SOURCE_HASH=sha512:af07d49a433fce683da7bdf9aea5693ad108aa16166e0147716175bd779fe5090029617dd7db153bc0f5efcf7bdd377761a616efd4cca90a87bf317132ede88c
+ SOURCE3=$SPELL-$VERSION-20150310.diff.bz2
SOURCE4=$SOURCE3.sign
SOURCE3_URL[0]=http://loop-aes.sourceforge.net/updates/$SOURCE3
SOURCE3_URL[1]=http://koti.tnnet.fi/jari.ruusu/linux/$SOURCE3
@@ -12,8 +12,8 @@ if [[ $UL_VERSION == aes ]]; then
SOURCE3_GPG=loop-AES.gpg:$SOURCE4:UPSTREAM_KEY
SOURCE4_IGNORE=signature
else
- VERSION=2.25.2
-
SOURCE_HASH=sha512:cf8c5bde78f844425150c2a81bdecb87aa57bcd5cebd177a78160835627f58037fa2cfe4db26fd8f35eedb3beb499a91492a297a27d065465e2ea0c6218dc387
+ VERSION=2.26.2
+
SOURCE_HASH=sha512:1cb8e2f32882b3f496d31c250a45cfb61bedb79f7a2802b358c23134d4257fa9bc9cde8888cfa1aaba12109f82b93345c6dc0bec2d11629ffa084f2a4476a91b
SECURITY_PATCH=2
fi
BRANCH=`echo $VERSION | cut -d . -f 1,2`
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index bfcb082..8ed8063 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,6 @@
+2015-06-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.26.2
+
2015-05-07 Vlad Glagolev <stealth AT sourcemage.org>
* PREPARE: added forgotten spell_ok check (thanks to Justin and his
super-fresh rebuild); added a warning message for those who haven't
diff --git a/x11-toolkits/gtk+3/DEPENDS b/x11-toolkits/gtk+3/DEPENDS
index 48425d5..a92b9e6 100755
--- a/x11-toolkits/gtk+3/DEPENDS
+++ b/x11-toolkits/gtk+3/DEPENDS
@@ -28,6 +28,7 @@ depends libsm &&
depends libxext &&
depends libxcursor &&
depends libxrender &&
+depends libepoxy &&

optional_depends gtk+2 \
"--enable-gtk2-dependency" \
diff --git a/x11-toolkits/gtk+3/HISTORY b/x11-toolkits/gtk+3/HISTORY
index d9b3853..409e53b 100644
--- a/x11-toolkits/gtk+3/HISTORY
+++ b/x11-toolkits/gtk+3/HISTORY
@@ -1,3 +1,6 @@
+2015-06-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: add dependency on libepoxy
+
2015-05-25 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: downgraded stable branch to 3.16.3

diff --git a/x11-toolkits/qscintilla/BUILD b/x11-toolkits/qscintilla/BUILD
index 92534bd..10d36c53 100755
--- a/x11-toolkits/qscintilla/BUILD
+++ b/x11-toolkits/qscintilla/BUILD
@@ -8,5 +8,5 @@ else
QTSCINT=Qt3
fi &&
cd $SOURCE_DIRECTORY/$QTSCINT &&
- qmake qscintilla.pro &&
+ PATH=$INSTALL_ROOT/opt/qt4/bin:$PATH qmake qscintilla.pro &&
make
diff --git a/x11-toolkits/qscintilla/DETAILS b/x11-toolkits/qscintilla/DETAILS
index 533df6f..3a5a0db 100755
--- a/x11-toolkits/qscintilla/DETAILS
+++ b/x11-toolkits/qscintilla/DETAILS
@@ -1,6 +1,6 @@
SPELL=qscintilla
- VERSION=2.7.1
-
SOURCE_HASH=sha512:7e1c003ac210f27e60666385fa4b0b42b20371b48ac4a05b0a5740c963beaa5403df42e2d516bbe6e9eb3d2ad1e5acb5825fcb3d0b4aabfbe971ecae3c86296b
+ VERSION=2.9
+
SOURCE_HASH=sha512:a74b7b1182e9f602aa9f61072877d8dba93c430453ed70e18d74013dbda8b0faef30629f2c086d3b06d0632b3f4980570362bb6e635c15686be1be47eaeecb00
SOURCE=QScintilla-gpl-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/QScintilla-gpl-$VERSION

WEB_SITE=http://www.riverbankcomputing.co.uk/software/qscintilla/intro
diff --git a/x11-toolkits/qscintilla/HISTORY b/x11-toolkits/qscintilla/HISTORY
index 7acf218..f4c3174 100644
--- a/x11-toolkits/qscintilla/HISTORY
+++ b/x11-toolkits/qscintilla/HISTORY
@@ -1,3 +1,7 @@
+2015-06-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.9
+ * BUILD: fix build with qt4 in /opt
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)




  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (4d86b22bc5a0165bbac12afa78125c4091d2f3b8), Florian Franzmann, 06/27/2015

Archive powered by MHonArc 2.6.24.

Top of Page