sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Florian Franzmann (28d4d5a5561beb4a6096c8f5446cab18ca83836a)
- 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 (28d4d5a5561beb4a6096c8f5446cab18ca83836a)
- Date: Sat, 8 Aug 2015 17:29:25 +0000
GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:
ChangeLog | 3
crypto/password-store/BUILD | 1
crypto/password-store/DEPENDS | 9
crypto/password-store/DETAILS | 24
crypto/password-store/HISTORY | 3
crypto/password-store/INSTALL | 20
graphics-libs/vigra/BUILD | 1
graphics-libs/vigra/DEPENDS | 37 -
graphics-libs/vigra/HISTORY | 4
graphics-libs/vigra/PRE_SUB_DEPENDS | 4
graphics-libs/vigra/SUB_DEPENDS | 4
graphics/hugin/0002-access-extract-through-this-pointer.patch | 34 -
graphics/hugin/DEPENDS | 3
graphics/hugin/DETAILS | 4
graphics/hugin/HISTORY | 6
graphics/hugin/PRE_BUILD | 3
science/qlandkarte-gt/DEPENDS | 1
science/qlandkarte-gt/HISTORY | 3
science/qlandkarte-gt/INSTALL | 8
x11-toolkits/qt4/HISTORY | 4
x11-toolkits/qt4/INSTALL | 6
x11-toolkits/qt4/profile.d/qt4.sh | 3
x11-toolkits/wxgtk/HISTORY | 6
x11-toolkits/wxgtk/PRE_BUILD | 8
x11-toolkits/wxgtk/wxGTK-2.8.12.1-autoconf.patch | 27
x11-toolkits/wxgtk/wxGTK-2.8.12.1-bakefile.patch | 25
x11-toolkits/wxgtk/wxGTK-2.8.12.1-libdir.patch | 304
++++++++++
27 files changed, 493 insertions(+), 62 deletions(-)
New commits:
commit 28d4d5a5561beb4a6096c8f5446cab18ca83836a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
graphics/hugin: version 2015.0.0
commit fd27e9aab1de510907c6bdfb815b1acc3c315bb2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
graphics-libs/vigra: fix dependencies, add sub dependency for openexr
commit df651453dffafdc431fdf52ab9d8e6dd28432322
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
x11-toolkits/wxgtk: add fix for OpenGL not being found
commit 8c242ae5890a5f24bfcfcd3a7bab04b7448717ef
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
crypto/password-store: new spell, a password manager
commit 909c38c5a3dbc22a90c777f455aac19dd82d30ce
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
x11-toolkits/qt4: install profile.d script so PATH is set correctly
commit 782317d2b2530dc5a9b7e313de4d7df1dc408d07
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
science/qlandkarte-gt: fix library search path
diff --git a/ChangeLog b/ChangeLog
index 6804220..c1db600 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2015-08-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * crypto/password-store: new spell, a cli password manager
+
2015-08-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* haskell/happy: spell deprecated [renamed to haskell-happy]
diff --git a/crypto/password-store/BUILD b/crypto/password-store/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/crypto/password-store/BUILD
@@ -0,0 +1 @@
+true
diff --git a/crypto/password-store/DEPENDS b/crypto/password-store/DEPENDS
new file mode 100755
index 0000000..c59e3c5
--- /dev/null
+++ b/crypto/password-store/DEPENDS
@@ -0,0 +1,9 @@
+depends git &&
+depends gnupg-exp &&
+depends xclip &&
+depends pwgen &&
+depends tree &&
+
+suggest_depends bash "" "" "for bash completion" &&
+suggest_depends zsh "" "" "for zsh completion" &&
+suggest_depends fish "" "" "for fish completion"
diff --git a/crypto/password-store/DETAILS b/crypto/password-store/DETAILS
new file mode 100755
index 0000000..a2ab023
--- /dev/null
+++ b/crypto/password-store/DETAILS
@@ -0,0 +1,24 @@
+ SPELL=password-store
+ VERSION=1.6.5
+ SOURCE="${SPELL}-${VERSION}.tar.xz"
+ SOURCE_URL[0]=http://git.zx2c4.com/${SPELL}/snapshot/${SOURCE}
+
SOURCE_HASH=sha512:e28503b63c6d18a2f45f4a732fdec0380c2ac15e1778136ec5e7ac568662b09183d3ad4fd36ca7e87cfe74540f916cb6365695bdf665a39da4cbe86c4bde7a78
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://www.passwordstore.org/";
+ LICENSE[0]=GPL
+ ENTERED=20150808
+ SHORT="a command line password manager"
+cat << EOF
+Password management should be simple and follow Unix philosophy. With pass,
+each password lives inside of a gpg encrypted file whose filename is the
title
+of the website or resource that requires the password. These encrypted files
+may be organized into meaningful folder hierarchies, copied from computer
+to computer, and, in general, manipulated using standard command line file
+management utilities.
+
+pass makes managing these individual password files extremely easy. All
+passwords live in ~/.password-store, and pass provides some nice commands for
+adding, editing, generating, and retrieving passwords. It is a very short
+and simple shell script. It's capable of temporarily putting passwords on
+your clipboard and tracking password changes using git.
+EOF
diff --git a/crypto/password-store/HISTORY b/crypto/password-store/HISTORY
new file mode 100644
index 0000000..3cecb4f
--- /dev/null
+++ b/crypto/password-store/HISTORY
@@ -0,0 +1,3 @@
+2014-08-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DETAILS, DEPENDS, INSTALL: spell created
+
diff --git a/crypto/password-store/INSTALL b/crypto/password-store/INSTALL
new file mode 100755
index 0000000..4541ed8
--- /dev/null
+++ b/crypto/password-store/INSTALL
@@ -0,0 +1,20 @@
+if is_depends_enabled $SPELL bash; then
+ FORCE_BASHCOMP=1
+else
+ FORCE_BASHCOMP=0
+fi &&
+
+if is_depends_enabled $SPELL zsh; then
+ FORCE_ZSHCOMP=1
+else
+ FORCE_ZSHCOMP=0
+fi &&
+
+if is_depends_enabled $SPELL zsh; then
+ FORCE_FISHCOMP=1
+else
+ FORCE_FISHCOMP=0
+fi &&
+FORCE_BASHCOMP=${FORCE_BASHCOMP} \
+ FORCE_ZSHCOMP=${FORCE_ZSHCOMP} \
+ FORCE_FISHCOMP=${FORCE_FISHCOMP} default_install
diff --git a/graphics-libs/vigra/BUILD b/graphics-libs/vigra/BUILD
index 8209c63..e013b8d 100755
--- a/graphics-libs/vigra/BUILD
+++ b/graphics-libs/vigra/BUILD
@@ -1,2 +1 @@
cmake_build
-
diff --git a/graphics-libs/vigra/DEPENDS b/graphics-libs/vigra/DEPENDS
index 37779ac..7a1d14f 100755
--- a/graphics-libs/vigra/DEPENDS
+++ b/graphics-libs/vigra/DEPENDS
@@ -1,27 +1,20 @@
depends -sub CXX gcc &&
depends cmake &&
+depends fftw &&
+depends JPEG &&
+depends libpng &&
+depends tiff &&
+depends zlib &&
-optional_depends fftw \
- "--with-fftw" \
- "--without-fftw" \
+optional_depends hdf5 \
+ "-DWITH_HDF5=on" \
+ "-DWITH_HDF5=off" \
"to support fast Fourier transforms" &&
-optional_depends JPEG \
- "--with-jpeg" \
- "--without-jpeg" \
- "for jpeg support" &&
-optional_depends libpng \
- "--with-png" \
- "--without-png" \
- "for png support" &&
-optional_depends numpy \
- "" \
- "" \
+optional_depends numpy \
+ "-DWITH_VIGRANUMPY=on" \
+ "-DWITH_VIGRANUMPY=off" \
"for vigranumpy module" &&
-optional_depends tiff \
- "--with-tiff" \
- "--without-tiff" \
- "for tiff support" &&
-optional_depends zlib \
- "--with-zlib" \
- "--without-zlib" \
- "for using zlib compression library"
+optional_depends openexr \
+ "-DWITH_OPENEXR=on" \
+ "-DWITH_OPENEXR=off" \
+ "for openexr support"
diff --git a/graphics-libs/vigra/HISTORY b/graphics-libs/vigra/HISTORY
index 8ed9394..26ea62c 100644
--- a/graphics-libs/vigra/HISTORY
+++ b/graphics-libs/vigra/HISTORY
@@ -1,3 +1,7 @@
+2015-08-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: adapt dependencies to version 1.10.0
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: add sub dependency for OPENEXR
+
2014-09-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.10.0
diff --git a/graphics-libs/vigra/PRE_SUB_DEPENDS
b/graphics-libs/vigra/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..a666654
--- /dev/null
+++ b/graphics-libs/vigra/PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case "$THIS_SUB_DEPENDS" in
+ OPENEXR) is_depends_enabled $SPELL openexr ;;
+ *) echo "bogus sub_depends: $SPELL $THIS_SUB_DEPENDS"; return 1;;
+esac
diff --git a/graphics-libs/vigra/SUB_DEPENDS b/graphics-libs/vigra/SUB_DEPENDS
new file mode 100755
index 0000000..648a3e3
--- /dev/null
+++ b/graphics-libs/vigra/SUB_DEPENDS
@@ -0,0 +1,4 @@
+case "$THIS_SUB_DEPENDS" in
+ OPENEXR) depends openexr "-DWITH_OPENEXR=on" ;;
+ *) echo "bogus sub_depends: $SPELL $THIS_SUB_DEPENDS"; return 1;;
+esac
diff --git a/graphics/hugin/0002-access-extract-through-this-pointer.patch
b/graphics/hugin/0002-access-extract-through-this-pointer.patch
deleted file mode 100644
index c29b5be..0000000
--- a/graphics/hugin/0002-access-extract-through-this-pointer.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 345bb4349b2c37e3193378347db557abf6d200aa Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-Date: Fri, 26 Oct 2012 22:24:43 +0200
-Subject: [PATCH 2/2] access extract through this pointer
-
----
- src/foreign/zthread/include/zthread/Guard.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/foreign/zthread/include/zthread/Guard.h
b/src/foreign/zthread/include/zthread/Guard.h
-index abcd92c..e690a5b 100755
---- a/src/foreign/zthread/include/zthread/Guard.h
-+++ b/src/foreign/zthread/include/zthread/Guard.h
-@@ -428,7 +428,7 @@ public:
- template <class U, class V>
- Guard(Guard<U, V>& g) : LockHolder<LockType>(g) {
-
-- LockingPolicy::shareScope(*this, extract(g));
-+ LockingPolicy::shareScope(*this, this->extract(g));
-
- }
-
-@@ -458,7 +458,7 @@ public:
- template <class U, class V>
- Guard(Guard<U, V>& g, LockType& lock) : LockHolder<LockType>(lock) {
-
-- LockingPolicy::transferScope(*this, extract(g));
-+ LockingPolicy::transferScope(*this, this->extract(g));
-
- }
-
---
-1.8.0
-
diff --git a/graphics/hugin/DEPENDS b/graphics/hugin/DEPENDS
index 7b158ef..ffd1b0e 100755
--- a/graphics/hugin/DEPENDS
+++ b/graphics/hugin/DEPENDS
@@ -3,12 +3,15 @@ depends enblend &&
depends -sub XRC wxgtk &&
depends exiv2 &&
depends openexr &&
+depends -sub OPENEXR vigra &&
depends -sub THREAD boost &&
depends tiff &&
depends JPEG &&
depends libpng &&
depends cmake &&
depends glew &&
+depends freeglut &&
+depends gettext &&
depends tclap &&
runtime_depends image-exiftool &&
diff --git a/graphics/hugin/DETAILS b/graphics/hugin/DETAILS
index 8753d00..ef7a632 100755
--- a/graphics/hugin/DETAILS
+++ b/graphics/hugin/DETAILS
@@ -1,8 +1,8 @@
SPELL=hugin
- VERSION=2011.4.0
+ VERSION=2015.0.0
SOURCE="$SPELL-$VERSION.tar.bz2"
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/hugin/$SOURCE
-
SOURCE_HASH=sha512:13f2e1d72e1bc7e3c3871dd845ec3cd7aefe9dc1bf108808996b9dccdfff6a10a8dba2935f1a20c898385e97bdf8f08e9f77bb315e73ae5240eb594bfbc55803
+
SOURCE_HASH=sha512:bb2acf4dea80d43280778f67594dd1ddb0c2e186bcbaafe460fe47e0bd464ae2191b9b25344245e7267316e602ac2179cc838a0dcecb0d408c2206890a5ab6a2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE="http://hugin.sourceforge.net/";
LICENSE[0]=GPL
diff --git a/graphics/hugin/HISTORY b/graphics/hugin/HISTORY
index 4a6b385..26c8e76 100644
--- a/graphics/hugin/HISTORY
+++ b/graphics/hugin/HISTORY
@@ -1,3 +1,9 @@
+2015-08-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2015.0.0
+ * DEPENDS: add dependency on vigra with OPENEXR, gettext, freeglut
+ * PRE_BUILD, 0002-access-extract-through-this-pointer.patch: remove
+ obsolete patch
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)
diff --git a/graphics/hugin/PRE_BUILD b/graphics/hugin/PRE_BUILD
index c3b88b6..a549000 100755
--- a/graphics/hugin/PRE_BUILD
+++ b/graphics/hugin/PRE_BUILD
@@ -1,4 +1,3 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-patch -p1 < $SPELL_DIRECTORY/0001-add-missing-header.patch &&
-patch -p1 < $SPELL_DIRECTORY/0002-access-extract-through-this-pointer.patch
+patch -p1 < $SPELL_DIRECTORY/0001-add-missing-header.patch
diff --git a/science/qlandkarte-gt/DEPENDS b/science/qlandkarte-gt/DEPENDS
index 7b9a728..94a0ac4 100755
--- a/science/qlandkarte-gt/DEPENDS
+++ b/science/qlandkarte-gt/DEPENDS
@@ -3,6 +3,7 @@ depends cmake &&
depends -sub OPENGL qt4 &&
depends gdal &&
depends proj &&
+depends patchelf &&
depends PYTHON &&
optional_depends libexif \
"-DWITH_EXIF=on" \
diff --git a/science/qlandkarte-gt/HISTORY b/science/qlandkarte-gt/HISTORY
index ac618dd..6d73063 100644
--- a/science/qlandkarte-gt/HISTORY
+++ b/science/qlandkarte-gt/HISTORY
@@ -1,3 +1,6 @@
+2015-08-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, INSTALL: fix library search path
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: depends -sub CXX gcc (half-automated)
diff --git a/science/qlandkarte-gt/INSTALL b/science/qlandkarte-gt/INSTALL
index 5551aae..f7d2c6e 100755
--- a/science/qlandkarte-gt/INSTALL
+++ b/science/qlandkarte-gt/INSTALL
@@ -1,2 +1,8 @@
default_install &&
-install -m755 -o root -g root ${SOURCE_DIRECTORY}/srtmconvert.py
${INSTALL_ROOT}/usr/bin/srtmconvert
+install -m755 -o root -g root ${SOURCE_DIRECTORY}/srtmconvert.py
${INSTALL_ROOT}/opt/qt4/bin/srtmconvert &&
+patchelf --set-rpath /opt/qt4/lib ${INSTALL_ROOT}/opt/qt4/bin/cache2gtiff &&
+patchelf --set-rpath /opt/qt4/lib ${INSTALL_ROOT}/opt/qt4/bin/map2gcm &&
+patchelf --set-rpath /opt/qt4/lib ${INSTALL_ROOT}/opt/qt4/bin/map2jnx &&
+patchelf --set-rpath /opt/qt4/lib ${INSTALL_ROOT}/opt/qt4/bin/map2rmap &&
+patchelf --set-rpath /opt/qt4/lib ${INSTALL_ROOT}/opt/qt4/bin/map2rmp &&
+patchelf --set-rpath /opt/qt4/lib ${INSTALL_ROOT}/opt/qt4/bin/qlandkartegt
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 62f3273..7821b4d 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,7 @@
+2015-08-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * INSTALL, profile.d/qt4.sh: make sure PATH is set so qt4 apps are
+ found
+
2015-06-20 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
ensure that qt4 is installed to /opt/qt4
diff --git a/x11-toolkits/qt4/INSTALL b/x11-toolkits/qt4/INSTALL
new file mode 100755
index 0000000..830b9e7
--- /dev/null
+++ b/x11-toolkits/qt4/INSTALL
@@ -0,0 +1,6 @@
+default_install &&
+if install_config_file $SPELL_DIRECTORY/profile.d/qt4.sh \
+ $INSTALL_ROOT/etc/profile.d/qt4.sh; then
+ chmod 0755 $INSTALL_ROOT/etc/profile.d/qt4.sh
+fi
+
diff --git a/x11-toolkits/qt4/profile.d/qt4.sh
b/x11-toolkits/qt4/profile.d/qt4.sh
new file mode 100755
index 0000000..5a64c62
--- /dev/null
+++ b/x11-toolkits/qt4/profile.d/qt4.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+export PATH=$PATH:/opt/qt4/bin
diff --git a/x11-toolkits/wxgtk/HISTORY b/x11-toolkits/wxgtk/HISTORY
index 59a8a09..5799535 100644
--- a/x11-toolkits/wxgtk/HISTORY
+++ b/x11-toolkits/wxgtk/HISTORY
@@ -1,3 +1,9 @@
+2015-08-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, wxGTK-2.8.12.1-autoconf.patch,
+ wxGTK-2.8.12.1-bakefile.patch,
+ wxGTK-2.8.12.1-libdir.patch: add three patches from gentoo to fix a
+ bug in the configure script that leads to OpenGL not being found
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)
diff --git a/x11-toolkits/wxgtk/PRE_BUILD b/x11-toolkits/wxgtk/PRE_BUILD
new file mode 100755
index 0000000..103cc38
--- /dev/null
+++ b/x11-toolkits/wxgtk/PRE_BUILD
@@ -0,0 +1,8 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SPELL_DIRECTORY}/wxGTK-2.8.12.1-libdir.patch &&
+patch -p1 < ${SPELL_DIRECTORY}/wxGTK-2.8.12.1-bakefile.patch &&
+patch -p1 < ${SPELL_DIRECTORY}/wxGTK-2.8.12.1-autoconf.patch &&
+
+mv configure.in configure.ac &&
+autoconf
diff --git a/x11-toolkits/wxgtk/wxGTK-2.8.12.1-autoconf.patch
b/x11-toolkits/wxgtk/wxGTK-2.8.12.1-autoconf.patch
new file mode 100644
index 0000000..2701500
--- /dev/null
+++ b/x11-toolkits/wxgtk/wxGTK-2.8.12.1-autoconf.patch
@@ -0,0 +1,27 @@
+From 4164cd68d45ec4b3b46c22ed981c81f766154428 Mon Sep 17 00:00:00 2001
+From: Vadim Zeitlin <vadim AT wxwidgets.org>
+Date: Thu, 17 Jun 2010 22:30:27 +0000
+Subject: Backport fix from bakefile svn for autoconf 2.65.
+
+Use AC_REQUIRE() instead of directly using a macro, the latter doesn't work
+with autoconf 2.65.
+
+This is a backport of r1337 from bakefile svn to allow people to use autoconf
+2.65 immediately and will become unnecessary when we update to the next
+bakefile version.
+
+git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64620
c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
+
+diff --git a/build/aclocal/bakefile-lang.m4 b/build/aclocal/bakefile-lang.m4
+index 4cc4a67..ec0f711 100644
+--- a/build/aclocal/bakefile-lang.m4
++++ b/build/aclocal/bakefile-lang.m4
+@@ -240,7 +240,7 @@ dnl check for different proprietary compilers depending
on target platform
+ dnl _AC_BAKEFILE_PROG_COMPILER(LANG)
+ AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER],
+ [
+- AC_PROG_$1
++ AC_REQUIRE([AC_PROG_$1])
+
+ dnl Intel compiler can be used under several different OS and even
+ dnl different architectures (x86, amd64 and Itanium) so it's easier to
just
diff --git a/x11-toolkits/wxgtk/wxGTK-2.8.12.1-bakefile.patch
b/x11-toolkits/wxgtk/wxGTK-2.8.12.1-bakefile.patch
new file mode 100644
index 0000000..f497665
--- /dev/null
+++ b/x11-toolkits/wxgtk/wxGTK-2.8.12.1-bakefile.patch
@@ -0,0 +1,25 @@
+From 006b0650b0f390c1e9a19361988b6af7a327e296 Mon Sep 17 00:00:00 2001
+From: nE0sIghT <ykonotopov AT gmail.com>
+Date: Wed, 5 Aug 2015 12:38:39 +0300
+Subject: [PATCH 2/2] Fixed bakefile version
+
+---
+ build/aclocal/bakefile.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build/aclocal/bakefile.m4 b/build/aclocal/bakefile.m4
+index 88478ca..aa04b16 100644
+--- a/build/aclocal/bakefile.m4
++++ b/build/aclocal/bakefile.m4
+@@ -837,7 +837,7 @@ AC_DEFUN([AC_BAKEFILE],
+ AC_SUBST(OBJCXXFLAGS)
+
+
+- BAKEFILE_BAKEFILE_M4_VERSION="0.2.8"
++ BAKEFILE_BAKEFILE_M4_VERSION="0.2.9"
+
+ dnl includes autoconf_inc.m4:
+ $1
+--
+2.4.6
+
diff --git a/x11-toolkits/wxgtk/wxGTK-2.8.12.1-libdir.patch
b/x11-toolkits/wxgtk/wxGTK-2.8.12.1-libdir.patch
new file mode 100644
index 0000000..db95714
--- /dev/null
+++ b/x11-toolkits/wxgtk/wxGTK-2.8.12.1-libdir.patch
@@ -0,0 +1,304 @@
+From e87336e8d583044d62b1a9400db4c29f1474fa50 Mon Sep 17 00:00:00 2001
+From: nE0sIghT <ykonotopov AT gmail.com>
+Date: Wed, 5 Aug 2015 12:37:36 +0300
+Subject: [PATCH 1/2] Backported new libraries search code
+
+---
+ acinclude.m4 | 75 ++++++++++++++++++++++++++++++++++++++++++++---
+ configure.in | 96
+++++++++++++++++++++++-------------------------------------
+ 2 files changed, 107 insertions(+), 64 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index a44747c..1e307c9 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -43,16 +43,17 @@ for ac_dir in $1 /usr/include;
+ ])
+
+ dnl
---------------------------------------------------------------------------
+-dnl call WX_PATH_FIND_LIBRARIES(search path, lib name), sets
ac_find_libraries
+-dnl to the full name of the file that was found or leaves it empty if not
found
++dnl call WX_PATH_FIND_LIBRARIES(lib name, [optional extra search paths])
++dnl sets ac_find_libraries to the full name of the file that was found
++dnl or leaves it empty if not found
+ dnl
---------------------------------------------------------------------------
+ AC_DEFUN([WX_PATH_FIND_LIBRARIES],
+ [
+ ac_find_libraries=
+- for ac_dir in $1;
++ for ac_dir in $2 $SEARCH_LIB
+ do
+ for ac_extension in a so sl dylib dll.a; do
+- if test -f "$ac_dir/lib$2.$ac_extension"; then
++ if test -f "$ac_dir/lib$1.$ac_extension"; then
+ ac_find_libraries=$ac_dir
+ break 2
+ fi
+@@ -115,6 +116,72 @@ AC_DEFUN([WX_LINK_PATH_EXIST],
+ fi
+ ])
+
++dnl
---------------------------------------------------------------------------
++dnl Usage: WX_FIND_LIB(lib-name, [lib-function to test], [extra search
paths])
++dnl
++dnl Tests in a variety of ways for the presence of lib-name
++dnl
++dnl On success, returns any novel path found in ac_find_libraries; else
"std"
++dnl and any cflags in ac_find_cflags
++dnl On failure, ac_find_libraries will be empty
++dnl
---------------------------------------------------------------------------
++AC_DEFUN([WX_FIND_LIB],
++[
++ ac_find_libraries=
++
++ dnl Try with pkg-config first. It requires its lib-name parameter
lowercase
++ fl_pkgname=`echo "$1" | tr [[:upper:]] [[:lower:]]`
++ dnl suppress PKG_PROG_PKG_CONFIG output; we don't want to keep seeing it
++ PKG_PROG_PKG_CONFIG() AS_MESSAGE_FD> /dev/null
++ PKG_CHECK_MODULES([$1], [$fl_pkgname],
++ [
++ dnl Start by assuming there are no novel lib paths
++ ac_find_libraries="std"
++
++ dnl A simple copy of the internal vars $1_CFLAGS $1_LIBS doesn't work
++ dnl inside the macro
++ dnl
++ dnl TODO: When we stop being autoconf 2.61 compatible, the next 2
lines
++ dnl should become:
++ dnl AS_VAR_COPY([ac_find_cflags], [$1_CFLAGS])
++ dnl AS_VAR_COPY([fl_libs], [$1_LIBS])
++ eval ac_find_cflags=\$$1_CFLAGS
++ eval fl_libs=\$$1_LIBS
++
++ dnl fl_libs may now contain -Lfoopath -lfoo (only non-standard paths
are
++ dnl added) We only want the path bit, not the lib names
++ for fl_path in $fl_libs
++ do
++ if test `echo "$fl_path" | cut -c 1-2` = "-L"; then
++ dnl there shouldn't be >1 novel path
++ dnl return it without the -L, ready for WX_LINK_PATH_EXIST
++ ac_find_libraries=`echo "$fl_path" | cut -c 3-`
++ fi
++ done
++ ],
++ [
++ if test "x$ac_find_libraries" = "x"; then
++ dnl Next with AC_CHECK_LIB, if a test function was provided
++ if test "x$2" != "x"; then
++ AC_CHECK_LIB([$1], [$2], [ac_find_libraries="std"])
++ fi
++ fi
++
++ if test "x$ac_find_libraries" = "x"; then
++ dnl Finally try the search path
++ dnl Output a message again, as AC_CHECK_LIB will just have said "no"
++ AC_MSG_CHECKING([elsewhere])
++ dnl $3 will occasionally hold extra path(s) to search
++ WX_PATH_FIND_LIBRARIES([$1], [$3])
++ if test "x$ac_find_libraries" != "x"; then
++ AC_MSG_RESULT([yes])
++ else
++ AC_MSG_RESULT([no])
++ fi
++ fi
++ ])
++])
++
+ dnl
===========================================================================
+ dnl C++ features test
+ dnl
===========================================================================
+diff --git a/configure.in b/configure.in
+index 021845d..9c78ba3 100644
+--- a/configure.in
++++ b/configure.in
+@@ -2767,7 +2767,7 @@ if test "$build" != "$host" -a "$GCC" = yes; then
+ x_includes=$ac_find_includes
+ fi
+ if test -z "$x_libraries" -o "$x_libraries" = NONE; then
+- WX_PATH_FIND_LIBRARIES($SEARCH_LIB, Xt)
++ WX_PATH_FIND_LIBRARIES(Xt)
+ x_libraries=$ac_find_libraries
+ fi
+ fi
+@@ -3554,7 +3554,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or
'gtk-config
+ dnl test for external libxpm if we're configured to use it
+ if test "$wxUSE_GPE" = "yes"; then
+ AC_MSG_CHECKING(for gpewidget library)
+- WX_PATH_FIND_LIBRARIES($SEARCH_LIB,gpewidget)
++ WX_PATH_FIND_LIBRARIES(gpewidget)
+ if test "$ac_find_libraries" != "" ; then
+ WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
+ dnl -lgpewidget must be before all GTK libs and
+@@ -3567,7 +3567,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or
'gtk-config
+ fi
+
+ dnl AC_MSG_CHECKING(for gpe library)
+- dnl WX_PATH_FIND_LIBRARIES($SEARCH_LIB,gpe)
++ dnl WX_PATH_FIND_LIBRARIES(gpe)
+ dnl if test "$ac_find_libraries" != "" ; then
+ dnl WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
+ dnl GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lgpe"
+@@ -3817,7 +3817,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or
'gtk-config
+
+
+ AC_MSG_CHECKING(for Motif/Lesstif library)
+- WX_PATH_FIND_LIBRARIES($SEARCH_LIB, Xm)
++ WX_PATH_FIND_LIBRARIES(Xm)
+
+ if test "x$ac_find_libraries" != "x" ; then
+ AC_MSG_RESULT(found in $ac_find_libraries)
+@@ -3956,7 +3956,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or
'gtk-config
+ dnl test for external libxpm if we're configured to use it
+ if test "$wxUSE_LIBXPM" = "sys"; then
+ AC_MSG_CHECKING(for Xpm library)
+- WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm)
++ WX_PATH_FIND_LIBRARIES(Xpm)
+ if test "$ac_find_libraries" != "" ; then
+ WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
+@@ -4192,41 +4192,23 @@ dnl
---------------------------------------------------------------------------
+ dnl wxDisplay Sanity checks
+ dnl
---------------------------------------------------------------------------
+
++USE_XINERAMA=0
+ if test "$wxUSE_DISPLAY" = "yes"; then
+ dnl
---------------------------------------------------------------------------
+ dnl Xinerama (for unix ) - Brian Victor
+ dnl
---------------------------------------------------------------------------
+ if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" !=
1; then
+- AC_MSG_CHECKING([for Xinerama])
+- WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xinerama)
++ WX_FIND_LIB(Xinerama, XineramaQueryScreens)
+ if test "$ac_find_libraries" != "" ; then
+- WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+- if test "$ac_path_to_link" != " -L/usr/lib" ; then
+- LDFLAGS="$LDFLAGS $ac_path_to_link"
++ if test "$ac_find_libraries" != "std" ; then
++ WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
++ if test "$ac_path_to_link" != " -L/usr/lib" ; then
++ LDFLAGS="$LDFLAGS $ac_path_to_link"
++ fi
+ fi
++ USE_XINERAMA=1
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXinerama"
+- AC_MSG_RESULT([yes])
+-
+- AC_MSG_CHECKING([for Xxf86vm extension])
+- WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xxf86vm)
+- if test "$ac_find_libraries" != "" ; then
+- AC_MSG_RESULT([yes])
+- AC_CHECK_HEADERS([X11/extensions/xf86vmode.h],
+- [
+- GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm"
+- ],
+- [],
+- [
+- #if HAVE_X11_XLIB_H
+- #include <X11/Xlib.h>
+- #endif
+- ])
+- else
+- AC_MSG_RESULT([no])
+- fi
+-
+ else
+- AC_MSG_RESULT([no])
+ AC_MSG_WARN([Xinerama not found; disabling wxDisplay])
+ wxUSE_DISPLAY="no"
+ fi
+@@ -4243,17 +4225,16 @@ dnl X11 session management
+ dnl
---------------------------------------------------------------------------
+ if test "$wxUSE_DETECT_SM" = "yes"; then
+ if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" !=
1; then
+- AC_MSG_CHECKING([for -lSM - X11 session management])
+- WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],SM)
++ WX_FIND_LIB(SM, SmcOpenConnection)
+ if test "$ac_find_libraries" != "" ; then
+- WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+- if test "$ac_path_to_link" != " -L/usr/lib" ; then
++ if test "$ac_find_libraries" != "std" ; then
++ WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
++ if test "$ac_path_to_link" != " -L/usr/lib" ; then
+ LDFLAGS="$LDFLAGS $ac_path_to_link"
++ fi
+ fi
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lSM"
+- AC_MSG_RESULT([yes])
+ else
+- AC_MSG_RESULT([no])
+ AC_MSG_WARN([libSM not found; disabling session management
detection])
+ wxUSE_DETECT_SM="no"
+ fi
+@@ -4295,51 +4276,46 @@ if test "$wxUSE_OPENGL" = "yes"; then
+ AC_CHECK_HEADER(GL/glu.h, [
+ found_gl=0
+
+- AC_MSG_CHECKING([for -lGL])
+- WX_PATH_FIND_LIBRARIES([$SEARCH_LIB
/opt/graphics/OpenGL/lib],GL)
++ WX_FIND_LIB(GL, glBegin, [/opt/graphics/OpenGL/lib])
+ if test "$ac_find_libraries" != "" ; then
+- AC_MSG_RESULT([found in $ac_find_libraries])
+-
+- WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+- if test "$ac_path_to_link" != " -L/usr/lib" ; then
++ if test "$ac_find_libraries" != "std" ; then
++ WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
++ if test "$ac_path_to_link" != " -L/usr/lib" ; then
+ LDFLAGS_GL="$ac_path_to_link"
++ fi
+ fi
+
+ dnl don't suppose that libGL and libGLU are always in
the
+ dnl same directory -- this is not true for some common
+ dnl distributions
+- AC_MSG_CHECKING([for -lGLU])
+- WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],GLU)
++ WX_FIND_LIB(GLU, gluBeginCurve,
[/opt/graphics/OpenGL/lib])
+ if test "$ac_find_libraries" != "" ; then
++ if test "$ac_find_libraries" != "std" ; then
+ WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+ if test "$ac_path_to_link" != " -L/usr/lib" -a \
+- "$ac_path_to_link" != "$LDFLAGS_GL";
then
+- LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link"
++ "$ac_path_to_link" != "$LDFLAGS_GL" ; then
++ LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link"
+ fi
++ fi
+
+ found_gl=1
+ OPENGL_LIBS="-lGL -lGLU"
+- AC_MSG_RESULT([yes])
+- else
+- AC_MSG_RESULT([no])
+ fi
+- else
+- AC_MSG_RESULT([no])
+ fi
+
+ if test "$found_gl" != 1; then
+- AC_MSG_CHECKING([for -lMesaGL])
+- WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],MesaGL)
++ WX_FIND_LIB(MesaGL, glEnable,
[/opt/graphics/OpenGL/lib])
+ if test "$ac_find_libraries" != "" ; then
++ if test "$ac_find_libraries" != "std" ; then
+ WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+- LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
+- OPENGL_LIBS="-lMesaGL -lMesaGLU"
+- AC_MSG_RESULT([yes])
+- else
+- AC_MSG_RESULT([no])
++ if test "$ac_path_to_link" != " -L/usr/lib" ; then
++ LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link"
++ fi
++ fi
++ OPENGL_LIBS="-lMesaGL -lMesaGLU"
+ fi
+ fi
+- ])
++ ],, [ ])
+ ],
+ [],
+ [ ])
+--
+2.4.6
+
- [SM-Commit] GIT changes to master grimoire by Florian Franzmann (28d4d5a5561beb4a6096c8f5446cab18ca83836a), Florian Franzmann, 08/08/2015
Archive powered by MHonArc 2.6.24.