mirror of
https://abf.rosa.ru/djam/codelite.git
synced 2025-02-23 14:42:55 +00:00
New version 6.0.1, update files, re-diff patches
This commit is contained in:
Andrey Bondrov
parent
6f4daa88b1
commit
2b0a4ff0b2
5 changed files with 66 additions and 66 deletions
2
.abf.yml
2
.abf.yml
|
|
@ -1,2 +1,2 @@
|
|||
sources:
|
||||
codelite-5.4-gtk.src.tar.gz: 728f29f36385ad845d95d3a775ed2a137260efd2
|
||||
codelite-6.0.1.tar.gz: 6c2c5f86ca931c345da1954cd478946284b195f8
|
||||
|
|
|
|||
|
|
@ -1,50 +0,0 @@
|
|||
diff -urN codelite-orig/DatabaseExplorer/CMakeLists.txt codelite-patched/DatabaseExplorer/CMakeLists.txt
|
||||
--- codelite-orig/DatabaseExplorer/CMakeLists.txt 2014-02-14 16:08:02.466571699 +1100
|
||||
+++ codelite-patched/DatabaseExplorer/CMakeLists.txt 2014-02-14 16:36:59.448061768 +1100
|
||||
@@ -75,7 +75,7 @@
|
||||
|
||||
# Remove the "lib" prefix from the plugin name
|
||||
set_target_properties(${PLUGIN_NAME} PROPERTIES PREFIX "")
|
||||
-target_link_libraries(${PLUGIN_NAME} ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES} ${LIBMYSQLCLIENT} -L"${CL_LIBPATH}" -lwxsqlite3 -lsqlite3lib -llibcodelite -lplugin -ldatabaselayersqlite -lwxshapeframework)
|
||||
+target_link_libraries(${PLUGIN_NAME} ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES} ${LIBMYSQLCLIENT} -L"${CL_LIBPATH}" -lwxsqlite3 -lsqlite3lib -llibcodelite -lplugin -ldatabaselayersqlite -lwxshapeframework -lgtk-x11-2.0)
|
||||
# Make sure that the plugin will not start build before 'plugin.so' is ready
|
||||
add_dependencies(${PLUGIN_NAME} plugin)
|
||||
install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIR})
|
||||
diff -urN codelite-orig/Plugin/CMakeLists.txt codelite-patched/Plugin/CMakeLists.txt
|
||||
--- codelite-orig/Plugin/CMakeLists.txt 2014-02-14 16:08:02.217567702 +1100
|
||||
+++ codelite-patched/Plugin/CMakeLists.txt 2014-02-14 16:26:31.315884200 +1100
|
||||
@@ -67,11 +67,11 @@
|
||||
# Define the output
|
||||
add_library(plugin SHARED ${SRCS})
|
||||
if(GTK2_FOUND)
|
||||
- target_link_libraries(plugin ${LINKER_OPTIONS} ${GTK2_LIBRARIES} ${wxWidgets_LIBRARIES} -L"${CL_LIBPATH}" -lwxsqlite3 -lsqlite3lib -llibcodelite)
|
||||
+ target_link_libraries(plugin ${LINKER_OPTIONS} ${GTK2_LIBRARIES} ${wxWidgets_LIBRARIES} -L"${CL_LIBPATH}" -lwxsqlite3 -lsqlite3lib -llibcodelite -ldl -lutil)
|
||||
elseif (GTK3_FOUND)
|
||||
- target_link_libraries(plugin ${LINKER_OPTIONS} ${GTK3_LIBRARIES} ${wxWidgets_LIBRARIES} -L"${CL_LIBPATH}" -lwxsqlite3 -lsqlite3lib -llibcodelite)
|
||||
+ target_link_libraries(plugin ${LINKER_OPTIONS} ${GTK3_LIBRARIES} ${wxWidgets_LIBRARIES} -L"${CL_LIBPATH}" -lwxsqlite3 -lsqlite3lib -llibcodelite -ldl -lutil)
|
||||
else()
|
||||
- target_link_libraries(plugin ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES} -L"${CL_LIBPATH}" -lwxsqlite3 -lsqlite3lib -llibcodelite)
|
||||
+ target_link_libraries(plugin ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES} -L"${CL_LIBPATH}" -lwxsqlite3 -lsqlite3lib -llibcodelite -ldl -lutil)
|
||||
endif()
|
||||
|
||||
install(TARGETS plugin DESTINATION ${PLUGINS_DIR})
|
||||
diff -urN codelite-orig/sdk/databaselayer/CMakeLists.txt codelite-patched/sdk/databaselayer/CMakeLists.txt
|
||||
--- codelite-orig/sdk/databaselayer/CMakeLists.txt 2014-02-14 16:08:02.363570046 +1100
|
||||
+++ codelite-patched/sdk/databaselayer/CMakeLists.txt 2014-02-14 16:08:45.190258495 +1100
|
||||
@@ -49,5 +49,5 @@
|
||||
|
||||
# Define the output
|
||||
add_library(databaselayersqlite SHARED ${SRCS} ${MYSQL_SRCS})
|
||||
-target_link_libraries(databaselayersqlite ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES})
|
||||
+target_link_libraries(databaselayersqlite ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES} -ldl)
|
||||
install(TARGETS databaselayersqlite DESTINATION ${PLUGINS_DIR})
|
||||
diff -urN codelite-orig/sdk/wxsqlite3/CMakeLists.txt codelite-patched/sdk/wxsqlite3/CMakeLists.txt
|
||||
--- codelite-orig/sdk/wxsqlite3/CMakeLists.txt 2014-02-14 16:08:02.233567959 +1100
|
||||
+++ codelite-patched/sdk/wxsqlite3/CMakeLists.txt 2014-02-14 16:08:16.004789104 +1100
|
||||
@@ -32,5 +32,5 @@
|
||||
|
||||
# Define the output
|
||||
add_library(wxsqlite3 SHARED ${SRCS})
|
||||
-target_link_libraries(wxsqlite3 ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES} -L"${CL_LIBPATH}" -lsqlite3lib)
|
||||
+target_link_libraries(wxsqlite3 ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES} -L"${CL_LIBPATH}" -lsqlite3lib -ldl)
|
||||
install(TARGETS wxsqlite3 DESTINATION ${PLUGINS_DIR})
|
||||
|
|
@ -1,11 +1,9 @@
|
|||
diff -ur codelite-5.1.vanilla/Runtime/codelite.desktop.template codelite-5.1/Runtime/codelite.desktop.template
|
||||
--- codelite-5.1.vanilla/Runtime/codelite.desktop.template 2013-03-20 21:32:00.000000000 +0100
|
||||
+++ codelite-5.1/Runtime/codelite.desktop.template 2013-04-13 16:22:03.310720481 +0200
|
||||
@@ -1,6 +1,8 @@
|
||||
diff -urN codelite-6.0.1/Runtime/codelite.desktop.template codelite-6.0.1-patched/Runtime/codelite.desktop.template
|
||||
--- codelite-6.0.1/Runtime/codelite.desktop.template 2014-06-04 15:10:09.000000000 +1100
|
||||
+++ codelite-6.0.1-patched/Runtime/codelite.desktop.template 2014-08-07 13:31:23.807202954 +1100
|
||||
@@ -1,5 +1,7 @@
|
||||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
-Name=codelite
|
||||
+Name=CodeLite
|
||||
Name=CodeLite
|
||||
+Comment=Оpen-source, cross platform IDE for the C/C++ programming languages
|
||||
+Comment[ru]=Свободная, кроссплатформенная среда разработки программного обеспечения для языков С/С++ с открытым исходным кодом
|
||||
Exec=codelite %f
|
||||
50
codelite-6.0.1-linkage.patch
Normal file
50
codelite-6.0.1-linkage.patch
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
diff -urN codelite-6.0.1/DatabaseExplorer/CMakeLists.txt codelite-6.0.1-patched/DatabaseExplorer/CMakeLists.txt
|
||||
--- codelite-6.0.1/DatabaseExplorer/CMakeLists.txt 2014-06-04 15:10:09.000000000 +1100
|
||||
+++ codelite-6.0.1-patched/DatabaseExplorer/CMakeLists.txt 2014-08-07 13:56:33.727198669 +1100
|
||||
@@ -78,7 +78,7 @@
|
||||
if (GTK3_FOUND)
|
||||
target_link_libraries(${PLUGIN_NAME} ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES} ${GTK3_LIBRARIES} ${LIBMYSQLCLIENT} -L"${CL_LIBPATH}" -lwxsqlite3 -lsqlite3lib -llibcodelite -lplugin -ldatabaselayersqlite -lwxshapeframework)
|
||||
else()
|
||||
- target_link_libraries(${PLUGIN_NAME} ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES} ${GTK2_LIBRARIES} ${LIBMYSQLCLIENT} -L"${CL_LIBPATH}" -lwxsqlite3 -lsqlite3lib -llibcodelite -lplugin -ldatabaselayersqlite -lwxshapeframework)
|
||||
+ target_link_libraries(${PLUGIN_NAME} ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES} ${GTK2_LIBRARIES} ${LIBMYSQLCLIENT} -L"${CL_LIBPATH}" -lwxsqlite3 -lsqlite3lib -llibcodelite -lplugin -ldatabaselayersqlite -lwxshapeframework -lgtk-x11-2.0)
|
||||
endif()
|
||||
# Make sure that the plugin will not start build before 'plugin.so' is ready
|
||||
add_dependencies(${PLUGIN_NAME} plugin)
|
||||
diff -urN codelite-6.0.1/Plugin/CMakeLists.txt codelite-6.0.1-patched/Plugin/CMakeLists.txt
|
||||
--- codelite-6.0.1/Plugin/CMakeLists.txt 2014-06-04 15:10:09.000000000 +1100
|
||||
+++ codelite-6.0.1-patched/Plugin/CMakeLists.txt 2014-08-07 13:57:36.570197916 +1100
|
||||
@@ -80,11 +80,11 @@
|
||||
# Define the output
|
||||
add_library(plugin SHARED ${SRCS})
|
||||
if(GTK2_FOUND)
|
||||
- target_link_libraries(plugin ${LINKER_OPTIONS} ${ADDITIONAL_LIBRARIES} ${GTK2_LIBRARIES} ${wxWidgets_LIBRARIES} -L"${CL_LIBPATH}" -lwxsqlite3 -lsqlite3lib -llibcodelite)
|
||||
+ target_link_libraries(plugin ${LINKER_OPTIONS} ${ADDITIONAL_LIBRARIES} ${GTK2_LIBRARIES} ${wxWidgets_LIBRARIES} -L"${CL_LIBPATH}" -lwxsqlite3 -lsqlite3lib -llibcodelite -ldl -lutil)
|
||||
elseif (GTK3_FOUND)
|
||||
- target_link_libraries(plugin ${LINKER_OPTIONS} ${ADDITIONAL_LIBRARIES} ${GTK3_LIBRARIES} ${wxWidgets_LIBRARIES} -L"${CL_LIBPATH}" -lwxsqlite3 -lsqlite3lib -llibcodelite)
|
||||
+ target_link_libraries(plugin ${LINKER_OPTIONS} ${ADDITIONAL_LIBRARIES} ${GTK3_LIBRARIES} ${wxWidgets_LIBRARIES} -L"${CL_LIBPATH}" -lwxsqlite3 -lsqlite3lib -llibcodelite -ldl -lutil)
|
||||
else()
|
||||
- target_link_libraries(plugin ${LINKER_OPTIONS} ${ADDITIONAL_LIBRARIES} ${wxWidgets_LIBRARIES} -L"${CL_LIBPATH}" -lwxsqlite3 -lsqlite3lib -llibcodelite)
|
||||
+ target_link_libraries(plugin ${LINKER_OPTIONS} ${ADDITIONAL_LIBRARIES} ${wxWidgets_LIBRARIES} -L"${CL_LIBPATH}" -lwxsqlite3 -lsqlite3lib -llibcodelite -ldl -lutil)
|
||||
endif()
|
||||
|
||||
install(TARGETS plugin DESTINATION ${PLUGINS_DIR})
|
||||
diff -urN codelite-6.0.1/sdk/databaselayer/CMakeLists.txt codelite-6.0.1-patched/sdk/databaselayer/CMakeLists.txt
|
||||
--- codelite-6.0.1/sdk/databaselayer/CMakeLists.txt 2014-06-04 15:10:09.000000000 +1100
|
||||
+++ codelite-6.0.1-patched/sdk/databaselayer/CMakeLists.txt 2014-08-07 13:55:22.091199527 +1100
|
||||
@@ -49,5 +49,5 @@
|
||||
|
||||
# Define the output
|
||||
add_library(databaselayersqlite SHARED ${SRCS} ${MYSQL_SRCS})
|
||||
-target_link_libraries(databaselayersqlite ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES})
|
||||
+target_link_libraries(databaselayersqlite ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES} -ldl)
|
||||
install(TARGETS databaselayersqlite DESTINATION ${PLUGINS_DIR})
|
||||
diff -urN codelite-6.0.1/sdk/wxsqlite3/CMakeLists.txt codelite-6.0.1-patched/sdk/wxsqlite3/CMakeLists.txt
|
||||
--- codelite-6.0.1/sdk/wxsqlite3/CMakeLists.txt 2014-06-04 15:10:09.000000000 +1100
|
||||
+++ codelite-6.0.1-patched/sdk/wxsqlite3/CMakeLists.txt 2014-08-07 13:55:22.091199527 +1100
|
||||
@@ -32,5 +32,5 @@
|
||||
|
||||
# Define the output
|
||||
add_library(wxsqlite3 SHARED ${SRCS})
|
||||
-target_link_libraries(wxsqlite3 ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES} -L"${CL_LIBPATH}" -lsqlite3lib)
|
||||
+target_link_libraries(wxsqlite3 ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES} -L"${CL_LIBPATH}" -lsqlite3lib -ldl)
|
||||
install(TARGETS wxsqlite3 DESTINATION ${PLUGINS_DIR})
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
Summary: A powerful open-source, cross platform code editor for C/C++
|
||||
Name: codelite
|
||||
Version: 5.4
|
||||
Release: 3
|
||||
Version: 6.0.1
|
||||
Release: 1
|
||||
License: GPLv2+
|
||||
Group: Development/Other
|
||||
Url: http://codelite.sourceforge.net
|
||||
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-gtk.src.tar.gz
|
||||
Group: Development/Tools
|
||||
Url: http://www.codelite.org
|
||||
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
|
||||
Source10: %{name}.rpmlintrc
|
||||
Patch0: codelite-5.4-desktop.patch
|
||||
Patch1: codelite-5.4-linkage.patch
|
||||
Patch0: codelite-6.0.1-desktop.patch
|
||||
Patch1: codelite-6.0.1-linkage.patch
|
||||
Patch2: codelite-5.4-libdir.patch
|
||||
BuildRequires: cmake
|
||||
BuildRequires: wxgtku3.0-devel
|
||||
|
|
@ -27,7 +27,9 @@ users to easily create, build and debug complex projects.
|
|||
%{_bindir}/clg++
|
||||
%{_bindir}/clgcc
|
||||
%{_bindir}/codelite
|
||||
%{_bindir}/codelite-cc
|
||||
%{_bindir}/codelite-clang
|
||||
%{_bindir}/codelite-echo
|
||||
%{_bindir}/codelite-make
|
||||
%{_bindir}/codelite-terminal
|
||||
%{_bindir}/codelite_indexer
|
||||
|
|
@ -36,10 +38,10 @@ users to easily create, build and debug complex projects.
|
|||
%{_bindir}/codelite_exec
|
||||
%{_bindir}/codelite_kill_children
|
||||
%{_bindir}/codelite_xterm
|
||||
%{_bindir}/codelitegcc
|
||||
%{_datadir}/applications/%{name}.desktop
|
||||
%{_datadir}/%{name}
|
||||
%{_libdir}/%{name}/
|
||||
%{_mandir}/man1/*.1*
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue