Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (2299b03f82f45a3f7cd5a05299bfe80dc416a5ee)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (2299b03f82f45a3f7cd5a05299bfe80dc416a5ee)
  • Date: Mon, 13 Jul 2015 16:53:02 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

graphics-libs/libpng/DETAILS | 2 +-
graphics-libs/libwmf/DETAILS | 2 +-
graphics-libs/mesalib/DETAILS | 8 ++++----
graphics-libs/mesalib/HISTORY | 3 +++
plasma/plasma-workspace/HISTORY | 3 +++
plasma/plasma-workspace/plasma.sh | 6 ++----
qt5/qttools/BUILD | 8 --------
qt5/qttools/DETAILS | 2 +-
qt5/qttools/HISTORY | 4 ++++
qt5/qttools/INSTALL | 9 ---------
10 files changed, 19 insertions(+), 28 deletions(-)

New commits:
commit 2299b03f82f45a3f7cd5a05299bfe80dc416a5ee
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qttools - fix build

commit b484cb105f23377fd933d67a65d6513c3c16ed85
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

mesalib: => 10.6.2

commit 43ddb2e3efea415d14b80e350c0baf2eb2c92133
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libwmf: => 0.2.8.4

commit b944abd342c8da5b729a7fc320157def356bbfed
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libpng: => 1.6.17

commit b6101b78f298953c667dfc2e405de8b2bb8b153d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

plasma-workspace - tweak plasm.sh

diff --git a/graphics-libs/libpng/DETAILS b/graphics-libs/libpng/DETAILS
index 9e29cfd..5b2c679 100755
--- a/graphics-libs/libpng/DETAILS
+++ b/graphics-libs/libpng/DETAILS
@@ -5,7 +5,7 @@
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/$SPELL/$SOURCE
if [[ $ANI_PNG == y ]]; then
SOURCE2=$SPELL-$VERSION-apng.patch.gz
-
SOURCE2_HASH=sha512:5abfe55ad8e2778572fa5c1543c23b01c7f7fc4fea1aec535ac5749ae1ba1e209e7b94641d34d4b6514be7abbf176b957e3690832d4358d0590754063303eeb0
+
SOURCE2_HASH=sha512:f22a48b355adea197a2d79f90ccc6b3edef2b5e8f6fb17319bd38652959126bbecb9442fd95e5147a894484446e87e535667fbfcf3b1e901b8375e5bb00a3bf3

SOURCE2_URL[0]=http://downloads.sourceforge.net/sourceforge/$SPELL-apng/$SOURCE2
fi
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/graphics-libs/libwmf/DETAILS b/graphics-libs/libwmf/DETAILS
index 1a0f202..e2e767f 100755
--- a/graphics-libs/libwmf/DETAILS
+++ b/graphics-libs/libwmf/DETAILS
@@ -1,6 +1,6 @@
SPELL=libwmf
VERSION=0.2.8.4
-
SOURCE_HASH='sha512:d98df8e76a52245487b13e5ab3d2fbba9d246f97ee04a7344c0e5861bb2d0f990fc6d662dbd849ce621768b06eaebd4270fb34bec4ee004334a98b14ba6044a5'
+
SOURCE_HASH='sha512:d98df8e76a52245487b13e5ab3d2fbba9d246f97ee04a7344c0e5861bb2d0f990fc6d662dbd849ce621768b06eaebd4270fb34bec4ee004334a98b14ba6044a5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/wvware/$SOURCE
diff --git a/graphics-libs/mesalib/DETAILS b/graphics-libs/mesalib/DETAILS
index 9bceb3f..3fc9fac 100755
--- a/graphics-libs/mesalib/DETAILS
+++ b/graphics-libs/mesalib/DETAILS
@@ -1,14 +1,14 @@
SPELL=mesalib
if [[ "$MESALIB_BRANCH" == "scm" ]]; then
- VERSION=$(get_scm_version)
- SOURCE=$SPELL-git.tar.bz2
+ VERSION=10.6.2
+ SOURCE=$SPELL-git.tar.xz
FORCE_DOWNLOAD="on"
SOURCE_URL[0]=git://anongit.freedesktop.org/git/mesa/mesa:mesalib-git
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/mesalib-git
SOURCE_IGNORE=volatile
else
- VERSION=10.6.1
-
SOURCE_HASH=sha512:7ba5f4a7e421e6f198c4e80c1f0259071e1115aecdbe2846a7986bcfe1503a6f4a1806126295e3d9f4b6aee63dd107e82c3972ccb8079b9b5baf1f65246d21ab
+ VERSION=10.6.2
+
SOURCE_HASH=sha512:feaca60b7cc8310a613bd89d0008fb7807de403ce6782e0e62e47ecba040d3728602778f47c704751cb49f8e2d950de03153b84b66d28203e29a70987b96340b
PATCHLEVEL=0
# VX=`echo $VERSION | cut -d. -f-2`
SX=mesa-${VERSION}
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index fdc1d99..cad9fc5 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,6 @@
+2015-07-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 10.6.2
+
2015-06-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 10.6.1

diff --git a/plasma/plasma-workspace/HISTORY b/plasma/plasma-workspace/HISTORY
index 18eefb3..81b8725 100644
--- a/plasma/plasma-workspace/HISTORY
+++ b/plasma/plasma-workspace/HISTORY
@@ -1,3 +1,6 @@
+2015-07-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * plasma.sh: tweak
+
2015-07-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.3.2

diff --git a/plasma/plasma-workspace/plasma.sh
b/plasma/plasma-workspace/plasma.sh
index 8193d92..de9833b 100644
--- a/plasma/plasma-workspace/plasma.sh
+++ b/plasma/plasma-workspace/plasma.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
if [ "$USER" != "root" ];then

# setup KDE5 environment for SMGL
@@ -6,9 +6,7 @@ export QTDIR=/opt/qt5
export KF5=$QTDIR
export PATH+=":$KF5/bin"
export XDG_CONFIG_DIRS=/etc/xdg
-#export XDG_DATA_DIRS+=:$QTDIR/share:/usr/share
export QT_PLUGIN_PATH+=:$KF5/lib/plugins
-#export QT_PLUGIN_PATH=$KF5/lib/plugins:$QTDIR/plugins:

export QML2_IMPORT_PATH=$KF5/lib/qml
export QML_IMPORT_PATH=$QML2_IMPORT_PATH
@@ -16,7 +14,7 @@ export
XCURSOR_PATH=$KF5/share/icons:~/.icons:/usr/share/icons:/usr/share/pixmap

# allow running kde4 apps in a plasma5 session
# put qt4 first, otherwise kamil/akonadi cannot find plugins
- export KDE4=/opt/qt4
+ KDE4=/opt/qt4
if [[ -f $KDE4/bin/kdeinit4 ]];then
export XDG_DATA_DIRS+=":$KDE4/share"
export PATH+=":$KDE4/bin"
diff --git a/qt5/qttools/BUILD b/qt5/qttools/BUILD
deleted file mode 100755
index ada89aa..0000000
--- a/qt5/qttools/BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-default_build &&
-# Build some additional tools that might be missing otherwise.
-# The collectiongenerator is referenced in cmake files from
-# the normal install!
-cd "$SOURCE_DIRECTORY/src/assistant" &&
-make sub-qcollectiongenerator &&
-make sub-qhelpconverter &&
-make sub-qhelpgenerator
diff --git a/qt5/qttools/DETAILS b/qt5/qttools/DETAILS
index ee2d234..89ccee4 100755
--- a/qt5/qttools/DETAILS
+++ b/qt5/qttools/DETAILS
@@ -2,7 +2,7 @@ QT_URL=http://download.qt.io/official_releases/
SPELL=qttools
SPELLX=$SPELL-opensource-src
VERSION=5.5.0
- PATCHLEVEL=1
+ PATCHLEVEL=2

SOURCE_HASH=sha512:801969c68a943ebfc8658c77e799102cd00cb9be1a9b7b1ed033b4fe5b573bac5866d48571f1de27790437fd59950ebacd538109f9249ea1c3c5a991e716be6b
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
diff --git a/qt5/qttools/HISTORY b/qt5/qttools/HISTORY
index 8de99fa..65f52c2 100644
--- a/qt5/qttools/HISTORY
+++ b/qt5/qttools/HISTORY
@@ -1,3 +1,7 @@
+2015-07-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD, INSTALL: deleted, they break the build
+ * DETAILS: PATCHLEVEL++
+
2015-07-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.5.0

diff --git a/qt5/qttools/INSTALL b/qt5/qttools/INSTALL
deleted file mode 100755
index 0e0ae23..0000000
--- a/qt5/qttools/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-default_install &&
-# No working install target for those?!
-cd "$SOURCE_DIRECTORY" &&
-install -v -m 755 \
-bin/qcollectiongenerator \
-bin/qhelpconverter \
-bin/qhelpgenerator \
-bin/qtpaths \
-$QT5DIR/bin



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (2299b03f82f45a3f7cd5a05299bfe80dc416a5ee), Treeve Jelbert, 07/13/2015

Archive powered by MHonArc 2.6.24.

Top of Page