Merge branch 'master' of code.chakralinux.org:chakra/packages/desktop

2025-02-03 02:37:15 +08:00 · 2019-01-24 17:57:30 +01:00 · 2019-01-24 17:57:30 +01:00 · 0c63d1ac57
commit 0c63d1ac57
parent b56a6b192f fd4b832a6c
4 changed files with 73 additions and 40 deletions
--- a/clipgrab/PKGBUILD
+++ b/clipgrab/PKGBUILD
@ -1,29 +1,26 @@
 pkgname=clipgrab
-pkgver=3.7.1
+pkgver=3.8.0
 pkgrel=1
 pkgdesc='A video downloader and converter for YouTube, Vimeo, DailyMotion, MyVideo and many other'
 arch=('x86_64')
 url='https://clipgrab.org/'
 screenshot='http://download.clipgrab.de/img/screenshot_videosearch_x11.png'
 license=('GPL3')
-depends=('qt5-webkit')
+depends=('qt5-webengine')
 makedepends=('ffmpeg')
 optdepends=('ffmpeg: for the conversion functionality')
 source=("https://download.clipgrab.org/${pkgname}-${pkgver}.tar.gz"
-        "${pkgname}.desktop"
-        https://gitlab.com/kikadf/clipgrab-qt5/raw/patches/patches/clipgrab-qt5-${pkgver}.patch)
-sha256sums=('addf58c027f8f0e01acb0d1d6cdb9fd17c356d4fe5e2d768b94e531b599d1f2e'
-            'a12c0501d2f46b4a2a7103a0cce8a35d9b44245dee6cc12eb7d3e5c083cc5809'
-            '2efa3a821c352f4093315439365d600b9c93cc64562e2d2f8da9f67882b61cde')
-
-prepare() {
-  cd clipgrab-$pkgver
-  patch -p1 -i ../clipgrab-qt5-${pkgver}.patch
-} 
+        "${pkgname}.desktop")
+sha256sums=('e67485514e12ed4c4c7a1e70d1f9d51b093677088617ae44c2f68f729d4490d6'
+            'a12c0501d2f46b4a2a7103a0cce8a35d9b44245dee6cc12eb7d3e5c083cc5809')

 build() {
  cd ${pkgname}-${pkgver}
-  qmake-qt5 clipgrab.pro
+  qmake-qt5 \
+    QMAKE_CFLAGS_RELEASE="$CPPFLAGS $CFLAGS" \
+    QMAKE_CXXFLAGS_RELEASE="$CPPFLAGS $CXXFLAGS" \
+    QMAKE_LFLAGS_RELEASE="$LDFLAGS" \
+    clipgrab.pro
  make
 }

--- a/falkon/0001-branded-speeddial.patch
+++ b/falkon/0001-branded-speeddial.patch
@ -1,15 +0,0 @@
--- a/src/lib/plugins/speeddial.cpp	2018-02-28 14:59:36.000000000 +0100
-+++ b/src/lib/plugins/speeddial.cpp	2018-02-28 15:10:00.869714665 +0100
-@@ -66,7 +66,11 @@
-         allPages = "url:\"https:/kde.org\"|title:\"KDE Community Home\";"
-                    "url:\"https://phabricator.kde.org/source/falkon/\"|title:\"Falkon Git\";"
-                    "url:\"https://bugs.kde.org/describecomponents.cgi?product=Falkon\"|title:\"Falkon Bug Tracker\";"
-                   "url:\"https://duckduckgo.com\"|title:\"DuckDuckGo\";";
-+                   "url:\"https://www.chakralinux.org\"|title:\"The Chakra Project\";"
-+                   "url:\"https://community.chakralinux.org\"|title:\"Forums\";"
-+                   "url:\"https://webchat.freenode.net/?channels=chakra\"|title:\"IRC\";"
-+                   "url:\"http://www.youtube.com/html5\"|title:\"YouTube-html5\";"
-+                   "url:\"https://duckduckgo.com/?t=chakra\"|title:\"DuckDuckGo\";";
- 
-     }
-     changed(allPages);
--- a/falkon/PKGBUILD
+++ b/falkon/PKGBUILD
@ -1,23 +1,28 @@
 pkgname='falkon'
 pkgver=3.0.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Cross-platform QtWebEngine browser"
 url="https://github.com/KDE/falkon"
 arch=('x86_64')
 license=('GPL3')
 depends=('qt5-webengine' 'qt5-x11extras' 'qt5-svg')
-makedepends=('qt5-tools' 'kwallet' 'extra-cmake-modules' 'lcms2')
+makedepends=('qt5-tools' 'kwallet' 'extra-cmake-modules' 'lcms2' 'pyside2' 'shiboken2' 'llvm' 'clang')
 optdepends=('bash-completion: bash completion support'
-            'kwallet: kf5 kwallet integration')
+            'kwallet: kf5 kwallet integration'
+            'pyside2: Python plugins')
 conflicts=('qupzilla')
 replaces=('qupzilla')
 categories=('network')
