* [PR PATCH] Remove deepin packages
@ 2020-11-12 16:32 Johnnynator
2020-11-13 19:08 ` [PR PATCH] [Merged]: " Johnnynator
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Johnnynator @ 2020-11-12 16:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 493 bytes --]
There is a new pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages rm-deepin
https://github.com/void-linux/void-packages/pull/26321
Remove deepin packages
every update attempt of the deepin software stack resulted in some pain
or some kind of breakage somewhere. Since nobody else seems to be
intrested in updating it, remove it.
A patch file from https://github.com/void-linux/void-packages/pull/26321.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rm-deepin-26321.patch --]
[-- Type: text/x-diff, Size: 82075 bytes --]
From 6e0678a75df56180854ed98e26c784828df81879 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 11 Nov 2020 15:36:05 +0100
Subject: [PATCH 01/22] Remove package: dtkcore
---
common/shlibs | 1 -
srcpkgs/dtkcore-devel | 1 -
srcpkgs/dtkcore/template | 53 ----------------------------------------
3 files changed, 55 deletions(-)
delete mode 120000 srcpkgs/dtkcore-devel
delete mode 100644 srcpkgs/dtkcore/template
diff --git a/common/shlibs b/common/shlibs
index 5dea7af6b68..52185187373 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3489,7 +3489,6 @@ libgsettings-qt.so.1 gsettings-qt-0.1+17.10.20170824_1
libplacebo.so.72 libplacebo-2.72.0_1
libw2xc.so waifu2x-converter-cpp-5.2_1
libnova-0.15.so.0 libnova-0.15.0_1
-libdtkcore.so.2 dtkcore-2.0.6_1
libdframeworkdbus.so.2 dde-qt-dbus-factory-1.0.1_1
libdtkwidget.so.2 dtkwidget-2.0.6.1_1
libcue.so.2 libcue-2.2.0_1
diff --git a/srcpkgs/dtkcore-devel b/srcpkgs/dtkcore-devel
deleted file mode 120000
index 40e0fc1af19..00000000000
--- a/srcpkgs/dtkcore-devel
+++ /dev/null
@@ -1 +0,0 @@
-dtkcore
\ No newline at end of file
diff --git a/srcpkgs/dtkcore/template b/srcpkgs/dtkcore/template
deleted file mode 100644
index b49d21bc42d..00000000000
--- a/srcpkgs/dtkcore/template
+++ /dev/null
@@ -1,53 +0,0 @@
-# Template file for 'dtkcore'
-pkgname=dtkcore
-version=2.1.1
-revision=1
-build_style=qmake
-configure_args="LIB_INSTALL_DIR=/usr/lib/ VERSION=${version}"
-hostmakedepends="qt5-qmake pkg-config"
-makedepends="qt5-devel gsettings-qt-devel"
-short_desc="Base devlopment tool of all C++/Qt work on Deepin"
-maintainer="John <me@johnnynator.dev>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/linuxdeepin/dtkcore"
-changelog="https://github.com/linuxdeepin/dtkcore/blob/${version}/CHANGELOG.md"
-distfiles="https://github.com/linuxdeepin/dtkcore/archive/${version}.tar.gz"
-checksum=16685953ea0dff2270a5ba04f23b77abe98f0cb798b07f882eb66e7148eb1f57
-python_version=2 #unverified
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-devel"
-fi
-
-pre_install() {
- if [ "$CROSS_BUILD" ]; then
- # Replace the host arch binary with target arch one
- cd tools/deepin-os-release
- rm *.o
- qmake ${configure_args} \
- PREFIX=/usr \
- LIB=/usr/lib \
- QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \
- QMAKE_CFLAGS="${CFLAGS}" \
- QMAKE_CXXFLAGS="${CXXFLAGS}" \
- QMAKE_LFLAGS="${LDFLAGS}" \
- -qtconf ${wrksrc}/qt.conf
- make CC="$CC" CXX="$CXX" LINK="$CXX"
- cd ${wrksrc}
- fi
-}
-
-dtkcore-devel_package() {
- short_desc+=" - development files"
- depends="${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.so"
- vmove usr/lib/qt5
- vmove usr/lib/pkgconfig
- vmove "usr/lib/libdtk-*"
- vmove usr/lib/cmake
- vsed -e 's/libs = .*/libs = $$QT_MODULE_LIB_BASE/g' \
- -i ${PKGDESTDIR}/usr/lib/qt5/mkspecs/modules/qt_lib_dtkcore.pri
- }
-}
From 4f4641e5c6526e59b1b5d1758b620b78111af48f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 11 Nov 2020 15:36:42 +0100
Subject: [PATCH 02/22] Remove package: dde-qt-dbus-factory
---
common/shlibs | 1 -
srcpkgs/dde-qt-dbus-factory-devel | 1 -
srcpkgs/dde-qt-dbus-factory/template | 36 ----------------------------
3 files changed, 38 deletions(-)
delete mode 120000 srcpkgs/dde-qt-dbus-factory-devel
delete mode 100644 srcpkgs/dde-qt-dbus-factory/template
diff --git a/common/shlibs b/common/shlibs
index 52185187373..b414a45fb7c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3489,7 +3489,6 @@ libgsettings-qt.so.1 gsettings-qt-0.1+17.10.20170824_1
libplacebo.so.72 libplacebo-2.72.0_1
libw2xc.so waifu2x-converter-cpp-5.2_1
libnova-0.15.so.0 libnova-0.15.0_1
-libdframeworkdbus.so.2 dde-qt-dbus-factory-1.0.1_1
libdtkwidget.so.2 dtkwidget-2.0.6.1_1
libcue.so.2 libcue-2.2.0_1
libdtkwm.so.2 dtkwm-2.0.6_1
diff --git a/srcpkgs/dde-qt-dbus-factory-devel b/srcpkgs/dde-qt-dbus-factory-devel
deleted file mode 120000
index 16fd6abcb8e..00000000000
--- a/srcpkgs/dde-qt-dbus-factory-devel
+++ /dev/null
@@ -1 +0,0 @@
-dde-qt-dbus-factory
\ No newline at end of file
diff --git a/srcpkgs/dde-qt-dbus-factory/template b/srcpkgs/dde-qt-dbus-factory/template
deleted file mode 100644
index f51e7541c95..00000000000
--- a/srcpkgs/dde-qt-dbus-factory/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'dde-qt-dbus-factory'
-pkgname=dde-qt-dbus-factory
-version=5.0.1
-revision=1
-build_style=qmake
-hostmakedepends="qt5-qmake python"
-makedepends="qt5-devel"
-short_desc="Auto-generated Qt5 D-Bus code used by DDE"
-maintainer="John <me@johnnynator.dev>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/linuxdeepin/dde-qt-dbus-factory"
-changelog="https://github.com/linuxdeepin/dde-qt-dbus-factory/blob/${version}/CHANGELOG.md"
-distfiles="https://github.com/linuxdeepin/dde-qt-dbus-factory/archive/${version}.tar.gz"
-checksum=f945b17b79784d7e6f0b5566937aac443a5493cf34af40e13f38805b464f6dbd
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" dtkcore-devel qt5-devel dde-qt-dbus-factory-devel"
-fi
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- sed -i -e 's/os.path.join(project_root, "bin", "qdbusxml2cpp-fix")/os.path.join("\/usr", "bin", "qdbusxml2cpp-fix")/' libdframeworkdbus/generate_code.py
- fi
-}
-
-dde-qt-dbus-factory-devel_package() {
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/cmake
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vbin bin/qdbusxml2cpp-fix
- }
-}
From 97540f53faf84b09ba0adf5f332e47314aa9353c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 11 Nov 2020 15:37:17 +0100
Subject: [PATCH 03/22] Remove package: dtkwidget
---
common/shlibs | 1 -
srcpkgs/dtkwidget-devel | 1 -
srcpkgs/dtkwidget/patches/qt515.patch | 120 --------------------------
srcpkgs/dtkwidget/template | 37 --------
4 files changed, 159 deletions(-)
delete mode 120000 srcpkgs/dtkwidget-devel
delete mode 100644 srcpkgs/dtkwidget/patches/qt515.patch
delete mode 100644 srcpkgs/dtkwidget/template
diff --git a/common/shlibs b/common/shlibs
index b414a45fb7c..559e31841c9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3489,7 +3489,6 @@ libgsettings-qt.so.1 gsettings-qt-0.1+17.10.20170824_1
libplacebo.so.72 libplacebo-2.72.0_1
libw2xc.so waifu2x-converter-cpp-5.2_1
libnova-0.15.so.0 libnova-0.15.0_1
-libdtkwidget.so.2 dtkwidget-2.0.6.1_1
libcue.so.2 libcue-2.2.0_1
libdtkwm.so.2 dtkwm-2.0.6_1
libticonv.so.8 libticonv-1.1.5_1
diff --git a/srcpkgs/dtkwidget-devel b/srcpkgs/dtkwidget-devel
deleted file mode 120000
index beb56e0f1db..00000000000
--- a/srcpkgs/dtkwidget-devel
+++ /dev/null
@@ -1 +0,0 @@
-dtkwidget
\ No newline at end of file
diff --git a/srcpkgs/dtkwidget/patches/qt515.patch b/srcpkgs/dtkwidget/patches/qt515.patch
deleted file mode 100644
index fd7e582126f..00000000000
--- a/srcpkgs/dtkwidget/patches/qt515.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- src/widgets/private/settings/shortcutedit.cpp 2019-07-30 13:07:11.000000000 +0200
-+++ - 2020-06-22 16:42:22.506228977 +0200
-@@ -19,6 +19,7 @@
-
- #include <QDebug>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QKeySequence>
- #include <QKeyEvent>
-
---- src/widgets/dsegmentedcontrol.cpp 2019-07-30 13:07:11.000000000 +0200
-+++ - 2020-06-22 16:43:42.149506303 +0200
-@@ -17,6 +17,7 @@
-
- #include <QDebug>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPaintEvent>
- #include <QApplication>
-
---- src/widgets/dvideowidget.cpp 2019-07-30 13:07:11.000000000 +0200
-+++ - 2020-06-22 16:44:21.292219385 +0200
-@@ -24,6 +24,7 @@
- #include <QMediaPlayer>
- #include <QMediaPlaylist>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPointer>
-
- DWIDGET_BEGIN_NAMESPACE
---- src/widgets/dsimplelistview.cpp 2019-07-30 13:07:11.000000000 +0200
-+++ - 2020-06-22 16:45:02.445556466 +0200
-@@ -30,6 +30,7 @@
- #include <QStyleFactory>
- #include <QWheelEvent>
- #include <QtMath>
-+#include <QPainterPath>
- #include <QPointer>
-
- #include "dhidpihelper.h"
---- src/widgets/dclipeffectwidget.cpp 2019-07-30 13:07:11.000000000 +0200
-+++ - 2020-06-22 16:45:36.908358398 +0200
-@@ -21,6 +21,7 @@
- #include <QEvent>
- #include <QBackingStore>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPaintEvent>
- #include <QDebug>
-
---- src/widgets/dgraphicsclipeffect.cpp 2019-07-30 13:07:11.000000000 +0200
-+++ - 2020-06-22 16:46:09.212494581 +0200
-@@ -19,6 +19,7 @@
- #include <DObjectPrivate>
-
- #include <QPainter>
-+#include <QPainterPath>
- #include <QDebug>
-
- DWIDGET_BEGIN_NAMESPACE
---- src/widgets/dwaterprogress.cpp 2019-07-30 13:07:11.000000000 +0200
-+++ - 2020-06-22 16:46:35.208048436 +0200
-@@ -20,6 +20,7 @@
- #include <QtMath>
- #include <QTimer>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QGraphicsDropShadowEffect>
-
- #include <DObjectPrivate>
---- src/widgets/private/dblureffectwidget_p.h 2019-07-30 13:07:11.000000000 +0200
-+++ - 2020-06-22 16:47:08.709658671 +0200
-@@ -19,6 +19,7 @@
- #define DBLUREFFECTWIDGET_P_H
-
- #include <DObjectPrivate>
-+#include <QPainterPath>
- #include "dblureffectwidget.h"
-
- DWIDGET_BEGIN_NAMESPACE
---- src/widgets/dspinner.cpp 2019-07-30 13:07:11.000000000 +0200
-+++ - 2020-06-22 16:47:35.308523365 +0200
-@@ -2,6 +2,7 @@
-
- #include <QtMath>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QTimer>
-
- #include <DObjectPrivate>
---- src/widgets/dborderlesswidget.cpp 2019-07-30 13:07:11.000000000 +0200
-+++ - 2020-06-22 16:48:29.369148052 +0200
-@@ -25,6 +25,7 @@
- #include <QTemporaryFile>
- #include <QImage>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QGuiApplication>
- #include <QWindow>
-
---- src/widgets/dcrumbedit.cpp 2019-07-30 13:07:11.000000000 +0200
-+++ - 2020-06-22 16:48:50.759824370 +0200
-@@ -23,6 +23,7 @@
-
- #include <QAbstractTextDocumentLayout>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QTextBlock>
- #include <QStyleOptionFrame>
- #include <QMouseEvent>
---- src/dtkwidget_global.h 2019-07-30 13:07:11.000000000 +0200
-+++ - 2020-06-22 16:54:00.773382584 +0200
-@@ -21,6 +21,7 @@
- #include <dtkwidget_config.h>
-
- #include <QtCore/QMetaMethod>
-+#include <QtGui/QPainterPath>
-
- #define DWIDGET_NAMESPACE Widget
- #define DTK_WIDGET_NAMESPACE DTK_NAMESPACE::Widget
diff --git a/srcpkgs/dtkwidget/template b/srcpkgs/dtkwidget/template
deleted file mode 100644
index 2495a013c76..00000000000
--- a/srcpkgs/dtkwidget/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'dtkwidget'
-pkgname=dtkwidget
-version=2.1.1
-revision=2
-build_style=qmake
-configure_args="DBUS_VERSION_0_4_2=YES LIB_INSTALL_DIR=/usr/lib VERSION=${version}"
-hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
-makedepends="dde-qt-dbus-factory-devel dtkcore-devel gsettings-qt-devel
- librsvg-devel pulseaudio-devel qt5-multimedia-devel qt5-svg-devel
- qt5-x11extras-devel startup-notification-devel xcb-util-devel"
-short_desc="Deepin Tool Kit Widget"
-maintainer="John <me@johnnynator.dev>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/linuxdeepin/dtkwidget"
-changelog="https://github.com/linuxdeepin/dtkwidget/blob/${version}/CHANGELOG.md"
-distfiles="https://github.com/linuxdeepin/dtkwidget/archive/${version}.tar.gz"
-checksum=451c86d93a3336df61418e1d41ec6e976d6a710c967ac74379a353b33e58c914
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" dtkcore-devel qt5-multimedia-devel
- qt5-x11extras-devel qt5-svg-devel"
-fi
-
-CXXFLAGS="-fcommon"
-
-dtkwidget-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} dtkcore-devel"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove usr/lib/cmake
- vmove usr/lib/qt5/mkspecs
- vmove "usr/lib/libdtk-*"
- vmove "usr/lib/*.so"
- }
-}
From 6a88401052965ba326c9d4b424e058a11b5f6110 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 11 Nov 2020 15:38:40 +0100
Subject: [PATCH 04/22] Remove package: dtkwm
---
common/shlibs | 1 -
srcpkgs/dtkwm-devel | 1 -
.../dtkwm/patches/set-dtk-module-name.patch | 23 -------------
srcpkgs/dtkwm/template | 32 -------------------
4 files changed, 57 deletions(-)
delete mode 120000 srcpkgs/dtkwm-devel
delete mode 100644 srcpkgs/dtkwm/patches/set-dtk-module-name.patch
delete mode 100644 srcpkgs/dtkwm/template
diff --git a/common/shlibs b/common/shlibs
index 559e31841c9..13a33185e67 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3490,7 +3490,6 @@ libplacebo.so.72 libplacebo-2.72.0_1
libw2xc.so waifu2x-converter-cpp-5.2_1
libnova-0.15.so.0 libnova-0.15.0_1
libcue.so.2 libcue-2.2.0_1
-libdtkwm.so.2 dtkwm-2.0.6_1
libticonv.so.8 libticonv-1.1.5_1
libtifiles2.so.10 libtifiles2-1.1.7_1
libticables2.so.7 libticables2-1.3.5_1
diff --git a/srcpkgs/dtkwm-devel b/srcpkgs/dtkwm-devel
deleted file mode 120000
index 637eb3a2837..00000000000
--- a/srcpkgs/dtkwm-devel
+++ /dev/null
@@ -1 +0,0 @@
-dtkwm
\ No newline at end of file
diff --git a/srcpkgs/dtkwm/patches/set-dtk-module-name.patch b/srcpkgs/dtkwm/patches/set-dtk-module-name.patch
deleted file mode 100644
index cc5354fc1fb..00000000000
--- a/srcpkgs/dtkwm/patches/set-dtk-module-name.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=941055
-
-From: Hillwood Yang <hillwood@opensuse.org>
-Date: Wed, 7 Aug 2019 10:50:54 +0800
-Subject: Set DTK_MODULE_NAME
-
-Fix build on new version dtkcore ( issue#8 )
----
- src/src.pro | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/src.pro b/src/src.pro
-index 0a95a65..df0aa08 100644
---- src/src.pro
-+++ src/src.pro
-@@ -8,6 +8,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {
-
- TEMPLATE = lib
- TARGET = dtkwm
-+DTK_MODULE_NAME = dtkwm
- DEFINES += LIBDTKWM_LIBRARY
-
- load(dtk_build)
diff --git a/srcpkgs/dtkwm/template b/srcpkgs/dtkwm/template
deleted file mode 100644
index 88528a7cafe..00000000000
--- a/srcpkgs/dtkwm/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'dtkwm'
-pkgname=dtkwm
-version=2.0.12
-revision=1
-build_style=qmake
-configure_args="VERSION=${version}"
-hostmakedepends="qt5-qmake pkg-config"
-makedepends="qt5-devel qt5-x11extras-devel qt5-multimedia-devel xcb-util-devel
- dtkcore-devel"
-short_desc="Deepin graphical user interface library"
-maintainer="John <me@johnnynator.dev>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/linuxdeepin/dtkwm/"
-changelog="https://github.com/linuxdeepin/dtkwm/blob/${version}/CHANGELOG.md"
-distfiles="https://github.com/linuxdeepin/dtkwm/archive/${version}.tar.gz"
-checksum=bb6140964372a57bbb5a940d07e98aaef2f655bb1478716cad62a35eb9cf3045
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" dtkcore-devel qt5-x11extras-devel"
-fi
-
-dtkwm-devel_package() {
- short_desc+=" - development files"
- depends="${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.so"
- vmove usr/lib/qt5
- vmove usr/lib/cmake
- vmove usr/lib/pkgconfig
- }
-}
From 05832f09b2514b4b58710835f9ad8811bc8de768 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 11 Nov 2020 15:39:16 +0100
Subject: [PATCH 05/22] Remove package: gsettings-qt
---
common/shlibs | 1 -
srcpkgs/gsettings-qt-devel | 1 -
.../patches/0001-Fix-link-path-error.patch | 24 ----------
.../patches/0002-Add-ordered-config.patch | 25 ----------
.../patches/0003-Fix-make-check-failed.patch | 37 ---------------
srcpkgs/gsettings-qt/template | 46 -------------------
6 files changed, 134 deletions(-)
delete mode 120000 srcpkgs/gsettings-qt-devel
delete mode 100644 srcpkgs/gsettings-qt/patches/0001-Fix-link-path-error.patch
delete mode 100644 srcpkgs/gsettings-qt/patches/0002-Add-ordered-config.patch
delete mode 100644 srcpkgs/gsettings-qt/patches/0003-Fix-make-check-failed.patch
delete mode 100644 srcpkgs/gsettings-qt/template
diff --git a/common/shlibs b/common/shlibs
index 13a33185e67..743593c071f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3485,7 +3485,6 @@ libkid3-core.so.3.8.3 kid3-3.8.3_1
libkid3-gui.so.3.8.3 kid3-3.8.3_1
libcfitsio.so.9 cfitsio-3.480_1
libapparmor.so.1 libapparmor-2.12.0_1
-libgsettings-qt.so.1 gsettings-qt-0.1+17.10.20170824_1
libplacebo.so.72 libplacebo-2.72.0_1
libw2xc.so waifu2x-converter-cpp-5.2_1
libnova-0.15.so.0 libnova-0.15.0_1
diff --git a/srcpkgs/gsettings-qt-devel b/srcpkgs/gsettings-qt-devel
deleted file mode 120000
index 6402e122b23..00000000000
--- a/srcpkgs/gsettings-qt-devel
+++ /dev/null
@@ -1 +0,0 @@
-gsettings-qt
\ No newline at end of file
diff --git a/srcpkgs/gsettings-qt/patches/0001-Fix-link-path-error.patch b/srcpkgs/gsettings-qt/patches/0001-Fix-link-path-error.patch
deleted file mode 100644
index 96f9d0f7a31..00000000000
--- a/srcpkgs/gsettings-qt/patches/0001-Fix-link-path-error.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Iceyer <iceyers@gmail.com>
-Date: Thu, 20 Jul 2017 16:01:55 +0800
-Subject: Fix link path error
-Forwarded: https://code.launchpad.net/~iceyers/gsettings-qt/fix-link-path
-
-This patch would fix the FTBFS on Debian.
-
----
- GSettings/gsettings-qt.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/GSettings/gsettings-qt.pro b/GSettings/gsettings-qt.pro
-index 218eeea..ffd9b5f 100644
---- GSettings/gsettings-qt.pro
-+++ GSettings/gsettings-qt.pro
-@@ -4,7 +4,7 @@ QT -= gui
- CONFIG += qt plugin no_keywords link_pkgconfig
- PKGCONFIG += gio-2.0
- INCLUDEPATH += ../src .
--LIBS += -L../src -lgsettings-qt
-+LIBS += -L$$(PWD)/../src -lgsettings-qt
-
- TARGET = GSettingsQmlPlugin
-
diff --git a/srcpkgs/gsettings-qt/patches/0002-Add-ordered-config.patch b/srcpkgs/gsettings-qt/patches/0002-Add-ordered-config.patch
deleted file mode 100644
index af74a82330a..00000000000
--- a/srcpkgs/gsettings-qt/patches/0002-Add-ordered-config.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Iceyer <iceyers@gmail.com>
-Date: Fri, 21 Jul 2017 14:43:24 +0800
-Subject: Add ordered config
-Forwarded: https://code.launchpad.net/~iceyers/gsettings-qt/fix-link-path
-
-This patch would fix random FTBFS when doing parallel build after
-debhelper v10 due to tests built before real libraries.
-
----
- gsettings-qt.pro | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/gsettings-qt.pro gsettings-qt.pro
-index 15e3684..ee04310 100644
---- a/gsettings-qt.pro
-+++ gsettings-qt.pro
-@@ -1,2 +1,7 @@
- TEMPLATE = subdirs
--SUBDIRS += src/gsettings-qt.pro GSettings/gsettings-qt.pro tests/tests.pro tests/cpptest.pro
-+CONFIG += ordered
-+SUBDIRS += \
-+ src/gsettings-qt.pro \
-+ GSettings/gsettings-qt.pro \
-+ tests/tests.pro \
-+ tests/cpptest.pro
diff --git a/srcpkgs/gsettings-qt/patches/0003-Fix-make-check-failed.patch b/srcpkgs/gsettings-qt/patches/0003-Fix-make-check-failed.patch
deleted file mode 100644
index ece1a6f0ad6..00000000000
--- a/srcpkgs/gsettings-qt/patches/0003-Fix-make-check-failed.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Iceyer <iceyers@gmail.com>
-Date: Fri, 4 Aug 2017 19:03:59 +0800
-Subject: Fix make check failed
-Forwarded: https://code.launchpad.net/~iceyers/gsettings-qt/fix-link-path
-
-This commit would fix the failure when invoking "make check".
----
- tests/cpptest.pro | 3 ++-
- tests/tests.pro | 1 +
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tests/cpptest.pro tests/cpptest.pro
-index 68b3b49..ec46730 100644
---- a/tests/cpptest.pro
-+++ tests/cpptest.pro
-@@ -3,7 +3,8 @@ QT += testlib
- QT -= gui
- CONFIG += testcase link_pkgconfig
- TARGET = cpptest
--IMPORTPATH = $$PWD/..
-+IMPORTPATH = $$(PWD)/..
-+QMAKE_RPATHDIR += $$(PWD)/../src
- SOURCES = cpptest.cpp
- INCLUDEPATH += $$(PWD)/../src
- LIBS += -L$$(PWD)/../src -lgsettings-qt
-diff --git a/tests/tests.pro tests/tests.pro
-index 6e3a388..2183584 100644
---- a/tests/tests.pro
-+++ tests/tests.pro
-@@ -4,6 +4,7 @@ QT -= gui
- CONFIG += qmltestcase
- TARGET = test
- IMPORTPATH = $$PWD/..
-+QMAKE_RPATHDIR += $$PWD/../src
- SOURCES = test.cpp
-
- schema.target = gschemas.compiled
diff --git a/srcpkgs/gsettings-qt/template b/srcpkgs/gsettings-qt/template
deleted file mode 100644
index 5c5ada5a77c..00000000000
--- a/srcpkgs/gsettings-qt/template
+++ /dev/null
@@ -1,46 +0,0 @@
-# Template file for 'gsettings-qt'
-pkgname=gsettings-qt
-version=0.1+17.10.20170824
-revision=3
-build_style=qmake
-hostmakedepends="qt5-qmake pkg-config qt5-declarative"
-makedepends="qt5-devel qt5-declarative-devel glib-devel"
-short_desc="Qml bindings for GSettings"
-maintainer="John <me@johnnynator.dev>"
-license="LGPL-3.0-only"
-homepage="https://launchpad.net/gsettings-qt"
-distfiles="$DEBIAN_SITE/main/g/gsettings-qt/gsettings-qt_${version}.orig.tar.gz"
-checksum=a3d1020d526ece2319f1e8f05876e456e85279741653008e05c5d7e8b019c9b9
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-devel qt5-declarative-devel"
-fi
-
-pre_configure() {
- # disable generation for qmltypes file while cross building
- # also makes trouble x86_64-musl so just remove it for everything
- if [ "$CROSS_BUILD" ] || [ "${XBPS_TARGET_MACHINE#*-musl}" != "$XBPS_TARGET_MACHINE" ];then
- vsed -i GSettings/gsettings-qt.pro -e '/qmltypes/ d'
- fi
-}
-
-post_install() {
- if [ "$CROSS_BUILD" ]; then
- vsed -i ${DESTDIR}/usr/${XBPS_CROSS_TRIPLET}/usr/lib/pkgconfig/gsettings-qt.pc \
- -e "s;${XBPS_CROSS_TRIPLET}\${prefix}/;;"
- rm -r ${DESTDIR}/usr/${XBPS_CROSS_TRIPLET}/usr/tests
- cp -a ${DESTDIR}/usr/${XBPS_CROSS_TRIPLET}/usr/* ${DESTDIR}/usr/
- else
- rm -r ${DESTDIR}/usr/tests
- fi
-}
-
-gsettings-qt-devel_package() {
- short_desc+=" - development files"
- depends="${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- }
-}
From 2c704905e1ee51e9b38f39f36c37c4afa81c51f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 11 Nov 2020 15:39:57 +0100
Subject: [PATCH 06/22] Remove package: deepin-calculator
---
srcpkgs/deepin-calculator/template | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 srcpkgs/deepin-calculator/template
diff --git a/srcpkgs/deepin-calculator/template b/srcpkgs/deepin-calculator/template
deleted file mode 100644
index 7d170519be9..00000000000
--- a/srcpkgs/deepin-calculator/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'deepin-calculator'
-pkgname=deepin-calculator
-version=5.0.1
-revision=1
-build_style=qmake
-hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
-makedepends="dtkwidget-devel qt5-svg-devel"
-depends="qt5integration"
-short_desc="Easy to use Calculator for Deepin"
-maintainer="John <me@johnnynator.dev>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/linuxdeepin/deepin-calculator"
-changelog="https://github.com/linuxdeepin/deepin-calculator/blob/${version}/CHANGELOG.md"
-distfiles="https://github.com/linuxdeepin/deepin-calculator/archive/${version}.tar.gz"
-checksum=d30564b57a73fe820fcd0ad3382b655b6d17b66a7d89cddec755bf9620a96674
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-svg-devel"
-fi
From f3567af5641e0bbabd1b58cf6f616b1c5ea17720 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 11 Nov 2020 15:40:08 +0100
Subject: [PATCH 07/22] Remove package: deepin-draw
---
srcpkgs/deepin-draw/template | 20 --------------------
1 file changed, 20 deletions(-)
delete mode 100644 srcpkgs/deepin-draw/template
diff --git a/srcpkgs/deepin-draw/template b/srcpkgs/deepin-draw/template
deleted file mode 100644
index 79e2589d6a9..00000000000
--- a/srcpkgs/deepin-draw/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'deepin-draw'
-pkgname=deepin-draw
-version=1.0.0
-revision=1
-build_style=qmake
-hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
-makedepends="qt5-svg-devel dtkwidget-devel libexif-devel libraw-devel
- freeimage-devel xcb-util-devel dtkwm-devel"
-depends="deepin-picker qt5integration"
-short_desc="Deepin Painting Tool"
-maintainer="John <me@johnnynator.dev>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/linuxdeepin/deepin-draw"
-changelog="https://github.com/linuxdeepin/deepin-draw/blob/${version}/CHANGELOG.md"
-distfiles="https://github.com/linuxdeepin/deepin-draw/archive/${version}.tar.gz"
-checksum=4a9430d9e52b3708da7e9e88a8106686333cd80ff3a3b127d1549d5ee111c6f4
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-svg-devel"
-fi
From 52a5ea4190325be9dd0ffb014ff502a46377b443 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 11 Nov 2020 15:40:18 +0100
Subject: [PATCH 08/22] Remove package: deepin-editor
---
srcpkgs/deepin-editor/template | 22 ----------------------
srcpkgs/deepin-editor/update | 1 -
2 files changed, 23 deletions(-)
delete mode 100644 srcpkgs/deepin-editor/template
delete mode 100644 srcpkgs/deepin-editor/update
diff --git a/srcpkgs/deepin-editor/template b/srcpkgs/deepin-editor/template
deleted file mode 100644
index f0ced3c71f0..00000000000
--- a/srcpkgs/deepin-editor/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'deepin-editor'
-pkgname=deepin-editor
-version=1.2.9.1
-revision=1
-build_style=cmake
-hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
-makedepends="dtkwidget-devel libxcb-devel kcodecs-devel
- xcb-util-devel qt5-svg-devel qt5-x11extras-devel libXtst-devel
- syntax-highlighting-devel polkit-qt5-devel"
-depends="qt5integration"
-short_desc="Simple editor for Deepin"
-maintainer="John <me@johnnynator.dev>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/linuxdeepin/deepin-editor"
-changelog="https://github.com/linuxdeepin/deepin-editor/blob/${version}/CHANGELOG.md"
-distfiles="https://github.com/linuxdeepin/deepin-editor/archive/${version}.tar.gz"
-checksum=8aabef5ae31f96d781dc24b27390b1dd8e28903f3f9f33e008637f6a45280159
-CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libdtk-2.0.6/DWidget -I${XBPS_CROSS_BASE}/usr/include/libdtk-2.0.6/DCore"
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" dtkwidget-devel"
-fi
diff --git a/srcpkgs/deepin-editor/update b/srcpkgs/deepin-editor/update
deleted file mode 100644
index 3fa24a6780a..00000000000
--- a/srcpkgs/deepin-editor/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore=1.10
From 554cb476c25af152912ff33a9b722fb59277149c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 11 Nov 2020 15:40:51 +0100
Subject: [PATCH 09/22] Remove package: deepin-gtk-theme
---
srcpkgs/deepin-gtk-theme/template | 13 -------------
1 file changed, 13 deletions(-)
delete mode 100644 srcpkgs/deepin-gtk-theme/template
diff --git a/srcpkgs/deepin-gtk-theme/template b/srcpkgs/deepin-gtk-theme/template
deleted file mode 100644
index becf7701621..00000000000
--- a/srcpkgs/deepin-gtk-theme/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'deepin-gtk-theme'
-pkgname=deepin-gtk-theme
-version=17.10.11
-revision=1
-archs=noarch
-build_style=gnu-makefile
-short_desc="Deepin GTK Theme"
-maintainer="John <me@johnnynator.dev>"
-license="LGPL-3.0-or-later"
-homepage="https://github.com/linuxdeepin/deepin-gtk-theme"
-changelog="https://github.com/linuxdeepin/deepin-gtk-theme/blob/master/CHANGELOG.md"
-distfiles="https://github.com/linuxdeepin/deepin-gtk-theme/archive/${version}.tar.gz"
-checksum=d97ffa5e0298b6b3274917c18d76e5ac179595f9ed47bc57f859081fc413690c
From 127ce56ed09ed939d03f438c8e7a2287a168cbea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 11 Nov 2020 15:41:02 +0100
Subject: [PATCH 10/22] Remove package: deepin-icon-theme
---
srcpkgs/deepin-icon-theme/template | 35 ------------------------------
1 file changed, 35 deletions(-)
delete mode 100644 srcpkgs/deepin-icon-theme/template
diff --git a/srcpkgs/deepin-icon-theme/template b/srcpkgs/deepin-icon-theme/template
deleted file mode 100644
index 60902c27771..00000000000
--- a/srcpkgs/deepin-icon-theme/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'deepin-icon-theme'
-pkgname=deepin-icon-theme
-version=2020.04.13
-revision=1
-archs=noarch
-hostmakedepends="xcursorgen"
-depends="papirus-icon-theme"
-short_desc="Deepin Icon Theme"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/linuxdeepin/deepin-icon-theme"
-changelog="https://github.com/linuxdeepin/deepin-icon-theme/blob/master/CHANGELOG.md"
-distfiles="https://github.com/linuxdeepin/deepin-icon-theme/archive/${version}.tar.gz"
-checksum=570271778ae71ffa62a93fb574171deb2da16558778cc547bbfc59625ca23599
-
-do_build() {
- make cursor check-perm
-}
-
-do_install() {
- vmkdir usr/share/icons
- vcopy Sea usr/share/icons
- vcopy bloom /usr/share/icons
- vcopy bloom-dark /usr/share/icons
- vcopy bloom-classic /usr/share/icons
- vcopy bloom-classic-dark /usr/share/icons
- vcopy usr/share/icons/hicolor usr/share/icons
-}
-
-sea-icon-theme_package() {
- short_desc="Deepin Sea Icons"
- pkg_install() {
- vmove usr/share/icons/Sea
- }
-}
From 8024e2dd57e3e995fad2b26ca88447f5b915d2e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 11 Nov 2020 15:41:15 +0100
Subject: [PATCH 11/22] Remove package: deepin-image-viewer
---
.../patches/QPainterPath.patch | 130 ------------------
srcpkgs/deepin-image-viewer/template | 20 ---
2 files changed, 150 deletions(-)
delete mode 100644 srcpkgs/deepin-image-viewer/patches/QPainterPath.patch
delete mode 100644 srcpkgs/deepin-image-viewer/template
diff --git a/srcpkgs/deepin-image-viewer/patches/QPainterPath.patch b/srcpkgs/deepin-image-viewer/patches/QPainterPath.patch
deleted file mode 100644
index 37c2cad4a07..00000000000
--- a/srcpkgs/deepin-image-viewer/patches/QPainterPath.patch
+++ /dev/null
@@ -1,130 +0,0 @@
---- viewer/frame/extensionpanel.cpp 2019-07-05 11:40:24.000000000 +0200
-+++ viewer/frame/extensionpanel.cpp 2020-09-01 18:57:17.236841105 +0200
-@@ -19,6 +19,7 @@
- #include "controller/signalmanager.h"
- #include "darrowbutton.h"
- #include <QPainter>
-+#include <QPainterPath>
-
- using namespace Dtk::Widget;
-
---- viewer/frame/toptoolbar.cpp 2019-07-05 11:40:24.000000000 +0200
-+++ viewer/frame/toptoolbar.cpp 2020-09-01 18:57:11.238840796 +0200
-@@ -35,6 +35,7 @@
- #include <QDebug>
- #include <QHBoxLayout>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QProcess>
- #include <QResizeEvent>
- #include <QShortcut>
---- viewer/module/album/albumdelegate.cpp 2019-07-05 11:40:24.000000000 +0200
-+++ viewer/module/album/albumdelegate.cpp 2020-09-01 18:56:54.229839918 +0200
-@@ -22,6 +22,7 @@
- #include <QDateTime>
- #include <QLineEdit>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QDebug>
- #include <QHBoxLayout>
- #include <QImageReader>
---- viewer/module/timeline/mvc/timelinedelegate.cpp 2019-07-05 11:40:24.000000000 +0200
-+++ viewer/module/timeline/mvc/timelinedelegate.cpp 2020-09-01 18:56:59.205840175 +0200
-@@ -24,6 +24,7 @@
- #include <QHBoxLayout>
- #include <QLineEdit>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPixmapCache>
- #include <QStandardItemModel>
- #include <QThread>
---- viewer/module/timeline/mvc/timelineview.cpp 2019-07-05 11:40:24.000000000 +0200
-+++ viewer/module/timeline/mvc/timelineview.cpp 2020-09-01 18:57:04.935840471 +0200
-@@ -29,6 +29,7 @@
- #include <QHeaderView>
- #include <QPaintEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QtConcurrent>
- #include <QtMath>
-
---- viewer/widgets/blureframe.cpp 2019-07-05 11:40:24.000000000 +0200
-+++ viewer/widgets/blureframe.cpp 2020-09-01 18:56:35.239838939 +0200
-@@ -19,6 +19,7 @@
- #include <QApplication>
- #include <QDebug>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QGraphicsScene>
- #include <QGraphicsPixmapItem>
- #include <QGraphicsBlurEffect>
---- viewer/widgets/dialogs/albumdeletedialog.cpp 2019-07-05 11:40:24.000000000 +0200
-+++ viewer/widgets/dialogs/albumdeletedialog.cpp 2020-09-01 18:56:24.002838359 +0200
-@@ -20,6 +20,7 @@
- #include "utils/baseutils.h"
- #include "utils/imageutils.h"
- #include <QPainter>
-+#include <QPainterPath>
- #include <QDebug>
-
- AlbumDeleteDialog::AlbumDeleteDialog(const QStringList &paths, QWidget *parent)
---- viewer/widgets/dialogs/filedeletedialog.cpp 2019-07-05 11:40:24.000000000 +0200
-+++ viewer/widgets/dialogs/filedeletedialog.cpp 2020-09-01 18:56:15.056837898 +0200
-@@ -20,6 +20,7 @@
- #include "utils/baseutils.h"
- #include "utils/imageutils.h"
- #include <QPainter>
-+#include <QPainterPath>
- #include <QDebug>
-
- FileDeleteDialog::FileDeleteDialog(const QStringList &paths, QWidget *parent)
---- viewer/widgets/dialogs/imginfodialog.cpp 2019-07-05 11:40:24.000000000 +0200
-+++ viewer/widgets/dialogs/imginfodialog.cpp 2020-09-01 18:56:30.424838690 +0200
-@@ -26,6 +26,7 @@
- #include <QKeyEvent>
- #include <QLabel>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QVBoxLayout>
-
- namespace {
---- viewer/widgets/dspinner.cpp 2019-07-05 11:40:24.000000000 +0200
-+++ viewer/widgets/dspinner.cpp 2020-09-01 18:56:44.085839395 +0200
-@@ -2,6 +2,7 @@
-
- #include <QtMath>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QTimer>
-
- #include <DObjectPrivate>
---- viewer/widgets/popupmenustyle.cpp 2019-07-05 11:40:24.000000000 +0200
-+++ viewer/widgets/popupmenustyle.cpp 2020-09-01 18:56:40.639839217 +0200
-@@ -19,6 +19,7 @@
- #include <QPixmap>
- #include <QPixmapCache>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QStyleOption>
- #include <QStyleOptionMenuItem>
-
---- viewer/widgets/thumbnaildelegate.cpp 2019-07-05 11:40:24.000000000 +0200
-+++ viewer/widgets/thumbnaildelegate.cpp 2020-09-01 18:56:02.445837247 +0200
-@@ -23,6 +23,7 @@
- #include <QHBoxLayout>
- #include <QLineEdit>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPixmapCache>
- #include <QStandardItemModel>
- #include <QThread>
---- viewer/widgets/thumbnaillistview.cpp 2019-07-05 11:40:24.000000000 +0200
-+++ viewer/widgets/thumbnaillistview.cpp 2020-09-01 18:56:09.028837587 +0200
-@@ -30,6 +30,7 @@
- #include <QMutex>
- #include <QPaintEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPen>
- #include <QScrollBar>
- #include <QStandardItemModel>
diff --git a/srcpkgs/deepin-image-viewer/template b/srcpkgs/deepin-image-viewer/template
deleted file mode 100644
index 65bdb4fdb61..00000000000
--- a/srcpkgs/deepin-image-viewer/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'deepin-image-viewer'
-pkgname=deepin-image-viewer
-version=5.0.0
-revision=1
-build_style=qmake
-hostmakedepends="qt5-qmake pkg-config"
-makedepends="qt5-svg-devel qt5-x11extras-devel libraw-devel libexif-devel
- libgomp-devel freeimage-devel dtkwidget-devel"
-depends="qt5-plugin-sqlite qt5integration"
-short_desc="Deepin Image Viewer"
-maintainer="John <me@johnnynator.dev>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/linuxdeepin/deepin-image-viewer"
-changelog="https://github.com/linuxdeepin/deepin-image-viewer/blob/${version}/CHANGELOG.md"
-distfiles="https://github.com/linuxdeepin/deepin-image-viewer/archive/${version}.tar.gz"
-checksum=1ea7256e0a6df50f78af15e6a26c89c2814eca946cd824344352f49dcf4afe13
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-svg-devel qt5-x11extras-devel"
-fi
From bfd2dcb9537cbf1d5dca55d1c3b72f21609425d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 11 Nov 2020 15:41:27 +0100
Subject: [PATCH 12/22] Remove package: deepin-menu
---
srcpkgs/deepin-menu/template | 20 --------------------
1 file changed, 20 deletions(-)
delete mode 100644 srcpkgs/deepin-menu/template
diff --git a/srcpkgs/deepin-menu/template b/srcpkgs/deepin-menu/template
deleted file mode 100644
index e74fb6a084e..00000000000
--- a/srcpkgs/deepin-menu/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'deepin-menu'
-pkgname=deepin-menu
-version=3.4.8
-revision=2
-build_style=qmake
-hostmakedepends="qt5-qmake pkg-config"
-makedepends="dtkwidget-devel qt5-declarative-devel dde-qt-dbus-factory-devel
- qt5-x11extras-devel"
-depends="python"
-short_desc="Unified menu service for Deepin Desktop Environment"
-maintainer="John <me@johnnynator.dev>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/linuxdeepin/deepin-menu/"
-changelog="https://github.com/linuxdeepin/deepin-menu/blob/${version}/CHANGELOG.md"
-distfiles="https://github.com/linuxdeepin/deepin-menu/archive/${version}.tar.gz"
-checksum=0bb52620d421153930db49f1af4ba0fef28485966d72763ab9c02c09967daa8f
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-devel"
-fi
From bb6cf87bbdcfaa6374bc8632968d3cc97e4affd0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 11 Nov 2020 15:41:39 +0100
Subject: [PATCH 13/22] Remove package: deepin-movie-reborn
---
common/shlibs | 1 -
srcpkgs/deepin-movie-reborn-devel | 1 -
srcpkgs/deepin-movie-reborn/patches/48.patch | 43 -------------------
.../deepin-movie-reborn/patches/cross.patch | 10 -----
.../deepin-movie-reborn/patches/locale.patch | 11 -----
.../patches/musl-basename.patch | 13 ------
srcpkgs/deepin-movie-reborn/template | 39 -----------------
7 files changed, 118 deletions(-)
delete mode 120000 srcpkgs/deepin-movie-reborn-devel
delete mode 100644 srcpkgs/deepin-movie-reborn/patches/48.patch
delete mode 100644 srcpkgs/deepin-movie-reborn/patches/cross.patch
delete mode 100644 srcpkgs/deepin-movie-reborn/patches/locale.patch
delete mode 100644 srcpkgs/deepin-movie-reborn/patches/musl-basename.patch
delete mode 100644 srcpkgs/deepin-movie-reborn/template
diff --git a/common/shlibs b/common/shlibs
index 743593c071f..c8f867e47dc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -828,7 +828,6 @@ libpeas-gtk-1.0.so.0 libpeas-1.0.0_2
libtotem.so.0 libtotem-3.6.2_1
libclutter-1.0.so.0 clutter-1.14.0_1
libavfs.so.0 libavfs-1.0.5_1
-libdmr.so.0.1 deepin-movie-reborn-3.2.5_1
libgjs.so.0 gjs-1.65.2_1
libtelepathy-glib.so.0 telepathy-glib-0.15.5_1
libaccountsservice.so.0 accountsservice-0.6.4_1
diff --git a/srcpkgs/deepin-movie-reborn-devel b/srcpkgs/deepin-movie-reborn-devel
deleted file mode 120000
index 85b9a40f39d..00000000000
--- a/srcpkgs/deepin-movie-reborn-devel
+++ /dev/null
@@ -1 +0,0 @@
-deepin-movie-reborn
\ No newline at end of file
diff --git a/srcpkgs/deepin-movie-reborn/patches/48.patch b/srcpkgs/deepin-movie-reborn/patches/48.patch
deleted file mode 100644
index 4acd009ad15..00000000000
--- a/srcpkgs/deepin-movie-reborn/patches/48.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 0a46b32065fc7508cc9af611d6809187a42be91d Mon Sep 17 00:00:00 2001
-From: Gary Wang <wzc782970009@gmail.com>
-Date: Tue, 30 Jul 2019 11:24:28 +0800
-Subject: [PATCH] fix: build failed if cannot find dtk-settings tool
-
----
- src/CMakeLists.txt | 16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
-
-diff --git src/CMakeLists.txt src/CMakeLists.txt
-index b403c96..55b0318 100644
---- src/CMakeLists.txt
-+++ src/CMakeLists.txt
-@@ -42,12 +42,15 @@ list(APPEND SRCS ${MPV_SRCS})
- list(APPEND PROJECT_INCLUDE ${PROJECT_SOURCE_DIR}/src/backends/mpv)
- #~
-
--add_custom_target(json_i18n ALL
-- /usr/lib/dtk2/dtk-settings resources/data/settings.json -o common/settings_translation.cpp
-- COMMAND sed -i "s,#include .*,#include <DSettings>," common/settings_translation.cpp
-- VERBATIM
-- SOURCES resources/data/settings.json
-- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/src/)
-+set (DTK_SETTINGS_TOOLS_EXECUTABLE ${DTKCORE_TOOL_DIR}/dtk-settings)
-+if (EXISTS ${DTK_SETTINGS_TOOLS_EXECUTABLE})
-+ add_custom_target(json_i18n ALL
-+ ${DTKCORE_TOOL_DIR}/dtk-settings resources/data/settings.json -o common/settings_translation.cpp
-+ COMMAND sed -i "s,#include .*,#include <DSettings>," common/settings_translation.cpp
-+ VERBATIM
-+ SOURCES resources/data/settings.json
-+ WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/src/)
-+endif ()
-
- ## translations
- file(GLOB TS LIST_DIRECTORIES false translations/${CMD_NAME}*.ts)
-@@ -61,7 +64,6 @@ endif ()
- # ~
-
- add_executable(${CMD_NAME} ${SRCS} ${RCS} ${QM})
--add_dependencies(${CMD_NAME} json_i18n)
- target_include_directories(${CMD_NAME} PUBLIC ${PROJECT_INCLUDE})
-
- set(TARGET_LIBS X11 Xext Xtst PkgConfig::Xcb Qt5::Widgets Qt5::X11Extras Qt5::Network
diff --git a/srcpkgs/deepin-movie-reborn/patches/cross.patch b/srcpkgs/deepin-movie-reborn/patches/cross.patch
deleted file mode 100644
index 8439ce5dc6f..00000000000
--- a/srcpkgs/deepin-movie-reborn/patches/cross.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/backends/mpv/mpv_glwidget.cpp 2018-05-04 10:15:32.000000000 +0200
-+++ - 2018-05-22 22:08:57.552655817 +0200
-@@ -38,6 +38,7 @@
- #include <DApplication>
- DWIDGET_USE_NAMESPACE
-
-+#include <GL/gl.h>
-
- static const char* vs_blend = R"(
- attribute vec2 position;
diff --git a/srcpkgs/deepin-movie-reborn/patches/locale.patch b/srcpkgs/deepin-movie-reborn/patches/locale.patch
deleted file mode 100644
index b7837db82f1..00000000000
--- a/srcpkgs/deepin-movie-reborn/patches/locale.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/libdmr/player_engine.cpp 2018-05-04 10:15:32.000000000 +0200
-+++ - 2018-05-05 14:43:52.094245514 +0200
-@@ -48,6 +48,8 @@
- auto *l = new QVBoxLayout(this);
- l->setContentsMargins(0, 0, 0, 0);
-
-+ setlocale(LC_NUMERIC, "C");
-+
- _current = new MpvProxy(this);
- if (_current) {
- connect(_current, &Backend::stateChanged, this, &PlayerEngine::onBackendStateChanged);
diff --git a/srcpkgs/deepin-movie-reborn/patches/musl-basename.patch b/srcpkgs/deepin-movie-reborn/patches/musl-basename.patch
deleted file mode 100644
index de5543fdb32..00000000000
--- a/srcpkgs/deepin-movie-reborn/patches/musl-basename.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- compositing_manager.cpp 2018-02-16 23:26:46.157644103 +0100
-+++ src/libdmr/compositing_manager.cpp 2018-02-16 23:31:57.378630531 +0100
-@@ -46,6 +46,10 @@
- #undef Bool
- #include <mpv/qthelper.hpp>
-
-+#if !defined(__GLIBC__)
-+#include <libgen.h>
-+#endif
-+
- typedef const char * glXGetScreenDriver_t (Display *dpy, int scrNum);
-
- static glXGetScreenDriver_t *GetScreenDriver;
diff --git a/srcpkgs/deepin-movie-reborn/template b/srcpkgs/deepin-movie-reborn/template
deleted file mode 100644
index a46bcbb63ac..00000000000
--- a/srcpkgs/deepin-movie-reborn/template
+++ /dev/null
@@ -1,39 +0,0 @@
-# Template file for 'deepin-movie-reborn'
-pkgname=deepin-movie-reborn
-version=5.0.0
-revision=2
-build_style=cmake
-hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
-makedepends="dtkwidget-devel ffmpegthumbnailer-devel libdvdnav-devel mpv-devel
- pulseaudio-devel qt5-declarative-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-svg-devel qt5-tools-devel
- qt5-x11extras-devel xcb-util-wm-devel"
-depends="qt5integration"
-short_desc="Deepin Movie Player"
-maintainer="John <me@johnnynator.dev>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/linuxdeepin/deepin-movie-reborn"
-changelog="https://github.com/linuxdeepin/deepin-movie-reborn/blob/${version}/CHANGELOG.md"
-distfiles="https://github.com/linuxdeepin/deepin-movie-reborn/archive/${version}.tar.gz"
-checksum=b52456ef8c373c1738edc15cfbdb7127f2dbdf57153594bb2b716f02573ef1ef
-CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libdtk-2.0.6/DWidget"
-CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/libdtk-2.0.6/DCore"
-CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/libdtk-2.0.6/DWm"
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" dtkcore-devel"
-fi
-
-case $XBPS_TARGET_MACHINE in
- arm*) broken="https://travis-ci.org/void-linux/void-packages/jobs/394936356";;
-esac
-
-deepin-movie-reborn-devel_package() {
- short_desc+=" - development files"
- depends="${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/lib/pkgconfig
- vmove usr/include
- vmove "usr/lib/*.so"
- }
-}
From 0d621b19fe0e573161265f6b761e03037d298354 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 11 Nov 2020 15:42:20 +0100
Subject: [PATCH 14/22] Remove package: deepin-music
---
srcpkgs/deepin-music-devel | 1 -
.../deepin-music/patches/QPainterPath.patch | 30 ------------------
srcpkgs/deepin-music/template | 31 -------------------
3 files changed, 62 deletions(-)
delete mode 120000 srcpkgs/deepin-music-devel
delete mode 100644 srcpkgs/deepin-music/patches/QPainterPath.patch
delete mode 100644 srcpkgs/deepin-music/template
diff --git a/srcpkgs/deepin-music-devel b/srcpkgs/deepin-music-devel
deleted file mode 120000
index 6374d6b3e74..00000000000
--- a/srcpkgs/deepin-music-devel
+++ /dev/null
@@ -1 +0,0 @@
-deepin-music
\ No newline at end of file
diff --git a/srcpkgs/deepin-music/patches/QPainterPath.patch b/srcpkgs/deepin-music/patches/QPainterPath.patch
deleted file mode 100644
index f30319a6c8f..00000000000
--- a/srcpkgs/deepin-music/patches/QPainterPath.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/music-player/view/lyricwidget.cpp 2019-06-01 08:20:13.000000000 +0200
-+++ src/music-player/view/lyricwidget.cpp 2020-09-01 12:45:53.437691502 +0200
-@@ -29,6 +29,7 @@
- #include <QHBoxLayout>
- #include <QListView>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QResizeEvent>
- #include <QPaintEvent>
- #include <QStringListModel>
---- src/music-player/view/widget/cover.cpp 2019-06-01 08:20:13.000000000 +0200
-+++ src/music-player/view/widget/cover.cpp 2020-09-01 12:45:58.610691769 +0200
-@@ -23,6 +23,7 @@
-
- #include <QDebug>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QGraphicsDropShadowEffect>
-
- static auto borderPenWidth = 1.0;
---- src/music-player/view/widget/soundvolume.cpp 2019-06-01 08:20:13.000000000 +0200
-+++ src/music-player/view/widget/soundvolume.cpp 2020-09-01 12:46:04.652692081 +0200
-@@ -23,6 +23,7 @@
-
- #include <QDebug>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QWheelEvent>
- #include <QGraphicsDropShadowEffect>
- #include <QVBoxLayout>
diff --git a/srcpkgs/deepin-music/template b/srcpkgs/deepin-music/template
deleted file mode 100644
index 62a15f4314f..00000000000
--- a/srcpkgs/deepin-music/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'deepin-music'
-pkgname=deepin-music
-version=5.0.1
-revision=2
-build_style=qmake
-hostmakedepends="qt5-qmake pkg-config"
-makedepends="dtkwidget-devel ffmpeg-devel libcue-devel pulseaudio-devel
- qt5-multimedia-devel qt5-svg-devel qt5-x11extras-devel taglib-devel"
-depends="deepin-menu qt5-plugin-sqlite qt5integration"
-short_desc="Deepin Music Player"
-maintainer="John <me@johnnynator.dev>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/linuxdeepin/deepin-music/"
-changelog="https://github.com/linuxdeepin/deepin-music/blob/${version}/CHANGELOG.md"
-distfiles="https://github.com/linuxdeepin/deepin-music/archive/${version}.tar.gz"
-checksum=3c64e035cee392a96b31acfd34c468b4c23b120d964a837b4b31ff19a88992d0
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" dtkcore-devel qt5-svg-devel qt5-multimedia-devel qt5-x11extras-devel"
-fi
-
-deepin-music-devel_package() {
- short_desc+=" - development files"
- depends="${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove usr/lib/qt5/mkspecs
- vmove "usr/lib/*.so"
- }
-}
From 8993d6ca45085fad6a2bfe26d3d9f3c9164c0fbb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 11 Nov 2020 15:42:36 +0100
Subject: [PATCH 15/22] Remove package: deepin-picker
---
srcpkgs/deepin-picker/patches/qt5.15.patch | 20 --------------------
srcpkgs/deepin-picker/template | 20 --------------------
2 files changed, 40 deletions(-)
delete mode 100644 srcpkgs/deepin-picker/patches/qt5.15.patch
delete mode 100644 srcpkgs/deepin-picker/template
diff --git a/srcpkgs/deepin-picker/patches/qt5.15.patch b/srcpkgs/deepin-picker/patches/qt5.15.patch
deleted file mode 100644
index 4e77a4d44d3..00000000000
--- a/srcpkgs/deepin-picker/patches/qt5.15.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/animation.cpp 2019-07-08 08:41:51.000000000 +0200
-+++ - 2020-07-08 16:48:26.348650427 +0200
-@@ -25,6 +25,7 @@
- #include "utils.h"
- #include <QApplication>
- #include <QColor>
-+#include <QPainterPath>
- #include <QPainter>
- #include <QDebug>
-
---- src/picker.cpp 2019-07-08 08:41:51.000000000 +0200
-+++ - 2020-07-08 16:48:52.281052014 +0200
-@@ -26,6 +26,7 @@
- #include "settings.h"
- #include "utils.h"
- #include "colormenu.h"
-+#include <QPainterPath>
- #include <QPainter>
- #include <QBitmap>
- #include <QPixmap>
diff --git a/srcpkgs/deepin-picker/template b/srcpkgs/deepin-picker/template
deleted file mode 100644
index d556fb87d4b..00000000000
--- a/srcpkgs/deepin-picker/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'deepin-picker'
-pkgname=deepin-picker
-version=5.0.1
-revision=1
-build_style=qmake
-hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
-makedepends="dtkwidget-devel qt5-svg-devel qt5-x11extras-devel xcb-util-devel
- libXtst-devel"
-depends="qt5integration"
-short_desc="Simple color picker"
-maintainer="John <me@johnnynator.dev>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/linuxdeepin/deepin-picker"
-changelog="https://github.com/linuxdeepin/deepin-picker/blob/${version}/CHANGELOG.md"
-distfiles="https://github.com/linuxdeepin/deepin-picker/archive/${version}.tar.gz"
-checksum=097e7512f8e6cbcd57320fbd423aec6c0278d64fc35b6237e132828dc2ca41fc
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-svg-devel qt5-x11extras-devel"
-fi
From b91006ac86455d168e1d4f3f99d80ec84cad8162 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 11 Nov 2020 15:42:48 +0100
Subject: [PATCH 16/22] Remove package: deepin-screenshot
---
.../patches/QPainterPath.patch | 10 ------
srcpkgs/deepin-screenshot/template | 31 -------------------
2 files changed, 41 deletions(-)
delete mode 100644 srcpkgs/deepin-screenshot/patches/QPainterPath.patch
delete mode 100644 srcpkgs/deepin-screenshot/template
diff --git a/srcpkgs/deepin-screenshot/patches/QPainterPath.patch b/srcpkgs/deepin-screenshot/patches/QPainterPath.patch
deleted file mode 100644
index 75ca164fa38..00000000000
--- a/srcpkgs/deepin-screenshot/patches/QPainterPath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/widgets/shapeswidget.cpp 2019-07-08 07:43:20.000000000 +0200
-+++ src/widgets/shapeswidget.cpp 2020-09-01 12:54:18.856717576 +0200
-@@ -21,6 +21,7 @@
-
- #include <QApplication>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QDebug>
-
- #include "src/utils/calculaterect.h"
diff --git a/srcpkgs/deepin-screenshot/template b/srcpkgs/deepin-screenshot/template
deleted file mode 100644
index be5d21fb2f5..00000000000
--- a/srcpkgs/deepin-screenshot/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'deepin-screenshot'
-pkgname=deepin-screenshot
-version=5.0.0
-revision=2
-build_style=cmake
-hostmakedepends="pkg-config qt5-qmake"
-makedepends="dtkwidget-devel dtkwm-devel libXtst-devel qt5-svg-devel
- qt5-x11extras-devel xcb-util-devel"
-depends="deepin-turbo qt5integration"
-short_desc="Deepin Screenshot App"
-maintainer="John <me@johnnynator.dev>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/linuxdeepin/deepin-screenshot"
-changelog="https://github.com/linuxdeepin/deepin-screenshot/blob/${version}/CHANGELOG.md"
-distfiles="https://github.com/linuxdeepin/deepin-screenshot/archive/${version}.tar.gz"
-checksum=1d793a9a7d1dedbf0bf36970035d5d3c7888cad195ae7e1ccd77e47b5f9c37b0
-CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libdtk-2.0.16/DWidget"
-CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/libdtk-2.0.16/DCore"
-CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/libdtk-2.0.16/DWm"
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" dtkwidget-devel dtkwm-devel"
-fi
-
-pre_configure() {
- sed -i '/^set(CMAKE_CXX_FLAGS.*/d' CMakeLists.txt
-}
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-x11extras-devel"
-fi
From 2f0d286667fa9425d33ed7ebcdb2bf8ba9fa59ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 11 Nov 2020 15:43:06 +0100
Subject: [PATCH 17/22] Remove package: deepin-system-monitor
---
.../patches/QPainterPath.patch | 160 ------------------
.../patches/qt5.14.patch | 28 ---
srcpkgs/deepin-system-monitor/template | 22 ---
3 files changed, 210 deletions(-)
delete mode 100644 srcpkgs/deepin-system-monitor/patches/QPainterPath.patch
delete mode 100644 srcpkgs/deepin-system-monitor/patches/qt5.14.patch
delete mode 100644 srcpkgs/deepin-system-monitor/template
diff --git a/srcpkgs/deepin-system-monitor/patches/QPainterPath.patch b/srcpkgs/deepin-system-monitor/patches/QPainterPath.patch
deleted file mode 100644
index e221eedf301..00000000000
--- a/srcpkgs/deepin-system-monitor/patches/QPainterPath.patch
+++ /dev/null
@@ -1,160 +0,0 @@
---- src/attributes_dialog.cpp 2019-05-23 12:03:34.000000000 +0200
-+++ src/attributes_dialog.cpp 2020-09-01 18:02:43.625672222 +0200
-@@ -28,6 +28,7 @@
- #include <QDateTime>
- #include <QDebug>
- #include <QPainter>
-+#include <QPainterPath>
- #include <dthememanager.h>
- #include <proc/readproc.h>
- #include <proc/sysinfo.h>
---- src/compact_cpu_monitor.cpp 2019-05-23 12:03:34.000000000 +0200
-+++ src/compact_cpu_monitor.cpp 2020-09-01 18:03:48.469675568 +0200
-@@ -28,6 +28,7 @@
- #include "utils.h"
- #include <QDebug>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QApplication>
- #include <DHiDPIHelper>
-
---- src/compact_cpu_monitor.h 2019-05-23 12:03:34.000000000 +0200
-+++ src/compact_cpu_monitor.h 2020-09-01 18:03:41.773675222 +0200
-@@ -24,6 +24,7 @@
- #ifndef COMPACTCPUMONITOR_H
- #define COMPACTCPUMONITOR_H
-
-+#include <QPainterPath>
- #include <QWidget>
-
- class CompactCpuMonitor : public QWidget
---- src/compact_disk_monitor.cpp 2019-05-23 12:03:34.000000000 +0200
-+++ src/compact_disk_monitor.cpp 2020-09-01 18:05:07.969679669 +0200
-@@ -28,6 +28,7 @@
- #include "utils.h"
- #include <QDebug>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QApplication>
- #include <DHiDPIHelper>
-
---- src/compact_disk_monitor.h 2019-05-23 12:03:34.000000000 +0200
-+++ src/compact_disk_monitor.h 2020-09-01 18:03:33.882674815 +0200
-@@ -24,6 +24,7 @@
- #ifndef COMPACTDISKMONITOR_H
- #define COMPACTDISKMONITOR_H
-
-+#include <QPainterPath>
- #include <QWidget>
-
- class CompactDiskMonitor : public QWidget
---- src/compact_network_monitor.cpp 2019-05-23 12:03:34.000000000 +0200
-+++ src/compact_network_monitor.cpp 2020-09-01 18:02:59.925673063 +0200
-@@ -28,6 +28,7 @@
- #include "utils.h"
- #include <QDebug>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QApplication>
- #include <DHiDPIHelper>
-
---- src/compact_network_monitor.h 2019-05-23 12:03:34.000000000 +0200
-+++ src/compact_network_monitor.h 2020-09-01 18:03:57.463676032 +0200
-@@ -24,6 +24,7 @@
- #ifndef COMPACTNETWORKMONITOR_H
- #define COMPACTNETWORKMONITOR_H
-
-+#include <QPainterPath>
- #include <QWidget>
-
- class CompactNetworkMonitor : public QWidget
---- src/cpu_monitor.h 2019-05-23 12:03:34.000000000 +0200
-+++ src/cpu_monitor.h 2020-09-01 18:03:12.705673723 +0200
-@@ -25,6 +25,7 @@
- #define CpuMONITOR_H
-
- #include <QList>
-+#include <QPainterPath>
- #include <QPointF>
- #include <QTimer>
- #include <QVBoxLayout>
---- src/disk_monitor.cpp 2019-05-23 12:03:34.000000000 +0200
-+++ src/disk_monitor.cpp 2020-09-01 18:02:36.901671876 +0200
-@@ -28,6 +28,7 @@
- #include "utils.h"
- #include <QDebug>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QApplication>
- #include <DHiDPIHelper>
-
---- src/disk_monitor.h 2019-05-23 12:03:34.000000000 +0200
-+++ src/disk_monitor.h 2020-09-01 18:02:53.669672741 +0200
-@@ -24,6 +24,7 @@
- #ifndef DISKMONITOR_H
- #define DISKMONITOR_H
-
-+#include <QPainterPath>
- #include <QWidget>
-
- class DiskMonitor : public QWidget
---- src/main_window.cpp 2019-05-23 12:03:34.000000000 +0200
-+++ src/main_window.cpp 2020-09-01 18:04:54.944678997 +0200
-@@ -30,6 +30,7 @@
- #include <QDebug>
- #include <QDesktopWidget>
- #include <QKeyEvent>
-+#include <QPainterPath>
- #include <QStyleFactory>
- #include <iostream>
- #include <signal.h>
---- src/network_monitor.cpp 2019-05-23 12:03:34.000000000 +0200
-+++ src/network_monitor.cpp 2020-09-01 18:05:13.757679968 +0200
-@@ -28,6 +28,7 @@
- #include "utils.h"
- #include <QDebug>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QApplication>
- #include <DHiDPIHelper>
-
---- src/network_monitor.h 2019-05-23 12:03:34.000000000 +0200
-+++ src/network_monitor.h 2020-09-01 18:04:19.213677154 +0200
-@@ -24,6 +24,7 @@
- #ifndef NETWORKMONITOR_H
- #define NETWORKMONITOR_H
-
-+#include <QPainterPath>
- #include <QWidget>
-
- class NetworkMonitor : public QWidget
---- src/process_item.cpp 2019-05-23 12:03:34.000000000 +0200
-+++ src/process_item.cpp 2020-09-01 18:04:11.593676761 +0200
-@@ -27,6 +27,7 @@
- #include <QCollator>
- #include <QDebug>
- #include <QLocale>
-+#include <QPainterPath>
- #include "chinese2pinyin.h"
-
- DWIDGET_USE_NAMESPACE
---- src/process_switch_tab.cpp 2019-05-23 12:03:34.000000000 +0200
-+++ src/process_switch_tab.cpp 2020-09-01 18:04:32.500677839 +0200
-@@ -26,6 +26,7 @@
- #include "utils.h"
- #include <QDebug>
- #include <DHiDPIHelper>
-+#include <QPainterPath>
-
- DWIDGET_USE_NAMESPACE
-
---- src/utils.cpp 2019-05-23 12:03:34.000000000 +0200
-+++ src/utils.cpp 2020-09-01 18:05:02.184679371 +0200
-@@ -32,6 +32,7 @@
- #include <QImageReader>
- #include <QLayout>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPixmap>
- #include <QStandardPaths>
- #include <QString>
diff --git a/srcpkgs/deepin-system-monitor/patches/qt5.14.patch b/srcpkgs/deepin-system-monitor/patches/qt5.14.patch
deleted file mode 100644
index 061ea5cb110..00000000000
--- a/srcpkgs/deepin-system-monitor/patches/qt5.14.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 014ec783c9bf11ae352934ee2e593f29700b2843 Mon Sep 17 00:00:00 2001
-From: Hillwood Yang <hillwood@opensuse.org>
-Date: Sat, 25 Jan 2020 20:39:39 +0800
-Subject: [PATCH] Fix hash<QString> error above Qt 5.14
-
----
- src/hashqstring.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/hashqstring.h b/src/hashqstring.h
-index 20522b3..71d71c4 100644
---- src/hashqstring.h
-+++ src/hashqstring.h
-@@ -27,6 +27,7 @@
- #include <QString>
- #include <string>
-
-+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
- namespace std {
- template<> struct hash<QString>
- {
-@@ -36,5 +37,6 @@ namespace std {
- }
- };
- }
-+#endif
-
- #endif // HASHQSTRING_H
diff --git a/srcpkgs/deepin-system-monitor/template b/srcpkgs/deepin-system-monitor/template
deleted file mode 100644
index 9a6dd826ec3..00000000000
--- a/srcpkgs/deepin-system-monitor/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'deepin-system-monitor'
-pkgname=deepin-system-monitor
-version=5.0.0
-revision=2
-build_style=qmake
-hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
-makedepends="dtkwm-devel dtkwidget-devel qt5-x11extras-devel libpcap-devel
- procps-ng-devel libxcb-devel libXtst-devel xcb-util-devel"
-depends="qt5integration"
-short_desc="User-friendly system monitor for Deepin"
-maintainer="John <me@johnnynator.dev>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/linuxdeepin/deepin-system-monitor"
-changelog="https://github.com/linuxdeepin/deepin-system-monitor/blob/${version}/CHANGELOG.md"
-distfiles="https://github.com/linuxdeepin/deepin-system-monitor/archive/${version}.tar.gz"
-checksum=5af4f6c321719937f47a07929bc94dd4de8b64a977bcc32355620d2606ee0de9
-
-CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libdtk-2.0.16/DWm"
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-x11extras-devel"
-fi
From bdea2d7284ba0aebbb71a18bce7ba9bdd0d0a889 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 11 Nov 2020 15:43:18 +0100
Subject: [PATCH 18/22] Remove package: deepin-terminal
---
srcpkgs/deepin-terminal/patches/glib.patch | 11 --------
srcpkgs/deepin-terminal/template | 32 ----------------------
2 files changed, 43 deletions(-)
delete mode 100644 srcpkgs/deepin-terminal/patches/glib.patch
delete mode 100644 srcpkgs/deepin-terminal/template
diff --git a/srcpkgs/deepin-terminal/patches/glib.patch b/srcpkgs/deepin-terminal/patches/glib.patch
deleted file mode 100644
index 142ff0b0992..00000000000
--- a/srcpkgs/deepin-terminal/patches/glib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt 2018-05-24 16:03:56.376621081 +0200
-+++ - 2018-05-24 16:07:49.217575585 +0200
-@@ -10,7 +10,7 @@
- find_package(Vala)
- ensure_vala_version("0.22.0" MINIMUM)
- find_package(PkgConfig)
--find_package(GLib "2.48" REQUIRED)
-+find_package(GLib REQUIRED)
- find_package(JsonGlib)
- find_package(Libsecret)
- find_package(FontConfig)
diff --git a/srcpkgs/deepin-terminal/template b/srcpkgs/deepin-terminal/template
deleted file mode 100644
index b2218762e4b..00000000000
--- a/srcpkgs/deepin-terminal/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'deepin-terminal'
-pkgname=deepin-terminal
-version=5.0.0
-revision=2
-build_style=cmake
-build_helper="gir"
-configure_args="-DTEST_BUILD=OFF -DUSE_VENDOR_LIB=OFF"
-hostmakedepends="glib-devel gobject-introspection gperf intltool pkg-config
- vala"
-makedepends="json-glib-devel libgee08-devel librsvg-devel libsecret-devel
- libwnck-devel vala-devel vte3-devel glib-devel gdk-pixbuf-devel"
-depends="deepin-menu expect"
-short_desc="Deepin Terminal"
-maintainer="John <me@johnnynator.dev>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/linuxdeepin/deepin-terminal"
-changelog="https://github.com/linuxdeepin/deepin-terminal/blob/master/CHANGELOG.md"
-distfiles="https://github.com/linuxdeepin/deepin-terminal/archive/${version}.tar.gz"
-checksum=fc0586a48f85a8151602c205004118429f22c504cd25881eecfd553849fe35f2
-
-case $XBPS_TARGET_MACHINE in
- *-musl) CFLAGS="-DREG_NOERROR=REG_OK"
-esac
-
-post_patch() {
- # latest vala string#to_utf8() return char[]
- # but term.feed_child expects "unowned uint8[]"
- vsed -i 's/[.]to_utf8()/.data/g' \
- widget/command_panel.vala \
- widget/terminal.vala \
- widget/workspace.vala
-}
From da86178c7442fe0df22d7e6ad5e0082930f19c66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 11 Nov 2020 15:43:34 +0100
Subject: [PATCH 19/22] Remove package: deepin-turbo
---
srcpkgs/deepin-turbo-devel | 1 -
srcpkgs/deepin-turbo/patches/elogind.patch | 11 -------
srcpkgs/deepin-turbo/patches/musl.patch | 34 ----------------------
srcpkgs/deepin-turbo/template | 25 ----------------
4 files changed, 71 deletions(-)
delete mode 120000 srcpkgs/deepin-turbo-devel
delete mode 100644 srcpkgs/deepin-turbo/patches/elogind.patch
delete mode 100644 srcpkgs/deepin-turbo/patches/musl.patch
delete mode 100644 srcpkgs/deepin-turbo/template
diff --git a/srcpkgs/deepin-turbo-devel b/srcpkgs/deepin-turbo-devel
deleted file mode 120000
index 2812f472a8a..00000000000
--- a/srcpkgs/deepin-turbo-devel
+++ /dev/null
@@ -1 +0,0 @@
-deepin-turbo
\ No newline at end of file
diff --git a/srcpkgs/deepin-turbo/patches/elogind.patch b/srcpkgs/deepin-turbo/patches/elogind.patch
deleted file mode 100644
index 59a034b5e18..00000000000
--- a/srcpkgs/deepin-turbo/patches/elogind.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/launcherlib/CMakeLists.txt 2018-08-31 07:19:31.000000000 +0200
-+++ - 2018-08-31 10:48:25.243608023 +0200
-@@ -14,7 +14,7 @@
-
- # Set libraries to be linked. Shared libraries to be preloaded are not linked in anymore,
- # but dlopen():ed and listed in src/launcher/preload.h instead.
--link_libraries(${LIBDL} "-L/lib -lsystemd")
-+link_libraries(${LIBDL} "-L/lib -lelogind")
-
- # Set executable
- add_library(deepin-turbo MODULE ${SRC} ${MOC_SRC})
diff --git a/srcpkgs/deepin-turbo/patches/musl.patch b/srcpkgs/deepin-turbo/patches/musl.patch
deleted file mode 100644
index ec953f5b63d..00000000000
--- a/srcpkgs/deepin-turbo/patches/musl.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/invoker/invoker.c 2018-08-31 07:19:31.000000000 +0200
-+++ - 2018-08-31 12:26:25.514301761 +0200
-@@ -26,7 +26,6 @@
- #include <string.h>
- #include <signal.h>
- #include <sys/socket.h>
--#include <bits/socket.h>
- #include <sys/un.h>
- #include <sys/uio.h>
- #include <sys/time.h>
---- src/launcherlib/booster.cpp 2018-08-31 12:08:21.962843593 +0200
-+++ - 2018-08-31 12:30:57.972278758 +0200
-@@ -586,7 +586,7 @@
- else
- dlopenFlags |= RTLD_LOCAL;
-
--#if (PLATFORM_ID == Linux)
-+#if defined(__GLIBC__)
- if (m_appData->dlopenDeep())
- dlopenFlags |= RTLD_DEEPBIND;
- #endif
---- src/launcherlib/booster.cpp 2018-08-31 12:49:54.813076172 +0200
-+++ - 2018-08-31 12:50:06.767009507 +0200
-@@ -49,6 +49,10 @@
-
- #include "coverage.h"
-
-+#if !defined(__GLIBC__)
-+#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src)
-+#endif
-+
- Booster::Booster() :
- m_appData(new AppData),
- m_connection(NULL),
diff --git a/srcpkgs/deepin-turbo/template b/srcpkgs/deepin-turbo/template
deleted file mode 100644
index c9d0eb96cb0..00000000000
--- a/srcpkgs/deepin-turbo/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'deepin-turbo'
-pkgname=deepin-turbo
-version=0.0.3
-revision=1
-build_style=cmake
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="qt5-devel elogind-devel"
-short_desc="Daemon that helps to launch applications faster"
-maintainer="John <me@johnnynator.dev>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/linuxdeepin/deepin-turbo"
-distfiles="https://github.com/linuxdeepin/deepin-turbo/archive/${version}.tar.gz"
-checksum=bb2a461e69f1738ec02d10c069772cc03a5a6b3570ca64f7e3ab3c0ade06f620
-
-post_install() {
- rm -rf usr/lib/systemd
-}
-
-deepin-turbo-devel_package() {
- short_desc+=" - Development files"
- depends="${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- }
-}
From e131bfe0c52e113cd9ec5e283a7cae6f5d08b27e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 11 Nov 2020 15:43:49 +0100
Subject: [PATCH 20/22] Remove package: deepin-voice-recorder
---
.../patches/QPainterPath.patch | 20 -------------------
srcpkgs/deepin-voice-recorder/template | 19 ------------------
2 files changed, 39 deletions(-)
delete mode 100644 srcpkgs/deepin-voice-recorder/patches/QPainterPath.patch
delete mode 100644 srcpkgs/deepin-voice-recorder/template
diff --git a/srcpkgs/deepin-voice-recorder/patches/QPainterPath.patch b/srcpkgs/deepin-voice-recorder/patches/QPainterPath.patch
deleted file mode 100644
index fcd76ba7248..00000000000
--- a/srcpkgs/deepin-voice-recorder/patches/QPainterPath.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/file_item.h 2019-07-08 08:40:03.000000000 +0200
-+++ src/file_item.h 2020-09-01 17:57:09.549654988 +0200
-@@ -28,6 +28,7 @@
- #include <QHBoxLayout>
- #include <QLabel>
- #include <QListWidgetItem>
-+#include <QPainterPath>
- #include <QWidget>
-
- #include "dimagebutton.h"
---- src/waveform.cpp 2019-07-08 08:40:03.000000000 +0200
-+++ src/waveform.cpp 2020-09-01 17:56:23.137652593 +0200
-@@ -27,6 +27,7 @@
- #include <QPaintEvent>
- #include <QApplication>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QTime>
- #include <QTimer>
- #include <QWidget>
diff --git a/srcpkgs/deepin-voice-recorder/template b/srcpkgs/deepin-voice-recorder/template
deleted file mode 100644
index dab27614b73..00000000000
--- a/srcpkgs/deepin-voice-recorder/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'deepin-voice-recorder'
-pkgname=deepin-voice-recorder
-version=5.0.0
-revision=2
-build_style=qmake
-hostmakedepends="qt5-qmake pkg-config"
-makedepends="qt5-multimedia-devel dtkwidget-devel ffmpeg-devel pulseaudio-devel"
-depends="qt5integration gst-plugins-good1-qt5"
-short_desc="Deepin voice recorder"
-maintainer="John <me@johnnynator.dev>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/linuxdeepin/deepin-voice-recorder/"
-changelog="https://raw.githubusercontent.com/linuxdeepin/deepin-voice-recorder/${version}/CHANGELOG.md"
-distfiles="https://github.com/linuxdeepin/deepin-voice-recorder/archive/${version}.tar.gz"
-checksum=6dd29ec20ca0bcbb5f12059b2505d52ddbbab6837257756a84cb9f41adeab023
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-multimedia-devel"
-fi
From c58404d9af7b30544d74eb0f22aaa4140f6aec5c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 11 Nov 2020 15:44:10 +0100
Subject: [PATCH 21/22] Remove package: qt5dxcb-plugin
---
.../deepin-qt5dxcb-plugin-qt5.15.patch | 119 ------------------
srcpkgs/qt5dxcb-plugin/template | 37 ------
2 files changed, 156 deletions(-)
delete mode 100644 srcpkgs/qt5dxcb-plugin/patches/deepin-qt5dxcb-plugin-qt5.15.patch
delete mode 100644 srcpkgs/qt5dxcb-plugin/template
diff --git a/srcpkgs/qt5dxcb-plugin/patches/deepin-qt5dxcb-plugin-qt5.15.patch b/srcpkgs/qt5dxcb-plugin/patches/deepin-qt5dxcb-plugin-qt5.15.patch
deleted file mode 100644
index bb0782d1413..00000000000
--- a/srcpkgs/qt5dxcb-plugin/patches/deepin-qt5dxcb-plugin-qt5.15.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-diff --git a/platformplugin/dplatformwindowhelper.cpp b/platformplugin/dplatformwindowhelper.cpp
-index de4478d..a85f14e 100644
---- platformplugin/dplatformwindowhelper.cpp
-+++ platformplugin/dplatformwindowhelper.cpp
-@@ -35,6 +35,8 @@
- #include <private/qguiapplication_p.h>
- #include <qpa/qplatformcursor.h>
-
-+#include <QPainterPath>
-+
- Q_DECLARE_METATYPE(QPainterPath)
- Q_DECLARE_METATYPE(QMargins)
-
-@@ -511,10 +513,17 @@ bool DPlatformWindowHelper::setWindowModified(bool modified)
- return me()->m_frameWindow->handle()->setWindowModified(modified);
- }
-
-+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
- bool DPlatformWindowHelper::startSystemResize(const QPoint &pos, Qt::Corner corner)
- {
- return me()->m_frameWindow->handle()->startSystemResize(pos, corner);
- }
-+#else
-+bool DPlatformWindowHelper::startSystemResize(Qt::Edges edges)
-+{
-+ return me()->m_frameWindow->handle()->startSystemResize(edges);
-+}
-+#endif
-
- void DPlatformWindowHelper::setFrameStrutEventsEnabled(bool enabled)
- {
-diff --git a/platformplugin/dplatformwindowhelper.h b/platformplugin/dplatformwindowhelper.h
-index 8d9fa14..e43809a 100644
---- platformplugin/dplatformwindowhelper.h
-+++ platformplugin/dplatformwindowhelper.h
-@@ -92,8 +92,12 @@ public:
-
- bool setWindowModified(bool modified);
-
-+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
- bool startSystemResize(const QPoint &pos, Qt::Corner corner);
--
-+#else
-+ bool startSystemResize(Qt::Edges edges);
-+#endif
-+
- void setFrameStrutEventsEnabled(bool enabled);
- bool frameStrutEventsEnabled() const;
-
-diff --git a/platformplugin/linux.pri b/platformplugin/linux.pri
-index 3be1e5f..59e237a 100644
---- platformplugin/linux.pri
-+++ platformplugin/linux.pri
-@@ -30,26 +30,37 @@ contains(QT_CONFIG, xcb-xlib)|qtConfig(xcb-xlib) {
- DEFINES += XCB_USE_XLIB
- QMAKE_USE += xcb_xlib
-
-- greaterThan(QT_MINOR_VERSION, 11) {
-- contains(QT_CONFIG, xcb-xinput)|qtConfig(xcb-xinput) {
-- DEFINES += XCB_USE_XINPUT2 XCB_USE_XINPUT21 XCB_USE_XINPUT22
-- QMAKE_USE += xcb_xinput
-+ greaterThan(QT_MINOR_VERSION, 14) {
-+ DEFINES += XCB_USE_XINPUT2 XCB_USE_XINPUT21 XCB_USE_XINPUT22
-+ QMAKE_USE += xcb_xinput
-
-- !isEmpty(QMAKE_LIBXI_VERSION_MAJOR) {
-- DEFINES += LIBXI_MAJOR=$$QMAKE_LIBXI_VERSION_MAJOR \
-- LIBXI_MINOR=$$QMAKE_LIBXI_VERSION_MINOR \
-- LIBXI_PATCH=$$QMAKE_LIBXI_VERSION_PATCH
-- }
-+ !isEmpty(QMAKE_LIBXI_VERSION_MAJOR) {
-+ DEFINES += LIBXI_MAJOR=$$QMAKE_LIBXI_VERSION_MAJOR \
-+ LIBXI_MINOR=$$QMAKE_LIBXI_VERSION_MINOR \
-+ LIBXI_PATCH=$$QMAKE_LIBXI_VERSION_PATCH
- }
- } else {
-- contains(QT_CONFIG, xinput2)|qtConfig(xinput2) {
-- DEFINES += XCB_USE_XINPUT2
-- QMAKE_USE += xinput2
-+ greaterThan(QT_MINOR_VERSION, 11) {
-+ contains(QT_CONFIG, xcb-xinput)|qtConfig(xcb-xinput) {
-+ DEFINES += XCB_USE_XINPUT2 XCB_USE_XINPUT21 XCB_USE_XINPUT22
-+ QMAKE_USE += xcb_xinput
-+
-+ !isEmpty(QMAKE_LIBXI_VERSION_MAJOR) {
-+ DEFINES += LIBXI_MAJOR=$$QMAKE_LIBXI_VERSION_MAJOR \
-+ LIBXI_MINOR=$$QMAKE_LIBXI_VERSION_MINOR \
-+ LIBXI_PATCH=$$QMAKE_LIBXI_VERSION_PATCH
-+ }
-+ }
-+ } else {
-+ contains(QT_CONFIG, xinput2)|qtConfig(xinput2) {
-+ DEFINES += XCB_USE_XINPUT2
-+ QMAKE_USE += xinput2
-
-- !isEmpty(QMAKE_LIBXI_VERSION_MAJOR) {
-- DEFINES += LIBXI_MAJOR=$$QMAKE_LIBXI_VERSION_MAJOR \
-- LIBXI_MINOR=$$QMAKE_LIBXI_VERSION_MINOR \
-- LIBXI_PATCH=$$QMAKE_LIBXI_VERSION_PATCH
-+ !isEmpty(QMAKE_LIBXI_VERSION_MAJOR) {
-+ DEFINES += LIBXI_MAJOR=$$QMAKE_LIBXI_VERSION_MAJOR \
-+ LIBXI_MINOR=$$QMAKE_LIBXI_VERSION_MINOR \
-+ LIBXI_PATCH=$$QMAKE_LIBXI_VERSION_PATCH
-+ }
- }
- }
- }
-diff --git a/platformplugin/utility.h b/platformplugin/utility.h
-index 2e819e1..d3b2677 100644
---- platformplugin/utility.h
-+++ platformplugin/utility.h
-@@ -19,6 +19,7 @@
- #define UTILITY_H
-
- #include <QImage>
-+#include <QPainterPath>
-
- #include "global.h"
-
diff --git a/srcpkgs/qt5dxcb-plugin/template b/srcpkgs/qt5dxcb-plugin/template
deleted file mode 100644
index 615526f7d5f..00000000000
--- a/srcpkgs/qt5dxcb-plugin/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'qt5dxcb-plugin'
-pkgname=qt5dxcb-plugin
-version=5.0.11
-revision=2
-wrksrc="qt5platform-plugins-${version}"
-build_style=qmake
-make_build_args="VERSION=${version}"
-hostmakedepends="pkg-config qt5-qmake"
-makedepends="cairo-devel libSM-devel libXi-devel libxkbcommon-devel
- qt5-x11extras-devel xcb-util-image-devel xcb-util-keysyms-devel
- xcb-util-renderutil-devel xcb-util-wm-devel qt5-xcb-private-headers"
-depends="qt5-core>=5.15.1<5.15.2"
-short_desc="Qt platform plugins for DDE"
-maintainer="John <me@johnnynator.dev>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/linuxdeepin/qt5platform-plugins"
-distfiles="https://github.com/linuxdeepin/qt5platform-plugins/archive/${version}.tar.gz"
-checksum=46b55b3114a2b028c64f5e88bdc01db31670a33f00969acc1ce8eb98af8a089c
-
-pre_configure() {
- _qt5_dep_ver="${depends#*>=}"
- _qt5_dep_ver="${_qt5_dep_ver%<*}"
- _qt5_version="$(xbps-uhelper version qt5-core)"
-
- if [[ "${_qt5_version%_*}" != "${_qt5_dep_ver}" ]]; then
- echo
- msg_red "Qt5 version doesn't match version listed in \$depends\\n"
- msg_red "${_qt5_version%_*} does not match ${_qt5_dep_ver}\\n"
- exit 1
- fi
- sed -i "s|error(Not support Qt Version: .*)|INCLUDEPATH += ${XBPS_CROSS_BASE}/usr/include/qt5xcb-private|" platformplugin/linux.pri
- sed -i 's/active = VtableHook::overrideVfptrFun.*/active = 1;/' platformplugin/dhighdpi.cpp
-}
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-x11extras-devel"
-fi
From 97a6009de5732abf9036449b82aaa84a7c519aeb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 11 Nov 2020 15:44:20 +0100
Subject: [PATCH 22/22] Remove package: qt5integration
every update attempt of the deepin software stack resulted in some pain
or some kind of breakage somewhere. Since nobody else seems to be
intrested in updating it, remove it.
---
srcpkgs/qt5integration/patches/qt5.13.patch | 9 ----
srcpkgs/qt5integration/patches/qt5.14.patch | 46 ---------------------
srcpkgs/qt5integration/patches/qt5.15.patch | 40 ------------------
srcpkgs/qt5integration/template | 40 ------------------
4 files changed, 135 deletions(-)
delete mode 100644 srcpkgs/qt5integration/patches/qt5.13.patch
delete mode 100644 srcpkgs/qt5integration/patches/qt5.14.patch
delete mode 100644 srcpkgs/qt5integration/patches/qt5.15.patch
delete mode 100644 srcpkgs/qt5integration/template
diff --git a/srcpkgs/qt5integration/patches/qt5.13.patch b/srcpkgs/qt5integration/patches/qt5.13.patch
deleted file mode 100644
index 8cb82dd8e10..00000000000
--- a/srcpkgs/qt5integration/patches/qt5.13.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- dstyleplugin/style.cpp 2019-06-01 04:49:41.000000000 +0000
-+++ - 2019-07-12 20:48:16.221885362 +0000
-@@ -1418,6 +1418,4 @@
- }
- }
-
--#include "moc_style.cpp"
--
- }
diff --git a/srcpkgs/qt5integration/patches/qt5.14.patch b/srcpkgs/qt5integration/patches/qt5.14.patch
deleted file mode 100644
index abe90b78c9c..00000000000
--- a/srcpkgs/qt5integration/patches/qt5.14.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/platformthemeplugin/qdeepintheme.cpp b/platformthemeplugin/qdeepintheme.cpp
-index e98487b..45e90bc 100644
---- platformthemeplugin/qdeepintheme.cpp
-+++ platformthemeplugin/qdeepintheme.cpp
-@@ -571,10 +571,18 @@ static bool updateScreenScaleFactors(DThemeSettings *s, const QByteArray &value,
- }
-
- QHighDpiScaling::updateHighDpiScaling();
-+#if QT_VERSION < QT_VERSION_CHECK(5,14,0)
- qDebug() << QHighDpiScaling::logicalDpi();
-+#else
-+ qDebug() << QHighDpiScaling::logicalDpi(QGuiApplication::primaryScreen());
-+#endif
- updateScaleLogcailDpi(s->scaleLogicalDpi());
-
-+#if QT_VERSION < QT_VERSION_CHECK(5,14,0)
- qDebug() << QHighDpiScaling::logicalDpi();
-+#else
-+ qDebug() << QHighDpiScaling::logicalDpi(QGuiApplication::primaryScreen());
-+#endif
-
- return true;
- }
---- platformthemeplugin/qdeepintheme.cpp 2019-12-19 17:45:47.396894045 +0800
-+++ platformthemeplugin/qdeepintheme.cpp 2019-12-19 17:46:28.436136243 +0800
-@@ -516,19 +516,7 @@
- static bool updateScaleLogcailDpi(const QPair<qreal, qreal> &dpi)
- {
- bool ok = dpi.first >= 0 && dpi.second >= 0;
--
-- if (dpi.first > 0) {
-- QHighDpiScaling::m_logicalDpi.first = dpi.first;
-- } else if (qIsNull(dpi.first)) {
-- QHighDpiScaling::m_logicalDpi.first = qGuiApp->primaryScreen()->handle()->logicalDpi().first;
-- }
--
-- if (dpi.second > 0) {
-- QHighDpiScaling::m_logicalDpi.second = dpi.second;
-- } else if (qIsNull(dpi.second)) {
-- QHighDpiScaling::m_logicalDpi.second = qGuiApp->primaryScreen()->handle()->logicalDpi().second;
-- }
--
-+ QHighDpiScaling::m_usePixelDensity = false;
- return ok;
- }
-
diff --git a/srcpkgs/qt5integration/patches/qt5.15.patch b/srcpkgs/qt5integration/patches/qt5.15.patch
deleted file mode 100644
index 991b6a3a615..00000000000
--- a/srcpkgs/qt5integration/patches/qt5.15.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- dstyleplugin/painterhelper.cpp 2019-06-01 06:49:41.000000000 +0200
-+++ - 2020-06-13 19:53:12.351525353 +0200
-@@ -18,6 +18,7 @@
- #include "painterhelper.h"
-
- #include <QPainter>
-+#include <QPainterPath>
- #include <QDebug>
-
- namespace dstyle {
---- dstyleplugin/tabwidgethelper.cpp 2019-06-01 06:49:41.000000000 +0200
-+++ - 2020-06-13 19:55:48.688315440 +0200
-@@ -20,6 +20,7 @@
- #include "painterhelper.h"
-
- #include <QPainter>
-+#include <QPainterPath>
- #include <QTabWidget>
- #include <QDebug>
-
---- dstyleplugin/pushbuttonhelper.cpp 2019-06-01 06:49:41.000000000 +0200
-+++ - 2020-06-13 19:59:30.207650141 +0200
-@@ -29,6 +29,7 @@
- #endif
-
- #include <QDebug>
-+#include <QPainterPath>
- #include <QStyleOptionButton>
-
- DWIDGET_USE_NAMESPACE
---- dstyleplugin/tabbarhelper.cpp 2019-06-01 06:49:41.000000000 +0200
-+++ - 2020-06-13 19:59:51.345283503 +0200
-@@ -33,6 +33,7 @@
- #include <QStyleOptionTabBarBase>
- #include <QStyleOptionToolButton>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QToolButton>
- #include <QLinearGradient>
- #include <QDebug>
diff --git a/srcpkgs/qt5integration/template b/srcpkgs/qt5integration/template
deleted file mode 100644
index f083e559d83..00000000000
--- a/srcpkgs/qt5integration/template
+++ /dev/null
@@ -1,40 +0,0 @@
-# Template file for 'qt5integration'
-pkgname=qt5integration
-version=5.0.0
-revision=7
-build_style=qmake
-hostmakedepends="qt5-qmake pkg-config"
-makedepends="libqtxdg-devel dtkwm-devel dtkwidget-devel mtdev-devel
- qt5-svg-devel qt5-x11extras-devel qt5-multimedia-devel"
-depends="qt5dxcb-plugin qt5-styleplugins qt5-core>=5.15.1<5.15.2"
-short_desc="Qt platform theme integration plugins for Deepin Desktop Environment"
-maintainer="John <me@johnnynator.dev>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/linuxdeepin/qt5integration"
-changelog="https://github.com/linuxdeepin/qt5integration/blob/${version}/CHANGELOG.md"
-distfiles="https://github.com/linuxdeepin/qt5integration/archive/${version}.tar.gz"
-checksum=59eff73ea16ded0a54fe91a08168d53b96f6e7fe9a53b599ba37346b283d6a7c
-
-pre_configure() {
- _qt5_dep_ver="${depends#*>=}"
- _qt5_dep_ver="${_qt5_dep_ver%<*}"
- _qt5_version="$(xbps-uhelper version qt5-core)"
-
- if [[ "${_qt5_version%_*}" != "${_qt5_dep_ver}" ]]; then
- echo
- msg_red "Qt5 version doesn't match version listed in \$depends\\n"
- msg_red "${_qt5_version%_*} does not match ${_qt5_dep_ver}\\n"
- exit 1
- fi
-}
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-devel qt5-x11extras-devel"
- pre_configure() {
- _qtxdg_version=$(PKG_CONFIG_PATH=${XBPS_CROSS_BASE}/usr/lib/pkgconfig\
- pkg-config --modversion Qt5XdgIconLoader)
- echo $_qtxdg_version
- sed -i -e "s%INCLUDEPATH +=.*%INCLUDEPATH += ${XBPS_CROSS_BASE}/usr/include/qt5xdgiconloader/${_qtxdg_version}%g"\
- platformthemeplugin/qt5deepintheme-plugin.pro
- }
-fi
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: Remove deepin packages
2020-11-12 16:32 [PR PATCH] Remove deepin packages Johnnynator
@ 2020-11-13 19:08 ` Johnnynator
2021-02-05 21:49 ` gorkawien
2021-02-06 9:14 ` gorkawien
2 siblings, 0 replies; 4+ messages in thread
From: Johnnynator @ 2020-11-13 19:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 332 bytes --]
There's a merged pull request on the void-packages repository
Remove deepin packages
https://github.com/void-linux/void-packages/pull/26321
Description:
every update attempt of the deepin software stack resulted in some pain
or some kind of breakage somewhere. Since nobody else seems to be
intrested in updating it, remove it.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Remove deepin packages
2020-11-12 16:32 [PR PATCH] Remove deepin packages Johnnynator
2020-11-13 19:08 ` [PR PATCH] [Merged]: " Johnnynator
@ 2021-02-05 21:49 ` gorkawien
2021-02-06 9:14 ` gorkawien
2 siblings, 0 replies; 4+ messages in thread
From: gorkawien @ 2021-02-05 21:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 586 bytes --]
New comment by gorkawien on void-packages repository
https://github.com/void-linux/void-packages/pull/26321#issuecomment-774306832
Comment:
I am using deepin-terminal. For me is the best one. From time to time I also use other packages from Deepin. And there ore persons using packages from Deepin and also there a lot of people asking me if they can install DDE.
Also expecting that people using one or more deepin-packages will come here to post that they want to keep them.
Is a pain to maintain these packages? Mounting a cupboard from Ikea is also a pain, but we keep going.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Remove deepin packages
2020-11-12 16:32 [PR PATCH] Remove deepin packages Johnnynator
2020-11-13 19:08 ` [PR PATCH] [Merged]: " Johnnynator
2021-02-05 21:49 ` gorkawien
@ 2021-02-06 9:14 ` gorkawien
2 siblings, 0 replies; 4+ messages in thread
From: gorkawien @ 2021-02-06 9:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 500 bytes --]
New comment by gorkawien on void-packages repository
https://github.com/void-linux/void-packages/pull/26321#issuecomment-774306832
Comment:
I am using deepin-terminal. is my favorite terminal. I don't agree with the statement "nobody else seems to be
intrested in updating it" Well mostly users don't show here to say that they use it packages from deepin (and they don't need to).
Maintaining deepin packages is a pain in the ass??? Well you also have problems while mounting Ikea furniture.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-02-06 9:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-12 16:32 [PR PATCH] Remove deepin packages Johnnynator
2020-11-13 19:08 ` [PR PATCH] [Merged]: " Johnnynator
2021-02-05 21:49 ` gorkawien
2021-02-06 9:14 ` gorkawien
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).