Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/kexi/files/, app-office/kexi/
Date: Tue, 27 Aug 2019 20:22:08
Message-Id: 1566937276.af7adfc22385edcf84b5d0e217ee2aecedf1380d.asturm@gentoo
1 commit: af7adfc22385edcf84b5d0e217ee2aecedf1380d
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 27 20:17:11 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 27 20:21:16 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af7adfc2
7
8 app-office/kexi: Let cmake detect PostgreSQL 12
9
10 Let's do something useful with that revbump.
11
12 Closes: https://bugs.gentoo.org/692924
13 Package-Manager: Portage-2.3.73, Repoman-2.3.17
14 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
15
16 .../kexi/files/kexi-3.2.0-postgresql-9.12.patch | 24 ++++++
17 app-office/kexi/kexi-3.2.0-r1.ebuild | 86 ++++++++++++++++++++++
18 2 files changed, 110 insertions(+)
19
20 diff --git a/app-office/kexi/files/kexi-3.2.0-postgresql-9.12.patch b/app-office/kexi/files/kexi-3.2.0-postgresql-9.12.patch
21 new file mode 100644
22 index 00000000000..8835c5ea13d
23 --- /dev/null
24 +++ b/app-office/kexi/files/kexi-3.2.0-postgresql-9.12.patch
25 @@ -0,0 +1,24 @@
26 +From 88ac2b4a1386bc05f0e3965f31949039eaf4d3ff Mon Sep 17 00:00:00 2001
27 +From: Pino Toscano <pino@×××.org>
28 +Date: Sat, 25 May 2019 07:12:17 +0200
29 +Subject: cmake: find PostgreSQL 12
30 +
31 +---
32 + cmake/modules/FindPostgreSQL.cmake | 2 +-
33 + 1 file changed, 1 insertion(+), 1 deletion(-)
34 +
35 +diff --git a/cmake/modules/FindPostgreSQL.cmake b/cmake/modules/FindPostgreSQL.cmake
36 +index 56e6e56..1579be0 100644
37 +--- a/cmake/modules/FindPostgreSQL.cmake
38 ++++ b/cmake/modules/FindPostgreSQL.cmake
39 +@@ -86,7 +86,7 @@ set(PostgreSQL_LIBRARY_DIR_MESSAGE "Set the PostgreSQL_LIBRARY_DIR cmake cache e
40 + set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to where PostgreSQL is found on the machine E.g C:/Program Files/PostgreSQL/8.4")
41 +
42 + set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
43 +- "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
44 ++ "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
45 +
46 + # Define additional search paths for root directories.
47 + foreach (suffix ${PostgreSQL_KNOWN_VERSIONS} )
48 +--
49 +cgit v1.1
50
51 diff --git a/app-office/kexi/kexi-3.2.0-r1.ebuild b/app-office/kexi/kexi-3.2.0-r1.ebuild
52 new file mode 100644
53 index 00000000000..fcd7857e501
54 --- /dev/null
55 +++ b/app-office/kexi/kexi-3.2.0-r1.ebuild
56 @@ -0,0 +1,86 @@
57 +# Copyright 1999-2019 Gentoo Authors
58 +# Distributed under the terms of the GNU General Public License v2
59 +
60 +EAPI=7
61 +
62 +# KDE_HANDBOOK="true"
63 +KDE_TEST="forceoptional"
64 +inherit kde5
65 +
66 +DESCRIPTION="Visual database applications creator"
67 +HOMEPAGE="https://kde.org/applications/office/kexi/ http://www.kexi-project.org/"
68 +[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
69 +
70 +KEYWORDS="amd64 x86"
71 +IUSE="debug experimental marble mdb mysql postgres sqlite webkit"
72 +
73 +BDEPEND="sys-devel/gettext"
74 +DEPEND="
75 + $(add_frameworks_dep breeze-icons-rcc)
76 + $(add_frameworks_dep karchive)
77 + $(add_frameworks_dep kcodecs)
78 + $(add_frameworks_dep kcompletion)
79 + $(add_frameworks_dep kconfig)
80 + $(add_frameworks_dep kconfigwidgets)
81 + $(add_frameworks_dep kcoreaddons)
82 + $(add_frameworks_dep kcrash)
83 + $(add_frameworks_dep kguiaddons)
84 + $(add_frameworks_dep ki18n)
85 + $(add_frameworks_dep kiconthemes)
86 + $(add_frameworks_dep kio)
87 + $(add_frameworks_dep kitemviews)
88 + $(add_frameworks_dep ktexteditor)
89 + $(add_frameworks_dep ktextwidgets)
90 + $(add_frameworks_dep kwidgetsaddons)
91 + $(add_frameworks_dep kxmlgui)
92 + $(add_qt_dep designer)
93 + $(add_qt_dep qtgui)
94 + $(add_qt_dep qtnetwork)
95 + $(add_qt_dep qtprintsupport)
96 + $(add_qt_dep qtwidgets)
97 + $(add_qt_dep qtxml)
98 + >=dev-db/kdb-3.1.0-r1:5=[debug?,mysql?,postgres?,sqlite?]
99 + >=dev-libs/kproperty-3.1.0:5=
100 + >=dev-libs/kreport-3.1.0:5=[scripting]
101 + marble? ( $(add_kdeapps_dep marble) )
102 + mdb? (
103 + dev-libs/glib:2
104 + virtual/libiconv
105 + )
106 + mysql? ( dev-db/mysql-connector-c:= )
107 + postgres? (
108 + dev-db/postgresql:*
109 + dev-libs/libpqxx
110 + )
111 + webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
112 +"
113 +RDEPEND="${DEPEND}"
114 +
115 +PATCHES=(
116 + "${FILESDIR}"/${P}-missing-header.patch
117 + "${FILESDIR}"/${P}-postgresql-9.12.patch
118 +)
119 +
120 +src_prepare() {
121 + if ! use webkit; then
122 + punt_bogus_dep Qt5 WebKit
123 + punt_bogus_dep Qt5 WebKitWidgets
124 + fi
125 +
126 + kde5_src_prepare
127 +}
128 +
129 +src_configure() {
130 + local mycmakeargs=(
131 + -DKEXI_MIGRATEMANAGER_DEBUG=$(usex debug)
132 + -DKEXI_AUTORISE_TABBED_TOOLBAR=$(usex experimental)
133 + -DKEXI_SCRIPTS_SUPPORT=$(usex experimental)
134 + $(cmake-utils_use_find_package marble KexiMarble)
135 + $(cmake-utils_use_find_package mdb GLIB2)
136 + $(cmake-utils_use_find_package mysql MySQL)
137 + $(cmake-utils_use_find_package postgres PostgreSQL)
138 + )
139 + use experimental && mycmakeargs+=( -DKEXI_SCRIPTING_DEBUG=$(usex debug) )
140 +
141 + kde5_src_configure
142 +}