Skip to Content.
Sympa Menu

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

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 (5bbf66fb6bd46983210c9ca118b9f55455aa24d7)
  • Date: Wed, 7 Nov 2018 11:08:32 +0000

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

plasma/plasma-workspace/HISTORY | 1 +
plasma/plasma-workspace/plasma.sh | 11 ++++-------
video/ffmpeg/DETAILS | 2 +-
video/ffmpeg/HISTORY | 3 +++
4 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 5bbf66fb6bd46983210c9ca118b9f55455aa24d7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

ffmpeg: => 4.1

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

plasma-workspace - tweak

diff --git a/plasma/plasma-workspace/HISTORY b/plasma/plasma-workspace/HISTORY
index 336471f..ed1579c 100644
--- a/plasma/plasma-workspace/HISTORY
+++ b/plasma/plasma-workspace/HISTORY
@@ -1,5 +1,6 @@
2018-11-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.14.3
+ * plasma.sh: improve

2018-11-04 Treeve Jelbert <treeve AT sourcemage.org>
* plasma.sh: fix qt dirs
diff --git a/plasma/plasma-workspace/plasma.sh
b/plasma/plasma-workspace/plasma.sh
index 6be9766..554ea18 100644
--- a/plasma/plasma-workspace/plasma.sh
+++ b/plasma/plasma-workspace/plasma.sh
@@ -1,16 +1,13 @@
#!/bin/bash
if [ "$USER" != "root" ];then
-
# setup KDE5 environment for SMGL
export QTDIR=/opt/qt5
-export KF5=$QTDIR
-export PATH+=":$KF5/bin"
+export PATH+=":$QTDIR/bin"
export XDG_CONFIG_DIRS=/etc/xdg
-export QT_PLUGIN_PATH+=:$KF5/plugins
+export QT_PLUGIN_PATH=$QTDIR/plugins

-export QML2_IMPORT_PATH=$KF5/qml
-export QML_IMPORT_PATH=$QML2_IMPORT_PATH
-export
XCURSOR_PATH=$KF5/share/icons:~/.icons:/usr/share/icons:/usr/share/pixmaps
+export QML2_IMPORT_PATH=$QTDIR/qml
+export
XCURSOR_PATH=$QTDIR/share/icons:~/.icons:/usr/share/icons:/usr/share/pixmaps

# temporary runtime directories
export XDG_RUNTIME_DIR=${TMPDIR-/tmp}/plasma-$USER
diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index 0aa29c7..470f007 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -1,6 +1,6 @@
SPELL=ffmpeg
if [[ $FFMPEG_RELEASE == stable ]]; then
- VERSION=4.0.3
+ VERSION=4.1
SECURITY_PATCH=20
else
VERSION=0.7.16
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index c3945bd..68b0dc2 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,6 @@
+2018-11-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.1
+
2018-11-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 4.0.3




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (5bbf66fb6bd46983210c9ca118b9f55455aa24d7), Treeve Jelbert, 11/07/2018

Archive powered by MHonArc 2.6.24.

Top of Page