[arch-commits] Commit in deepin-qt5integration/trunk (2 files)

Sat Mar 5 11:47:32 UTC 2022

Date: Saturday, March 5, 2022 @ 11:47:31
  Author: arojas
Revision: 1142164

Qt 5.15.3 rebuild

Added:
  deepin-qt5integration/trunk/no-versioned-targets.patch
Modified:
  deepin-qt5integration/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   19 ++++--
 no-versioned-targets.patch |  117 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 130 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================

--- PKGBUILD	2022-03-05 11:31:34 UTC (rev 1142163)
+++ PKGBUILD	2022-03-05 11:47:31 UTC (rev 1142164)
@@ -1,8 +1,8 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=deepin-qt5integration
-pkgver=5.5.17
-pkgrel=1
+pkgver=5.5.8
+pkgrel=2
 pkgdesc='Qt platform theme integration plugins for DDE'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/qt5integration"
@@ -10,13 +10,20 @@
 depends=('dtkwidget' 'libqtxdg' 'deepin-qt5platform-plugins')
 makedepends=('xcb-util-renderutil' 'deepin-file-manager' 'gtest')
 groups=('deepin')
-source=("https://github.com/linuxdeepin/qt5integration/archive/$pkgver/$pkgname-$pkgver.tar.gz")
-sha512sums=('3aadb03a333106015b4bf69cc72de7656301d11b80f5778b9b3133364306ab198eaaa638b6cb26ff82a8776f6886ad27a14cc3489cf125ab9156b55bf08b91d0')
+source=("https://github.com/linuxdeepin/qt5integration/archive/$pkgver/$pkgname-$pkgver.tar.gz"
+         no-versioned-targets.patch)
+sha512sums=('c1c71a8f220d8e237636387eeb9a41d3438bacfcf93497d9ce2f0f6873f295aaeaea2fd09ff92d35baa249034dcc35ee115de4734ec4c60cbf9a3333241a7f3d'
+            '38e8b8b3e215988dec6f06fce61d529414594ffa0ee614ad2101bdffe95004ecd20df14b0396983d28dc9549eb75a6fcf03f0e7ad442620d6258741d8ccf21db')
 
+prepare() {
+  cd qt5integration-$pkgver
+  patch -p1 -i ../no-versioned-targets.patch # Fix build with recent dtkgui
+}
+
 build() {
   cd qt5integration-$pkgver
   qmake-qt5 PREFIX=/usr
-  make
+  make -j1
 }
 
 package() {
@@ -24,5 +31,5 @@
   make INSTALL_ROOT="$pkgdir" install
 
   # Upstream installs the same plugin twice as Qt plugins, which breaks everything.
-  # find "$pkgdir"/usr/lib/qt/plugins/ -type f ! -name '*5.5.so' -delete -print
+  find "$pkgdir"/usr/lib/qt/plugins/ -type f ! -name '*5.5.so' -delete -print
 }

Added: no-versioned-targets.patch
===================================================================
--- no-versioned-targets.patch	                        (rev 0)
+++ no-versioned-targets.patch	2022-03-05 11:47:31 UTC (rev 1142164)
@@ -0,0 +1,117 @@
+diff --git a/iconengineplugins/builtinengine/builtinengine.pro b/iconengineplugins/builtinengine/builtinengine.pro
+index 7d7c448..317b7a8 100644
+--- a/iconengineplugins/builtinengine/builtinengine.pro
++++ b/iconengineplugins/builtinengine/builtinengine.pro
+@@ -7,7 +7,7 @@ SOURCES += main.cpp \
+            dbuiltiniconengine.cpp
+ OTHER_FILES += builtinengine.json
+ 
+-QT += gui-private dtkgui$${DTK_VERSION}
++QT += gui-private dtkgui
+ DESTDIR = $$_PRO_FILE_PWD_/../../bin/plugins/iconengines/$${BASED_DTK_DIR}
+ 
+ unix {
+diff --git a/iconengineplugins/svgiconengine/svgiconengine.pro b/iconengineplugins/svgiconengine/svgiconengine.pro
+index 113cfa2..e3608f5 100644
+--- a/iconengineplugins/svgiconengine/svgiconengine.pro
++++ b/iconengineplugins/svgiconengine/svgiconengine.pro
+@@ -9,7 +9,7 @@ OTHER_FILES += qsvgiconengine.json
+ 
+ CONFIG += c++11
+ 
+-QT += gui-private dtkgui$${DTK_VERSION} concurrent
++QT += gui-private dtkgui concurrent
+ DESTDIR = $$_PRO_FILE_PWD_/../../bin/plugins/iconengines/$${BASED_DTK_DIR}
+ 
+ unix {
+diff --git a/imageformatplugins/svg/svg.pro b/imageformatplugins/svg/svg.pro
+index d2be96d..4a972dd 100644
+--- a/imageformatplugins/svg/svg.pro
++++ b/imageformatplugins/svg/svg.pro
+@@ -8,7 +8,7 @@ SOURCES += main.cpp \
+ OTHER_FILES += svg.json
+ 
+ CONFIG += c++11 link_pkgconfig
+-PKGCONFIG += dtkgui$${DTK_VERSION}
++PKGCONFIG += dtkgui
+ 
+ DESTDIR = $$_PRO_FILE_PWD_/../../bin/plugins/imageformats/$${BASED_DTK_DIR}
+ 
+diff --git a/platformthemeplugin/qt5deepintheme-plugin.pro b/platformthemeplugin/qt5deepintheme-plugin.pro
+index 6a2c75c..bc536ee 100644
+--- a/platformthemeplugin/qt5deepintheme-plugin.pro
++++ b/platformthemeplugin/qt5deepintheme-plugin.pro
+@@ -1,6 +1,6 @@
+ # load(configure) will clear DTK_VERSION
+ include(../.qmake.conf)
+-QT       += dbus x11extras dtkgui$${DTK_VERSION}
++QT       += dbus x11extras dtkgui
+ QT       += core-private gui-private
+ greaterThan(QT_MAJOR_VERSION, 4) {
+   QT += widgets widgets-private
+@@ -17,7 +17,7 @@ CONFIG += plugin link_pkgconfig c++11
+ load(configure)
+ qtCompileTest(dthemed_icon_lookup) {
+     DEFINES += DTHEMED_ICON_LOOKUP
+-    PKGCONFIG += dtkwidget$${DTK_VERSION} til
++    PKGCONFIG += dtkwidget til
+ 
+     SOURCES += diconengine.cpp
+     HEADERS += diconengine.h
+diff --git a/styleplugins/chameleon/chameleon.pro b/styleplugins/chameleon/chameleon.pro
+index fe05fd5..661e291 100644
+--- a/styleplugins/chameleon/chameleon.pro
++++ b/styleplugins/chameleon/chameleon.pro
+@@ -1,4 +1,4 @@
+-QT        += core gui widgets widgets-private core-private gui-private dtkgui$${DTK_VERSION} dtkwidget$${DTK_VERSION}
++QT        += core gui widgets widgets-private core-private gui-private dtkgui dtkwidget
+ 
+ TARGET = chameleon$${DTK_VERSION}
+ TEMPLATE = lib
+diff --git a/styleplugins/dstyleplugin/dstyleplugin.pro b/styleplugins/dstyleplugin/dstyleplugin.pro
+index 9124039..e82e86c 100644
+--- a/styleplugins/dstyleplugin/dstyleplugin.pro
++++ b/styleplugins/dstyleplugin/dstyleplugin.pro
+@@ -6,7 +6,7 @@
+ 
+ QT        += core gui widgets widgets-private core-private gui-private
+ CONFIG    += link_pkgconfig c++11
+-PKGCONFIG += dtkwidget$${DTK_VERSION}
++PKGCONFIG += dtkwidget
+ 
+ TARGET = dstyleplugin$${DTK_VERSION}
+ TEMPLATE = lib
+@@ -66,9 +66,9 @@ RESOURCES += \
+     assets.qrc
+ 
+ load(configure)
+-qtCompileTest(dtkwidget$${DTK_VERSION}) {
++qtCompileTest(dtkwidget) {
+     DEFINES += DTK_SUPPORT_BLUR_WINDOW
+-    message(The libdtkwidget$${DTK_VERSION} support blur window)
++    message(The libdtkwidget support blur window)
+ } else {
+-    warning(The libdtkwidget$${DTK_VERSION} can not support blur window)
++    warning(The libdtkwidget can not support blur window)
+ }
+diff --git a/styles/styles.pro b/styles/styles.pro
+index d152b48..0ae8b80 100644
+--- a/styles/styles.pro
++++ b/styles/styles.pro
+@@ -1,4 +1,4 @@
+-QT += widgets dtkwidget$${DTK_VERSION}
++QT += widgets dtkwidget
+ 
+ HEADERS       = norwegianwoodstyle.h \
+                 widgetgallery.h
+diff --git a/tests/tests.pro b/tests/tests.pro
+index 0f223fe..ddfa2f8 100644
+--- a/tests/tests.pro
++++ b/tests/tests.pro
+@@ -1,5 +1,5 @@
+ TEMPLATE = app
+-QT += dtkgui$${DTK_VERSION} concurrent dtkwidget$${DTK_VERSION}
++QT += dtkgui concurrent dtkwidget
+ CONFIG -= app_bundle
+ 
+ unix:LIBS += -lgtest

