Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Michael Weber (xmw)" <xmw@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-db/sqlitebrowser/files: sqlitebrowser-3.6.0-unbundle.patch sqlitebrowser-3.6.0-unbundle-keep-qscintilla.patch
Date: Tue, 02 Jun 2015 08:24:10
Message-Id: 20150602082405.47936A23@oystercatcher.gentoo.org
1 xmw 15/06/02 08:24:05
2
3 Added: sqlitebrowser-3.6.0-unbundle.patch
4 sqlitebrowser-3.6.0-unbundle-keep-qscintilla.patch
5 Log:
6 Version bump (bug 550292 by Tomáš Chaloupka).
7
8 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
9
10 Revision Changes Path
11 1.1 dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle.patch?rev=1.1&content-type=text/plain
15
16 Index: sqlitebrowser-3.6.0-unbundle.patch
17 ===================================================================
18 --- sqlitebrowser-3.6.0/CMakeLists.txt
19 +++ sqlitebrowser-3.6.0/CMakeLists.txt
20 @@ -21,15 +21,9 @@
21 set(CMAKE_PREFIX_PATH "${QT5_PATH};${SQLITE3_PATH}")
22 endif()
23
24 -set(ANTLR_DIR libs/antlr-2.7.7)
25 set(QHEXEDIT_DIR libs/qhexedit)
26 -set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
27 -set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5)
28
29 -add_subdirectory(${ANTLR_DIR})
30 add_subdirectory(${QHEXEDIT_DIR})
31 -add_subdirectory(${QCUSTOMPLOT_DIR})
32 -add_subdirectory(${QSCINTILLA_DIR})
33
34 if(USE_QT5)
35 find_package(Qt5Widgets REQUIRED)
36 @@ -31,7 +31,7 @@
37 set(CMAKE_AUTOMOC ON)
38 set(CMAKE_INCLUDE_CURRENT_DIR ON)
39 else()
40 - find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork REQUIRED)
41 + find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork qscintilla2 REQUIRED)
42 include("${QT_USE_FILE}")
43 add_definitions(${QT_DEFINITIONS})
44 endif()
45 @@ -207,10 +201,7 @@
46
47 include_directories(
48 "${CMAKE_CURRENT_BINARY_DIR}"
49 - ${ANTLR_DIR}
50 ${QHEXEDIT_DIR}
51 - ${QCUSTOMPLOT_DIR}
52 - ${QSCINTILLA_DIR}
53 ${ADDITIONAL_INCLUDE_PATHS}
54 src)
55
56 @@ -227,13 +218,10 @@
57 qt5_use_modules(${PROJECT_NAME} Gui Widgets Network Test PrintSupport)
58 set(QT_LIBRARIES "")
59 endif()
60 -add_dependencies(${PROJECT_NAME} antlr qhexedit qcustomplot qscintilla2)
61 +add_dependencies(${PROJECT_NAME} qhexedit)
62
63 link_directories(
64 - "${CMAKE_CURRENT_BINARY_DIR}/${ANTLR_DIR}"
65 - "${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}"
66 - "${CMAKE_CURRENT_BINARY_DIR}/${QCUSTOMPLOT_DIR}"
67 - "${CMAKE_CURRENT_BINARY_DIR}/${QSCINTILLA_DIR}")
68 + "${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}")
69
70 target_link_libraries(${PROJECT_NAME}
71 antlr
72 --- sqlitebrowser-3.6.0/tests/CMakeLists.txt
73 +++ sqlitebrowser-3.6.0/tests/CMakeLists.txt
74 @@ -7,9 +7,6 @@
75 set(CMAKE_BUILD_TYPE "Release")
76 endif()
77
78 -set(ANTLR_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../libs/antlr-2.7.7")
79 -add_subdirectory("${ANTLR_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/antlr")
80 -
81 if(USE_QT5)
82 find_package(Qt5Widgets REQUIRED)
83 set(CMAKE_AUTOMOC ON)
84 @@ -65,7 +62,7 @@
85 QT4_WRAP_UI(SQLB_FORM_HDR ${SQLB_FORMS})
86 endif()
87
88 -include_directories("${CMAKE_CURRENT_BINARY_DIR}" "${ANTLR_DIR}" ../src)
89 +include_directories("${CMAKE_CURRENT_BINARY_DIR}" ../src)
90
91 add_executable(${PROJECT_NAME} ${SQLB_MOC} ${SQLB_HDR} ${SQLB_SRC} ${SQLB_FORM_HDR})
92
93
94
95
96 1.1 dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle-keep-qscintilla.patch
97
98 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle-keep-qscintilla.patch?rev=1.1&view=markup
99 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle-keep-qscintilla.patch?rev=1.1&content-type=text/plain
100
101 Index: sqlitebrowser-3.6.0-unbundle-keep-qscintilla.patch
102 ===================================================================
103 --- sqlitebrowser-3.6.0/CMakeLists.txt
104 +++ sqlitebrowser-3.6.0/CMakeLists.txt
105 @@ -21,14 +21,10 @@
106 set(CMAKE_PREFIX_PATH "${QT5_PATH};${SQLITE3_PATH}")
107 endif()
108
109 -set(ANTLR_DIR libs/antlr-2.7.7)
110 set(QHEXEDIT_DIR libs/qhexedit)
111 -set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
112 set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5)
113
114 -add_subdirectory(${ANTLR_DIR})
115 add_subdirectory(${QHEXEDIT_DIR})
116 -add_subdirectory(${QCUSTOMPLOT_DIR})
117 add_subdirectory(${QSCINTILLA_DIR})
118
119 if(USE_QT5)
120 @@ -207,9 +201,7 @@
121
122 include_directories(
123 "${CMAKE_CURRENT_BINARY_DIR}"
124 - ${ANTLR_DIR}
125 ${QHEXEDIT_DIR}
126 - ${QCUSTOMPLOT_DIR}
127 ${QSCINTILLA_DIR}
128 ${ADDITIONAL_INCLUDE_PATHS}
129 src)
130 @@ -227,12 +218,9 @@
131 qt5_use_modules(${PROJECT_NAME} Gui Widgets Network Test PrintSupport)
132 set(QT_LIBRARIES "")
133 endif()
134 -add_dependencies(${PROJECT_NAME} antlr qhexedit qcustomplot qscintilla2)
135 +add_dependencies(${PROJECT_NAME} qhexedit qscintilla2)
136
137 link_directories(
138 - "${CMAKE_CURRENT_BINARY_DIR}/${ANTLR_DIR}"
139 - "${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}"
140 - "${CMAKE_CURRENT_BINARY_DIR}/${QCUSTOMPLOT_DIR}"
141 "${CMAKE_CURRENT_BINARY_DIR}/${QSCINTILLA_DIR}")
142
143 target_link_libraries(${PROJECT_NAME}
144 --- sqlitebrowser-3.6.0/tests/CMakeLists.txt
145 +++ sqlitebrowser-3.6.0/tests/CMakeLists.txt
146 @@ -7,9 +7,6 @@
147 set(CMAKE_BUILD_TYPE "Release")
148 endif()
149
150 -set(ANTLR_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../libs/antlr-2.7.7")
151 -add_subdirectory("${ANTLR_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/antlr")
152 -
153 if(USE_QT5)
154 find_package(Qt5Widgets REQUIRED)
155 set(CMAKE_AUTOMOC ON)
156 @@ -65,7 +62,7 @@
157 QT4_WRAP_UI(SQLB_FORM_HDR ${SQLB_FORMS})
158 endif()
159
160 -include_directories("${CMAKE_CURRENT_BINARY_DIR}" "${ANTLR_DIR}" ../src)
161 +include_directories("${CMAKE_CURRENT_BINARY_DIR}" ../src)
162
163 add_executable(${PROJECT_NAME} ${SQLB_MOC} ${SQLB_HDR} ${SQLB_SRC} ${SQLB_FORM_HDR})
Report Message
Find on MARC Find on Google Groups