[gentoo-commits] repo/gentoo:master commit in: app-office/libalkimia/files/, app-office/libalkimia/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: app-office/libalkimia/files/, app-office/libalkimia/
@ 2017-07-06 12:51 Michael Palimaka
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2017-07-06 12:51 UTC (permalink / raw
  To: gentoo-commits

commit:     5a794c8b903c955fe509a9cbb6c7ba9cca9a7498
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  6 12:51:07 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jul  6 12:51:33 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a794c8b

app-office/libalkimia: remove 4.3.2-r1

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-office/libalkimia/Manifest                     |  1 -
 .../libalkimia/files/libalkimia-4.3.2-doc.patch    | 34 ----------------------
 app-office/libalkimia/libalkimia-4.3.2-r1.ebuild   | 27 -----------------
 3 files changed, 62 deletions(-)

diff --git a/app-office/libalkimia/Manifest b/app-office/libalkimia/Manifest
index 773bcad145f..0873a7d0fec 100644
--- a/app-office/libalkimia/Manifest
+++ b/app-office/libalkimia/Manifest
@@ -1,2 +1 @@
-DIST 137323-libalkimia-4.3.2.tar.bz2 32687 SHA256 64379af992d5548a6757495f47568ebf8cb859a868ced8b5d3d5975f4dfcebdc SHA512 fb04e7bf6d01f9fc54cccc63f0b41c28e28a6844eec1e65c057c7dde599a58cb1f173dd012aca995280581d47e3419b59e0d070f649de0e4b1dd92cd4af4c2b2 WHIRLPOOL d022dcc647abb24ed5416d07d7e4e8bc9a8dfb72371ebf5533d49c35892f2116544f6852e7391103c1eb373f18d9070ccc8a80ff1cffaac12bd8db4d46914393
 DIST libalkimia-5.0.0.tar.xz 28400 SHA256 eea8a2a0f6788a1b9fd464b370598ed6e55353fb40da53375e6f022e71526cb5 SHA512 9ba205f5726f237389b9ea928ef37fc3b38161aaec5988dcc64afa3d8e53575a055b248e3c27e738db13f9e6af231f493e1374bbc50d0672729b0cdb391ce99f WHIRLPOOL 8b12395145f2df72daf9678b5f15e851fc04ad56db72a3cd9882869e1a619bf8ba8014fef8db66370135882b70767ef8692f763328f966be8697f52694ab4b04

diff --git a/app-office/libalkimia/files/libalkimia-4.3.2-doc.patch b/app-office/libalkimia/files/libalkimia-4.3.2-doc.patch
deleted file mode 100644
index c88b95b6526..00000000000
--- a/app-office/libalkimia/files/libalkimia-4.3.2-doc.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ruN libalkimia-4.3.1.orig/libalkimia/CMakeLists.txt libalkimia-4.3.1/libalkimia/CMakeLists.txt
---- libalkimia-4.3.1.orig/libalkimia/CMakeLists.txt	2011-08-01 12:14:46.000000000 +0200
-+++ libalkimia-4.3.1/libalkimia/CMakeLists.txt	2011-08-01 23:04:41.000000000 +0200
-@@ -86,6 +86,8 @@
- endif(NOT WIN32)
- ########### documentation ###################
- 
-+if(BUILD_DOC)
-+
- # check for Doxygen
- find_package(Doxygen)
- if(DOXYGEN_FOUND)
-@@ -95,9 +97,20 @@
- 
-   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libalkimia.doxygen.in ${CMAKE_CURRENT_BINARY_DIR}/libalkimia.doxygen IMMEDIATE)
- 
--  add_custom_target(libalkimia_apidoc ${DOXYGEN} ${CMAKE_CURRENT_BINARY_DIR}/libalkimia.doxygen)
-+  add_custom_target(libalkimia_apidoc ALL ${DOXYGEN} ${CMAKE_CURRENT_BINARY_DIR}/libalkimia.doxygen)
-+else(DOXYGEN_FOUND)
-+  MESSAGE(FATAL_ERROR "API documentation requested but doxygen not found")
- endif(DOXYGEN_FOUND)
- 
-+ELSE(BUILD_DOC)
-+
-+  MESSAGE(STATUS "")
-+  MESSAGE(STATUS "Documentation will NOT be installed")
-+  MESSAGE(STATUS "Because the option -DBUILD_DOC=ON wasn't passed to cmake")
-+  MESSAGE(STATUS "")
-+
-+ENDIF(BUILD_DOC)
-+
- ########### tests ###################
- 
- set( alkvaluetest_SRCS alkvaluetest.cpp )

