From bd7908c6630f38067350d396ac5d18c3cc2434a0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 29 Oct 2017 11:22:34 +0000 Subject: gentoo resync : 29.10.2017 --- dev-db/sqliteman/Manifest | 2 + dev-db/sqliteman/files/sqliteman-1.2.2-qt5.patch | 346 +++++++++++++++++++++++ dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild | 45 +++ 3 files changed, 393 insertions(+) create mode 100644 dev-db/sqliteman/files/sqliteman-1.2.2-qt5.patch create mode 100644 dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild (limited to 'dev-db/sqliteman') diff --git a/dev-db/sqliteman/Manifest b/dev-db/sqliteman/Manifest index b4a754bc6f5d..98fe38acf414 100644 --- a/dev-db/sqliteman/Manifest +++ b/dev-db/sqliteman/Manifest @@ -1,8 +1,10 @@ AUX sqliteman-1.2.2-lpthread.patch 486 SHA256 af99d278b6d0cda9f84487985afdb427f77edd6eff9a1a62edac906dcfd5487b SHA512 e4598b7f74da7c046571a5b6744d172a9d5d8d35c28ff0bd11b0db68a3fa8ba291ab9634a3622ea5aa383fe6aff75318350665a0a75f68224b6ba97cbc8f3855 WHIRLPOOL 63858a7eb84bdc51ae13d41e1c20c0a29f0b88b853a29560f895b197881acaa9fe3456ef13f585d6746489760c48c5ad05b6f238faf57d1e554f83c0bed762ff AUX sqliteman-1.2.2-qscintilla-2.10.patch 587 SHA256 572ba772bfe151f3f5bc85e21bea645da84aeecc2a91272ff9b3c4dcb6a94fed SHA512 91af0f16af6c0d686d3e184518262de123bb998fc4802108645b15b3288c8aa242a869dec99c350cdfa9982420f4989e54d8287e9c387073361e2bdcf1310472 WHIRLPOOL 93bf44bac8433293d9a20b452fa4324a9a4519fba0eb7b9d0120a5d40e96777c55fe026b827c9b80125f988f95cdf391172f73acccdc4b9db7cff0efd8e6e438 +AUX sqliteman-1.2.2-qt5.patch 11317 SHA256 5cd44c0b5e4387758b3c485365ed97f2f766b69fff893d89767a19eda800f0ff SHA512 5169991a0b764fe02782dcc94befe1479bcae631f815c268c9e2a3f02c8efbaceb78ecb87d04eea240623fdfcc475b6b91149a4461974f648f4dea62ba07e309 WHIRLPOOL 2e9832bb24741e3866a6f3c7bd620e88bd45624717a1c6132177d693137b0f9de49e73731fe0eac32c73deae2333fedcdf015347bd840db69257220e48410273 DIST sqliteman-1.2.2.tar.gz 1579855 SHA256 2229e627528ec02a9cf7aba3a65bef8999272fc25eb22112dc3f8ee583eb5dfb SHA512 ada8315247723c6cbb9a4c235ce427aed3fcbe6f4edaa3ee2f9c31c1729d71a4bfc874bb7ca561f2a2c9afad092e2f90c7871646eccecb3e71bcd50d1164faf4 WHIRLPOOL 73f6bee7a98e46ef6e76dca086f6cd9379f3f7c8574df70f92d21ac68def0aef548350877eda319d7bedd6b34f5f128db839ef1b2c583a7ad5565a4a78a42d6c EBUILD sqliteman-1.2.2-r2.ebuild 659 SHA256 e5a7d0189a76a303a23cec6b1735d3b02e4c1fc13942f4994734e0ae0788bc36 SHA512 56a3746bef61c5a750c2c7fff27dc02f1a535b9ca2ffadacf864753a49ea52444eaac22c7dc26464e07b034f0056167cdaf56d3a6b70d6d72ecde02137bcecaf WHIRLPOOL 916799ba2a35ec622ceeb02c0eb2c7cb30fbe9b7aa20d6bf0b6615f15e54a1c1bd1acd81ee1ba866d0ec3608f2ffc61a6d65480b25b2b2ffebe61e841da75c0f EBUILD sqliteman-1.2.2-r3.ebuild 680 SHA256 6ebd8e39aa81c95bdc65e6f03a6975d71ca82eaca9886bef91a66e8b9a8305f1 SHA512 24abd2d29b5740f05eba51b3663ae77691df586cd07f313273902445a6381d809b26a2694017aa2d6374efe5f186d7b97737c9d012ed4db9a6cb149592a85c91 WHIRLPOOL 0ac27daceb409f7e72d9104850762335903adb98d530e8ac9acf2c9edaca1a3f3622dbd74d9c1e59e80bdb49afa33acaca73d48612ff1aef8eb13ac2c356e4db +EBUILD sqliteman-1.2.2-r4.ebuild 896 SHA256 7b18ab33b2c667d816d92039e089108f983e8d6094bb7161fe014fe60d698c85 SHA512 e4229ea3c94bbb8a741182b033aae9375d9b2aa422d049a6a13a63e1852b07d513448b0932567bcbc15bcba68b2c3bf98126c1aac80697180dafd87f5a05be6d WHIRLPOOL a712f8f90cb10737c6ae0d60eb93bf7b4f35902b1e5d73f07e8ace15342c55a44c9cbd00528cec6e15f779ad8eb157337afd5a73f219158195187236a0f75b4a MISC ChangeLog 3476 SHA256 c9ddffe6aefd0b0f18bd6f93b98bd254d7f728ad9a5f768d5d1ac3bc745ee91a SHA512 fa7ccff18dd334d20a636783b8395d95e27b46dbd401f3a5e64d9e9e90c0dcaf12ef2a8fcb858fd07565dcc97566b42e5b908f1c09d433849b048cbab9fb5d1d WHIRLPOOL b91a6800f13796d66b784266b000b990960b2fdb1c00d08fb3b44f13b49092463a504ee742d222aed4bb2957a9a5d32036f55a04f30908753aa9e0b0b4882916 MISC ChangeLog-2015 1667 SHA256 ba16bedc2ba55ac810300de58f2f3fea81b5eef5e4a8c467323200e3c94c4290 SHA512 1199bc0c7acb74d0000105d69acf448bbac9f4e40999e3adf6a28343f3d17318e606183ac5bb5fee3667237442571aa48499c17f6e63aa1d4f69cf872fcc68d4 WHIRLPOOL 11b650bfaa1dd418ac08fea148b71a7f31db899fb7ecf34b5a9e286bc9c54d0258de98b330c29144b051aa66cb63ad58ad28971fd4d994ce39d99e1f48e005d1 MISC metadata.xml 326 SHA256 e5809cdedbb1bf2d8c70f0df907f780c75d89412b8bb19cbf464bb7a70c681c6 SHA512 28cfd089b3652e0bc89c32cffa6bc3c6a10dc84ac786db5de65155ef2752982fd167f5a916f1738848e1bce5ed86d335f463187ad532db06e90d5ce6492f4d53 WHIRLPOOL 142f8b039fc64b663505b4f53d50a0109203cae21914c3df67e1dc9260197b43063c9550010aa5421faf35c31902f599df41aa48dbbefe3a4990d5fa9586a306 diff --git a/dev-db/sqliteman/files/sqliteman-1.2.2-qt5.patch b/dev-db/sqliteman/files/sqliteman-1.2.2-qt5.patch new file mode 100644 index 000000000000..ebc571a33981 --- /dev/null +++ b/dev-db/sqliteman/files/sqliteman-1.2.2-qt5.patch @@ -0,0 +1,346 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d9fd041..f589bfe 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -101,28 +101,7 @@ + + +-SET (QT_MT_REQUIRED true) +-SET (QT_MIN_VERSION "4.2.0") ++SET (QT_MIN_VERSION "5.7.1") +-SET( QT_USE_QTSQL TRUE ) +-SET( QT_USE_QTXML TRUE ) +-FIND_PACKAGE( Qt4 REQUIRED ) +-MESSAGE(STATUS Qt4 version: ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}) +-# suggest Qt upgrade +-if (QT_VERSION_MINOR LESS 3) +- MESSAGE(STATUS "") +- MESSAGE(STATUS "__ BIG FAT WARNING! _______________________________") +- MESSAGE(STATUS "Your Qt version seems older than it should be.") +- MESSAGE(STATUS "Althought will be Sqliteman compilled successfully,") +- MESSAGE(STATUS "it will be limited in its features.") +- MESSAGE(STATUS "There are some important bugs in older Qt versions.") +- MESSAGE(STATUS "Please upgrade to the current Qt version.") +- MESSAGE(STATUS "___________________________________________________") +- MESSAGE(STATUS "") +-endif (QT_VERSION_MINOR LESS 3) +-MESSAGE(STATUS Qt4 includes: ${QT_INCLUDES}) +-MESSAGE(STATUS Qt4 libs: ${QT_LIBRARY_DIR}) +- +-INCLUDE( ${QT_USE_FILE} ) +- ++FIND_PACKAGE( Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Sql Widgets ) + + IF (WANT_INTERNAL_QSCINTILLA) + MESSAGE(STATUS "QSci: Building with internal copy of QScintilla.") +diff --git a/cmake/modules/FindQScintilla.cmake b/cmake/modules/FindQScintilla.cmake +index c4592d0..92754b4 100644 +--- a/cmake/modules/FindQScintilla.cmake ++++ b/cmake/modules/FindQScintilla.cmake +@@ -10,22 +10,19 @@ + # + # Redistribution and use is allowed according to the terms of the FreeBSD license. + +-IF(NOT QT4_FOUND) +- INCLUDE(FindQt4) +-ENDIF(NOT QT4_FOUND) +- + SET(QSCINTILLA_FOUND FALSE) + +-IF(QT4_FOUND) +- FIND_PATH(QSCINTILLA_INCLUDE_DIR qsciglobal.h +- "${QT_INCLUDE_DIR}/Qsci" /usr/include /usr/include/Qsci ++IF(Qt5_FOUND) ++ FIND_PATH(QSCINTILLA_INCLUDE_DIR qsciglobal.h ++ HINTS ${Qt5Core_INCLUDE_DIRS} ++ PATH_SUFFIXES Qsci + ) + +- SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2) +- FIND_LIBRARY(QSCINTILLA_LIBRARY +- NAMES ${QSCINTILLA_NAMES} +- PATHS ${QT_LIBRARY_DIR} +- ) ++ SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2 qscintilla2_qt5 libqscintilla2_qt5) ++ FIND_LIBRARY(QSCINTILLA_LIBRARY ++ NAMES ${QSCINTILLA_NAMES} ++ HINTS ${Qt5Core_LIBRARIES} ++ ) + + IF (QSCINTILLA_LIBRARY AND QSCINTILLA_INCLUDE_DIR) + +@@ -41,7 +34,7 @@ IF(QT4_FOUND) + ENDIF (CYGWIN) + + ENDIF (QSCINTILLA_LIBRARY AND QSCINTILLA_INCLUDE_DIR) +-ENDIF(QT4_FOUND) ++ENDIF(Qt5_FOUND) + + IF (QSCINTILLA_FOUND) + IF (NOT QScintilla_FIND_QUIETLY) +diff --git a/sqliteman/CMakeLists.txt b/sqliteman/CMakeLists.txt +index c9154a7..13397ee 100644 +--- a/sqliteman/CMakeLists.txt ++++ b/sqliteman/CMakeLists.txt +@@ -139,12 +139,12 @@ IF (WANT_RESOURCES) + ) + ENDIF (WANT_RESOURCES) + SET (SQLITEMAN_RCS ${SQLITEMAN_RCS} api/api.qrc) +-QT4_ADD_RESOURCES( SQLITEMAN_RC_RCS ${SQLITEMAN_RCS} ) ++QT5_ADD_RESOURCES( SQLITEMAN_RC_RCS ${SQLITEMAN_RCS} ) + + +-QT4_WRAP_UI( SQLITEMAN_UI_HDRS ${SQLITEMAN_UI} ) ++QT5_WRAP_UI( SQLITEMAN_UI_HDRS ${SQLITEMAN_UI} ) + +-QT4_WRAP_CPP( SQLITEMAN_MOC_SRC ${SQLITEMAN_MOC} ) ++QT5_WRAP_CPP( SQLITEMAN_MOC_SRC ${SQLITEMAN_MOC} ) + + INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ) + INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR}/sqliteman ) +@@ -157,10 +157,13 @@ IF (WANT_INTERNAL_QSCINTILLA) + ${CMAKE_SOURCE_DIR}/sqliteman/qscintilla2/Qt4/Qsci + ) + ELSE (WANT_INTERNAL_QSCINTILLA) +- INCLUDE_DIRECTORIES( ${QSCINTILLA_INCLUDE_DIR} ) ++ INCLUDE_DIRECTORIES( ++ ${QSCINTILLA_INCLUDE_DIR} ++ ${Qt5Widgets_INCLUDE_DIRS} ++ ${Qt5Sql_INCLUDE_DIRS} ++ ) + ENDIF (WANT_INTERNAL_QSCINTILLA) + +- + IF (MSVC) + # this is a must to switch off subsystem:console (console window poping up) + # WinMain wrapper from QT_QTMAIN_LIBRARY is used and liner must be modified +@@ -178,6 +181,6 @@ ADD_EXECUTABLE( ${EXE_NAME} ${WIN32_SUBSYSTEM} + ) + +-TARGET_LINK_LIBRARIES( ${EXE_NAME} ${QT_LIBRARIES}) # ${POPULATOR_LIB}) ++TARGET_LINK_LIBRARIES( ${EXE_NAME} Qt5::Widgets Qt5::Sql ) + + IF (WIN32) + # don't use console subsystem +diff --git a/sqliteman/alterviewdialog.h b/sqliteman/alterviewdialog.h +index 31407f9..b014473 100644 +--- a/sqliteman/alterviewdialog.h ++++ b/sqliteman/alterviewdialog.h +@@ -8,11 +8,8 @@ for which a new license (GPL+exception) is in place. + #ifndef ALTERVIEWDIALOG_H + #define ALTERVIEWDIALOG_H + +-#include +- + #include "ui_createviewdialog.h" + +- + /*! \brief GUI for view altering + \author Petr Vanek + */ +@@ -22,10 +19,10 @@ class AlterViewDialog : public QDialog + + public: + AlterViewDialog(const QString & name, const QString & schema, QWidget * parent = 0); +- ~AlterViewDialog(){}; ++ ~AlterViewDialog(){} + + bool update; +- void setText(const QString & text) { ui.sqlEdit->setText(text); }; ++ void setText(const QString & text) { ui.sqlEdit->setText(text); } + + private: + Ui::CreateViewDialog ui; +diff --git a/sqliteman/analyzedialog.h b/sqliteman/analyzedialog.h +index 4b871cf..3f4302e 100644 +--- a/sqliteman/analyzedialog.h ++++ b/sqliteman/analyzedialog.h +@@ -8,8 +8,6 @@ for which a new license (GPL+exception) is in place. + #ifndef ANALYZEDIALOG_H + #define ANALYZEDIALOG_H + +-#include +- + #include "ui_analyzedialog.h" + + +@@ -23,7 +21,7 @@ class AnalyzeDialog : public QDialog + + public: + AnalyzeDialog(QWidget * parent = 0); +- ~AnalyzeDialog(){}; ++ ~AnalyzeDialog(){} + + private: + Ui::AnalyzeDialog ui; +diff --git a/sqliteman/constraintsdialog.h b/sqliteman/constraintsdialog.h +index 6ab19c7..61485bb 100644 +--- a/sqliteman/constraintsdialog.h ++++ b/sqliteman/constraintsdialog.h +@@ -8,8 +8,6 @@ for which a new license (GPL+exception) is in place. + #ifndef CONSTRAINTSDIALOG_H + #define CONSTRAINTSDIALOG_H + +-#include +- + #include "ui_constraintsdialog.h" + + +@@ -23,7 +21,7 @@ class ConstraintsDialog : public QDialog + + public: + ConstraintsDialog(const QString & tabName, const QString & schema, QWidget * parent = 0); +- ~ConstraintsDialog(){}; ++ ~ConstraintsDialog(){} + + bool update; + +diff --git a/sqliteman/createindexdialog.h b/sqliteman/createindexdialog.h +index 9c75b35..186a46a 100644 +--- a/sqliteman/createindexdialog.h ++++ b/sqliteman/createindexdialog.h +@@ -8,8 +8,6 @@ for which a new license (GPL+exception) is in place. + #ifndef INDEXDIALOG_H + #define INDEXDIALOG_H + +-#include +- + #include "ui_createindexdialog.h" + + +@@ -27,7 +25,7 @@ class CreateIndexDialog : public QDialog + \param parent standard Qt parent + */ + CreateIndexDialog(const QString & tabName, const QString & schema, QWidget * parent = 0); +- ~CreateIndexDialog(){}; ++ ~CreateIndexDialog(){} + + bool update; + +diff --git a/sqliteman/dataexportdialog.cpp b/sqliteman/dataexportdialog.cpp +index 7ad5d03..ee77b25 100644 +--- a/sqliteman/dataexportdialog.cpp ++++ b/sqliteman/dataexportdialog.cpp +@@ -223,7 +223,7 @@ bool DataExportDialog::exportHTML() + { + out << ""; + for (int i = 0; i < m_header.size(); ++i) +- out << "" << m_header.at(i) << ""; ++ out << "" << m_header.at(i).toHtmlEscaped() << ""; + out << "" << endl(); + } + +@@ -234,7 +234,7 @@ bool DataExportDialog::exportHTML() + out << ""; + QSqlRecord r = m_data->record(i); + for (int j = 0; j < m_header.size(); ++j) +- out << "" << r.value(j).toString() << ""; ++ out << "" << r.value(j).toString().toHtmlEscaped() << ""; + out << "" << endl(); + } + out << "" << endl() << "" << endl() << ""; +@@ -256,7 +256,7 @@ bool DataExportDialog::exportExcelXML() + { + out << "" << endl(); + for (int i = 0; i < m_header.size(); ++i) +- out << "" << m_header.at(i) << "" << endl(); ++ out << "" << m_header.at(i).toHtmlEscaped() << "" << endl(); + out << "" << endl(); + } + +@@ -267,7 +267,7 @@ bool DataExportDialog::exportExcelXML() + out << "" << endl(); + QSqlRecord r = m_data->record(i); + for (int j = 0; j < m_header.size(); ++j) +- out << "" << r.value(j).toString() << "" << endl(); ++ out << "" << r.value(j).toString().toHtmlEscaped() << "" << endl(); + out << "" << endl(); + } + +diff --git a/sqliteman/populatordialog.cpp b/sqliteman/populatordialog.cpp +index 1e55f63..8e6e246 100644 +--- a/sqliteman/populatordialog.cpp ++++ b/sqliteman/populatordialog.cpp +@@ -7,7 +7,7 @@ for which a new license (GPL+exception) is in place. + #include + #include + #include +-#include ++#include + + #include "populatordialog.h" + #include "populatorcolumnwidget.h" +--- a/sqliteman/shortcutmodel.cpp ++++ b/sqliteman/shortcutmodel.cpp +@@ -45,7 +45,7 @@ QVariant ShortcutModel::data(const QModelIndex & index, int role) const + return QVariant(index.column() == 0 ? m_values.at(index.row()).first : m_values.at(index.row()).second); + } + if (role == Qt::BackgroundRole && index.column() == 0 && m_values.at(index.row()).first.isEmpty()) +- return QVariant(Qt::red); ++ return QVariant(QColor(Qt::red)); + return QVariant(); + } + +diff --git a/sqliteman/sqlmodels.cpp b/sqliteman/sqlmodels.cpp +index 178b2e7..82d1f0c 100644 +--- a/sqliteman/sqlmodels.cpp ++++ b/sqliteman/sqlmodels.cpp +@@ -47,7 +47,7 @@ QVariant SqlTableModel::data(const QModelIndex & item, int role) const + + // mark rows prepared for a deletion in this trasnaction + if (role == Qt::BackgroundColorRole && m_deleteCache.contains(item.row())) +- return QVariant(Qt::red); ++ return QVariant(QColor(Qt::red)); + + // nulls + if (m_useNull && curr.isNull()) +diff --git a/sqliteman/sqlparser/tosqlparse.h b/sqliteman/sqlparser/tosqlparse.h +index 3424fa2..678df90 100644 +--- a/sqliteman/sqlparser/tosqlparse.h ++++ b/sqliteman/sqlparser/tosqlparse.h +@@ -50,7 +50,6 @@ This file is based on the TOra source code. http://tora.sf.net + + #include + #include +-// #include + #include + + // class toConnection; +diff --git a/sqliteman/tabletree.cpp b/sqliteman/tabletree.cpp +index 339e259..f4ab00c 100644 +--- a/sqliteman/tabletree.cpp ++++ b/sqliteman/tabletree.cpp +@@ -6,6 +6,8 @@ for which a new license (GPL+exception) is in place. + */ + #include + #include ++#include ++#include + + #include "database.h" + #include "tabletree.h" +diff --git a/sqliteman/vacuumdialog.h b/sqliteman/vacuumdialog.h +index cac27f1..5e25214 100644 +--- a/sqliteman/vacuumdialog.h ++++ b/sqliteman/vacuumdialog.h +@@ -8,7 +8,7 @@ for which a new license (GPL+exception) is in place. + #ifndef VACUUMDIALOG_H + #define VACUUMDIALOG_H + +-#include ++#include + + #include "ui_vacuumdialog.h" + +diff --git a/sqliteman/sqliteprocess.h b/sqliteman/sqliteprocess.h +index aaa60ca..5bec5b0 100644 +--- a/sqliteman/sqliteprocess.h ++++ b/sqliteman/sqliteprocess.h +@@ -8,6 +8,7 @@ for which a new license (GPL+exception) is in place. + #ifndef SQLITEPROCESS_H + #define SQLITEPROCESS_H + ++#include + #include + + diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild b/dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild new file mode 100644 index 000000000000..a7645ef0f775 --- /dev/null +++ b/dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +QT_VER=5.7.1 +inherit cmake-utils flag-o-matic xdg-utils + +DESCRIPTION="Powerful GUI manager for the Sqlite3 database" +HOMEPAGE="https://sourceforge.net/projects/sqliteman/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND=" + >=dev-qt/qtcore-${QT_VER}:5 + >=dev-qt/qtgui-${QT_VER}:5 + >=dev-qt/qtsql-${QT_VER}:5[sqlite] + >=dev-qt/qtwidgets-${QT_VER}:5 + >=x11-libs/qscintilla-2.9.4:=[qt5(+)]" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-lpthread.patch" + "${FILESDIR}/${P}-qt5.patch" +) + +src_prepare() { + # remove bundled lib + rm -rf "${S}"/${PN}/qscintilla2 || die + + append-flags -fPIC + cmake-utils_src_prepare +} + +pkg_postinst() { + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_desktop_database_update +} -- cgit v1.2.3