* [PR PATCH] kadu: remove package.
@ 2021-01-24 20:11 ericonr
2021-01-25 9:56 ` [PR PATCH] [Merged]: " pullmoll
0 siblings, 1 reply; 2+ messages in thread
From: ericonr @ 2021-01-24 20:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1646 bytes --]
There is a new pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages kadu
https://github.com/void-linux/void-packages/pull/28191
kadu: remove package.
No longer working or necessary.
Closes #12548
@pullmoll
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28191.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kadu-28191.patch --]
[-- Type: text/x-diff, Size: 9073 bytes --]
From 2910753d2742a94f12c5c0ca9a1b55681ad0f5a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 24 Jan 2021 17:10:40 -0300
Subject: [PATCH] kadu: remove package.
No longer working or necessary.
Closes #12548
---
srcpkgs/kadu-devel | 1 -
srcpkgs/kadu/patches/cmake-find-x11.patch | 40 -------------
srcpkgs/kadu/patches/gcc7.patch | 12 ----
srcpkgs/kadu/patches/qt5-5.15.0.patch | 10 ----
srcpkgs/kadu/patches/qt5-qcompare.patch | 11 ----
srcpkgs/kadu/patches/qt5-qdatastream.patch | 12 ----
srcpkgs/kadu/template | 65 ----------------------
srcpkgs/removed-packages/template | 1 +
8 files changed, 1 insertion(+), 151 deletions(-)
delete mode 120000 srcpkgs/kadu-devel
delete mode 100644 srcpkgs/kadu/patches/cmake-find-x11.patch
delete mode 100644 srcpkgs/kadu/patches/gcc7.patch
delete mode 100644 srcpkgs/kadu/patches/qt5-5.15.0.patch
delete mode 100644 srcpkgs/kadu/patches/qt5-qcompare.patch
delete mode 100644 srcpkgs/kadu/patches/qt5-qdatastream.patch
delete mode 100644 srcpkgs/kadu/template
diff --git a/srcpkgs/kadu-devel b/srcpkgs/kadu-devel
deleted file mode 120000
index c6b22664110..00000000000
--- a/srcpkgs/kadu-devel
+++ /dev/null
@@ -1 +0,0 @@
-kadu
\ No newline at end of file
diff --git a/srcpkgs/kadu/patches/cmake-find-x11.patch b/srcpkgs/kadu/patches/cmake-find-x11.patch
deleted file mode 100644
index acd56b65720..00000000000
--- a/srcpkgs/kadu/patches/cmake-find-x11.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- kadu-core/CMakeLists.txt 2017-01-24 22:36:21.000000000 +0100
-+++ kadu-core/CMakeLists.txt 2019-10-27 08:50:28.152486629 +0100
-@@ -111,7 +111,6 @@
- list (APPEND ADDITIONAL_LIBKADU_LIBRARIES ${LibArchive_LIBRARIES})
-
- if (UNIX AND NOT APPLE)
-- find_package (X11 REQUIRED COMPONENTS X11 Xutil Xfixes)
- if (X11_FOUND AND X11_Xutil_FOUND AND X11_Xfixes_FOUND)
- message (STATUS "Found required X11 libraries: ${X11_X11_LIB};${X11_Xfixes_LIB}")
- else ()
---- plugins/idle/CMakeLists.txt 2017-01-24 22:36:22.000000000 +0100
-+++ plugins/idle/CMakeLists.txt 2019-10-27 08:52:28.448492835 +0100
-@@ -15,7 +15,6 @@
- )
-
- if (UNIX AND NOT APPLE)
-- find_package (X11 REQUIRED COMPONENTS X11 Xutil Xscreensaver)
- if (X11_Xscreensaver_FOUND)
- message (STATUS "Found required X11 libraries: ${X11_X11_LIB};${X11_Xscreensaver_LIB}")
- else ()
---- plugins/pcspeaker/CMakeLists.txt 2017-01-24 22:36:22.000000000 +0100
-+++ plugins/pcspeaker/CMakeLists.txt 2019-10-27 08:55:53.297503403 +0100
-@@ -15,7 +15,6 @@
- set (LIBRARIES "")
-
- if (UNIX AND NOT APPLE)
-- find_package (X11 REQUIRED COMPONENTS X11)
- if (NOT X11_FOUND)
- message (SEND_ERROR "Could NOT find X11")
- endif ()
---- plugins/screenshot/CMakeLists.txt 2017-01-24 22:36:22.000000000 +0100
-+++ plugins/screenshot/CMakeLists.txt 2019-10-27 09:02:31.066523924 +0100
-@@ -30,7 +30,6 @@
-
- if (UNIX AND NOT APPLE)
- set (PLUGIN_ADDITIONAL_QT_MODULES X11Extras)
-- find_package (X11 REQUIRED COMPONENTS X11 Xext Xshape)
- if (X11_Xshape_FOUND)
- message (STATUS "Found required X11 libraries: ${X11_X11_LIB};${X11_Xext_LIB}")
- else ()
diff --git a/srcpkgs/kadu/patches/gcc7.patch b/srcpkgs/kadu/patches/gcc7.patch
deleted file mode 100644
index 7c76910edad..00000000000
--- a/srcpkgs/kadu/patches/gcc7.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git kadu-core/plugin/dependency-graph/plugin-dependency-graph-builder.h kadu-core/plugin/dependency-graph/plugin-dependency-graph-builder.h
-index 1e6a500..a231cba 100644
---- kadu-core/plugin/dependency-graph/plugin-dependency-graph-builder.h
-+++ kadu-core/plugin/dependency-graph/plugin-dependency-graph-builder.h
-@@ -22,6 +22,7 @@
- #include <QtCore/QObject>
- #include <map>
- #include <set>
-+#include <functional>
-
- #include "exports.h"
- #include "plugin/dependency-graph/plugin-dependency-graph.h"
diff --git a/srcpkgs/kadu/patches/qt5-5.15.0.patch b/srcpkgs/kadu/patches/qt5-5.15.0.patch
deleted file mode 100644
index ebc6e5fa93c..00000000000
--- a/srcpkgs/kadu/patches/qt5-5.15.0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kadu-core/gui/widgets/avatar-painter.cpp 2017-01-24 22:36:21.000000000 +0100
-+++ kadu-core/gui/widgets/avatar-painter.cpp 2020-08-07 20:18:18.050176596 +0200
-@@ -22,6 +22,7 @@
-
- #include <QtCore/QModelIndex>
- #include <QtGui/QPainter>
-+#include <QtGui/QPainterPath>
- #include <QtGui/QPixmap>
- #include <QtGui/QPixmapCache>
- #include <QtWidgets/QStyleOptionViewItem>
diff --git a/srcpkgs/kadu/patches/qt5-qcompare.patch b/srcpkgs/kadu/patches/qt5-qcompare.patch
deleted file mode 100644
index 03da5cadee3..00000000000
--- a/srcpkgs/kadu/patches/qt5-qcompare.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kadu-core/plugin/state/plugin-state.test.cpp 2017-01-24 22:36:21.000000000 +0100
-+++ kadu-core/plugin/state/plugin-state.test.cpp 2020-06-04 19:24:50.219823920 +0200
-@@ -34,7 +34,7 @@
-
- void PluginStateTest::newTest()
- {
-- QCOMPARE(pluginStateToString(PluginState::New), {});
-+ QCOMPARE(pluginStateToString(PluginState::New), nullptr);
- QCOMPARE(stringToPluginState(""), PluginState::New);
- QCOMPARE(stringToPluginState("New"), PluginState::New);
- QCOMPARE(stringToPluginState("Invalid"), PluginState::New);
diff --git a/srcpkgs/kadu/patches/qt5-qdatastream.patch b/srcpkgs/kadu/patches/qt5-qdatastream.patch
deleted file mode 100644
index 2f8a9aeee25..00000000000
--- a/srcpkgs/kadu/patches/qt5-qdatastream.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Qt5 since 5.5.0 needs explicit include of QDataStream
-
---- kadu-core/os/single-application/single-application.cpp 2015-03-24 22:13:18.000000000 +0100
-+++ kadu-core/os/single-application/single-application.cpp 2015-07-10 22:10:02.633790611 +0200
-@@ -30,6 +30,7 @@
- #include <QtCore/QRegExp>
- #include <QtNetwork/QLocalServer>
- #include <QtNetwork/QLocalSocket>
-+#include <QDataStream>
- #include <memory>
-
- #if defined(Q_OS_WIN)
diff --git a/srcpkgs/kadu/template b/srcpkgs/kadu/template
deleted file mode 100644
index 8587198ae71..00000000000
--- a/srcpkgs/kadu/template
+++ /dev/null
@@ -1,65 +0,0 @@
-# Template file for 'kadu'
-pkgname=kadu
-version=4.3
-revision=6
-build_style=cmake
-configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr
- -DX11_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
- -DX11_FOUND=1 -DX11_Xutil_FOUND=1 -DX11_Xshape_FOUND=1
- -DX11_Xfixes_FOUND=1 -DX11_Xscreensaver_FOUND=1
- -DX11_X11_LIB=X11 -DX11_Xext_LIB=Xext
- -DX11_Xfixes_LIB=Xfixes -DX11_Xscreensaver_LIB=Xss
- -DQCA2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/QtCrypto
- -DQCA2_LIBRARIES=qca -DENABLE_TESTS=OFF -Wno-dev"
-hostmakedepends="pkg-config qt5-host-tools"
-makedepends="libao-devel libsndfile-devel libarchive-devel
- enchant-devel injeqt-devel libgadu-devel libidn-devel libotr-devel
- qt5-devel qt5-xmlpatterns-devel qt5-declarative-devel qt5-multimedia-devel
- qt5-script-devel qt5-svg-devel qt5-tools-devel qt5-webkit-devel qt5-x11extras-devel
- qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- libmpdclient-devel qca-qt5-devel qxmpp-devel phonon-qt5-devel
- libX11-devel libXfixes-devel libXScrnSaver-devel"
-depends="hicolor-icon-theme qca-qt5-ossl
- $(vopt_if mysql qt5-plugin-mysql) $(vopt_if odbc qt5-plugin-odbc)
- $(vopt_if pgsql qt5-plugin-pgsql) $(vopt_if sqlite qt5-plugin-sqlite)
- $(vopt_if tds qt5-plugin-tds)"
-short_desc="Instant Messenger client"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
-homepage="https://sourceforge.net/projects/kadu/"
-distfiles="${SOURCEFORGE_SITE}/kadu/${version}/kadu-${version}.tar.bz2"
-checksum=ad5d1cbb908c3cd07f2955d343d44b993cd5639427a48a2912441955cfd2bd6e
-replaces="kadu-data>=0"
-
-build_options="mysql odbc pgsql sqlite tds"
-build_options_default="sqlite"
-desc_option_mysql="Use MySQL database plugin"
-desc_option_odbc="Use ODBC database plugin"
-desc_option_pgsql="Use PostgreSQL database plugin"
-desc_option_sqlite="Use SQlite database plugin"
-desc_option_tds="Use Tabular Data Stream database plugin"
-
-if [ -n "$CROSS_BUILD" ]; then
- hostmakedepends+=" ${makedepends}"
-fi
-
-pre_configure() {
- # Disable plugins which require pkgs Void does not ship (yet)
- # unity_integration: Ubuntu
- # indicator_docking: requires messaging-menu
- # word_fix: not packaged
- sed -i ${wrksrc}/Plugins.cmake \
- -e "s;unity_integration$;;" \
- -e "s;indicator_docking$;;" \
- -e "s;word_fix$;;"
-}
-
-kadu-devel_package() {
- short_desc+=" - development files"
- depends="${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/share/cmake
- vmove usr/share/kadu/sdk
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index adc3b867bb6..31635784366 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -38,6 +38,7 @@ replaces="
libgtkhtml<=4.10.0_1
httperf<=0.9.0_9
isl16<=0.16_2
+ kadu<=4.3_6
keepassx<=0.4.4_2
libapp<=20140527_2
libdbusmenu-qt<=0.9.2_4
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: kadu: remove package.
2021-01-24 20:11 [PR PATCH] kadu: remove package ericonr
@ 2021-01-25 9:56 ` pullmoll
0 siblings, 0 replies; 2+ messages in thread
From: pullmoll @ 2021-01-25 9:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1498 bytes --]
There's a merged pull request on the void-packages repository
kadu: remove package.
https://github.com/void-linux/void-packages/pull/28191
Description:
No longer working or necessary.
Closes #12548
@pullmoll
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-01-25 9:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-24 20:11 [PR PATCH] kadu: remove package ericonr
2021-01-25 9:56 ` [PR PATCH] [Merged]: " pullmoll
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).