diff --git a/app-office/libalkimia/libalkimia-4.3.2-r1.ebuild b/app-office/libalkimia/libalkimia-4.3.2-r1.ebuild
deleted file mode 100644
index 03a43830730..00000000000
--- a/app-office/libalkimia/libalkimia-4.3.2-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit kde4-base
-
-DESCRIPTION="Library with common classes and functionality used by KDE finance applications"
-HOMEPAGE="http://kde-apps.org/content/show.php/libalkimia?content=137323"
-SRC_URI="http://kde-apps.org/CONTENT/content-files/137323-${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND="dev-libs/gmp[cxx]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-PATCHES=( "${FILESDIR}/${PN}-4.3.2-doc.patch" )
-
-src_configure() {
-	mycmakeargs=( $(cmake-utils_use_build doc) )
-	kde4-base_src_configure
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/libalkimia/files/, app-office/libalkimia/
@ 2020-06-30 14:45 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2020-06-30 14:45 UTC (permalink / raw
  To: gentoo-commits

commit:     ee44cb64a265b662a785fdff790141ff8ab301dd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 30 14:37:07 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 30 14:45:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee44cb64

app-office/libalkimia: 8.0.3 version bump

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/libalkimia/Manifest                     |   1 +
 .../libalkimia/files/libalkimia-8.0.3-cmake.patch  |  54 ++++++
 .../files/libalkimia-8.0.3-no-financequote.patch   | 181 +++++++++++++++++++++
 app-office/libalkimia/libalkimia-8.0.3.ebuild      |  68 ++++++++
 4 files changed, 304 insertions(+)

diff --git a/app-office/libalkimia/Manifest b/app-office/libalkimia/Manifest
index 73a2de778c4..b597a2233c2 100644
--- a/app-office/libalkimia/Manifest
+++ b/app-office/libalkimia/Manifest
@@ -1 +1,2 @@
 DIST alkimia-7.0.2.tar.xz 38420 BLAKE2B ea2cc8dd80e2b9b2501d26936aa7d2799d040e8cf86f9adb4785e676046f3c76d0cbe3267e4159582086d910be35020bbc634140d32cc7e5588d06cf75a115a3 SHA512 275ea48cd33caed9393a170efcc6053a581c1cc000862dd73a63bdb6de3e3c3ad2e492901a859e517033e1239e297a43088580553efe32f1d99a85051f5af3e4
+DIST alkimia-8.0.3.tar.xz 212780 BLAKE2B 4863bd2fba7e92518618da250b08772e288697eab9e45980c72c4a29d51f3df94899ead344a9dd5f16ea73cab8dc5596c696156f7da678a030623e77c766949c SHA512 04debd3adeba6380ffe7e9d3949e927dca12ecd7f83dea7b7ba6295b158272c636978c89800757166889e632fed09f3e8b3ce19adc9b91e3369e3b16a5b6cb1e

diff --git a/app-office/libalkimia/files/libalkimia-8.0.3-cmake.patch b/app-office/libalkimia/files/libalkimia-8.0.3-cmake.patch
new file mode 100644
index 00000000000..1b99061e6bf
--- /dev/null
+++ b/app-office/libalkimia/files/libalkimia-8.0.3-cmake.patch
@@ -0,0 +1,54 @@
+From d413b91839ca0e66beb56a71625e3194df1a6599 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 12 Jun 2019 19:44:12 +0200
+Subject: [PATCH 1/2] Use non-deprecated KDE_INSTALL_TARGETS_DEFAULT_ARGS for
+ alkimia target
+
+---
+ src/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 7c0f0f7..0774032 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -147,7 +147,7 @@ set(INCLUDE_INSTALL_DIR include/alkimia/${ALKIMIA_INCLUDE_SUFFIX})
+ 
+ install(TARGETS alkimia
+   EXPORT  alkimiaTargets
+-  ${INSTALL_TARGETS_DEFAULT_ARGS}
++  ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
+ )
+ 
+ if(BUILD_QT4)
+-- 
+2.23.0
+
+
+From 1fd611bcc060e779ac62f5f69d956c6dee2b3383 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 12 Jun 2019 16:43:54 +0200
+Subject: [PATCH 2/2] Fix pkgconfig libdir path
+
+---
+ src/libalkimia.pc.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/libalkimia.pc.in b/src/libalkimia.pc.in
+index c2087c9..6ada277 100644
+--- a/src/libalkimia.pc.in
++++ b/src/libalkimia.pc.in
+@@ -4,8 +4,8 @@
+ # General installation directories
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@KDE4_LIB_DIR@
+-includedir=@INCLUDE_INSTALL_DIR@
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
++includedir=${prefix}/@INCLUDE_INSTALL_DIR@
+ 
+ # Human-readable name
+ Name: Alkimia
+-- 
+2.23.0
+

diff --git a/app-office/libalkimia/files/libalkimia-8.0.3-no-financequote.patch b/app-office/libalkimia/files/libalkimia-8.0.3-no-financequote.patch
new file mode 100644
index 00000000000..a9435906276
--- /dev/null
+++ b/app-office/libalkimia/files/libalkimia-8.0.3-no-financequote.patch
@@ -0,0 +1,181 @@
+From 4f79ab942936c2985136575e9244aae4d9b81323 Mon Sep 17 00:00:00 2001
+From: Ralf Habacker <ralf.habacker@freenet.de>
+Date: Fri, 24 Jan 2020 09:47:28 +0100
+Subject: [PATCH] Add option ENABLE_FINANCEQUOTE and set to false by default on
+ Windows
+
+Financequote needs perl, which isn't supported on Windows yet.
+---
+ CMakeLists.txt                          | 10 ++++++++++
+ src/CMakeLists.txt                      | 15 ++++++++++-----
+ src/alkonlinequote.cpp                  |  7 ++++++-
+ src/alkonlinequotesprofile.cpp          |  7 ++++++-
+ tools/onlinequoteseditor/mainwindow.cpp |  2 ++
+ 5 files changed, 34 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ae48620..02bea7c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -10,6 +10,16 @@ option(BUILD_QT4 "Build for Qt4" OFF)
+ option(BUILD_DOXYGEN_DOCS "Build api docs" ON)
+ option(BUILD_APPLETS "Build plasma applets" ON)
+ 
++if(WIN32)
++    set(ENABLE_FINANCEQUOTE_DEFAULT 0)
++else()
++    set(ENABLE_FINANCEQUOTE_DEFAULT 1)
++endif()
++option(ENABLE_FINANCEQUOTE "Enable finance quote support (requires perl)" ENABLE_FINANCEQUOTE_DEFAULT)
++if(ENABLE_FINANCEQUOTE)
++    add_definitions(-DENABLE_FINANCEQUOTE)
++endif()
++
+ find_package(ECM 0.0.11 REQUIRED NO_MODULE)
+ 
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 2692a79..b863fa1 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -49,7 +49,6 @@ set(ALKIMIA_LIB_SOVERSION "${alkimia_VERSION_MAJOR}")
+ 
+ set(alkimia_LIB_SRCS
+     alkcompany.cpp
+-    alkfinancequoteprocess.cpp
+     alkonlinequote.cpp
+     alkonlinequotesource.cpp
+     alkonlinequotesprofile.cpp
+@@ -61,7 +60,6 @@ set(alkimia_LIB_SRCS
+ 
+ set(alkimia_LIB_HEADERS
+     alkcompany.h
+-    alkfinancequoteprocess.h
+     alkonlinequote.h
+     alkonlinequotesource.h
+     alkonlinequotesprofile.h
+@@ -70,6 +68,11 @@ set(alkimia_LIB_HEADERS
+     alkwebpage.h
+ )
+ 
++if(ENABLE_FINANCEQUOTE)
++    list(APPEND alkimia_LIB_SRCS alkfinancequoteprocess.cpp)
++    list(APPEND alkimia_LIB_HEADERS alkfinancequoteprocess.h)
++endif()
++
+ set(alkimia_UI
+     alkonlinequoteswidget.ui
+ )
+@@ -177,9 +180,11 @@ install(FILES
+ make_directory(${FQ_LOCAL_INSTALL_PATH})
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/financequote.pl ${FQ_LOCAL_INSTALL_PATH}/financequote.pl IMMEDIATE COPYONLY)
+ 
+-install(PROGRAMS financequote.pl
+-  DESTINATION ${APPDATA_INSTALL_DIR}/alkimia${ALKIMIA_PATH_SUFFIX}/misc
+-)
++if(ENABLE_FINANCEQUOTE)
++    install(PROGRAMS financequote.pl
++      DESTINATION ${APPDATA_INSTALL_DIR}/alkimia${ALKIMIA_PATH_SUFFIX}/misc
++    )
++endif()
+ 
+ if (NOT WIN32)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libalkimia.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libalkimia${ALKIMIA_PATH_SUFFIX}.pc IMMEDIATE @ONLY)
+diff --git a/src/alkonlinequote.cpp b/src/alkonlinequote.cpp
+index 5b1b6e6..83a839c 100644
+--- a/src/alkonlinequote.cpp
++++ b/src/alkonlinequote.cpp
+@@ -337,6 +337,7 @@ bool AlkOnlineQuote::Private::launchNative(const QString &_symbol, const QString
+     return result;
+ }
+ 
++#ifdef ENABLE_FINANCEQUOTE
+ bool AlkOnlineQuote::Private::launchFinanceQuote(const QString &_symbol, const QString &_id,
+                                         const QString &_sourcename)
+ {
+@@ -374,6 +375,7 @@ bool AlkOnlineQuote::Private::launchFinanceQuote(const QString &_symbol, const Q
+     }
+     return result;
+ }
++#endif
+ 
+ bool AlkOnlineQuote::Private::parsePrice(const QString &_pricestr)
+ {
+@@ -560,10 +562,13 @@ void AlkOnlineQuote::setAcceptLanguage(const QString &language)
+ 
+ bool AlkOnlineQuote::launch(const QString &_symbol, const QString &_id, const QString &_source)
+ {
++#ifdef ENABLE_FINANCEQUOTE
+     if (AlkOnlineQuoteSource::isFinanceQuote(_source) ||
+             d->m_profile->type() == AlkOnlineQuotesProfile::Type::Script) {
+         return d->launchFinanceQuote(_symbol, _id, _source);
+-    } else if (_source.endsWith(".css")) {
++    } else
++#endif
++        if (_source.endsWith(".css")) {
+         return d->launchWebKitCssSelector(_symbol, _id, _source);
+     } else if (_source.endsWith(".webkit")) {
+         return d->launchWebKitHtmlParser(_symbol, _id, _source);
+diff --git a/src/alkonlinequotesprofile.cpp b/src/alkonlinequotesprofile.cpp
+index c3a6c96..637fb38 100644
+--- a/src/alkonlinequotesprofile.cpp
++++ b/src/alkonlinequotesprofile.cpp
+@@ -59,11 +59,12 @@ public:
+         , m_config(0)
+         , m_type(Type::Undefined)
+     {
+-
++#ifdef ENABLE_FINANCEQUOTE
+         if (m_financeQuoteScriptPath.isEmpty()) {
+             m_financeQuoteScriptPath = KGlobal::dirs()->findResource("appdata",
+                                                                      QString("misc/financequote.pl"));
+         }
++#endif
+     }
+ 
+     ~Private()
+@@ -135,6 +136,7 @@ public Q_SLOTS:
+         return groups;
+     }
+ 
++#ifdef ENABLE_FINANCEQUOTE
+     const QStringList quoteSourcesFinanceQuote()
+     {
+         if (m_financeQuoteSources.empty()) { // run the process one time only
+@@ -153,6 +155,7 @@ public Q_SLOTS:
+         }
+         return m_financeQuoteSources;
+     }
++#endif
+ 
+     const QStringList quoteSourcesSkrooge()
+     {
+@@ -391,9 +394,11 @@ const QStringList AlkOnlineQuotesProfile::quoteSources()
+     case AlkOnlineQuotesProfile::Type::KMyMoney5:
+         result << d->quoteSourcesNative();
+         break;
++#ifdef ENABLE_FINANCEQUOTE
+     case AlkOnlineQuotesProfile::Type::Script:
+         result << d->quoteSourcesFinanceQuote();
+         break;
++#endif
+     case AlkOnlineQuotesProfile::Type::None:
+         result << d->defaultQuoteSources().keys();
+         break;
+diff --git a/tools/onlinequoteseditor/mainwindow.cpp b/tools/onlinequoteseditor/mainwindow.cpp
+index 59af0c4..791b1e6 100644
+--- a/tools/onlinequoteseditor/mainwindow.cpp
++++ b/tools/onlinequoteseditor/mainwindow.cpp
+@@ -82,7 +82,9 @@ MainWindow::MainWindow(QWidget *parent)
+     manager.addProfile(new AlkOnlineQuotesProfile("skrooge5", AlkOnlineQuotesProfile::Type::Skrooge5, "skrooge-quotes.knsrc"));
+     manager.addProfile(new AlkOnlineQuotesProfile("kmymoney5", AlkOnlineQuotesProfile::Type::KMyMoney5, "kmymoney-quotes.knsrc"));
+ #endif
++#ifdef ENABLE_FINANCEQUOTE
+     manager.addProfile(new AlkOnlineQuotesProfile("Finance::Quote", AlkOnlineQuotesProfile::Type::Script));
++#endif
+     d->ui.setupUi(this);
+ 
+     d->quotesWidget = new AlkOnlineQuotesWidget(true, true);
+-- 
+GitLab
+

diff --git a/app-office/libalkimia/libalkimia-8.0.3.ebuild b/app-office/libalkimia/libalkimia-8.0.3.ebuild
new file mode 100644
index 00000000000..65225f91578
--- /dev/null
+++ b/app-office/libalkimia/libalkimia-8.0.3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KDE_ORG_NAME="alkimia"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${KDE_ORG_NAME}/${PV}/${KDE_ORG_NAME}-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Library with common classes and functionality used by KDE finance applications"
+HOMEPAGE="https://www.linux-apps.com/content/show.php/libalkimia?content=137323
+https://community.kde.org/Alkimia"
+
+LICENSE="LGPL-2.1"
+SLOT="0/8"
+IUSE="doc gmp plasma"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	!gmp? ( sci-libs/mpir:=[cxx] )
+	gmp? ( dev-libs/gmp:0=[cxx] )
+	plasma? (
+		>=kde-frameworks/kpackage-${KFMIN}:5
+		>=kde-frameworks/plasma-${KFMIN}:5
+	)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-cmake.patch"
+	"${FILESDIR}/${P}-no-financequote.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_FINANCEQUOTE=OFF
+		-DBUILD_WITH_WEBKIT=OFF
+		-DBUILD_DOXYGEN_DOCS=$(usex doc)
+		$(cmake_use_find_package !gmp MPIR)
+		-DBUILD_APPLETS=$(usex plasma)
+	)
+	ecm_src_configure
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/libalkimia/files/, app-office/libalkimia/
@ 2021-03-05 21:48 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2021-03-05 21:48 UTC (permalink / raw
  To: gentoo-commits

commit:     ba66d6b44e7371c11a5cbfdd314522a6c44114b4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  5 21:48:20 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar  5 21:48:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba66d6b4

app-office/libalkimia: Fix build with IUSE=-webengine

Closes: https://bugs.gentoo.org/774321
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/libalkimia-8.1.0-missing-header.patch    | 25 ++++++++++++++++++++++
 app-office/libalkimia/libalkimia-8.1.0.ebuild      |  5 ++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/app-office/libalkimia/files/libalkimia-8.1.0-missing-header.patch b/app-office/libalkimia/files/libalkimia-8.1.0-missing-header.patch
new file mode 100644
index 00000000000..c1f1ff463ee
--- /dev/null
+++ b/app-office/libalkimia/files/libalkimia-8.1.0-missing-header.patch
@@ -0,0 +1,25 @@
+From 0e398425030bae0cfe7be70ce82d61e674160a97 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 5 Mar 2021 22:40:40 +0100
+Subject: [PATCH] Add missing QUrl include with -DBUILD_WITH_WEBENGINE=no
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ tools/onlinequoteseditor/mainwindow.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tools/onlinequoteseditor/mainwindow.cpp b/tools/onlinequoteseditor/mainwindow.cpp
+index fad7e85..d5a3026 100644
+--- a/tools/onlinequoteseditor/mainwindow.cpp
++++ b/tools/onlinequoteseditor/mainwindow.cpp
+@@ -28,6 +28,7 @@
+ #include <QComboBox>
+ #include <QDockWidget>
+ #include <QLineEdit>
++#include <QUrl>
+ 
+ class MainWindow::Private
+ {
+-- 
+2.30.1
+

diff --git a/app-office/libalkimia/libalkimia-8.1.0.ebuild b/app-office/libalkimia/libalkimia-8.1.0.ebuild
index 97ecb376f53..aa2e4914543 100644
--- a/app-office/libalkimia/libalkimia-8.1.0.ebuild
+++ b/app-office/libalkimia/libalkimia-8.1.0.ebuild
@@ -54,7 +54,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-cmake.patch"
+	"${FILESDIR}/${P}-missing-header.patch" # bug 774321
+)
 
 src_configure() {
 	local mycmakeargs=(


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/libalkimia/files/, app-office/libalkimia/
@ 2021-04-06 11:06 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2021-04-06 11:06 UTC (permalink / raw
  To: gentoo-commits

commit:     b47ea8e7eaef55b231bb0cbd2b5cbe52e47a4aad
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  6 10:39:27 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr  6 11:06:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b47ea8e7

app-office/libalkimia: Drop 8.0.4

Bug: https://bugs.gentoo.org/780087
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/libalkimia/Manifest                     |  1 -
 .../libalkimia/files/libalkimia-8.0.3-cmake.patch  | 54 ---------------
 app-office/libalkimia/libalkimia-8.0.4.ebuild      | 78 ----------------------
 3 files changed, 133 deletions(-)

diff --git a/app-office/libalkimia/Manifest b/app-office/libalkimia/Manifest
index a0216b33a04..3ab2e8e0872 100644
--- a/app-office/libalkimia/Manifest
+++ b/app-office/libalkimia/Manifest
@@ -1,2 +1 @@
-DIST alkimia-8.0.4.tar.xz 221108 BLAKE2B 90a89bfc76998aeec95989455d62b2a46e06e86f01b96d0a28e3226ec4228108b35a9ca9f8d50f95a32130e39b4954515e205f40d6aad6346bc9310fd31dff75 SHA512 49b771ac28ec76143cf1237a21a834fa38689c91c773a472cc090e94f49287a79ad7790ef068cd6bebc4e64aa97e5026a9ea5be841bbdb3ca89b00b6ca7acc27
 DIST alkimia-8.1.0.tar.xz 230804 BLAKE2B 9cc005f8550181b4bf5dd945ac22592d711f0e9689758d56c62272d4879181f73faeaebecab24d74a790f6c6d1a59c42295ceb2c23d09195a76f7e6b6b4e53c0 SHA512 c3d0851ec6e5af7f690059f2c80942bbe69c6bde946898ba4a124c344dd47e0fba4e6ed0a5320e36385c060c49d5eeaaca35bc0a41410ef4ad849a4f9541d4d3

diff --git a/app-office/libalkimia/files/libalkimia-8.0.3-cmake.patch b/app-office/libalkimia/files/libalkimia-8.0.3-cmake.patch
deleted file mode 100644
index 1b99061e6bf..00000000000
--- a/app-office/libalkimia/files/libalkimia-8.0.3-cmake.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From d413b91839ca0e66beb56a71625e3194df1a6599 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 12 Jun 2019 19:44:12 +0200
-Subject: [PATCH 1/2] Use non-deprecated KDE_INSTALL_TARGETS_DEFAULT_ARGS for
- alkimia target
-
----
- src/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 7c0f0f7..0774032 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -147,7 +147,7 @@ set(INCLUDE_INSTALL_DIR include/alkimia/${ALKIMIA_INCLUDE_SUFFIX})
- 
- install(TARGETS alkimia
-   EXPORT  alkimiaTargets
--  ${INSTALL_TARGETS_DEFAULT_ARGS}
-+  ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
- )
- 
- if(BUILD_QT4)
--- 
-2.23.0
-
-
-From 1fd611bcc060e779ac62f5f69d956c6dee2b3383 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 12 Jun 2019 16:43:54 +0200
-Subject: [PATCH 2/2] Fix pkgconfig libdir path
-
----
- src/libalkimia.pc.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/libalkimia.pc.in b/src/libalkimia.pc.in
-index c2087c9..6ada277 100644
---- a/src/libalkimia.pc.in
-+++ b/src/libalkimia.pc.in
-@@ -4,8 +4,8 @@
- # General installation directories
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@
--libdir=@KDE4_LIB_DIR@
--includedir=@INCLUDE_INSTALL_DIR@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=${prefix}/@INCLUDE_INSTALL_DIR@
- 
- # Human-readable name
- Name: Alkimia
--- 
-2.23.0
-

diff --git a/app-office/libalkimia/libalkimia-8.0.4.ebuild b/app-office/libalkimia/libalkimia-8.0.4.ebuild
deleted file mode 100644
index dbc12daf7d2..00000000000
--- a/app-office/libalkimia/libalkimia-8.0.4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KDE_ORG_NAME="alkimia"
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${KDE_ORG_NAME}/${PV}/${KDE_ORG_NAME}-${PV}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Library with common classes and functionality used by KDE finance applications"
-HOMEPAGE="https://www.linux-apps.com/content/show.php/libalkimia?content=137323
-https://community.kde.org/Alkimia"
-
-LICENSE="LGPL-2.1"
-SLOT="0/8"
-IUSE="doc gmp plasma webengine"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	!gmp? ( sci-libs/mpir:=[cxx] )
-	gmp? ( dev-libs/gmp:0=[cxx] )
-	plasma? (
-		>=kde-frameworks/kpackage-${KFMIN}:5
-		>=kde-frameworks/plasma-${KFMIN}:5
-	)
-	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-8.0.3-cmake.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_FINANCEQUOTE=OFF
-		-DBUILD_TOOLS=ON
-		-DBUILD_WITH_WEBKIT=OFF
-		-DBUILD_DOXYGEN_DOCS=$(usex doc)
-		$(cmake_use_find_package !gmp MPIR)
-		-DBUILD_APPLETS=$(usex plasma)
-		-DBUILD_WITH_WEBENGINE=$(usex webengine)
-	)
-	ecm_src_configure
-}
-
-src_test() {
-	# Depends on BUILD_WITH_WEBKIT, bug 736128
-	local myctestargs=(
-		-E "(alkonlinequotestest)"
-	)
-	ecm_src_test
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/libalkimia/files/, app-office/libalkimia/
@ 2023-03-26 13:09 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2023-03-26 13:09 UTC (permalink / raw
  To: gentoo-commits

commit:     9da1c2adbbef9c70f9a25603dd853fde43677cb1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 26 12:55:38 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 12:55:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9da1c2ad

app-office/libalkimia: Another cmake fix, this time from upstream

Bug: https://bugs.gentoo.org/878397
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/libalkimia-8.1.0-cmake-webengine.patch   | 27 ++++++++++++++++++++++
 ...mia-8.1.1.ebuild => libalkimia-8.1.1-r1.ebuild} |  7 ++++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/app-office/libalkimia/files/libalkimia-8.1.0-cmake-webengine.patch b/app-office/libalkimia/files/libalkimia-8.1.0-cmake-webengine.patch
new file mode 100644
index 000000000000..7d1140ca7509
--- /dev/null
+++ b/app-office/libalkimia/files/libalkimia-8.1.0-cmake-webengine.patch
@@ -0,0 +1,27 @@
+From 09a11cee26af4ca55e5839dd44e32400147dc119 Mon Sep 17 00:00:00 2001
+From: Alexander Lohnau <alexander.lohnau@gmx.de>
+Date: Sun, 11 Sep 2022 11:55:49 +0200
+Subject: [PATCH] Fix finding of WebEngineWidgets
+
+---
+ src/LibAlkimiaConfig.cmake.in | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/LibAlkimiaConfig.cmake.in b/src/LibAlkimiaConfig.cmake.in
+index 5c2dfc3..1ad866e 100644
+--- a/src/LibAlkimiaConfig.cmake.in
++++ b/src/LibAlkimiaConfig.cmake.in
+@@ -9,7 +9,9 @@ if("@BUILD_QT4@" STREQUAL "ON" OR "@BUILD_QT4@" STREQUAL "1")
+ else()
+     find_dependency(Qt5Core)
+     find_dependency(Qt5DBus)
+-    if (@QT_BROWSER_LIB@)
++    if (@BUILD_WITH_WEBENGINE@)
++        find_dependency(Qt@QT_MAJOR_VERSION@WebEngineWidgets 5.15.0)
++    elseif (@QT_BROWSER_LIB@)
+         find_dependency(@QT_BROWSER_LIB@)
+     endif()
+     if (@QT_NETWORK_LIB@)
+-- 
+2.40.0
+

diff --git a/app-office/libalkimia/libalkimia-8.1.1.ebuild b/app-office/libalkimia/libalkimia-8.1.1-r1.ebuild
similarity index 93%
rename from app-office/libalkimia/libalkimia-8.1.1.ebuild
rename to app-office/libalkimia/libalkimia-8.1.1-r1.ebuild
index 0d5b5f054028..0cebd5e68506 100644
--- a/app-office/libalkimia/libalkimia-8.1.1.ebuild
+++ b/app-office/libalkimia/libalkimia-8.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -54,7 +54,10 @@ BDEPEND="
 	doc? ( app-doc/doxygen )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-8.1.0-cmake.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-8.1.0-cmake.patch"
+	"${FILESDIR}/${PN}-8.1.0-cmake-webengine.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2023-03-26 13:09 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-06 11:06 [gentoo-commits] repo/gentoo:master commit in: app-office/libalkimia/files/, app-office/libalkimia/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2023-03-26 13:09 Andreas Sturmlechner
2021-03-05 21:48 Andreas Sturmlechner
2020-06-30 14:45 Andreas Sturmlechner
2017-07-06 12:51 Michael Palimaka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox