Re: Remove x11/qt5/qtbase,-sqlite2
On Mon Jul 12, 2021 at 02:00:52AM +, Klemens Nanni wrote:
> Nothing uses it and sqlite2 is long deprecated.
> Builds fine without sqlite installed.
>
> This is one of the last remaining sqlite2 users:
>
> $ show-reverse-deps databases/sqlite
> databases/libdbi-drivers,-sqlite
> x11/qt5/qtbase,-sqlite2
>
> Feedback? Objections? OK?
OK rsadowski
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/qt5/qtbase/Makefile,v
> retrieving revision 1.44
> diff -u -p -r1.44 Makefile
> --- Makefile 9 Jun 2021 19:50:10 - 1.44
> +++ Makefile 11 Jul 2021 22:04:52 -
> @@ -7,15 +7,13 @@ COMMENT-main = C++ general-purpose tool
> COMMENT-global = global Qt5 documentation internals
> COMMENT-mysql = MySQL plugin for Qt5
> COMMENT-psql = PostgresSQL plugin for Qt5
> -COMMENT-sqlite2 =SQLite 2.x plugin for Qt5
> COMMENT-tds =TDS plugin for Qt5
>
> -REVISION-main = 3
> +REVISION-main = 4
>
> PKGNAME-mysql = qt5-mysql-${VERSION}
> PKGNAME-global = qt5-global-${VERSION}
> PKGNAME-psql = qt5-postgresql-${VERSION}
> -PKGNAME-sqlite2 =qt5-sqlite2-${VERSION}
> PKGNAME-tds =qt5-tds-${VERSION}
>
> PKG_ARCH-global =*
> @@ -57,14 +55,11 @@ WANTLIB-mysql += m pthread mariadb
> WANTLIB-psql = ${COMPILER_LIBCXX} Qt5Core Qt5Sql
> WANTLIB-psql += m pthread pq
>
> -WANTLIB-sqlite2 =${COMPILER_LIBCXX} Qt5Core Qt5Sql
> -WANTLIB-sqlite2 += m pthread sqlite
> -
> WANTLIB-tds =${COMPILER_LIBCXX} Qt5Core Qt5Sql
> WANTLIB-tds += m pthread sybdb
>
> # there is no -sqlite3 because it's heavily used by Qt itself (.qch files)
> -MULTI_PACKAGES = -main -examples -global -mysql -psql -sqlite2 -tds
> +MULTI_PACKAGES = -main -examples -global -mysql -psql -tds
>
> # qmake module is used only for running tests and setting vars
> MODQT_DEPS = No
> @@ -102,10 +97,6 @@ LIB_DEPENDS-psql =${BASE_PKGPATH},-main
> ${MODGCC4_CPPLIBDEP} \
> databases/postgresql
>
> -LIB_DEPENDS-sqlite2 =
> ${BASE_PKGPATH},-main>=${VERSION:R},<${QT5_NEXT_VERSION} \
> - ${MODGCC4_CPPLIBDEP} \
> - databases/sqlite
> -
> LIB_DEPENDS-tds =
> ${BASE_PKGPATH},-main>=${VERSION:R},<${QT5_NEXT_VERSION} \
> ${MODGCC4_CPPLIBDEP} \
> databases/freetds
> @@ -121,7 +112,6 @@ RUN_DEPENDS-global =
> RUN_DEPENDS-examples =
> RUN_DEPENDS-mysql =
> RUN_DEPENDS-psql =
> -RUN_DEPENDS-sqlite2 =
> RUN_DEPENDS-tds =
>
> CONFIGURE_STYLE =simple
> @@ -219,7 +209,6 @@ CONFIGURE_ARGS += -accessibility \
> # database support
> CONFIGURE_ARGS +=-sql-mysql
> CONFIGURE_ARGS +=-sql-psql
> -CONFIGURE_ARGS +=-sql-sqlite2
> CONFIGURE_ARGS +=-sql-tds
>
> .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
> Index: pkg/DESCR-main
> ===
> RCS file: /cvs/ports/x11/qt5/qtbase/pkg/DESCR-main,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 DESCR-main
> --- pkg/DESCR-main25 Dec 2016 14:13:12 - 1.1.1.1
> +++ pkg/DESCR-main11 Jul 2021 22:03:32 -
> @@ -9,8 +9,7 @@ simple example programs (source + binari
>
> There's a debug version of the libraries: qt5-debug.
>
> -There are database plugins: qt5-mysql, qt5-postgresql, qt5-sqlite2 and
> -qt5-tds.
> +There are database plugins: qt5-mysql, qt5-postgresql and qt5-tds.
>
> People who want to use Qt5 to compile applications outside the ports tree
> should note that Qt5's installation conforms to OpenBSD habits, not
> Index: pkg/DESCR-sqlite2
> ===
> RCS file: pkg/DESCR-sqlite2
> diff -N pkg/DESCR-sqlite2
> --- pkg/DESCR-sqlite2 25 Dec 2016 14:13:12 - 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1 +0,0 @@
> -Qt5 database plugin for connecting to SQLite 2.x.
> Index: pkg/PLIST-main
> ===
> RCS file: /cvs/ports/x11/qt5/qtbase/pkg/PLIST-main,v
> retrieving revision 1.12
> diff -u -p -r1.12 PLIST-main
> --- pkg/PLIST-main19 Jan 2021 06:16:29 - 1.12
> +++ pkg/PLIST-main11 Jul 2021 22:02:48 -
> @@ -1,5 +1,6 @@
> @comment $OpenBSD: PLIST-main,v 1.12 2021/01/19 06:16:29 rsadowski Exp $
> @conflict qt5-<5.6
> +@pkgpath x11/qt5,-sqlite2
> bin/moc-qt5
> bin/qmake-qt5
> bin/rcc-qt5
> Index: pkg/PLIST-sqlite2
> ===
> RCS file: pkg/PLIST-sqlite2
> diff -N pkg/PLIST-sqlite2
> --- pkg/PLIST-sqlite2 13 Mar 2020 16:53:50 - 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,4 +0,0 @@
> -@comment $OpenBSD:
Remove x11/qt5/qtbase,-sqlite2
Nothing uses it and sqlite2 is long deprecated.
Builds fine without sqlite installed.
This is one of the last remaining sqlite2 users:
$ show-reverse-deps databases/sqlite
databases/libdbi-drivers,-sqlite
x11/qt5/qtbase,-sqlite2
Feedback? Objections? OK?
Index: Makefile
===
RCS file: /cvs/ports/x11/qt5/qtbase/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- Makefile9 Jun 2021 19:50:10 - 1.44
+++ Makefile11 Jul 2021 22:04:52 -
@@ -7,15 +7,13 @@ COMMENT-main =C++ general-purpose tool
COMMENT-global = global Qt5 documentation internals
COMMENT-mysql =MySQL plugin for Qt5
COMMENT-psql = PostgresSQL plugin for Qt5
-COMMENT-sqlite2 = SQLite 2.x plugin for Qt5
COMMENT-tds = TDS plugin for Qt5
-REVISION-main =3
+REVISION-main =4
PKGNAME-mysql =qt5-mysql-${VERSION}
PKGNAME-global = qt5-global-${VERSION}
PKGNAME-psql = qt5-postgresql-${VERSION}
-PKGNAME-sqlite2 = qt5-sqlite2-${VERSION}
PKGNAME-tds = qt5-tds-${VERSION}
PKG_ARCH-global = *
@@ -57,14 +55,11 @@ WANTLIB-mysql +=m pthread mariadb
WANTLIB-psql = ${COMPILER_LIBCXX} Qt5Core Qt5Sql
WANTLIB-psql +=m pthread pq
-WANTLIB-sqlite2 = ${COMPILER_LIBCXX} Qt5Core Qt5Sql
-WANTLIB-sqlite2 += m pthread sqlite
-
WANTLIB-tds = ${COMPILER_LIBCXX} Qt5Core Qt5Sql
WANTLIB-tds += m pthread sybdb
# there is no -sqlite3 because it's heavily used by Qt itself (.qch files)
-MULTI_PACKAGES = -main -examples -global -mysql -psql -sqlite2 -tds
+MULTI_PACKAGES = -main -examples -global -mysql -psql -tds
# qmake module is used only for running tests and setting vars
MODQT_DEPS = No
@@ -102,10 +97,6 @@ LIB_DEPENDS-psql = ${BASE_PKGPATH},-main
${MODGCC4_CPPLIBDEP} \
databases/postgresql
-LIB_DEPENDS-sqlite2 =
${BASE_PKGPATH},-main>=${VERSION:R},<${QT5_NEXT_VERSION} \
- ${MODGCC4_CPPLIBDEP} \
- databases/sqlite
-
LIB_DEPENDS-tds =
${BASE_PKGPATH},-main>=${VERSION:R},<${QT5_NEXT_VERSION} \
${MODGCC4_CPPLIBDEP} \
databases/freetds
@@ -121,7 +112,6 @@ RUN_DEPENDS-global =
RUN_DEPENDS-examples =
RUN_DEPENDS-mysql =
RUN_DEPENDS-psql =
-RUN_DEPENDS-sqlite2 =
RUN_DEPENDS-tds =
CONFIGURE_STYLE = simple
@@ -219,7 +209,6 @@ CONFIGURE_ARGS += -accessibility \
# database support
CONFIGURE_ARGS += -sql-mysql
CONFIGURE_ARGS += -sql-psql
-CONFIGURE_ARGS += -sql-sqlite2
CONFIGURE_ARGS += -sql-tds
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
Index: pkg/DESCR-main
===
RCS file: /cvs/ports/x11/qt5/qtbase/pkg/DESCR-main,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR-main
--- pkg/DESCR-main 25 Dec 2016 14:13:12 - 1.1.1.1
+++ pkg/DESCR-main 11 Jul 2021 22:03:32 -
@@ -9,8 +9,7 @@ simple example programs (source + binari
There's a debug version of the libraries: qt5-debug.
-There are database plugins: qt5-mysql, qt5-postgresql, qt5-sqlite2 and
-qt5-tds.
+There are database plugins: qt5-mysql, qt5-postgresql and qt5-tds.
People who want to use Qt5 to compile applications outside the ports tree
should note that Qt5's installation conforms to OpenBSD habits, not
Index: pkg/DESCR-sqlite2
===
RCS file: pkg/DESCR-sqlite2
diff -N pkg/DESCR-sqlite2
--- pkg/DESCR-sqlite2 25 Dec 2016 14:13:12 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1 +0,0 @@
-Qt5 database plugin for connecting to SQLite 2.x.
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/x11/qt5/qtbase/pkg/PLIST-main,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST-main
--- pkg/PLIST-main 19 Jan 2021 06:16:29 - 1.12
+++ pkg/PLIST-main 11 Jul 2021 22:02:48 -
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST-main,v 1.12 2021/01/19 06:16:29 rsadowski Exp $
@conflict qt5-<5.6
+@pkgpath x11/qt5,-sqlite2
bin/moc-qt5
bin/qmake-qt5
bin/rcc-qt5
Index: pkg/PLIST-sqlite2
===
RCS file: pkg/PLIST-sqlite2
diff -N pkg/PLIST-sqlite2
--- pkg/PLIST-sqlite2 13 Mar 2020 16:53:50 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,4 +0,0 @@
-@comment $OpenBSD: PLIST-sqlite2,v 1.3 2020/03/13 16:53:50 rsadowski Exp $
-@pkgpath x11/qt5,-sqlite2
-lib/qt5/cmake/Qt5Sql/Qt5Sql_QSQLite2DriverPlugin.cmake
-@so lib/qt5/plugins/sqldrivers/libqsqlite2.so
