diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
| commit | f1af93971b7490792d8541bc790e0d8c6d787059 (patch) | |
| tree | a38046712bbc3a3844d77452d16c84e716caa3d4 /app-office/kexi | |
| parent | fc637fb28da700da71ec2064d65ca5a7a31b9c6c (diff) | |
gentoo resync : 06.08.2019
Diffstat (limited to 'app-office/kexi')
| -rw-r--r-- | app-office/kexi/Manifest | 3 | ||||
| -rw-r--r-- | app-office/kexi/files/kexi-3.2.0-postgresql-9.12.patch | 24 | ||||
| -rw-r--r-- | app-office/kexi/kexi-3.2.0-r1.ebuild (renamed from app-office/kexi/kexi-3.2.0.ebuild) | 7 |
3 files changed, 31 insertions, 3 deletions
diff --git a/app-office/kexi/Manifest b/app-office/kexi/Manifest index c4af589cd79c..bd4989605b72 100644 --- a/app-office/kexi/Manifest +++ b/app-office/kexi/Manifest @@ -1,4 +1,5 @@ AUX kexi-3.2.0-missing-header.patch 739 BLAKE2B da09cf24f4852222040112a7774bd5d0463f85d52d52c352b453f4d0502085a0faa67ae3ae8fd44102c2fa3b8840525929e53c9ad1a05acfb5c23747cdbb6d91 SHA512 14779c27e47d7e3c0f3f8de917deae8fed7b38673bcc5ec53fa0ca7c89c354a3601af80c6fe17ab3231f633852c47c0dcd2858834cee79a961fc3d02a1043fa1 +AUX kexi-3.2.0-postgresql-9.12.patch 1094 BLAKE2B ac9ba4ff8f5c29ae8ebdcfa6820ed8663aa0f13a9fb55f4eff85265fa3d76a3e33e6c1000400a7a21721e9f45ba58006dbb97c312fd4b96f9d0e9e49dfd88690 SHA512 cfde38090e163ff441477c7f8262629589c9ab49c2687eefe7e0a107f4d70fd447cc35e1031612a6ce970e3b3ec3b9394f13e6e2876c29614cb43ba0b9fc9fbd DIST kexi-3.2.0.tar.xz 3624956 BLAKE2B 8d0b3712f07d13f606c4c0d714b3d4ea0fe9f56e4d4a3aeeb144ffda56cd5ef89e4f08d5660550364103c86acd60923ddc74fcea135a23fffbae87853a7c00f4 SHA512 5cb9e0747c8e7ea19020b62345571ba10f65278dcc718bb0772827721bf8812d0ffee3c35d53b57285884c66e0406520835c7b00789fbe5459717722dff13e93 -EBUILD kexi-3.2.0.ebuild 2283 BLAKE2B 1193a1da88dd931f14c920a54435ae5fe524b654e5b2b2a177f1ff0e2956e50f8e1c87a208112980b762d07b66f097b5bd770b17e8659fd44b0acab6b47b6fd0 SHA512 199f3d0c67c77a7684e73591ad56367c8b178ed37b27c9af585dee8625ee1787827696f1d27c63b69c42a14887775d37d752172a036c434009125e3544e70863 +EBUILD kexi-3.2.0-r1.ebuild 2330 BLAKE2B 93a140281ac2503dd3c4e06889542840c7d03b3c3317f691b8b5071f2bde8d3af1275b91b6ef1d7c414c553fb85f279c656f9562f50f4529251be49f0e8d77c4 SHA512 1582cde00f8d9d293c32554fdf76217970ff704b7eeb047c17088538d81f289075d279f651784cad27e97dc27ec5e9fd4bc35c28ddfc28e127f3fd66554b44bc MISC metadata.xml 600 BLAKE2B 383b28f24ff8522330ed843789c30ac771b4ecb03f45f7f60503463ead5e6a6fd4480eea83be7904d3e0cfecaca73c6fc9d8d29214fbfb2082aa97c45ba607ff SHA512 fc7615150e90fb963d4ae2775b5d0dda7667c0fd975cdcd8e5d52a87d01935471c37c9256e894c68fe88268d61d7a3cde42f36171f9160dae20ce8140eaab22f 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 new file mode 100644 index 000000000000..8835c5ea13db --- /dev/null +++ b/app-office/kexi/files/kexi-3.2.0-postgresql-9.12.patch @@ -0,0 +1,24 @@ +From 88ac2b4a1386bc05f0e3965f31949039eaf4d3ff Mon Sep 17 00:00:00 2001 +From: Pino Toscano <pino@kde.org> +Date: Sat, 25 May 2019 07:12:17 +0200 +Subject: cmake: find PostgreSQL 12 + +--- + cmake/modules/FindPostgreSQL.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/modules/FindPostgreSQL.cmake b/cmake/modules/FindPostgreSQL.cmake +index 56e6e56..1579be0 100644 +--- a/cmake/modules/FindPostgreSQL.cmake ++++ b/cmake/modules/FindPostgreSQL.cmake +@@ -86,7 +86,7 @@ set(PostgreSQL_LIBRARY_DIR_MESSAGE "Set the PostgreSQL_LIBRARY_DIR cmake cache e + 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") + + set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS} +- "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") ++ "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") + + # Define additional search paths for root directories. + foreach (suffix ${PostgreSQL_KNOWN_VERSIONS} ) +-- +cgit v1.1 diff --git a/app-office/kexi/kexi-3.2.0.ebuild b/app-office/kexi/kexi-3.2.0-r1.ebuild index 5bef8c3c8265..fcd7857e501d 100644 --- a/app-office/kexi/kexi-3.2.0.ebuild +++ b/app-office/kexi/kexi-3.2.0-r1.ebuild @@ -47,7 +47,7 @@ DEPEND=" dev-libs/glib:2 virtual/libiconv ) - mysql? ( virtual/libmysqlclient ) + mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* dev-libs/libpqxx @@ -56,7 +56,10 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}"/${P}-missing-header.patch ) +PATCHES=( + "${FILESDIR}"/${P}-missing-header.patch + "${FILESDIR}"/${P}-postgresql-9.12.patch +) src_prepare() { if ! use webkit; then |