summaryrefslogtreecommitdiffstats
path: root/libraries/qt5
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/qt5')
-rw-r--r--libraries/qt5/README117
-rw-r--r--libraries/qt5/README.benchmarks114
-rw-r--r--libraries/qt5/README.ccache46
-rw-r--r--libraries/qt5/desktop/assistant-qt5.desktop8
-rw-r--r--libraries/qt5/desktop/designer-qt5.desktop10
-rw-r--r--libraries/qt5/desktop/linguist-qt5.desktop9
-rw-r--r--libraries/qt5/desktop/qdbusviewer-qt5.desktop9
-rw-r--r--libraries/qt5/doinst.sh9
-rw-r--r--libraries/qt5/patches/explicitly-initialize-sqlite.patch217
-rw-r--r--libraries/qt5/patches/qt5.mysql.h.diff12
-rw-r--r--libraries/qt5/profile.d/qt5.csh17
-rw-r--r--libraries/qt5/profile.d/qt5.sh17
-rw-r--r--libraries/qt5/qt5.SlackBuild349
-rw-r--r--libraries/qt5/qt5.info10
-rw-r--r--libraries/qt5/slack-desc19
15 files changed, 0 insertions, 963 deletions
diff --git a/libraries/qt5/README b/libraries/qt5/README
deleted file mode 100644
index c0fc3bbad5..0000000000
--- a/libraries/qt5/README
+++ /dev/null
@@ -1,117 +0,0 @@
-Qt is a cross-platform C++ application framework. Qt's
-primary feature is its rich set of widgets that provide
-standard GUI functionality.
-
-The following are optional dependencies that Qt will link
-against if they are detected at build time:
-
-libwebp opus pcre2 snappy
-
-============================================================
-
-OPTIONS
-
-To use Qt's built-in ccache option:
-
- CCACHE=yes ./qt5.SlackBuild
-
-See README.benchmarks for the benefits of using ccache.
-
-To build the documentation:
-
- DOCS=yes ./qt5.SlackBuild
-
-To build the examples:
-
- EXAMPLES=yes ./qt5.SlackBuild
-
-To build support for proprietary media codecs:
-
- PROPRIETARY_CODECS=yes ./qt5.SlackBuild
-
-(this will produce a non-redistributable package in some
-countries)
-
-To disable support for pulseaudio:
-
- PULSEAUDIO=no ./qt5.SlackBuild
-
-(Qt will automatically detect if pulseaudio is not installed
-at build time and disable it if it is missing.)
-
-To NOT build qtwebengine (EXPERIMENTAL):
-
- WEBENGINE=no ./qt5.SlackBuild
-
-
-Combine any or all of the above.
-
-============================================================
-
-GENERAL NOTES
-
-After upgrading Qt5 it is important to rebuild qt5ct too, if
-it is installed, or some applications may not display or
-function correctly.
-
-There is a qt5-legacy (5.7.1) SlackBuild that is available
-for older applications that do not run correctly with this
-version. However it will not coexist with this version.
-
-Please report any problems about applications that don't
-work correctly to the Qt5 maintainer or to the mailing list.
-
-============================================================
-
-ROUGH SPEED & SIZE GUIDE
-
- OPTION PKG SPACE TIME
- Normal: 102M 5018M 9:55
- No Webengine: 50M 1895M 3:18
- With Documentation: 339M 6197M -
- With Examples: 391M 6388M -
- With Documentation and Examples: 628M 7604M -
-
- PKG: Package size.
- SPACE: Package directory + source space needed.
- TIME: Rough build time (- = unknown.)
-
-See README.benchmarks for more detailed information.
-See README.ccache for information on setting up ccache.
-
-============================================================
-
-NOTES ON OPTIONS
-
-* Using ccache should speed up subsequent rebuilds, but may
- be slower for first time or one-off builds.
-
-* Building the documentation and/or examples creates a
- significantly larger package.
-
-* Successfully tested so far without webengine (VERY quick
- tests):
-
- QMPlay2
- qt5ct
- qbittorrent-qt5
- speedcrunch
- qca-qt5
- psi-plus
- sddm
-
-============================================================
-
-BUILDING WITHOUT WEBENGINE
-
-See README.benchmarks for the benefits of not building
-webengine.
-
-YMMV whether it works with an application or not, but if you
-have no intention of using the browser code, which includes
-a chunk of 3rd party Google Chromium source, then it may
-make sense to skip it and save yourself about 2/3 of the
-build time.
-
-The package version has _nowebengine appended to it for
-clarity.
diff --git a/libraries/qt5/README.benchmarks b/libraries/qt5/README.benchmarks
deleted file mode 100644
index 466d6b924d..0000000000
--- a/libraries/qt5/README.benchmarks
+++ /dev/null
@@ -1,114 +0,0 @@
-ENVIRONMENT
-
- Linux 4.4.157 SMP x86_64 (stock 14.2 -huge.)
- Using /usr/bin/time rather than shell built-in.
- Jobs: 2.
- Qt version: 5.9.7
-
-DMI Info:
-
- Board: Lenovo Mahobay motherboard.
- CPU: Version: Intel(R) Pentium(R) CPU G640 @ 2.80GHz
- Family: Core i7 Core Count: 2
- Core Enabled: 2
- Thread Count: 2
- Max Speed: 2800 MHz
- Current Speed: 2800 MHz
- External Clock: 100 MHz
-
- CPUFREQ: Performance mode.
-
- RAM: 12G (1333 MHz) DDR3.
-
- An 8 GB tmpfs in /mnt/memory is used as a ramdisk for /tmp
- while the package was output on the real HDD. i.e.
- $TMP=/mnt/memory/SBo
- $OUTPUT=/tmp
-
-System ccache setup:
-
- cache size: 18.3 GB
- max_cache: 20.0 GB
- cache_dir: /root/.ccache
- CCACHE_TEMPDIR=/mnt/memory/ccache
-
-No special settings were used for Qt's -ccache.
-All builds with either ccache option were performed a few
-times to build up enough cache.
-
-BENCHMARKS
-
-BUILDS WITH WEBENGINE
-
-Normal build:
-
-45970.94 user
-2408.58 system
-9:55:02 elapsed
-135% CPU (0 avgtext + 0 avgdata 7378176 maxresident) k
-80232 inputs + 522800 outputs (263 major + 950621123 minor) pagefaults
-0 swaps
-
-Using Qt's -ccache option:
-
-36223.82 user
-1872.14 system
-6:58:03 elapsed
-151% CPU (0 avgtext + 0 avgdata 7375136 maxresident) k
-274848 inputs + 578712 outputs (730 major + 724828690 minor) pagefaults
-0 swaps
-
-Using system ccache:
-
-4008.03 user
-289.34 system
-1:17:11 elapsed
-92% CPU (0 avgtext + 0 avgdata 7377248 maxresident) k
-4396232 inputs + 391856 outputs (97 major + 59094442 minor) pagefaults
-0 swaps
-
-
-BUILDS WITHOUT WEBENGINE
-
-Normal build:
-
-10408.66 user
-687.60 system
-3:18:22 elapsed
-93% CPU (0 avgtext + 0 avgdata 3850048 maxresident) k
-48176 inputs + 414056 outputs (26 major + 265106108 minor) pagefaults
-0 swaps
-
-Using Qt's -ccache option:
-
-1055.75 user
-167.14 system
-22:17.13 elapsed
-91% CPU (0 avgtext + 0 avgdata 1188432 maxresident) k
-936 inputs + 468464 outputs (8 major + 42575851 minor) pagefaults
-0 swaps
-
-Using system ccache:
-
-922.05 user
-159.25 system
-19:42.82 elapsed
-91% CPU (0 avgtext + 0 avgdata 504048 maxresident) k
-5672 inputs + 158016 outputs (5 major + 38449127 minor) pagefaults
-0 swaps
-
-
-Average Packages Sizes:
-
-Normal: 102 MB
-Without webengine: 50 MB
-
-
-As is seen by the elapsed time in the results, using ccache
-system-wide has a huge benefit. Qt's -ccache option showed
-little gain when building the full package, but was good
-when building without webengine.
-
-See README.ccache for information on setting up ccache.
-
-Last updated Mon 10 Dec 03:46:29 UTC 2018
diff --git a/libraries/qt5/README.ccache b/libraries/qt5/README.ccache
deleted file mode 100644
index 1053bcc5c9..0000000000
--- a/libraries/qt5/README.ccache
+++ /dev/null
@@ -1,46 +0,0 @@
-NOTES ON SETTING UP CCACHE
-
-Using ccache can save a lot of time when building packages,
-and this is not limited to Qt5. Ccache is installed by
-default on stock Slackware.
-
-ccache(1) has a lot of useful info on using ccache, however
-I don't recommend using its method of symlinking. Instead I
-recommend the following way:
-
-mkdir -p /usr/local/bin
-ln -s /usr/bin/ccache /usr/local/bin/cc
-ln -s /usr/bin/ccache /usr/local/bin/c++
-ln -s /usr/bin/ccache /usr/local/bin/gcc
-ln -s /usr/bin/ccache /usr/local/bin/g++
-
-Doing it this way rather than copying the ccache binary as
-the man page suggests will ensure that the ccache used is
-updated whenever the ccache package is.
-
-The cache is created in the home directory of the user using
-it, and since slackbuilds are run by root that will be in
-/root/.ccache, therefore ensure that you have enough free
-space on the root file system for it. It is possible to put
-the cache directory elsewhere though. See the man page for
-info. But it would probably be fastest when on the same
-file system as the build directory.
-
-It's also possible to host the cache on a shared NFS
-directory, but be sure to test the speed before committing
-to that. The man page has some notes on this.
-
-Since Qt5 can take a lot of build space I recommend a max
-cache size of AT LEAST 6 GB. If you intend to use it all
-the time then use as much as you can. The default size is
-5 GB. I use 20 GB on my main build box, but use 7 GB on
-workstations and servers.
-
-Handy commands:
-
-ccache -s: To show some statistics.
-ccache -M <N>: To set the max cache size to N.
-
-(use G for GB with -M.)
-
-Last updated Mon 10 Dec 03:46:41 UTC 2018
diff --git a/libraries/qt5/desktop/assistant-qt5.desktop b/libraries/qt5/desktop/assistant-qt5.desktop
deleted file mode 100644
index 86f5701e34..0000000000
--- a/libraries/qt5/desktop/assistant-qt5.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Qt5 Assistant
-Comment=Shows Qt5 documentation and examples
-Exec=/usr/lib@LIBDIR@/qt5/bin/assistant
-Icon=assistant-qt5
-Terminal=false
-Type=Application
-Categories=Qt;Development;Documentation;
diff --git a/libraries/qt5/desktop/designer-qt5.desktop b/libraries/qt5/desktop/designer-qt5.desktop
deleted file mode 100644
index 16b91b8cb0..0000000000
--- a/libraries/qt5/desktop/designer-qt5.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Qt5 Designer
-GenericName=Interface Designer
-Comment=Design GUIs for Qt5 applications
-Exec=/usr/lib@LIBDIR@/qt5/bin/designer
-Icon=designer-qt5
-MimeType=application/x-designer;
-Terminal=false
-Type=Application
-Categories=Qt;Development;
diff --git a/libraries/qt5/desktop/linguist-qt5.desktop b/libraries/qt5/desktop/linguist-qt5.desktop
deleted file mode 100644
index 9ef2f0fbcb..0000000000
--- a/libraries/qt5/desktop/linguist-qt5.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Qt5 Linguist
-Comment=Add translations to Qt5 applications
-Exec=/usr/lib@LIBDIR@/qt5/bin/linguist
-Icon=linguist-qt5
-MimeType=text/vnd.trolltech.linguist;application/x-linguist;
-Terminal=false
-Type=Application
-Categories=Qt;Development;
diff --git a/libraries/qt5/desktop/qdbusviewer-qt5.desktop b/libraries/qt5/desktop/qdbusviewer-qt5.desktop
deleted file mode 100644
index 46947f092d..0000000000
--- a/libraries/qt5/desktop/qdbusviewer-qt5.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Qt5 QDbusViewer
-GenericName=Qt5 D-Bus Debugger
-Comment=Debug D-Bus applications
-Exec=/usr/lib@LIBDIR@/qt5/bin/qdbusviewer
-Icon=qdbusviewer-qt5
-Terminal=false
-Type=Application
-Categories=Qt;Development;Debugger;
diff --git a/libraries/qt5/doinst.sh b/libraries/qt5/doinst.sh
deleted file mode 100644
index 65c7e2eeb9..0000000000
--- a/libraries/qt5/doinst.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
- if [ -x /usr/bin/gtk-update-icon-cache ]; then
- /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
- fi
-fi
diff --git a/libraries/qt5/patches/explicitly-initialize-sqlite.patch b/libraries/qt5/patches/explicitly-initialize-sqlite.patch
deleted file mode 100644
index 2773658adc..0000000000
--- a/libraries/qt5/patches/explicitly-initialize-sqlite.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-From 9bab2acc924790b0a01a08e76f9216acc2d6528b Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Date: Thu, 16 May 2019 11:19:49 +0200
-Subject: [Backport] WebSQL: Explicitly initialize SQLite, remove deprecated
- API usage.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Change-Id: I291dd041c5646c4fdd714ff98dd939566861d921
-Reviewed-on: https://chromium-review.googlesource.com/892092
-Task-number: QTBUG-75853
-Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
----
- .../Source/modules/webdatabase/DatabaseTracker.cpp | 2 +-
- .../modules/webdatabase/sqlite/SQLiteFileSystem.cpp | 21 ++++++++++++++++++++-
- .../modules/webdatabase/sqlite/SQLiteFileSystem.h | 21 +++++++++++++++------
- .../webdatabase/sqlite/SQLiteFileSystemPosix.cpp | 19 ++++++++++---------
- .../webdatabase/sqlite/SQLiteFileSystemWin.cpp | 19 ++++++++++---------
- 5 files changed, 56 insertions(+), 26 deletions(-)
-
-diff --git a/chromium/third_party/WebKit/Source/modules/webdatabase/DatabaseTracker.cpp b/chromium/third_party/WebKit/Source/modules/webdatabase/DatabaseTracker.cpp
-index 13ea7d8181..f78d90a5df 100644
---- a/chromium/third_party/WebKit/Source/modules/webdatabase/DatabaseTracker.cpp
-+++ b/chromium/third_party/WebKit/Source/modules/webdatabase/DatabaseTracker.cpp
-@@ -66,7 +66,7 @@ DatabaseTracker& DatabaseTracker::tracker() {
- }
-
- DatabaseTracker::DatabaseTracker() {
-- SQLiteFileSystem::registerSQLiteVFS();
-+ SQLiteFileSystem::initializeSQLite();
- }
-
- bool DatabaseTracker::canEstablishDatabase(DatabaseContext* databaseContext,
-diff --git a/chromium/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystem.cpp b/chromium/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystem.cpp
-index 9c25341c57..2a6e140f9e 100644
---- a/chromium/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystem.cpp
-+++ b/chromium/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystem.cpp
-@@ -39,9 +39,28 @@
- // platform-specific files SQLiteFileSystemChromium{Win|Posix}.cpp
- namespace blink {
-
--SQLiteFileSystem::SQLiteFileSystem() {}
-+#if DCHECK_IS_ON()
-+// static
-+bool SQLiteFileSystem::initialize_sqlite_called_ = false;
-+#endif // DCHECK_IS_ON
-
-+// static
-+void SQLiteFileSystem::initializeSQLite() {
-+#if DCHECK_IS_ON()
-+ DCHECK(!initialize_sqlite_called_) << __func__ << " already called";
-+ initialize_sqlite_called_ = true;
-+#endif // DCHECK_IS_ON()
-+
-+ sqlite3_initialize();
-+ registerSQLiteVFS();
-+}
-+
-+// static
- int SQLiteFileSystem::openDatabase(const String& filename, sqlite3** database) {
-+#if DCHECK_IS_ON()
-+ DCHECK(initialize_sqlite_called_)
-+ << "InitializeSQLite() must be called before " << __func__;
-+#endif // DCHECK_IS_ON()
- SafePointScope scope(BlinkGC::HeapPointersOnStack);
- return sqlite3_open_v2(filename.utf8().data(), database,
- SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE,
-diff --git a/chromium/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystem.h b/chromium/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystem.h
-index 97c0ad83a1..af2bcd9211 100644
---- a/chromium/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystem.h
-+++ b/chromium/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystem.h
-@@ -42,22 +42,31 @@ namespace blink {
- // A class that abstracts the file system related operations required
- // by the WebKit database code.
- class SQLiteFileSystem {
-- DISALLOW_NEW();
--
- public:
-- // Registers a user-defined SQLite VFS.
-- static void registerSQLiteVFS();
-+ // This class is used as a namespace, so instantiating it doesn't make sense.
-+ SQLiteFileSystem() = delete;
-+
-+ // Initializes SQLite for Blink's use.
-+ //
-+ // This must be called exactly once in each renderer process that uses SQLite.
-+ static void initializeSQLite();
-
- // Opens a database file.
- //
-+ // initializeSQLite() must be called before this method is called.
-+ //
- // filemame - The name of the database file.
- // database - The SQLite structure that represents the database stored
- // in the given file.
- static int openDatabase(const String& filename, sqlite3** database);
-
- private:
-- // do not instantiate this class
-- SQLiteFileSystem();
-+ // Registers Chromium's VFS with SQLite.
-+ static void registerSQLiteVFS();
-+
-+#if DCHECK_IS_ON()
-+ static bool initialize_sqlite_called_;
-+#endif // DCHECK_IS_ON()
- }; // class SQLiteFileSystem
-
- } // namespace blink
-diff --git a/chromium/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemPosix.cpp b/chromium/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemPosix.cpp
-index 77e7b6d904..20d0fd2e0e 100644
---- a/chromium/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemPosix.cpp
-+++ b/chromium/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemPosix.cpp
-@@ -321,11 +321,6 @@ int chromiumSleep(sqlite3_vfs* vfs, int microseconds) {
- return wrappedVfs->xSleep(wrappedVfs, microseconds);
- }
-
--int chromiumCurrentTime(sqlite3_vfs* vfs, double* prNow) {
-- sqlite3_vfs* wrappedVfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
-- return wrappedVfs->xCurrentTime(wrappedVfs, prNow);
--}
--
- int chromiumGetLastError(sqlite3_vfs* vfs, int e, char* s) {
- // xGetLastError() has never been used by SQLite. The implementation in
- // os_win.c indicates this is a reasonable implementation.
-@@ -333,6 +328,11 @@ int chromiumGetLastError(sqlite3_vfs* vfs, int e, char* s) {
- return 0;
- }
-
-+int chromiumCurrentTimeInt64(sqlite3_vfs* vfs, sqlite3_int64* now) {
-+ sqlite3_vfs* wrapped_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
-+ return wrapped_vfs->xCurrentTimeInt64(wrapped_vfs, now);
-+}
-+
- } // namespace
-
- void SQLiteFileSystem::registerSQLiteVFS() {
-@@ -342,9 +342,9 @@ void SQLiteFileSystem::registerSQLiteVFS() {
- // TODO(shess): Implement local versions.
- ASSERT(wrappedVfs->xRandomness);
- ASSERT(wrappedVfs->xSleep);
-- ASSERT(wrappedVfs->xCurrentTime);
-+ ASSERT(wrappedVfs->xCurrentTimeInt64);
-
-- static sqlite3_vfs chromium_vfs = {1,
-+ static sqlite3_vfs chromium_vfs = {2,
- sizeof(chromiumVfsFile),
- wrappedVfs->mxPathname,
- 0,
-@@ -360,8 +360,9 @@ void SQLiteFileSystem::registerSQLiteVFS() {
- chromiumDlClose,
- chromiumRandomness,
- chromiumSleep,
-- chromiumCurrentTime,
-- chromiumGetLastError};
-+ nullptr, // CurrentTime is deprecated.
-+ chromiumGetLastError,
-+ chromiumCurrentTimeInt64};
- sqlite3_vfs_register(&chromium_vfs, 0);
- }
-
-diff --git a/chromium/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemWin.cpp b/chromium/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemWin.cpp
-index 2933df65f6..31103047fd 100644
---- a/chromium/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemWin.cpp
-+++ b/chromium/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemWin.cpp
-@@ -148,11 +148,6 @@ int chromiumSleep(sqlite3_vfs* vfs, int microseconds) {
- return wrappedVfs->xSleep(wrappedVfs, microseconds);
- }
-
--int chromiumCurrentTime(sqlite3_vfs* vfs, double* prNow) {
-- sqlite3_vfs* wrappedVfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
-- return wrappedVfs->xCurrentTime(wrappedVfs, prNow);
--}
--
- int chromiumGetLastError(sqlite3_vfs* vfs, int e, char* s) {
- // xGetLastError() has never been used by SQLite. The implementation in
- // os_win.c indicates this is a reasonable implementation.
-@@ -160,6 +155,11 @@ int chromiumGetLastError(sqlite3_vfs* vfs, int e, char* s) {
- return 0;
- }
-
-+int chromiumCurrentTimeInt64(sqlite3_vfs* vfs, sqlite3_int64* now) {
-+ sqlite3_vfs* wrapped_vfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
-+ return wrapped_vfs->xCurrentTimeInt64(wrapped_vfs, now);
-+}
-+
- } // namespace
-
- void SQLiteFileSystem::registerSQLiteVFS() {
-@@ -169,9 +169,9 @@ void SQLiteFileSystem::registerSQLiteVFS() {
- // TODO(shess): Implement local versions.
- ASSERT(wrappedVfs->xRandomness);
- ASSERT(wrappedVfs->xSleep);
-- ASSERT(wrappedVfs->xCurrentTime);
-+ ASSERT(wrappedVfs->xCurrentTimeInt64);
-
-- static sqlite3_vfs chromium_vfs = {1,
-+ static sqlite3_vfs chromium_vfs = {2,
- wrappedVfs->szOsFile,
- wrappedVfs->mxPathname,
- 0,
-@@ -187,8 +187,9 @@ void SQLiteFileSystem::registerSQLiteVFS() {
- chromiumDlClose,
- chromiumRandomness,
- chromiumSleep,
-- chromiumCurrentTime,
-- chromiumGetLastError};
-+ nullptr, // CurrentTime is deprecated.
-+ chromiumGetLastError,
-+ chromiumCurrentTimeInt64};
- sqlite3_vfs_register(&chromium_vfs, 0);
- }
-
---
-cgit v1.2.1
-
diff --git a/libraries/qt5/patches/qt5.mysql.h.diff b/libraries/qt5/patches/qt5.mysql.h.diff
deleted file mode 100644
index 1ac6faacfd..0000000000
--- a/libraries/qt5/patches/qt5.mysql.h.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur qt-everywhere-opensource-src-5.1.0.orig/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql_p.h qt-everywhere-opensource-src-5.1.0/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql_p.h
---- qt-everywhere-opensource-src-5.1.0.orig/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql_p.h 2013-07-02 07:09:52.000000000 +0000
-+++ qt-everywhere-opensource-src-5.1.0/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql_p.h 2013-07-21 21:21:01.190172379 +0000
-@@ -60,7 +60,7 @@
- #include <QtCore/qt_windows.h>
- #endif
-
--#include <mysql.h>
-+#include <mysql/mysql.h>
-
- #ifdef QT_PLUGIN
- #define Q_EXPORT_SQLDRIVER_MYSQL
diff --git a/libraries/qt5/profile.d/qt5.csh b/libraries/qt5/profile.d/qt5.csh
deleted file mode 100644
index ec1ecd9bef..0000000000
--- a/libraries/qt5/profile.d/qt5.csh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/csh
-# Environment path variables for the Qt package:
-if ( ! $?QT5DIR ) then
- # It's best to use the generic directory to avoid
- # compiling in a version-containing path:
- if ( -d /usr/lib@LIBDIRSUFFIX@/qt5 ) then
- setenv QT5DIR /usr/lib@LIBDIRSUFFIX@/qt5
- else
- # Find the newest Qt directory and set $QT5DIR to that:
- foreach qtd ( /usr/lib@LIBDIRSUFFIX@/qt5-* )
- if ( -d $qtd ) then
- setenv QT5DIR $qtd
- endif
- end
- endif
-endif
-set path = ( $path $QT5DIR/bin )
diff --git a/libraries/qt5/profile.d/qt5.sh b/libraries/qt5/profile.d/qt5.sh
deleted file mode 100644
index 8ee075e17e..0000000000
--- a/libraries/qt5/profile.d/qt5.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# Environment variables for the Qt package.
-#
-# It's best to use the generic directory to avoid
-# compiling in a version-containing path:
-if [ -d /usr/lib@LIBDIRSUFFIX@/qt5 ]; then
- QT5DIR=/usr/lib@LIBDIRSUFFIX@/qt5
-else
- # Find the newest Qt directory and set $QT5DIR to that:
- for qtd in /usr/lib@LIBDIRSUFFIX@/qt5-* ; do
- if [ -d $qtd ]; then
- QT5DIR=$qtd
- fi
- done
-fi
-PATH="$PATH:$QT5DIR/bin"
-export QT5DIR
diff --git a/libraries/qt5/qt5.SlackBuild b/libraries/qt5/qt5.SlackBuild
deleted file mode 100644
index ef7507d8de..0000000000
--- a/libraries/qt5/qt5.SlackBuild
+++ /dev/null
@@ -1,349 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for qt5
-
-# Update for 5.9.6 by David Woodfall <dave@slackbuilds.org>
-#
-# Copyright 2013-2017 Larry Hajali <larryhaja[at]gmail[dot]com>
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Merged some ideas from Alex Sarmardzic's script for qt4 at SlackBuilds.org
-# ^^ Modified by Robby Workman <rworkman@slackware.com> for QT4 & KDE4
-
-# We're using qt-copy instead of a released qt version, as this git release
-# has at least one bugfix strongly recommended by the kde developers.
-
-# Obtained from:
-# git clone git://gitorious.org/+kde-developers/qt/kde-qt.git
-# git checkout origin/4.5.3-patched
-# git checkout origin/4.6.0-stable-patched
-# git checkout origin/4.6.1-patched
-# git checkout origin/4.7.0-patched
-#
-# Alternate method (we don't use this):
-# wget http://qt.gitorious.org/qt/kde-qt/archive-tarball/4.6.2-patched
-#
-# Modifications 2010, 2011, 2012 Eric Hameleers, Eindhoven, NL
-# qt 4.7.3, 4.7.4, 4.8.0, 4.8.1, 4.8.2, 4.8.4 are built from original nokia sources.
-
-# This is the highly modified version qt.SlackBuild found in Slackware
-# tailored to Qt 5. Modified by Larry Hajali.
-
-# Adapted for Qt 5.9.6 by David Woodfall
-
-PRGNAM=qt5
-VERSION=${VERSION:-5.9.9}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-EXAMPLES=${EXAMPLES:-no}
-DOCS=${DOCS:-no}
-PROPRIETARY_CODECS=${PROPRIETARY_CODECS:-no}
-PULSEAUDIO=${PULSEAUDIO:-yes}
-CCACHE=${CCACHE:-no}
-WEBENGINE=${WEBENGINE:-yes}
-
-printf "\n%s\n\n" "SlackBuild Options:"
-printf "%s\n" "CCACHE: $CCACHE"
-printf "%s\n" "DOCS: $DOCS"
-printf "%s\n" "EXAMPLES: $EXAMPLES"
-printf "%s\n" "PROPRIETARY_CODECS: $PROPRIETARY_CODECS"
-printf "%s\n" "PULSEAUDIO: $PULSEAUDIO"
-printf "%s\n" "WEBENGINE: $WEBENGINE"
-printf "\n"
-
-# Default is no.
-if [ "$EXAMPLES" == "yes" ]; then
- BUILD_EXAMPLES=""
-else
- BUILD_EXAMPLES="-nomake examples"
-fi
-
-# Default is yes.
-if [ "$PULSEAUDIO" = "no" ]; then
- PULSE="-no-pulseaudio"
-fi
-
-# Default is no.
-if [ "$CCACHE" = "yes" ]; then
- CCACHE="-ccache"
-else
- unset CCACHE
-fi
-
-if [ "$WEBENGINE" = "no" ]; then
- EXCLUDE="--exclude=qtweb*"
- PKGVERSION="${VERSION}_nowebengine"
-else
- PKGVERSION="${VERSION}"
- # Note that this changes to -webengine-proprietary-codecs in later versions
- if [ "$PROPRIETARY_CODECS" = "yes" ]; then
- CODECS="-proprietary-codecs"
- fi
-fi
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
- SLKLDFLAGS="-L/usr/lib64"
-elif [ "$ARCH" = "armv7hl" ]; then
- # To prevent "qatomic_armv6.h error: output number 2 not directly addressable"
- # More permanent solution is to patch gcc:
- # http://bazaar.launchpad.net/~linaro-toolchain-dev/gcc-linaro/4.6/revision/106731
- SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -fno-strict-volatile-bitfields"
- LIBDIRSUFFIX=""
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-if [ -e /var/log/packages/$PRGNAM-legacy-[[:digit:]]* ]; then
- printf "%s\n%s\n%s\n" "You appear to have $PRGNAM-legacy installed." \
- "$PRGNAM will not co-exist with $PRGNAM-legacy." \
- "Please uninstall $PRGNAM-legacy and restart the SlackBuild."
- exit 1
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-echo "Removing any existing source directory. Please wait..."
-rm -rf ${PRGNAM/5/}-everywhere-opensource-src-$VERSION
-tar xvf $CWD/${PRGNAM/5/}-everywhere-opensource-src-$VERSION.tar.xz $EXCLUDE
-cd ${PRGNAM/5/}-everywhere-opensource-src-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
-
-# Limit -reduce-relocations to ix86 and x86_64.
-# https://bugreports.qt-project.org/browse/QTBUG-36129
-if echo $ARCH | grep -q '\(i.86\|x86_64\)' 2>/dev/null; then
- RELOCATIONS="-reduce-relocations"
-else
- RELOCATIONS=""
-fi
-
-# Borrowed a few things from alienBOB:
-# Fix path to mysql header:
-cat $CWD/patches/qt5.mysql.h.diff | patch -p1 --verbose
-
-# Fix missing private includes: QTBUG-37417
-sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' \
- -i qtbase/mkspecs/features/create_cmake.prf
-
-# Use our custom compiler and linker flags:
-sed -i -re "s,-O(2|3),$SLKCFLAGS," qtbase/mkspecs/common/gcc-base.conf
-sed -i -e "/^QMAKE_LFLAGS\s/s,+=,+= $SLKLDFLAGS,g" \
- qtbase/mkspecs/common/gcc-base.conf
-
-export CFLAGS="$SLKCFLAGS"
-export CXXFLAGS="$SLKCFLAGS -std=c++11"
-./configure -v \
- -confirm-license \
- -opensource \
- -prefix "/usr/lib${LIBDIRSUFFIX}/$PRGNAM" \
- -sysconfdir "/etc/xdg" \
- -headerdir "/usr/include/$PRGNAM" \
- -libdir "/usr/lib${LIBDIRSUFFIX}" \
- -docdir "/usr/doc/$PRGNAM-$VERSION" \
- -system-libpng \
- -system-libjpeg \
- -system-zlib \
- -system-sqlite \
- -plugin-sql-sqlite \
- -icu \
- -openssl-linked \
- -verbose \
- -dbus-linked \
- -qpa xcb \
- -xcb \
- -glib \
- -accessibility \
- -no-separate-debug-info \
- -no-pch \
- -no-rpath \
- -no-strip \
- -release \
- -no-use-gold-linker \
- -c++std c++11 \
- $CCACHE \
- $CODECS \
- $PULSE \
- $RELOCATIONS \
- $BUILD_EXAMPLES
-
-make
-make install INSTALL_ROOT=$PKG
-
-# Install documentation. Default is not to install documentation.
-if [ "$DOCS" == "yes" ]; then
- # Recreate Makefiles in order to use the just compiled qdoc.
- for doc in $(find . -name "Makefile*" | xargs egrep "^\s/usr/lib${LIBDIRSUFFIX}/qt5/bin/" \
- | cut -d':' -f1 | uniq)
- do
- rm -fv $doc
- done
- make docs
- make install_docs INSTALL_ROOT=$PKG
-fi
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-ln -s $PRGNAM $PKG/usr/lib${LIBDIRSUFFIX}/qt-$VERSION
-
-mkdir -p $PKG/usr/bin
-for BIN in $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/bin/*; do
- TMP_FILE=$(echo $BIN | sed -e "s|$PKG||")
- case $(basename $BIN) in
- syncqt.pl|fixqt4headers.pl)
- ln -s $TMP_FILE $PKG/usr/bin/$(basename $BIN)
- ;;
- *)
- ln -s $TMP_FILE $PKG/usr/bin/$(basename $BIN)-$PRGNAM
- ;;
- esac
-done
-
-# Create Environment variables
-mkdir -p $PKG/etc/profile.d
-sed -e "s|@LIBDIRSUFFIX@|${LIBDIRSUFFIX}|g" $CWD/profile.d/$PRGNAM.sh \
- > $PKG/etc/profile.d/$PRGNAM.sh
-sed -e "s|@LIBDIRSUFFIX@|${LIBDIRSUFFIX}|g" $CWD/profile.d/$PRGNAM.csh \
- > $PKG/etc/profile.d/$PRGNAM.csh
-chmod 0755 $PKG/etc/profile.d/*
-
-cat > $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5.pc << EOF
-prefix=/usr/lib${LIBDIRSUFFIX}/$PRGNAM
-bindir=\${prefix}/bin
-datadir=\${prefix}
-docdir=/usr/doc/$PRGNAM-$VERSION
-archdatadir=\${prefix}
-examplesdir=\${prefix}/examples
-headerdir=/usr/include/$PRGNAM
-importdir=\${prefix}/imports
-qmldir=\${prefix}/qml
-libdir=/usr/lib${LIBDIRSUFFIX}
-libexec=\${prefix}/libexec
-moc=\${bindir}/moc
-plugindir=\${prefix}/plugins
-qmake=\${bindir}/qmake
-sysconfdir=/etc/xdg
-translationdir=\${prefix}/translations
-
-Name: Qt5
-Description: Qt5 Configuration
-Version: $VERSION
-EOF
-
-if [ "$WEBENGINE" = "yes" ]; then
- # Fix internal linking for Qt5WebEngineCore.pc.
- sed -i \
- -e 's|-Wl,--start-group.* -Wl,--end-group||' \
- -e "s|-L${PWD}/qtwebengine/src/core/api/Release||" \
- $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5WebEngineCore.pc
-fi
-
-# While we are at it, there isn't any reason to keep references to $PKG in the *.prl files.
-for PRL in $(find $PKG -name "*\.prl"); do
- sed -i '/^QMAKE_PRL_BUILD_DIR/d' $PRL
-done
-
-# One more for the road.
-sed -i "s|$PWD/qtbase|/usr/lib${LIBDIRSUFFIX}/$PRGNAM|" \
- $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/mkspecs/modules/qt_lib_bootstrap_private.pri
-
-sed -i "s|-L${PWD}/\w*/lib ||g" \
- $PKG/usr/lib${LIBDIRSUFFIX}/libqgsttools_p.prl
-
-for i in $CWD/desktop/*.desktop; do
- install -D -m 0644 $i $PKG/usr/share/applications/$(basename $i)
-done
-sed -i "s|@LIBDIR@|$LIBDIRSUFFIX|" $PKG/usr/share/applications/*
-
-# Currently not working for qt version 5.4.0. Extra layer added to *.ico file
-# freaks out ImageMagick and fails image conversion.
-# Eg.
-# $ convert assistant.ico -resize 96x96! assistant.png
-# convert: file format version mismatch `assistant.ico' @ error/xwd.c/ReadXWDImage/241.
-# convert: no images defined `assistant.png' @ error/convert.c/ConvertImageCommand/3127.
-#for i in $(find . -name "assistant.ico" -o -name "designer.ico" \
-# -o -name "linguist.ico" -o -name "qdbusviewer.ico"); do
-# for j in 16 24 32 48 64 96 128; do
-# convert $i -resize ${j}x${j}! $(basename $i)-$j.png
-# install -D -m 0644 $(basename $i)-$j-0.png \
-# $PKG/usr/share/icons/hicolor/${j}x${j}/apps/$(basename $i | sed 's|.ico||')-$PRGNAM.png
-# done
-#done
-
-install -D -m 0644 qttools/src/assistant/assistant/images/assistant-128.png \
- $PKG/usr/share/icons/hicolor/128x128/apps/assistant-qt5.png
-install -D -m 0644 qttools/src/designer/src/designer/images/designer.png \
- $PKG/usr/share/icons/hicolor/128x128/apps/designer-qt5.png
-install -D -m 0644 qttools/src/qdbus/qdbusviewer/images/qdbusviewer-128.png \
- $PKG/usr/share/icons/hicolor/128x128/apps/qdbusviewer-qt5.png
-for i in 16 32 48 64 128; do
- install -D -m 0644 qttools/src/linguist/linguist/images/icons/linguist-${i}-32.png \
- $PKG/usr/share/icons/hicolor/${i}x${i}/apps/linguist-qt5.png
-done
-
-# Remove executable bits from files.
-find $PKG \( -name "*.qml" -o -name "*.app" \) -perm 755 -exec chmod 644 '{}' \;
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- README qtbase/{header*,LGPL_EXCEPTION.txt,LICENSE.*L} \
- $CWD/README.benchmarks $CWD/README.ccache \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
-
-# vim: expandtab
diff --git a/libraries/qt5/qt5.info b/libraries/qt5/qt5.info
deleted file mode 100644
index 18ec3e1a45..0000000000
--- a/libraries/qt5/qt5.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="qt5"
-VERSION="5.9.9"
-HOMEPAGE="http://qt-project.org/"
-DOWNLOAD="https://download.qt.io/official_releases/qt/5.9/5.9.9/single/qt-everywhere-opensource-src-5.9.9.tar.xz"
-MD5SUM="97e81709b57e82ab2b279408eaa9270e"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libxkbcommon libinput"
-MAINTAINER="Dave Woodfall"
-EMAIL="dave@slackbuilds.org"
diff --git a/libraries/qt5/slack-desc b/libraries/qt5/slack-desc
deleted file mode 100644
index 99abf5c2ba..0000000000
--- a/libraries/qt5/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-qt5: qt5 (a multi-platform C++ graphical user interface toolkit)
-qt5:
-qt5: Qt is a cross-platform C++ application framework. Qt's primary feature
-qt5: is its rich set of widgets that provide standard GUI functionality.
-qt5:
-qt5: Homepage: http://qt-project.org
-qt5:
-qt5:
-qt5:
-qt5:
-qt5: