Skip to Content.
Sympa Menu

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

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 (460166d38856d4e81caab613774f093ffbc4ef53)
  • Date: Sun, 12 Nov 2017 21:38:30 +0000

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

archive/unshield/BUILD | 4 -
archive/unshield/DETAILS | 8 +-
archive/unshield/HISTORY | 4 +
graphics-libs/gegl/DETAILS | 4 -
graphics-libs/gegl/HISTORY | 3
graphics-libs/ogre/BUILD | 2
graphics-libs/ogre/DEPENDS | 45 +++++--------
graphics-libs/ogre/DETAILS | 10 +-
graphics-libs/ogre/HISTORY | 4 +
graphics/imagemagick/DETAILS | 4 -
graphics/imagemagick/HISTORY | 3
libs/mygui/DEPENDS | 2
libs/mygui/DETAILS | 10 +-
libs/mygui/HISTORY | 4 +
libs/ois/0001-add-missing-unistd.h-includes.patch | 76
++++++++++++++++++++++
libs/ois/HISTORY | 3
libs/ois/PRE_BUILD | 5 +
libs/openscenegraph/DETAILS | 4 -
libs/openscenegraph/HISTORY | 4 +
libs/openscenegraph/PRE_BUILD | 2
x11-toolkits/qt4/DETAILS | 2
x11-toolkits/qt4/HISTORY | 4 +
x11-toolkits/qt4/PRE_BUILD | 4 -
23 files changed, 157 insertions(+), 54 deletions(-)

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

graphics-libs/gegl: version 0.3.22

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

graphics/imagemagick: version 7.0.7-11

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

libs/openscenegraph: install libraries to /usr/lib

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

x11-toolkits/qt4: fix error with boost 1.65

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

libs/openscenegraph: version 3.4.1

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

libs/mygui: version 3.2.2

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

libs/ois: fix compile error

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

graphics-libs/ogre: version 1.10.9

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

archive/unshield: version 1.4.2

diff --git a/archive/unshield/BUILD b/archive/unshield/BUILD
index ce6ba0f..df8fe19 100755
--- a/archive/unshield/BUILD
+++ b/archive/unshield/BUILD
@@ -4,5 +4,5 @@ for flag in \
do
CFLAGS="${CFLAGS/$flag}"
done &&
-CFLAGS="$CFLAGS -D_DEFAULT_SOURCE" &&
-default_build
+
+CFLAGS="$CFLAGS -D_DEFAULT_SOURCE" cmake_build
diff --git a/archive/unshield/DETAILS b/archive/unshield/DETAILS
index 159b527..c2fc189 100755
--- a/archive/unshield/DETAILS
+++ b/archive/unshield/DETAILS
@@ -1,8 +1,8 @@
SPELL=unshield
- VERSION=0.5
- SOURCE=unshield-0.5.tar.gz
-
SOURCE_URL[0]=http://ovh.dl.sourceforge.net/sourceforge/synce/unshield-0.5.tar.gz
-
SOURCE_HASH=sha512:7e07791f692a8c9a2811125ac5064b5aa29d4b7a5a37c20c0e6eadfc27154b6cfacb546223222bcf261864c7db8d7fc831e6a6211537685578e861185d0a1f66
+ VERSION=1.4.2
+ SOURCE=${SPELL}-${VERSION}.tar.gz
+
SOURCE_URL[0]=https://github.com/twogood/unshield/archive/${VERSION}.tar.gz
+
SOURCE_HASH=sha512:3ddd5df47198adade66acf89644efe3a1c87d60fcdf511f8e5c1fb29bbb07e77a9abc57a05b161ecb54a26a2a86242bbcba6e90df770b1325965ff5aa8eddf58
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://synce.sourceforge.net/synce/unshield.php
ENTERED=20050717
diff --git a/archive/unshield/HISTORY b/archive/unshield/HISTORY
index accddde..fca8c4b 100644
--- a/archive/unshield/HISTORY
+++ b/archive/unshield/HISTORY
@@ -1,3 +1,7 @@
+2017-11-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.4.2
+ * BUILD: use cmake
+
2015-07-13 Ismael Luceno <ismael AT sourcemage.org>
* BUILD: Added, avoid build warnings (the buildsystem uses -Werror)

diff --git a/graphics-libs/gegl/DETAILS b/graphics-libs/gegl/DETAILS
index 89f28f8..201058f 100755
--- a/graphics-libs/gegl/DETAILS
+++ b/graphics-libs/gegl/DETAILS
@@ -1,7 +1,7 @@
SPELL=gegl
- VERSION=0.3.20
+ VERSION=0.3.22
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:9067467e3d4bbfe00594a8459c9ea15047c1331764dd3aa2331da7d842a77c98894e3a0e19a7c0b1cb59189ffe03561e9bd12f92bdb8fdf1799afc6a575962f7
+
SOURCE_HASH=sha512:503e78d7ad91b99ad022f335ffa8475476b4dcd975fc1706b435a6738b51a8e2ba2b7d4fe07e7c419841cc2ebba177713227d3429cee6f92626e7cb0bc5d1c1f
SOURCE_URL[0]=https://download.gimp.org/pub/$SPELL/${VERSION%.*}/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://gegl.org/
diff --git a/graphics-libs/gegl/HISTORY b/graphics-libs/gegl/HISTORY
index af00ef8..9983bdd 100644
--- a/graphics-libs/gegl/HISTORY
+++ b/graphics-libs/gegl/HISTORY
@@ -1,3 +1,6 @@
+2017-11-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.3.22
+
2017-08-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.3.20

diff --git a/graphics-libs/ogre/BUILD b/graphics-libs/ogre/BUILD
index e013b8d..d57b339 100755
--- a/graphics-libs/ogre/BUILD
+++ b/graphics-libs/ogre/BUILD
@@ -1 +1 @@
-cmake_build
+OPTS="-DOGRE_CONFIG_ENABLE_FREEIMAGE=off $OPTS" cmake_build
diff --git a/graphics-libs/ogre/DEPENDS b/graphics-libs/ogre/DEPENDS
index eba2f5c..b30cc5c 100755
--- a/graphics-libs/ogre/DEPENDS
+++ b/graphics-libs/ogre/DEPENDS
@@ -2,45 +2,36 @@ depends -sub CXX gcc &&
depends freetype2 &&
depends libmng &&
depends pkgconfig &&
-depends stlport &&
depends zziplib &&
+depends libxt &&
+depends libxaw &&
+depends sdl2 &&
depends pkgconfig &&
depends OPENGL &&
depends gtkmm2 &&

-optional_depends boost \
- '--enable-threading' \
- '--disable-threading' \
- 'Thread support' &&
-if is_depends_enabled $SPELL boost;then
- sub_depends boost THREAD
-fi &&
+optional_depends tbb \
+ '-DOGRE_CONFIG_ENABLE_TBB_SCHEDULER=on' \
+ '-DOGRE_CONFIG_ENABLE_TBB_SCHEDULER=off' \
+ "use tbb's scheduler" &&
+
+depends boost &&
+sub_depends boost THREAD &&
+sub_depends boost ATOMIC &&
+sub_depends boost CHRONO &&
+sub_depends boost DATE_TIME &&
+sub_depends boost SYSTEM &&

optional_depends cegui "" "" "for sample programs" &&
optional_depends ode "" "" "used in demos" &&

-message "${SPELL_COLOR}devil${MESSAGE_COLOR} and
${SPELL_COLOR}freeimage${MESSAGE_COLOR} support conflicts," \
- "picking ${SPELL_COLOR}devil${MESSAGE_COLOR} will exclude
${SPELL_COLOR}freeimage${DEFAULT_COLOR}" &&
-
-optional_depends devil \
- "--enable-devil" \
- "--disable-devil" \
- "Use DevIL for image loading (RECOMMENDED)" &&
-
-if ! is_depends_enabled $SPELL devil; then
- optional_depends freeimage \
- '--enable-freeimage' \
- '--disable-freeimage' \
- 'image viewer (NOT RECOMMENDED)'
-fi &&
-
optional_depends libcg \
- "--enable-cg" \
- "--disable-cg" \
+ "" \
+ "" \
"Build the nVIDIA Cg plug-in (RECOMMENDED)" \
z-rejected &&

optional_depends openexr \
- "--enable-openexr" \
- "--disable-openexr" \
+ "" \
+ "" \
"Build OpenEXR plug-in"
diff --git a/graphics-libs/ogre/DETAILS b/graphics-libs/ogre/DETAILS
index bb55b9d..826a801 100755
--- a/graphics-libs/ogre/DETAILS
+++ b/graphics-libs/ogre/DETAILS
@@ -1,9 +1,9 @@
SPELL=ogre
- VERSION=1-8-1
- SOURCE=${SPELL}_src_v$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/ogre_src_v$VERSION
-
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/${SPELL}/${SPELL}/$(echo
${VERSION//-/.} | cut -f1,2 -d.)/${VERSION//-/.}/${SOURCE}
-
SOURCE_HASH=sha512:0bbce593e5a9ebf51e3cb53661f6447d99ae28a53365d7f518c6d408216690527ef7552385160cff8d5c3ef15d3ab5c2520ef2c1f51fda5541d5d4dca4663ae2
+ VERSION=1.10.9
+ SOURCE=${SPELL}-${VERSION}.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
+ SOURCE_URL[0]=https://github.com/OGRECave/ogre/archive/v${VERSION}.tar.gz
+
SOURCE_HASH=sha512:606ca2ded0724cd968624c732d87e4160e2a58aaa2011dc2231c73496c0bf3e54d0eac57202b0a666edc57213d3ac94c76f9fd5727d2762413c1df314cff4b9b
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=LGPL
WEB_SITE=http://www.ogre3d.org/
diff --git a/graphics-libs/ogre/HISTORY b/graphics-libs/ogre/HISTORY
index 59992eb..a1a52e8 100644
--- a/graphics-libs/ogre/HISTORY
+++ b/graphics-libs/ogre/HISTORY
@@ -1,3 +1,7 @@
+2017-11-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.10.9
+ * DEPENDS, BUILD: adapt dependencies
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index 55abe44..671b95b 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,11 +1,11 @@
SPELL=imagemagick
SPELLX=ImageMagick
- VERSION=7.0.7-10
+ VERSION=7.0.7-11
SECURITY_PATCH=5
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
SOURCE_URL[0]=http://www.imagemagick.org/download/releases/$SOURCE
-
SOURCE_HASH=sha512:8cd9cb6b63bf3af490e596d35ad9d75cd7e9f573385ab58eb5a1a009b4d37997079ae59c07c669496b942f6b3a61076db0a8f42903d5aecf3aa0e286bc6ea683
+
SOURCE_HASH=sha512:089c8516ca66845c6b8e6b365815ef1806fc97c785f75c06ed62241d7b6255387ee8f9004b1bcc0a6d03b7aa397d8e25131ca2aadc9255cc1e2368d73f774551
CCACHE="off"
WEB_SITE=http://www.imagemagick.org/
ENTERED=20010922
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index ba4afbe..a96cd77 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2017-11-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 7.0.7-11
+
2017-11-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 7.0.7-10

diff --git a/libs/mygui/DEPENDS b/libs/mygui/DEPENDS
index 0985a4c..56f79e4 100755
--- a/libs/mygui/DEPENDS
+++ b/libs/mygui/DEPENDS
@@ -1,4 +1,4 @@
-depends ogre &&
+depends ogre "-DOGRE_INCLUDE_DIR=${INSTALL_ROOT}/usr/include/OGRE" &&
depends ois &&
optional_depends freetype2 \
"-DMYGUI_USE_FREETYPE=TRUE" \
diff --git a/libs/mygui/DETAILS b/libs/mygui/DETAILS
index 7509ddc..8215efc 100755
--- a/libs/mygui/DETAILS
+++ b/libs/mygui/DETAILS
@@ -1,9 +1,9 @@
SPELL=mygui
- VERSION=3.2.0
- SOURCE="MyGUI_${VERSION}.zip"
-
SOURCE_URL[0]=http://netcologne.dl.sourceforge.net/project/my-gui/MyGUI/MyGUI_${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:8ff8de065a6f355a03e45bfeac6d8db706ee7a122346f41ef26664dc8280d4d1cba8ac943afbaae27c5a1b7fb8bfa8729a1758cc87e8764370284aec943f9278
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/MyGUI_${VERSION}"
+ VERSION=3.2.2
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+
SOURCE_URL[0]=https://github.com/MyGUI/mygui/archive/MyGUI${VERSION}.tar.gz
+
SOURCE_HASH=sha512:1290ce1d78b9e4bfe72bea3fb1bc6cdd25969b44be2844df62a1f425b3e221a68b61658fdf45271fb50a1957f12b5ada1c9be971e00ecfe41f53ae0a83ae18d4
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/mygui-MyGUI${VERSION}"
WEB_SITE="http://mygui.info/";
LICENSE[0]=LGPL
ENTERED=20120414
diff --git a/libs/mygui/HISTORY b/libs/mygui/HISTORY
index df2f3f2..7f06fb5 100644
--- a/libs/mygui/HISTORY
+++ b/libs/mygui/HISTORY
@@ -1,3 +1,7 @@
+2017-11-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.2.2
+ * DEPENDS: explicitly set ogre's include path
+
2012-04-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, DEPENDS, DETAILS: spell created

diff --git a/libs/ois/0001-add-missing-unistd.h-includes.patch
b/libs/ois/0001-add-missing-unistd.h-includes.patch
new file mode 100644
index 0000000..38c1fd7
--- /dev/null
+++ b/libs/ois/0001-add-missing-unistd.h-includes.patch
@@ -0,0 +1,76 @@
+From 64af4ea1fdff4001499d1b956ecbf91ec2a2fa2e Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Sat, 11 Nov 2017 23:51:02 +0100
+Subject: [PATCH] add missing unistd.h includes
+
+---
+ demos/FFConsoleDemo.cpp | 1 +
+ demos/OISConsole.cpp | 1 +
+ src/linux/LinuxForceFeedback.cpp | 1 +
+ src/linux/LinuxJoyStickEvents.cpp | 5 +++--
+ 4 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/demos/FFConsoleDemo.cpp b/demos/FFConsoleDemo.cpp
+index 9e996aa..399e07a 100644
+--- a/demos/FFConsoleDemo.cpp
++++ b/demos/FFConsoleDemo.cpp
+@@ -1,5 +1,6 @@
+ #include "OIS.h"
+
++#include <unistd.h>
+ #include <math.h>
+ #include <cstdlib>
+ #include <iostream>
+diff --git a/demos/OISConsole.cpp b/demos/OISConsole.cpp
+index 86f325a..15879c4 100644
+--- a/demos/OISConsole.cpp
++++ b/demos/OISConsole.cpp
+@@ -9,6 +9,7 @@
+ //Advanced Usage
+ #include "OISForceFeedback.h"
+
++#include <unistd.h>
+ #include <iostream>
+ #include <vector>
+ #include <sstream>
+diff --git a/src/linux/LinuxForceFeedback.cpp
b/src/linux/LinuxForceFeedback.cpp
+index 466a989..10d3d3f 100644
+--- a/src/linux/LinuxForceFeedback.cpp
++++ b/src/linux/LinuxForceFeedback.cpp
+@@ -23,6 +23,7 @@ restrictions:
+ #include "linux/LinuxForceFeedback.h"
+ #include "OISException.h"
+
++#include <unistd.h>
+ #include <cstdlib>
+ #include <errno.h>
+ #include <memory.h>
+diff --git a/src/linux/LinuxJoyStickEvents.cpp
b/src/linux/LinuxJoyStickEvents.cpp
+index 35c14ca..49a4cb7 100644
+--- a/src/linux/LinuxJoyStickEvents.cpp
++++ b/src/linux/LinuxJoyStickEvents.cpp
+@@ -31,10 +31,11 @@ restrictions:
+ #include "OISException.h"
+
+ #include <fcntl.h> //Needed to Open a file descriptor
+-#include <cassert>
++#include <cassert>
+ #include <linux/input.h>
+
+
++#include <unistd.h>
+ #include <sstream>
+ # include <iostream>
+ using namespace std;
+@@ -190,7 +191,7 @@ void LinuxJoyStick::capture()
+ break;
+ }
+
+-
++
+ case EV_REL: //Relative Axes (Do any joystick
actually have a relative axis?)
+ #ifdef OIS_LINUX_JOY_DEBUG
+ cout << "\nWarning: Relatives axes not
supported yet" << endl;
+--
+2.15.0
+
diff --git a/libs/ois/HISTORY b/libs/ois/HISTORY
index cfadc9a..77cb221 100644
--- a/libs/ois/HISTORY
+++ b/libs/ois/HISTORY
@@ -1,3 +1,6 @@
+2017-11-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, 0001-add-missing-unistd.h-includes.patch: fix compile
error
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/libs/ois/PRE_BUILD b/libs/ois/PRE_BUILD
index 4c1a412..4d41f06 100755
--- a/libs/ois/PRE_BUILD
+++ b/libs/ois/PRE_BUILD
@@ -1,3 +1,6 @@
-default_pre_build &&
+default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
+
+patch -p1 < "$SPELL_DIRECTORY/0001-add-missing-unistd.h-includes.patch" &&
+
. ./bootstrap
diff --git a/libs/openscenegraph/DETAILS b/libs/openscenegraph/DETAILS
index 7a2a3df..8c4bd20 100755
--- a/libs/openscenegraph/DETAILS
+++ b/libs/openscenegraph/DETAILS
@@ -1,9 +1,9 @@
SPELL=openscenegraph
- VERSION=3.4
+ VERSION=3.4.1
SOURCE=OpenSceneGraph-$VERSION.zip
SOURCE_DIRECTORY=$BUILD_DIRECTORY/OpenSceneGraph-OpenSceneGraph-${VERSION}

SOURCE_URL[0]=https://github.com/openscenegraph/OpenSceneGraph/archive/${SOURCE}
-
SOURCE_HASH=sha512:50b983ffec0fd5f3900debed109c753b8027b2e335d426bce1782cde60f4d7458485992eb10b7fe380afec71707042a63317f824e2f75e1914ff8952d6934c84
+
SOURCE_HASH=sha512:9fc17834f57848a48a5e1821073958b0d7a4d37fc51f3be636837db248d78cd8659afece3c13cf61d22012440ca6ff4538a84f01e3cfee79e0128beda4d33aea
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
WEB_SITE=http://www.openscenegraph.org/
ENTERED=20021102
diff --git a/libs/openscenegraph/HISTORY b/libs/openscenegraph/HISTORY
index 9315e85..031c9f7 100644
--- a/libs/openscenegraph/HISTORY
+++ b/libs/openscenegraph/HISTORY
@@ -1,3 +1,7 @@
+2017-11-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.4.1
+ * PRE_BUILD; install libraries to /usr/lib instead of /usr/lib64
+
2016-09-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 4.3
* PRE_BUILD, gdal-2.patch: remove obsolete patch
diff --git a/libs/openscenegraph/PRE_BUILD b/libs/openscenegraph/PRE_BUILD
index b929196..8b32f66 100755
--- a/libs/openscenegraph/PRE_BUILD
+++ b/libs/openscenegraph/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&

