From 0fb71e0215ed52863e462cccef73c01aff44d43d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 18 Dec 2017 15:11:02 +0000 Subject: gentoo resync : 18.12.2017 --- dev-db/Manifest.gz | Bin 21960 -> 21961 bytes dev-db/sqlitebrowser/Manifest | 4 +- .../files/sqlitebrowser-3.10.1-unbundle.patch | 46 +++++++++++++++++++++ dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild | 3 +- 4 files changed, 49 insertions(+), 4 deletions(-) (limited to 'dev-db') diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz index 61025e5c2ad1..b06f52546b1e 100644 Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest index 919782ed3663..1517a327599e 100644 --- a/dev-db/sqlitebrowser/Manifest +++ b/dev-db/sqlitebrowser/Manifest @@ -1,8 +1,8 @@ -AUX sqlitebrowser-3.10.1-unbundle.patch 1578 BLAKE2B 7c07caa81086a4a9a30660df837fbc34cb140ab531c1760a72739f868f0277b58c7e76f83d2c59a8b8b4ae843828551ca8beaa93c6d23ca5cf5df55a8ad4623b SHA512 26a58ef43da1b1cc295bc3c2cc6cc173f9dd4f9523732a03f31069bb9b10f810c9f0d0c40a7d31d37d2c520a4d4a8a4b2b2ff6795a4f780fee8e2b6da0edce5f +AUX sqlitebrowser-3.10.1-unbundle.patch 3313 BLAKE2B 91dda803cb2eed55a56568f4d2cc0519b33b59447fcdfee49705aa0bfce84009092b0e73ab0ae79b03fc30f20220b1ca8cebbd83b66d1f8fdd36c47669403019 SHA512 71b758dc1f412b1ed5d778e8ca5fc65eb99276acf5c81fc4812bf31251a0380b8e4fbc84a00718e5959ae7cb504cda06339e24cf070b8a2de1b0fce46cfb595f AUX sqlitebrowser-3.7.0-unbundle.patch 475 BLAKE2B 1e2783eec7d7c054d18920fc88617f143220669a5c69c62b024fa33922eff9d13e3c4ba5e453d6b1767defdd8a918156094c1234ed3d6ad632ee4b3d919f6540 SHA512 4f90c4df8ef49943489b239f675a86259536b988585182c8b804f4ed6d38b5aabd83b32b21952329332d8520945304a4f9fea6287631a9a58ce5f311d9242fdb AUX sqlitebrowser-3.9.1-cmake.patch 774 BLAKE2B 5773d3f70bc45348a4e3fc35fce57ad7eac416e7cc4d94eceb31ecc5e0ca2ed9dce837c299083e800b1ec7d80bd67d10ee60cf44c5a6915f39c619ef07f048f4 SHA512 f1a64286036d5c05e279fbf430f55400eb8f840564c0d9460424a42f87c4bd8d4f4e2c52c39e07d0bd3a50fa4a1e59bf591c53b1d28d2ef367af2ba25edae299 DIST sqlitebrowser-3.10.1.tar.gz 1992186 BLAKE2B 105333118a404aab48abe5ecbe83b425109b60adf40d3a3b7766c7036954996539bd133da4b3e3b1e2d819223842d107710b6b24aada6bb298462e062296dabf SHA512 da9650fff6cd7984e8f438b254318b5da46209eb21a375569ec1b4dd898a41d99d61d6682f2979a56d5c39d552ed42f443215900c1cebe95350e4624415f69c4 DIST sqlitebrowser-3.9.1.tar.gz 1704713 BLAKE2B 447a9e20fe4236feea2684703ac7f38b1c03f0ded352653b41bbec7d6380691776177fee1428fd67ac96190ed6752cedd76a9883cfa12584fec464cbf98707d3 SHA512 c1e88063fac864f60a9802ae378e13d6f3a09e2f4e71e50c6abca4967a941c444a64617bad2dfc743cf9a6be554af9c73e4c61533300ed9a51652234ffdbd225 -EBUILD sqlitebrowser-3.10.1.ebuild 1417 BLAKE2B 0e5c0be58c5354d623c652e948e1128d53cf63f31ec6ee1693257b14186b79eb49be65817fa4c81fd100e03fa180f7d602e5873ec4c460f96258c608faf595f0 SHA512 7f7b0eaab46c4e01d9746ebe190e1fa3ad084a3ffa3e4ffe729c01df5411aa7463e3c47b6357341d4ff9b1bf3a45aad4cb6d08999565044733ced5100e2d21da +EBUILD sqlitebrowser-3.10.1.ebuild 1380 BLAKE2B 3b7318374706616863cea99049f8108ee3fefbf779042ab397d19ad2a8d056386af566860b48e816955c1d1306be057aa5e786fb9596c54fea2d234adda275ef SHA512 8f9d0ec924150591d8fad23370a02b14cd1194cf1d455a366099254429f06e67e1397135f4d16fb6df5085d3c459bd73537f11c787e5e725f7986064fe46b19b EBUILD sqlitebrowser-3.9.1-r1.ebuild 1439 BLAKE2B 355dc9a6af52f1879559b7774d93f226e46a9998de3557c0f52d2b8ecde160e9c777bcc7ac4c8d33d74337972d6def9ada5d404b36d456133df000ca552623da SHA512 ad218ab7dc42f42487868aeba8fef1f282369bfc2508e6cbd20f0da1c6101f93ff3b157970e34046be20dfd98a2418763941c679d31dde82940cfc2a480b0cee MISC metadata.xml 740 BLAKE2B 43e5727769b3fa3fee9fe4514993988877b08a3a21816031cd21ae497a66801d6ba4993236e656b7de4161d22837975bb6d8e9cf93ebfd416235dd622a0b8758 SHA512 697ae7be911f1ce3a8b0c0f9f8509ac5fd338463b7b692ca320ab41ed7676fcc3d7db59e759cfbe82c6d2a1fa9d85a1eeefeda3bca702f56832f336ee7fd0369 diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch index 9e2ad3e910b7..b774e41ecd83 100644 --- a/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch +++ b/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch @@ -57,3 +57,49 @@ index fdf5b4c..ffba6d7 100644 find_package(Qt5Widgets REQUIRED) find_package(Qt5LinguistTools REQUIRED) +--- sqlitebrowser-3.10.1/src/tests/CMakeLists.txt ++++ sqlitebrowser-3.10.1/src/tests/CMakeLists.txt +@@ -49,9 +49,6 @@ + else() + target_link_libraries(test-sqlobjects antlr) + endif() +-link_directories("${CMAKE_CURRENT_BINARY_DIR}/${QSCINTILLA_DIR}") +-add_dependencies(test-sqlobjects qscintilla2) +-target_link_libraries(test-sqlobjects qscintilla2) + add_test(test-sqlobjects test-sqlobjects) + + # test-import +@@ -118,7 +118,4 @@ + else() + target_link_libraries(test-regex antlr) + endif() +-link_directories("${CMAKE_CURRENT_BINARY_DIR}/${QSCINTILLA_DIR}") +-add_dependencies(test-regex qscintilla2) +-target_link_libraries(test-regex qscintilla2) + add_test(test-regex test-regex) +--- sqlitebrowser-3.10.1/src/src.pro ++++ sqlitebrowser-3.10.1/src/src.pro +@@ -153,10 +150,7 @@ + } + } + + LIBPATH_QHEXEDIT=$$OUT_PWD/../libs/qhexedit +-LIBPATH_ANTLR=$$OUT_PWD/../libs/antlr-2.7.7 +-LIBPATH_QCUSTOMPLOT=$$OUT_PWD/../libs/qcustomplot-source +-LIBPATH_QSCINTILLA=$$OUT_PWD/../libs/qscintilla/Qt4Qt5 + unix { + LIBS += -ldl + } +@@ -197,9 +193,9 @@ + } + + UI_DIR = .ui +-INCLUDEPATH += $$PWD/../libs/antlr-2.7.7 $$PWD/../libs/qhexedit $$PWD/../libs/qcustomplot-source $$PWD/../libs/qscintilla/Qt4Qt5 $$PWD/.. +-LIBS += -L$$LIBPATH_QHEXEDIT -L$$LIBPATH_ANTLR -L$$LIBPATH_QCUSTOMPLOT -L$$LIBPATH_QSCINTILLA -lantlr -lqhexedit -lqcustomplot -lqscintilla2 +-DEPENDPATH += $$PWD/../libs/antlr-2.7.7 $$PWD/../libs/qhexedit $$PWD/../libs/qcustomplot-source $$PWD/../libs/qscintilla/Qt4Qt5 ++INCLUDEPATH += $$PWD/../libs/qhexedit $$PWD/.. ++LIBS += -L$$LIBPATH_QHEXEDIT -L$$LIBPATH_ANTLR -L$$LIBPATH_QCUSTOMPLOT -L$$LIBPATH_QSCINTILLA -lantlr -lqhexedit -lqcustomplot -lqscintilla2_qt5 ++DEPENDPATH += $$PWD/../libs/qhexedit + + unix { + # The executable diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild index c661e29a9f2c..42732d6e3e70 100644 --- a/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild +++ b/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild @@ -36,8 +36,7 @@ PATCHES=( src_prepare() { cmake-utils_src_prepare # https://github.com/qingfengxia/qhexedit still bundled - # x11-libs/qscintilla[qt4?,qt5?] still bundled - find libs/{antlr-2.7.7,qcustomplot-source} -delete || die + find libs/{antlr-2.7.7,qcustomplot-source,qscintilla} -delete || die sed -e "/^project/ s/\".*\"/sqlitebrowser/" -i CMakeLists.txt || die -- cgit v1.2.3