Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (50535f31fd0d2a6e3850328e394282b267813785)

Chronological Thread  
    < 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 (50535f31fd0d2a6e3850328e394282b267813785)
  • Date: Sun, 7 Jun 2020 12:36:53 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

kde5-apps/ktorrent/DEPENDS | 5 +-
kde5-apps/ktorrent/DETAILS | 2
kde5-apps/ktorrent/HISTORY | 4 +
kde5-extra/libktorrent/DEPENDS | 8 +++
kde5-extra/libktorrent/DETAILS | 4 -
kde5-extra/libktorrent/HISTORY | 4 +
libs/protobuf/BUILD | 1
libs/protobuf/HISTORY | 3 +
video/vlc/HISTORY | 3 +
video/vlc/PRE_BUILD | 2
video/vlc/patches/0001-fix-QPainterPath-usage.patch | 50
++++++++++++++++++++
11 files changed, 81 insertions(+), 5 deletions(-)

New commits:
commit 50535f31fd0d2a6e3850328e394282b267813785
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

vlc - fix build with qt-5.15

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

protobuf - build shared libs

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

ktorrent: => 5.2.0

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

libktorrent: => 2.2.0

diff --git a/kde5-apps/ktorrent/DEPENDS b/kde5-apps/ktorrent/DEPENDS
index ad7ccf8..00c2905 100755
--- a/kde5-apps/ktorrent/DEPENDS
+++ b/kde5-apps/ktorrent/DEPENDS
@@ -27,7 +27,6 @@ optional_depends kross '' '' 'scripting plugin'
&&

optional_depends karchive '' '' 'scripting plugin' &&
optional_depends kcompletion '' '' 'UPnP plugin' &&
-optional_depends kdewebkit '' '' 'search and syndication plugins' &&
optional_depends kdnssd '' '' 'zeroconf plugin' &&
optional_depends kdoctools '' '' 'build documentation'
optional_depends kitemviews '' '' 'scripting plugin' &&
@@ -35,4 +34,6 @@ optional_depends kplotting '' '' 'statistics plugin' &&
optional_depends ktextwidgets '' '' 'IP Filter plugin' &&

optional_depends phonon4qt5 '' '' 'multimedia plugin' &&
-optional_depends syndication '' ' -DENABLE_SYNDICATION_PLUGIN=0'
'syndication plugin'
+optional_depends syndication '' ' -DENABLE_SYNDICATION_PLUGIN=0'
'syndication plugin' &&
+optional_depends qtdeclarative '' '' '' &&
+optional_depends qtwebengine '' '' 'search and syndication plugins'
diff --git a/kde5-apps/ktorrent/DETAILS b/kde5-apps/ktorrent/DETAILS
index 9714941..5624508 100755
--- a/kde5-apps/ktorrent/DETAILS
+++ b/kde5-apps/ktorrent/DETAILS
@@ -1,5 +1,5 @@
SPELL=ktorrent
- VERSION=5.1.2
+ VERSION=5.2.0
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL=https://download.kde.org/stable/$SPELL/${VERSION}/$SOURCE
SOURCE2=$SOURCE.sig
diff --git a/kde5-apps/ktorrent/HISTORY b/kde5-apps/ktorrent/HISTORY
index 5692326..83dd123 100644
--- a/kde5-apps/ktorrent/HISTORY
+++ b/kde5-apps/ktorrent/HISTORY
@@ -1,3 +1,7 @@
+2020-06-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.2.0
+ * DEPENDS: add qtwebengine,qtdeclarative
+
2019-09-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.1.2

diff --git a/kde5-extra/libktorrent/DEPENDS b/kde5-extra/libktorrent/DEPENDS
index 62f137d..6ad30b2 100755
--- a/kde5-extra/libktorrent/DEPENDS
+++ b/kde5-extra/libktorrent/DEPENDS
@@ -1,7 +1,15 @@
. "$GRIMOIRE/KDE5_DEPENDS" &&
depends karchive &&
+depends kauth &&
+depends kcrash &&
+depends kconfig &&
+depends kcodecs &&
+depends kcoreaddons &&
+depends kjobwidgets &&
+depends kbookmarks &&
depends ki18n &&
depends kio &&
+depends solid &&
depends boost &&
depends gmp &&
depends libgcrypt &&
diff --git a/kde5-extra/libktorrent/DETAILS b/kde5-extra/libktorrent/DETAILS
index 3c76941..9ec94b8 100755
--- a/kde5-extra/libktorrent/DETAILS
+++ b/kde5-extra/libktorrent/DETAILS
@@ -1,6 +1,6 @@
SPELL=libktorrent
- VERSION=2.1.1
- VX=5.1.2
+ VERSION=2.2.0
+ VX=5.2.0
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL=https://download.kde.org/stable/ktorrent/$VX/$SOURCE
SOURCE2=$SOURCE.sig
diff --git a/kde5-extra/libktorrent/HISTORY b/kde5-extra/libktorrent/HISTORY
index 27b0333..5a3ed48 100644
--- a/kde5-extra/libktorrent/HISTORY
+++ b/kde5-extra/libktorrent/HISTORY
@@ -1,3 +1,7 @@
+2020-06-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.2.0
+ * DEPENDS: more frameworks
+
2019-09-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.1.1
* DETAILS: add gpg checking
diff --git a/libs/protobuf/BUILD b/libs/protobuf/BUILD
index 3beb85c..a70c4c4 100755
--- a/libs/protobuf/BUILD
+++ b/libs/protobuf/BUILD
@@ -1,4 +1,5 @@
CXXFLAGS="${CXXFLAGS// -ffast-math}" &&
OPTS+=" -Dprotobuf_BUILD_TESTS=OFF" &&
+OPTS+=" -DBUILD_SHARED_LIBS=ON" &&
cd "$SOURCE_DIRECTORY/cmake" &&
cmake_build
diff --git a/libs/protobuf/HISTORY b/libs/protobuf/HISTORY
index 3f495e8..5632335 100644
--- a/libs/protobuf/HISTORY
+++ b/libs/protobuf/HISTORY
@@ -1,3 +1,6 @@
+2020-06-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD: build shared libs, needed for vlc
+
2020-06-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.12.3

diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index da6259f..1e49084 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,6 @@
+2020-06-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD patches: fix for qt-5.15
+
2020-05-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.0.9.2

diff --git a/video/vlc/PRE_BUILD b/video/vlc/PRE_BUILD
index ef92f0c..2c3367a 100755
--- a/video/vlc/PRE_BUILD
+++ b/video/vlc/PRE_BUILD
@@ -1,5 +1,7 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
+# fix for qt5-15
+apply_patch_dir patches &&
# remove refs to non-existent vpx formats, remove in vpc-1.8
sed -i \
-e '/VPX_IMG_FMT_RGB555/D;/VPX_IMG_FMT_RGB565/D' \
diff --git a/video/vlc/patches/0001-fix-QPainterPath-usage.patch
b/video/vlc/patches/0001-fix-QPainterPath-usage.patch
new file mode 100644
index 0000000..b4eeba0
--- /dev/null
+++ b/video/vlc/patches/0001-fix-QPainterPath-usage.patch
@@ -0,0 +1,50 @@
+From 9c3efc3026cf6f7998eda04e189bc105c3ee7f0c Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Sun, 7 Jun 2020 13:59:08 +0200
+Subject: [PATCH] fix QPainterPath usage
+
+---
+ modules/gui/qt/components/playlist/views.cpp | 1 +
+ modules/gui/qt/dialogs/plugins.cpp | 1 +
+ modules/gui/qt/util/timetooltip.hpp | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/modules/gui/qt/components/playlist/views.cpp
b/modules/gui/qt/components/playlist/views.cpp
+index 24db9d9..73c1779 100644
+--- a/modules/gui/qt/components/playlist/views.cpp
++++ b/modules/gui/qt/components/playlist/views.cpp
+@@ -27,6 +27,7 @@
+ #include "input_manager.hpp" /* THEMIM */
+
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QRect>
+ #include <QStyleOptionViewItem>
+ #include <QFontMetrics>
+diff --git a/modules/gui/qt/dialogs/plugins.cpp
b/modules/gui/qt/dialogs/plugins.cpp
+index d233382..69728eb 100644
+--- a/modules/gui/qt/dialogs/plugins.cpp
++++ b/modules/gui/qt/dialogs/plugins.cpp
+@@ -53,6 +53,7 @@
+ #include <QListView>
+ #include <QListWidget>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QStyleOptionViewItem>
+ #include <QKeyEvent>
+ #include <QPushButton>
+diff --git a/modules/gui/qt/util/timetooltip.hpp
b/modules/gui/qt/util/timetooltip.hpp
+index 6a1329e..9f50b18 100644
+--- a/modules/gui/qt/util/timetooltip.hpp
++++ b/modules/gui/qt/util/timetooltip.hpp
+@@ -25,6 +25,7 @@
+ #include "qt.hpp"
+
+ #include <QWidget>
++#include <QPainterPath>
+
+ class TimeTooltip : public QWidget
+ {
+--
+2.26.2
+


  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (50535f31fd0d2a6e3850328e394282b267813785), Treeve Jelbert, 06/07/2020

Archive powered by MHonArc 2.6.24.

Top of Page