From 99abbc5e5a6ecd3fc981b45646fd8cb5d320377b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 24 Feb 2018 19:58:07 +0000 Subject: gentoo resync : 24.02.2018 --- dev-qt/qtsql/Manifest | 6 ++- dev-qt/qtsql/files/qtsql-5.9.4-mariadb-10.2.patch | 35 +++++++++++++ dev-qt/qtsql/qtsql-5.7.1-r1.ebuild | 2 +- dev-qt/qtsql/qtsql-5.9.4-r1.ebuild | 62 +++++++++++++++++++++++ dev-qt/qtsql/qtsql-5.9.4.ebuild | 2 +- 5 files changed, 103 insertions(+), 4 deletions(-) create mode 100644 dev-qt/qtsql/files/qtsql-5.9.4-mariadb-10.2.patch create mode 100644 dev-qt/qtsql/qtsql-5.9.4-r1.ebuild (limited to 'dev-qt/qtsql') diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest index 526c3ee5f1d0..a460727fb163 100644 --- a/dev-qt/qtsql/Manifest +++ b/dev-qt/qtsql/Manifest @@ -1,8 +1,10 @@ AUX qtsql-5.7.1-mariadb.patch 1888 BLAKE2B bd8a93f2b28ac9db84c1da1d294c974f1bed0a87a99177c0ac9738d4057d168be7d563d1c34ba40c2695dad47c83b16a6d9d05257dd1e768e1f3c5049fe1cc65 SHA512 4fb0e066eaf848feb7379d4f0f92e26a1e60e9003d77b8976588036df09c04cc24431335cfe08616a4c23b10975ba44e6c25b92417a8f285308bc8f0b46c2c78 +AUX qtsql-5.9.4-mariadb-10.2.patch 1187 BLAKE2B 1ee0a4ad020a1d0e5bcaa19ac987eb5b472f9701adf876024003e377ca40060a52323bdfd3ec8213e6e8e199336bbfd92c7aab716be38b46fd105628eea447f6 SHA512 3ad71a5c3a31bb60484de09bb6503fd1c35f6e55aa2116f5ea468314a3c72cc43ddcfde6da01f479f91c381fbf2f2e64024ab88cf0e8f2e0a3edbda45bd44609 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd EBUILD qtsql-4.8.7-r1.ebuild 2261 BLAKE2B 24e39792f5fd56b5d61a7b61dee71f00cae4a45436e74137de29460d89c5c13235811142dfb8f5499eea483890c4c39ff2fd9d86f0ac9e52f05d08499b1ac8ce SHA512 a81056b36b8a081403824b1102883d7d35e181c05bc6b8e56e29c227ec832fe712a1dde8a4178a30bad5454798aa17eaf33890403c15b08b67cb221487b8e4ca -EBUILD qtsql-5.7.1-r1.ebuild 1467 BLAKE2B 113ce8884c0b442c4fb6ec7c651f4cc25d735ebe115e86647dab0bdfdf73fd2361a9e6c4c74defaf16ca32c627e6de7c4f785bc413d3df3a8c69441e8d8f8831 SHA512 c5512de8111d6546f1c3525e85e9c15602515b704bfacf978bb0025c13b20c9dd791468f10b7fb2f22210d2dff12e7ccdbf834704f2bb37247b37f6c425b155f -EBUILD qtsql-5.9.4.ebuild 1456 BLAKE2B 46ae59edf6e4a1fc333b05151212f3c1f08058567f1a41725d3f71e39d71ae5343ca2b37d7054967dbc42fb27ad5e32aa127df9dce27a4d6a34d101598b2dc62 SHA512 dd030b452b255c0c732d24e0471f1c8f2971d34aab5486bd6ee0fa53d5200ca63c070c98b5335932bfa0467aa1209b3ff549967cf3aaaf78bb4e4fb200d20d3e +EBUILD qtsql-5.7.1-r1.ebuild 1468 BLAKE2B c8765bf757236f1556d55318f9777f7dffa3a68dd2e73e991836da5f05b48b8d28b3c80b99873d8f79e112acace4fd06348350e24fee06cbbdf5bc079f52222d SHA512 074c701f0d8d5dee3e4d496651ba8aea30be61e649ff6b26306fcbe2f13c22c8577a91eaa45f31116ee105e1fda8f84cba0f44e4e49c96ffe2f43b2d7bd83522 +EBUILD qtsql-5.9.4-r1.ebuild 1568 BLAKE2B 284e209c2523fb12f8882b7b0d8df8c54f658fd44740f602898c476c58f376cd379f8835feea250104b9fde9ba93877cdc17644ebe5e8de83a9c4df84215fca0 SHA512 333c7c33827b00fdb1dc9730596b4f366b8fffaf6012641bf155f3d6aef377bdf4f2ee4caea5cf6e1e15feb92a74eb5d82d93fdeae4be9db8b539da6f0b93cfb +EBUILD qtsql-5.9.4.ebuild 1457 BLAKE2B df88542f85ce827ab2e3c8d40cb7036952922a68200b671619b5e57686e8ca9cb2639e492a41b56d74eaa248ed94347146c89dc0bdc824339af3ec1295262e20 SHA512 44fdff88e4434be4694b8ed94a01703c857ee471a7ff342719883c0fe3f3062a5264cd9b25db314ee6677eb6746c0d474c1434255fbd7d57999d0b43c5540063 MISC metadata.xml 701 BLAKE2B b9f31dc4bdb158bda952ca941dc3a5f70004800c8874e310a2a9634223dde59e799df9b4f9d424d89870c191fe041ec29ecbab79c1f04be55c786170d921c10e SHA512 c807e5c85d7e4f23f15ef9f95f4bed3e303e25e355a096ee118e4846330948957dc44d16c97d3c687ee30a5895c511e9d1480a39ddf2360f8989d06daf0b91b8 diff --git a/dev-qt/qtsql/files/qtsql-5.9.4-mariadb-10.2.patch b/dev-qt/qtsql/files/qtsql-5.9.4-mariadb-10.2.patch new file mode 100644 index 000000000000..bfd0c903bc35 --- /dev/null +++ b/dev-qt/qtsql/files/qtsql-5.9.4-mariadb-10.2.patch @@ -0,0 +1,35 @@ +From 64588c9bae92ef79f9ca5e87653ffb0962691d0d Mon Sep 17 00:00:00 2001 +From: Andy Shaw +Date: Wed, 27 Sep 2017 09:23:10 +0200 +Subject: [PATCH] Extend the MariaDB define check to cover the later versions + too + +Change-Id: Ide89b4e07feb116bf152cbf3f5630d313e8ba0f1 +--- + src/plugins/sqldrivers/mysql/qsql_mysql.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp +index 6e428fb..b2d3e85 100644 +--- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp ++++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp +@@ -1159,14 +1159,14 @@ static void qLibraryInit() + # endif // MYSQL_VERSION_ID + #endif // Q_NO_MYSQL_EMBEDDED + +-#ifdef MARIADB_BASE_VERSION ++#if defined(MARIADB_BASE_VERSION) || defined(MARIADB_VERSION_ID) + qAddPostRoutine(mysql_server_end); + #endif + } + + static void qLibraryEnd() + { +-#if !defined(MARIADB_BASE_VERSION) ++#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID) + # if !defined(Q_NO_MYSQL_EMBEDDED) + # if MYSQL_VERSION_ID > 40000 + # if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003 +-- +2.7.4 + diff --git a/dev-qt/qtsql/qtsql-5.7.1-r1.ebuild b/dev-qt/qtsql/qtsql-5.7.1-r1.ebuild index cd5428629a29..71698562ab53 100644 --- a/dev-qt/qtsql/qtsql-5.7.1-r1.ebuild +++ b/dev-qt/qtsql/qtsql-5.7.1-r1.ebuild @@ -5,7 +5,7 @@ EAPI=6 QT5_MODULE="qtbase" inherit qt5-build -DESCRIPTION="SQL abstraction library for the Qt5 tooolkit" +DESCRIPTION="SQL abstraction library for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86" diff --git a/dev-qt/qtsql/qtsql-5.9.4-r1.ebuild b/dev-qt/qtsql/qtsql-5.9.4-r1.ebuild new file mode 100644 index 000000000000..0ba07790288b --- /dev/null +++ b/dev-qt/qtsql/qtsql-5.9.4-r1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="SQL abstraction library for the Qt5 framework" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" +fi + +IUSE="freetds mysql oci8 odbc postgres +sqlite" + +REQUIRED_USE=" + || ( freetds mysql oci8 odbc postgres sqlite ) +" + +DEPEND=" + ~dev-qt/qtcore-${PV} + freetds? ( dev-db/freetds ) + mysql? ( virtual/libmysqlclient:= ) + oci8? ( dev-db/oracle-instantclient-basic ) + odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) + postgres? ( dev-db/postgresql:* ) + sqlite? ( >=dev-db/sqlite-3.8.10.2:3 ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-mariadb-10.2.patch" + # See also: https://codereview.qt-project.org/#/c/206850/ +) + +QT5_TARGET_SUBDIRS=( + src/sql + src/plugins/sqldrivers +) + +QT5_GENTOO_PRIVATE_CONFIG=( + :sql +) + +src_configure() { + local myconf=( + $(qt_use freetds sql-tds plugin) + $(qt_use mysql sql-mysql plugin) + $(qt_use oci8 sql-oci plugin) + $(qt_use odbc sql-odbc plugin) + $(qt_use postgres sql-psql plugin) + $(qt_use sqlite sql-sqlite plugin) + $(usex sqlite -system-sqlite '') + ) + + use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" "-L${EPREFIX}/usr/$(get_libdir)/mysql") + use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)") + use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc") + use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql") + + qt5-build_src_configure +} diff --git a/dev-qt/qtsql/qtsql-5.9.4.ebuild b/dev-qt/qtsql/qtsql-5.9.4.ebuild index 8b17279a30ee..92728b7ff804 100644 --- a/dev-qt/qtsql/qtsql-5.9.4.ebuild +++ b/dev-qt/qtsql/qtsql-5.9.4.ebuild @@ -5,7 +5,7 @@ EAPI=6 QT5_MODULE="qtbase" inherit qt5-build -DESCRIPTION="SQL abstraction library for the Qt5 tooolkit" +DESCRIPTION="SQL abstraction library for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" -- cgit v1.2.3