<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b76f03daca57496fd95bd96ca17d582c75b7ad48">https://github.com/macports/macports-ports/commit/b76f03daca57496fd95bd96ca17d582c75b7ad48</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new b76f03daca5 sqlitebrowser: update to 3.12.0
</span>b76f03daca5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b76f03daca57496fd95bd96ca17d582c75b7ad48
</span>Author: i0ntempest <szf1234@me.com>
AuthorDate: Mon Jun 22 04:05:37 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> sqlitebrowser: update to 3.12.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> And disable parallel build until upstream gives a fix
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60626
</span>---
databases/sqlitebrowser/Portfile | 22 +++---
.../files/0001-Changes-for-MacPorts.patch | 84 ++++------------------
2 files changed, 24 insertions(+), 82 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/sqlitebrowser/Portfile b/databases/sqlitebrowser/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7fcec994ca2..10a607314f7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/sqlitebrowser/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/sqlitebrowser/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,8 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup sqlitebrowser sqlitebrowser 3.11.2 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup sqlitebrowser sqlitebrowser 3.12.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories databases
platforms darwin linux
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,20 +33,19 @@ long_description SQLite Database Browser is a visual tool used to create, des
</span>
homepage http://sqlitebrowser.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f1e925b87be61b9badba625b3847dd403860cc28 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 62d1385c16d771758c7dd36612f5b8c0dffbd37bc40a4c23efc3b0243779291e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2530537
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8c0e81ccc7c8df9a0197d9f1651801f5aa9bb155 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 211e33f7c4ad4b991b23ac02ee7a3e826f88c5297aad5fd8610d55ee8bd6b32f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4017540
</span>
# Exclude pre-release candidates
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.livecheck.regex {([0-9.]+)}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.livecheck.regex \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {([0-9.]+)}
</span>
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:antlr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qscintilla-qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:qscintilla-qt5
</span>
patchfiles-append 0001-Changes-for-MacPorts.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span>
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,14 +61,13 @@ platform darwin {
</span> qt5.min_version 5.4
pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|libs/antlr-2.7.7/antlr.pro||g" ${worksrcpath}/sqlitebrowser.pro
</span> reinplace "s|libs/qscintilla/Qt4Qt5/qscintilla.pro||g" ${worksrcpath}/sqlitebrowser.pro
reinplace "s|-lqscintilla2|-lqscintilla2_qt5|g" ${worksrcpath}/src/src.pro
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\$\$PWD/../libs/antlr-2.7.7||g" ${worksrcpath}/src/src.pro
</span> reinplace "s|\$\$PWD/../libs/qscintilla/Qt4Qt5||g" ${worksrcpath}/src/src.pro
<span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${worksrcpath}/libs/antlr-2.7.7 ${worksrcpath}/libs/qscintilla
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${worksrcpath}/libs/qscintilla
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_parallel_build no
</span> depends_lib-append port:sqlite3
qt5.depends_component \
qtmacextras qttools
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/sqlitebrowser/files/0001-Changes-for-MacPorts.patch b/databases/sqlitebrowser/files/0001-Changes-for-MacPorts.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index bd86847fc8f..4b69c98739d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/sqlitebrowser/files/0001-Changes-for-MacPorts.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/sqlitebrowser/files/0001-Changes-for-MacPorts.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 9dce698faa8c4d274389b933717aea475910ca4b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Aaron Madlon-Kay <aaron@madlon-kay.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 13 Nov 2019 16:34:46 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Changes for MacPorts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CMakeLists.txt | 18 +++++++++++-------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmake/FindQScintilla.cmake | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 12 insertions(+), 8 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 04e8a828..ee00b942 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,6 +22,8 @@ if(NOT CMAKE_BUILD_TYPE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2020-06-14 00:08:29.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2020-06-22 01:22:28.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,6 +24,8 @@
</span> set(CMAKE_BUILD_TYPE "Release")
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,80 +9,36 @@ index 04e8a828..ee00b942 100644
</span> add_definitions(-std=c++11)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED True)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -61,10 +63,10 @@ if(WIN32 AND MSVC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -72,7 +74,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(Qt5 REQUIRED COMPONENTS Concurrent Gui LinguistTools Network PrintSupport Test Widgets Xml)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NOT FORCE_INTERNAL_ANTLR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_package(Antlr2 QUIET)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_package(Antlr2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span> if(NOT FORCE_INTERNAL_QSCINTILLA)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_package(QScintilla QUIET)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_package(QScintilla)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_package(QScintilla 2.8.10 QUIET)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package(QScintilla 2.8.10)
</span> endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(QHEXEDIT_DIR libs/qhexedit)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -304,7 +306,7 @@ endif(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(FORCE_INTERNAL_QCUSTOMPLOT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(QCUSTOMPLOT_FOUND FALSE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -351,7 +353,7 @@
</span>
#enable version check for MacOS
if(APPLE)
- add_definitions(-DCHECKNEWVERSION)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # add_definitions(-DCHECKNEWVERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #add_definitions(-DCHECKNEWVERSION)
</span> endif(APPLE)
# SQLCipher option
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -343,12 +345,12 @@ include_directories(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(ANTLR2_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include_directories(${ANTLR2_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- include_directories(${ANTLR_DIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # include_directories(${ANTLR_DIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -399,7 +401,7 @@
</span> if(QSCINTILLA_FOUND)
include_directories(${QSCINTILLA_INCLUDE_DIR})
else()
- include_directories(${QSCINTILLA_DIR})
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # include_directories(${QSCINTILLA_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include_directories(${QSCINTILLA_DIR})
</span> endif()
add_executable(${PROJECT_NAME}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -424,7 +426,7 @@ if(ENABLE_TESTING)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(src/tests)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(UNIX AND NOT APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(FILES src/icons/${PROJECT_NAME}.png
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DESTINATION share/icons/hicolor/256x256/apps/)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -433,7 +435,7 @@ if(UNIX AND NOT APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(FILES distri/${PROJECT_NAME}.desktop.appdata.xml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DESTINATION share/appdata/)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif(UNIX AND NOT APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif(UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WIN32 AND MSVC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(TARGETS ${PROJECT_NAME}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -501,3 +503,5 @@ if(WIN32 AND MSVC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -566,3 +568,5 @@
</span> distri/winlaunch.bat
DESTINATION "/")
endif()
+
+feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/cmake/FindQScintilla.cmake b/cmake/FindQScintilla.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f469637c..dd46e49b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/cmake/FindQScintilla.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/cmake/FindQScintilla.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -80,7 +80,7 @@ endif ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_library ( QSCINTILLA_LIBRARY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NAMES qscintilla qscintilla2 libqscintilla2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NAMES qscintilla qscintilla2 libqscintilla2 qscintilla2_qt5 libqscintilla2_qt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HINTS ${QT_LIBRARY_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.24.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>