Skip to content
Permalink
Browse files

sqlitebrowser: update to 3.11.2

  • Loading branch information
amake authored and kencu committed Nov 13, 2019
1 parent 9e9717c commit d051d4248c91d439d8bfd17c6d378c561ffc8db3
@@ -1,13 +1,13 @@
# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
#

PortSystem 1.0
PortGroup qt5 1.0
PortGroup cmake 1.1
PortGroup github 1.0
PortGroup app 1.0

github.setup sqlitebrowser sqlitebrowser 3.9.1 v
revision 1
github.setup sqlitebrowser sqlitebrowser 3.11.2 v
revision 0

categories databases
platforms darwin linux
@@ -36,8 +36,9 @@ long_description SQLite Database Browser is a visual tool used to create, des

homepage http://sqlitebrowser.org

checksums rmd160 96624d2a492fb8b81c8f91d41c2d988a16a18bd0 \
sha256 ea30e8912972b14991827388dc6b99e82772637a46e0b132430504dd262df08d
checksums rmd160 f1e925b87be61b9badba625b3847dd403860cc28 \
sha256 62d1385c16d771758c7dd36612f5b8c0dffbd37bc40a4c23efc3b0243779291e \
size 2530537

universal_variant no

@@ -47,7 +48,8 @@ depends_lib-append port:antlr \
qt5.depends_component \
qtmacextras qttools

patchfiles-append patch-build-for-MP.diff
patchfiles-append 0001-Changes-for-MacPorts.patch
patch.pre_args -p1

if {[info procs cmake.save_configure_cmd] ne ""} {
# create a .macports-$subport-configure.cmd file containing the cmake invocation details
@@ -56,9 +58,8 @@ if {[info procs cmake.save_configure_cmd] ne ""} {
}

configure.args-append \
-DUSE_QT5=ON \
-DQSCINTILLA_INCLUDE_DIR=${qt_includes_dir} \
-DQSCINTILLA_LIB_DIR=${qt_frameworks_dir}
-DQT_LIBRARY_DIR=${qt_frameworks_dir}

platform darwin {
app.executable ${build.dir}/sqlitebrowser
@@ -89,6 +90,6 @@ platform linux {
configure.args-append \
-DCMAKE_PREFIX_PATH=${prefix}
configure.args-replace \
-DQSCINTILLA_LIB_DIR=${qt_frameworks_dir} \
-DQSCINTILLA_LIB_DIR=${qt_libs_dir}
-DQT_LIBRARY_DIR=${qt_frameworks_dir} \
-DQT_LIBRARY_DIR=${qt_libs_dir}
}
@@ -0,0 +1,100 @@
From 9dce698faa8c4d274389b933717aea475910ca4b Mon Sep 17 00:00:00 2001
From: Aaron Madlon-Kay <aaron@madlon-kay.com>
Date: Wed, 13 Nov 2019 16:34:46 +0900
Subject: [PATCH] Changes for MacPorts

---
CMakeLists.txt | 18 +++++++++++-------
cmake/FindQScintilla.cmake | 2 +-
2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04e8a828..ee00b942 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,6 +22,8 @@ if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release")
endif()

+include(FeatureSummary)
+
add_definitions(-std=c++11)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED True)
@@ -61,10 +63,10 @@ if(WIN32 AND MSVC)
endif()

if(NOT FORCE_INTERNAL_ANTLR)
- find_package(Antlr2 QUIET)
+ find_package(Antlr2)
endif()
if(NOT FORCE_INTERNAL_QSCINTILLA)
- find_package(QScintilla QUIET)
+ find_package(QScintilla)
endif()

set(QHEXEDIT_DIR libs/qhexedit)
@@ -304,7 +306,7 @@ endif(WIN32)

#enable version check for MacOS
if(APPLE)
- add_definitions(-DCHECKNEWVERSION)
+ # add_definitions(-DCHECKNEWVERSION)
endif(APPLE)

# SQLCipher option
@@ -343,12 +345,12 @@ include_directories(
if(ANTLR2_FOUND)
include_directories(${ANTLR2_INCLUDE_DIRS})
else()
- include_directories(${ANTLR_DIR})
+ # include_directories(${ANTLR_DIR})
endif()
if(QSCINTILLA_FOUND)
include_directories(${QSCINTILLA_INCLUDE_DIR})
else()
- include_directories(${QSCINTILLA_DIR})
+ # include_directories(${QSCINTILLA_DIR})
endif()

add_executable(${PROJECT_NAME}
@@ -424,7 +426,7 @@ if(ENABLE_TESTING)
add_subdirectory(src/tests)
endif()

-if(UNIX AND NOT APPLE)
+if(UNIX)
install(FILES src/icons/${PROJECT_NAME}.png
DESTINATION share/icons/hicolor/256x256/apps/)

@@ -433,7 +435,7 @@ if(UNIX AND NOT APPLE)

install(FILES distri/${PROJECT_NAME}.desktop.appdata.xml
DESTINATION share/appdata/)
-endif(UNIX AND NOT APPLE)
+endif(UNIX)

if(WIN32 AND MSVC)
install(TARGETS ${PROJECT_NAME}
@@ -501,3 +503,5 @@ if(WIN32 AND MSVC)
distri/winlaunch.bat
DESTINATION "/")
endif()
+
+feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/cmake/FindQScintilla.cmake b/cmake/FindQScintilla.cmake
index f469637c..dd46e49b 100644
--- a/cmake/FindQScintilla.cmake
+++ b/cmake/FindQScintilla.cmake
@@ -80,7 +80,7 @@ endif ()


find_library ( QSCINTILLA_LIBRARY
- NAMES qscintilla qscintilla2 libqscintilla2
+ NAMES qscintilla qscintilla2 libqscintilla2 qscintilla2_qt5 libqscintilla2_qt5
HINTS ${QT_LIBRARY_DIR}
)

--
2.24.0

This file was deleted.

0 comments on commit d051d42

Please sign in to comment.
You can’t perform that action at this time.