From b284a3168fa91a038925d2ecf5e4791011ea5e7d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 18 Nov 2019 10:15:03 +0000 Subject: gentoo resync : 18.11.2019 --- kde-apps/kcharselect/Manifest | 5 ++-- .../files/kcharselect-19.08.3-qt-5.14.patch | 32 ++++++++++++++++++++++ kde-apps/kcharselect/kcharselect-19.08.2.ebuild | 26 ------------------ kde-apps/kcharselect/kcharselect-19.08.3.ebuild | 32 ++++++++++++++++++++++ 4 files changed, 67 insertions(+), 28 deletions(-) create mode 100644 kde-apps/kcharselect/files/kcharselect-19.08.3-qt-5.14.patch delete mode 100644 kde-apps/kcharselect/kcharselect-19.08.2.ebuild create mode 100644 kde-apps/kcharselect/kcharselect-19.08.3.ebuild (limited to 'kde-apps/kcharselect') diff --git a/kde-apps/kcharselect/Manifest b/kde-apps/kcharselect/Manifest index 43652acaab33..07d015ba0ceb 100644 --- a/kde-apps/kcharselect/Manifest +++ b/kde-apps/kcharselect/Manifest @@ -1,5 +1,6 @@ +AUX kcharselect-19.08.3-qt-5.14.patch 883 BLAKE2B e36b8ed12dc80512080e3025376b2421fc016381a736271ada23a4b3f27aef19720045fc8eec306e3b73a73133690389b285ec410707ab20f9ed28a7137e7de6 SHA512 e5116469f91135842c4cbe18a20a63c58fe83faf1d0972f54761ea1de6fcdccae3a96cefeca40cc00d3782691ecca04eca731a60610d58261d2340262efcf3b8 DIST kcharselect-19.04.3.tar.xz 334100 BLAKE2B 1c0cebe254ffe002f7e0046057223d405e3c76f1187b905175f3ca00a8a37a9740fcddd6a41ee9ab8f583f2d1c03a2c3bf96f278f0293e69189c7f46be68bd68 SHA512 7909a5fe140da1026ad4ce96ae5932d7b20a6894c56f4088445a2fea3bb52d2da9014d76bbaac45b6f503985474ca1b84c2e6764fc5b5ac2e0f5c58f383f9c9d -DIST kcharselect-19.08.2.tar.xz 334740 BLAKE2B 3ffe71c3eb7c140c7130d01fa8268e45827ba0e007495fe9402540a66b1ec399a473e92c565818da98e2ed9acf9ab86f0c35ecef63c3a615044ba08f312048a5 SHA512 4d618a691d1153952b04ad172dc8bd1d87b56f530f05c88c91af3844eacf24ccd0123aec8978bc623009f68dc84b56d917dc4766376ae78115de73b3bff66b92 +DIST kcharselect-19.08.3.tar.xz 334588 BLAKE2B a402cb308f97aa80f1eee4c82ae07b45241cc446c4c49fdd45b895fbd15696a2b8606a10ee7cdf6ad037c2e7faa58ad862475a114269b388d2d0e6d9c09acb64 SHA512 55c20dc0cacd01f27ea047cf8845c47c93d973b954f3a7481f7949417066b56b031c5bacbf39356f92b785f6ad7113aacec391ec81fafafba6a49dd44366855c EBUILD kcharselect-19.04.3.ebuild 657 BLAKE2B d1d07ab10548b2d7f7c9744198faa7d41539bf628566ee7ed9ab19c4b610f0b487f76247b55cac944c71d165e14e8c15850e56495038f1dfdc3941058a2b7be9 SHA512 15527b03a922250e45c95a70c6de2525faef1fb210f5630525d52a4f20c117010f9ccf7e97e3b34d65d52342036e2969ee0e06d1322036a496c890e17af3724c -EBUILD kcharselect-19.08.2.ebuild 660 BLAKE2B 9d74098baf1f92907f529150ed5beaec97b84a7258a82957fc5e52e7f687a64041e6d2fab541f0839574c5a701cea1d5a60ffb08989712ae859d33d7be27f10d SHA512 649239d290fcf62d33ffc92f27c1f592b429a2a6035c4098cc601d0fa52b6db9bd2549c7206df63c8ce80bc00c0224d708fefdcc07500b1792f4fc708b8cfe30 +EBUILD kcharselect-19.08.3.ebuild 832 BLAKE2B 5dfb04cae83e5e3a3e4010be4091ef177dca77e772a9d06f0e4ea6119e49946cb8c59a36d1e2c3a42ff06985f53ffbeb39bf45207ded38cd178ded6b3623d9cd SHA512 9a3a5482636540463952f483b2a79c0dbf7ba0ad5e1e9ae0c5e4579956a3640fa75fd6bce9ff92a68c3aa4ff3468f5821da9667c7bc38082874c98624c772e28 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-apps/kcharselect/files/kcharselect-19.08.3-qt-5.14.patch b/kde-apps/kcharselect/files/kcharselect-19.08.3-qt-5.14.patch new file mode 100644 index 000000000000..884ed6a79628 --- /dev/null +++ b/kde-apps/kcharselect/files/kcharselect-19.08.3-qt-5.14.patch @@ -0,0 +1,32 @@ +From 956b63170b2606fb274f0bd90399dac0ae9dbcd4 Mon Sep 17 00:00:00 2001 +From: Laurent Montel +Date: Tue, 17 Sep 2019 13:41:01 +0200 +Subject: Make it compiles against qt5.14 + +--- + kcharselectdia.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/kcharselectdia.cc b/kcharselectdia.cc +index f1790b5..116cba4 100644 +--- a/kcharselectdia.cc ++++ b/kcharselectdia.cc +@@ -265,7 +265,6 @@ void KCharSelectDia::toClipHTML() + QClipboard *cb = QApplication::clipboard(); + QString input; + QString html; +- QString tempstring; + QChar tempchar; + int i = 0; + +@@ -282,7 +281,7 @@ void KCharSelectDia::toClipHTML() + } + else + { +- html.append(tempstring.sprintf("&#x%x;", tempchar.unicode())); ++ html.append(QString::asprintf("&#x%x;", tempchar.unicode())); + } + } + cb->setText(html); +-- +cgit v1.1 diff --git a/kde-apps/kcharselect/kcharselect-19.08.2.ebuild b/kde-apps/kcharselect/kcharselect-19.08.2.ebuild deleted file mode 100644 index 4cd14723edfa..000000000000 --- a/kde-apps/kcharselect/kcharselect-19.08.2.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KDE_HANDBOOK="forceoptional" -inherit kde5 - -DESCRIPTION="KDE character selection utility" -HOMEPAGE="https://kde.org/applications/utilities/kcharselect -https://utils.kde.org/projects/kcharselect/" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="" - -DEPEND=" - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) -" -RDEPEND="${DEPEND}" diff --git a/kde-apps/kcharselect/kcharselect-19.08.3.ebuild b/kde-apps/kcharselect/kcharselect-19.08.3.ebuild new file mode 100644 index 000000000000..848cd028f8e6 --- /dev/null +++ b/kde-apps/kcharselect/kcharselect-19.08.3.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="forceoptional" +KFMIN=5.60.0 +QTMIN=5.12.3 +inherit ecm kde.org + +DESCRIPTION="KDE character selection utility" +HOMEPAGE="https://kde.org/applications/utilities/kcharselect +https://utils.kde.org/projects/kcharselect/" +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="" + +DEPEND=" + >=kde-frameworks/kbookmarks-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-qt-5.14.patch ) -- cgit v1.2.3