+sed 's|SET(LIB_POSTFIX "64" CACHE|SET(LIB_POSTFIX "" CACHE|' -i
CMakeLists.txt &&
+
glselect mesa
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index 598b23d..12d10c1 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -3,7 +3,7 @@ persistent_remove QT_VER
TMPFS=off
SPELLX=qt-everywhere-opensource-src
VERSION=4.8.7
- PATCHLEVEL=2
+ PATCHLEVEL=3

SOURCE_HASH=sha512:f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
SOURCE=$SPELLX-$VERSION.tar.gz
SECURITY_PATCH=7
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 4fcca14..1896b11 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,7 @@
+2017-11-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, boost-1.65.1.patch: fix error in moc when run with boost
1.65
+ * DETAILS: PATCHLEVEL++
+
2016-08-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, 0001-fix-build-of-qtwebkit-with-gcc-6.patch: fix build of
qtwebkit with gcc 6
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index 18699fd..fc38d2b 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -63,4 +63,6 @@ if [[ $QT_WEBKIT_VIDEO == n ]]; then
sed -i '1iDEFINES += ENABLE_VIDEO=0'
src/3rdparty/webkit/Source/WebCore/WebCore.pro
fi &&

-patch -p1 < "$SPELL_DIRECTORY/0001-fix-build-of-qtwebkit-with-gcc-6.patch"
+patch -p1 < "$SPELL_DIRECTORY/0001-fix-build-of-qtwebkit-with-gcc-6.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/boost-1.65.1.patch"
+



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (460166d38856d4e81caab613774f093ffbc4ef53), Florian Franzmann, 11/12/2017

Archive powered by MHonArc 2.6.24.

Top of Page