smani pushed to sqlitebrowser (master). "Update to 3.7.0"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon Jun 15 08:29:54 UTC 2015
From 2f82cdb1297f0b7992fc280d945daeb41bb65ef4 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro at gmail.com>
Date: Mon, 15 Jun 2015 10:29:30 +0200
Subject: Update to 3.7.0
diff --git a/.gitignore b/.gitignore
index 09f1267..b2199fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/v3.5.0.tar.gz
/v3.5.1.tar.gz
/v3.6.0.tar.gz
+/v3.7.0.tar.gz
diff --git a/sources b/sources
index fe68389..3583703 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c33986560fe7a137ac7dc20ba3c4b113 v3.6.0.tar.gz
+1033f076944316a713d4831bf581cf3a v3.7.0.tar.gz
diff --git a/sqlitebrowser.spec b/sqlitebrowser.spec
index 9da2487..bcf68ba 100644
--- a/sqlitebrowser.spec
+++ b/sqlitebrowser.spec
@@ -1,6 +1,6 @@
Name: sqlitebrowser
-Version: 3.6.0
-Release: 2%{?dist}
+Version: 3.7.0
+Release: 1%{?dist}
Summary: Create, design, and edit SQLite database files
License: GPLv3+ or MPLv2.0
@@ -44,7 +44,7 @@ rm -rf libs
%build
mkdir build
pushd build
-%cmake -DUSE_QT5=1 ..
+%cmake -DUSE_QT5=1 -DENABLE_TESTING=1 ..
make %{?_smp_mflags}
popd
@@ -56,10 +56,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
%check
-cd tests
-%cmake -DUSE_QT5=1 .
-make %{?_smp_mflags}
-./sqlb-unittests
+make -C build test
%post
@@ -89,6 +86,9 @@ fi
%changelog
+* Mon Jun 15 2015 Sandro Mani <manisandro at gmail.com> - 3.7.0-1
+- Update to 3.7.0
+
* Wed May 20 2015 Sandro Mani <manisandro at gmail.com> - 3.6.0-2
- Rebuild (qhexedit2)
diff --git a/sqlitebrowser_build.patch b/sqlitebrowser_build.patch
index 5678120..2e6b8f1 100644
--- a/sqlitebrowser_build.patch
+++ b/sqlitebrowser_build.patch
@@ -1,8 +1,8 @@
-diff -rupN sqlitebrowser-3.6.0/src/EditDialog.cpp sqlitebrowser-3.6.0-new/src/EditDialog.cpp
---- sqlitebrowser-3.6.0/src/EditDialog.cpp 2015-04-27 11:31:47.000000000 +0200
-+++ sqlitebrowser-3.6.0-new/src/EditDialog.cpp 2015-05-20 20:52:51.764063791 +0200
+diff -rupN sqlitebrowser-3.7.0/src/EditDialog.cpp sqlitebrowser-3.7.0-new/src/EditDialog.cpp
+--- sqlitebrowser-3.7.0/src/EditDialog.cpp 2015-06-15 00:02:51.740963614 +0200
++++ sqlitebrowser-3.7.0-new/src/EditDialog.cpp 2015-06-15 00:03:18.535485183 +0200
@@ -7,6 +7,7 @@
- #include <QFileDialog>
+ #include <qhexedit.h>
#include <QKeySequence>
#include <QShortcut>
+#include <QImageReader>
diff --git a/sqlitebrowser_skiptest.patch b/sqlitebrowser_skiptest.patch
index 71cc2fc..72fb564 100644
--- a/sqlitebrowser_skiptest.patch
+++ b/sqlitebrowser_skiptest.patch
@@ -1,7 +1,7 @@
-diff -rupN sqlitebrowser-3.6.0/src/tests/TestImport.cpp sqlitebrowser-3.6.0-new/src/tests/TestImport.cpp
---- sqlitebrowser-3.6.0/src/tests/TestImport.cpp 2015-04-27 11:31:47.000000000 +0200
-+++ sqlitebrowser-3.6.0-new/src/tests/TestImport.cpp 2015-04-29 23:48:39.659255409 +0200
-@@ -28,6 +28,7 @@ TestImport::~TestImport()
+diff -rupN sqlitebrowser-3.7.0/src/tests/TestImport.cpp sqlitebrowser-3.7.0-new/src/tests/TestImport.cpp
+--- sqlitebrowser-3.7.0/src/tests/TestImport.cpp 2015-06-14 12:13:37.000000000 +0200
++++ sqlitebrowser-3.7.0-new/src/tests/TestImport.cpp 2015-06-14 20:42:12.819335046 +0200
+@@ -22,6 +22,7 @@ TestImport::~TestImport()
void TestImport::csvImport()
{
diff --git a/sqlitebrowser_unbundle.patch b/sqlitebrowser_unbundle.patch
index 567883e..a4bb8be 100644
--- a/sqlitebrowser_unbundle.patch
+++ b/sqlitebrowser_unbundle.patch
@@ -1,16 +1,20 @@
-diff -rupN sqlitebrowser-3.6.0/CMakeLists.txt sqlitebrowser-3.6.0-new/CMakeLists.txt
---- sqlitebrowser-3.6.0/CMakeLists.txt 2015-04-27 11:31:47.000000000 +0200
-+++ sqlitebrowser-3.6.0-new/CMakeLists.txt 2015-04-30 09:46:33.525874432 +0200
-@@ -21,15 +21,9 @@ if(WIN32 AND MSVC)
+diff -rupN sqlitebrowser-3.7.0/CMakeLists.txt sqlitebrowser-3.7.0-new/CMakeLists.txt
+--- sqlitebrowser-3.7.0/CMakeLists.txt 2015-06-14 12:13:37.000000000 +0200
++++ sqlitebrowser-3.7.0-new/CMakeLists.txt 2015-06-15 00:26:37.372712963 +0200
+@@ -26,19 +26,9 @@ if(WIN32 AND MSVC)
set(CMAKE_PREFIX_PATH "${QT5_PATH};${SQLITE3_PATH}")
endif()
--set(ANTLR_DIR libs/antlr-2.7.7)
+-find_package(Antlr2)
+-
-set(QHEXEDIT_DIR libs/qhexedit)
-set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
-set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5)
-
--add_subdirectory(${ANTLR_DIR})
+-if(NOT ANTLR2_FOUND)
+- set(ANTLR_DIR libs/antlr-2.7.7)
+- add_subdirectory(${ANTLR_DIR})
+-endif()
-add_subdirectory(${QHEXEDIT_DIR})
-add_subdirectory(${QCUSTOMPLOT_DIR})
-add_subdirectory(${QSCINTILLA_DIR})
@@ -20,11 +24,10 @@ diff -rupN sqlitebrowser-3.6.0/CMakeLists.txt sqlitebrowser-3.6.0-new/CMakeLists
if(USE_QT5)
find_package(Qt5Widgets REQUIRED)
-@@ -207,9 +201,8 @@ endif()
+@@ -225,16 +215,11 @@ endif()
include_directories(
"${CMAKE_CURRENT_BINARY_DIR}"
-- ${ANTLR_DIR}
- ${QHEXEDIT_DIR}
- ${QCUSTOMPLOT_DIR}
+ ${QHEXEDIT2_INCLUDE_DIRS}
@@ -32,73 +35,85 @@ diff -rupN sqlitebrowser-3.6.0/CMakeLists.txt sqlitebrowser-3.6.0-new/CMakeLists
${QSCINTILLA_DIR}
${ADDITIONAL_INCLUDE_PATHS}
src)
-@@ -227,19 +220,16 @@ if(USE_QT5)
- qt5_use_modules(${PROJECT_NAME} Gui Widgets Network Test PrintSupport)
+-if(ANTLR2_FOUND)
+- include_directories(${ANTLR2_INCLUDE_DIRS})
+-else()
+- include_directories(${ANTLR_DIR})
+-endif()
+
+ add_executable(${PROJECT_NAME}
+ ${SQLB_HDR}
+@@ -249,32 +234,20 @@ if(USE_QT5)
set(QT_LIBRARIES "")
endif()
--add_dependencies(${PROJECT_NAME} antlr qhexedit qcustomplot qscintilla2)
+ add_dependencies(${PROJECT_NAME} qhexedit qcustomplot qscintilla2)
+-if(NOT ANTLR2_FOUND)
+- add_dependencies(${PROJECT_NAME} antlr)
+-endif()
link_directories(
- "${CMAKE_CURRENT_BINARY_DIR}/${ANTLR_DIR}"
- "${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}"
- "${CMAKE_CURRENT_BINARY_DIR}/${QCUSTOMPLOT_DIR}"
- "${CMAKE_CURRENT_BINARY_DIR}/${QSCINTILLA_DIR}")
+-if(NOT ANTLR2_FOUND)
+- link_directories("${CMAKE_CURRENT_BINARY_DIR}/${ANTLR_DIR}")
+-endif()
+ ${QHEXEDIT2_LIBRARY_DIRS}
+ ${QCUSTOMPLOT_LIBRARY_DIRS})
target_link_libraries(${PROJECT_NAME}
- antlr
- qhexedit
- qcustomplot
- qscintilla2
++ antlr
+ ${QHEXEDIT2_LIBRARIES}
+ ${QCUSTOMPLOT_LIBRARIES}
+ qscintilla2-qt5
${QT_LIBRARIES}
${WIN32_STATIC_LINK}
${LIBSQLITE}
-diff -rupN sqlitebrowser-3.6.0/src/EditDialog.cpp sqlitebrowser-3.6.0-new/src/EditDialog.cpp
---- sqlitebrowser-3.6.0/src/EditDialog.cpp 2015-04-27 11:31:47.000000000 +0200
-+++ sqlitebrowser-3.6.0-new/src/EditDialog.cpp 2015-04-29 23:49:39.356537291 +0200
-@@ -2,7 +2,7 @@
+ ${ADDITIONAL_LIBS})
+-if(ANTLR2_FOUND)
+- target_link_libraries(${PROJECT_NAME} ${ANTLR2_LIBRARIES})
+-else()
+- target_link_libraries(${PROJECT_NAME} antlr)
+-endif()
+
+ if(WIN32 AND MSVC)
+ set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE")
+diff -rupN sqlitebrowser-3.7.0/src/EditDialog.cpp sqlitebrowser-3.7.0-new/src/EditDialog.cpp
+--- sqlitebrowser-3.7.0/src/EditDialog.cpp 2015-06-14 12:13:37.000000000 +0200
++++ sqlitebrowser-3.7.0-new/src/EditDialog.cpp 2015-06-15 00:26:37.373712982 +0200
+@@ -2,9 +2,9 @@
#include "ui_EditDialog.h"
#include "sqlitedb.h"
#include "PreferencesDialog.h"
-#include "src/qhexedit.h"
-+#include <qhexedit.h>
+ #include "FileDialog.h"
- #include <QFileDialog>
++#include <qhexedit.h>
#include <QKeySequence>
-diff -rupN sqlitebrowser-3.6.0/tests/CMakeLists.txt sqlitebrowser-3.6.0-new/tests/CMakeLists.txt
---- sqlitebrowser-3.6.0/tests/CMakeLists.txt 2015-04-27 11:31:47.000000000 +0200
-+++ sqlitebrowser-3.6.0-new/tests/CMakeLists.txt 2015-04-30 12:47:21.152075973 +0200
-@@ -7,12 +7,8 @@ if(NOT CMAKE_BUILD_TYPE)
- set(CMAKE_BUILD_TYPE "Release")
- endif()
-
--set(ANTLR_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../libs/antlr-2.7.7")
--add_subdirectory("${ANTLR_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/antlr")
--
- if(USE_QT5)
- find_package(Qt5Widgets REQUIRED)
-- set(CMAKE_AUTOMOC ON)
- set(CMAKE_INCLUDE_CURRENT_DIR ON)
- else()
- find_package(Qt4 COMPONENTS QtCore QtTest QtGui REQUIRED)
-@@ -65,7 +61,7 @@ else()
- QT4_WRAP_UI(SQLB_FORM_HDR ${SQLB_FORMS})
- endif()
-
--include_directories("${CMAKE_CURRENT_BINARY_DIR}" "${ANTLR_DIR}" ../src)
-+include_directories("${CMAKE_CURRENT_BINARY_DIR}" ../src)
-
- add_executable(${PROJECT_NAME} ${SQLB_MOC} ${SQLB_HDR} ${SQLB_SRC} ${SQLB_FORM_HDR})
+ #include <QShortcut>
-@@ -74,7 +70,6 @@ if(USE_QT5)
+diff -rupN sqlitebrowser-3.7.0/src/tests/CMakeLists.txt sqlitebrowser-3.7.0-new/src/tests/CMakeLists.txt
+--- sqlitebrowser-3.7.0/src/tests/CMakeLists.txt 2015-06-14 12:13:37.000000000 +0200
++++ sqlitebrowser-3.7.0-new/src/tests/CMakeLists.txt 2015-06-15 09:40:54.347202969 +0200
+@@ -58,16 +58,7 @@ if(USE_QT5)
set(QT_LIBRARIES "")
endif()
--add_dependencies(${PROJECT_NAME} antlr)
- target_link_libraries(${PROJECT_NAME} antlr ${QT_LIBRARIES} ${LIBSQLITE})
+-if(ANTLR2_FOUND)
+-else()
+- add_dependencies(test-sqlobjects antlr)
+-endif()
+-target_link_libraries(test-sqlobjects ${QT_LIBRARIES} ${LIBSQLITE})
+-if(ANTLR2_FOUND)
+- target_link_libraries(test-sqlobjects ${ANTLR2_LIBRARIES})
+-else()
+- target_link_libraries(test-sqlobjects antlr)
+-endif()
++target_link_libraries(test-sqlobjects ${QT_LIBRARIES} ${LIBSQLITE} antlr)
+ add_test(test-sqlobjects test-sqlobjects)
- MESSAGE(STATUS "Build type is ${CMAKE_BUILD_TYPE}")
+ # test-import
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/sqlitebrowser.git/commit/?h=master&id=2f82cdb1297f0b7992fc280d945daeb41bb65ef4
More information about the scm-commits
mailing list