-source=("http://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"
-        '0001-branded-speeddial.patch'
-        'start-white.png')
+source=("https://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"
+        'start-white.png'
+        falkon-pyside2.patch::"https://cgit.kde.org/falkon.git/patch/?id=4c83ba3d"
+        falkon-pyside2-5.12.patch
+        falkon-webinspector.patch::"https://cgit.kde.org/falkon.git/patch/?id=48ca42d6")
 sha1sums=('1c3b75b8c156b4f28ebb3c30e60e72c57233d47c'
-          '0045ac3a37a6a16347acf82046b63cd772bbd377'
-          '6ec67993bda3054d4210cc08177b124f873774e3')
+          '6ec67993bda3054d4210cc08177b124f873774e3'
+          'e1cf4433e58c0daa08f75a1dbb74bd9fc105bd31'
+          'b7318862e8e43efd158fdd1bd1225024bc1b52ae'
+          'c318adf83653cad781c452e3a2b26dd9ec450f8e')

 prepare() {
  msg 'Applying browserUI patch...'
@ -30,8 +35,6 @@ prepare() {
      -e 's|"backsize", "auto"|"backsize", "contain"|' -i speeddial.cpp
  cd $srcdir/$pkgname-$pkgver
  
-#  patch -Np1 -i ../0001-branded-speeddial.patch
-  
  msg 'Applying preference patch'
  cd src/lib/preferences/
  sed -e 's|"homepage", QUrl(QSL("falkon:start"))|"homepage", QUrl(QSL("https://www.chakralinux.org/?welcome"))|' \
@ -39,8 +42,13 @@ prepare() {
  msg 'Applying search engine patch...'
  cd ../opensearch/
  sed 's,\?q=\%s\&t=qupzilla,\?q=\%s\&t=chakra,g' -i searchenginesmanager.cpp
+
+  cd $srcdir/$pkgname-$pkgver
+  patch -p1 -i ../falkon-pyside2.patch # Fix build with Pyside2 5.11.0
+  patch -p1 -i ../falkon-pyside2-5.12.patch # Fix build with Pyside2 5.12.0
+  patch -p1 -i ../falkon-webinspector.patch # Fix WebInspector with Qt 5.11
 }
-         
+
 build() {
  export USE_WEBGL="true"
  export ENABLE_OPACITY_EFFECT="true"
@ -49,7 +57,8 @@ build() {
  cmake \
    -DCMAKE_INSTALL_PREFIX=/usr \
    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DCMAKE_BUILD_TYPE=Release
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_TESTING=OFF
  make
 }

--- a/falkon/falkon-pyside2-5.12.patch
+++ b/falkon/falkon-pyside2-5.12.patch
@ -0,0 +1,42 @@
+From 1c4a8ddd6f8e896787c837d37e9ad596c973e436 Mon Sep 17 00:00:00 2001
+From: David Rosca <nowrep@gmail.com>
+Date: Wed, 23 Jan 2019 15:55:29 +0100
+Subject: PyFalkon: Fix build with PySide 5.12
+
+BUG: 402947
+FIXED-IN: 3.1.0
+---
+ src/lib/tools/desktopfile.h            | 2 +-
+ src/plugins/PyFalkon/pyfalkon_global.h | 3 ---
+ 2 files changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/lib/tools/desktopfile.h b/src/lib/tools/desktopfile.h
+index baf231a..d41e7e2 100644
+--- a/src/lib/tools/desktopfile.h
+++ b/src/lib/tools/desktopfile.h
+@@ -26,7 +26,7 @@ class QSettings;
+ class FALKON_EXPORT DesktopFile
+ {
+ public:
+-    explicit DesktopFile();
+    DesktopFile();
+     explicit DesktopFile(const QString &filePath);
+ 
+     QString name() const;
+diff --git a/src/plugins/PyFalkon/pyfalkon_global.h b/src/plugins/PyFalkon/pyfalkon_global.h
+index b064dce..391ef6c 100644
+--- a/src/plugins/PyFalkon/pyfalkon_global.h
+++ b/src/plugins/PyFalkon/pyfalkon_global.h
+@@ -16,9 +16,6 @@
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * ============================================================ */
+ 
+-// Make "signals:", "slots:" visible as access specifiers
+-#define QT_ANNOTATE_ACCESS_SPECIFIER(a) __attribute__((annotate(#a)))
+-
+ // PYSIDE-711
+ #include <QHstsPolicy>
+ #include <QWebEngineContextMenuData>
+-- 
+cgit v1.1
+