From 3b0f29b58a09a41e2181fc69d972afaf79413a22 Mon Sep 17 00:00:00 2001 From: kamil Date: Wed, 15 Jun 2016 22:04:17 +0000 Subject: Import codelite-9.1 as editors/codelite CodeLite is an open source, free, cross platform IDE for the C/C++ programming languages which runs on all major Platforms. Originally packaged in pkgsrc-wip by myself. --- editors/codelite/patches/patch-CMakeLists.txt | 14 +++++++++ .../codelite/patches/patch-CodeLite_CMakeLists.txt | 15 +++++++++ .../patches/patch-CodeLite_unixprocess__impl.cpp | 17 ++++++++++ .../patches/patch-LiteEditor_CMakeLists.txt | 36 ++++++++++++++++++++++ .../codelite/patches/patch-Plugin_CMakeLists.txt | 15 +++++++++ .../codelite/patches/patch-Plugin_wxterminal.cpp | 26 ++++++++++++++++ .../patches/patch-codelite__terminal_MainFrame.cpp | 18 +++++++++++ .../patch-codelite__terminal_unixprocess__impl.cpp | 17 ++++++++++ .../patch-sdk_codelite__indexer_libctags_read.c | 25 +++++++++++++++ .../codelite/patches/patch-sdk_wxsqlite3_configure | 22 +++++++++++++ 10 files changed, 205 insertions(+) create mode 100644 editors/codelite/patches/patch-CMakeLists.txt create mode 100644 editors/codelite/patches/patch-CodeLite_CMakeLists.txt create mode 100644 editors/codelite/patches/patch-CodeLite_unixprocess__impl.cpp create mode 100644 editors/codelite/patches/patch-LiteEditor_CMakeLists.txt create mode 100644 editors/codelite/patches/patch-Plugin_CMakeLists.txt create mode 100644 editors/codelite/patches/patch-Plugin_wxterminal.cpp create mode 100644 editors/codelite/patches/patch-codelite__terminal_MainFrame.cpp create mode 100644 editors/codelite/patches/patch-codelite__terminal_unixprocess__impl.cpp create mode 100644 editors/codelite/patches/patch-sdk_codelite__indexer_libctags_read.c create mode 100644 editors/codelite/patches/patch-sdk_wxsqlite3_configure (limited to 'editors') diff --git a/editors/codelite/patches/patch-CMakeLists.txt b/editors/codelite/patches/patch-CMakeLists.txt new file mode 100644 index 00000000000..b333107a996 --- /dev/null +++ b/editors/codelite/patches/patch-CMakeLists.txt @@ -0,0 +1,14 @@ +$NetBSD: patch-CMakeLists.txt,v 1.1 2016/06/15 22:04:17 kamil Exp $ + +Add NetBSD entry. + +--- CMakeLists.txt.orig 2016-01-30 10:49:18.000000000 +0000 ++++ CMakeLists.txt +@@ -59,6 +59,7 @@ endif() + + set( USE_CLANG 1 ) + set( IS_FREEBSD 0 ) ++set( IS_NETBSD 1 ) + set( BUILD_WXC 0 ) + set( CL_COPY_WX_LIBS 0 ) + set( WITH_SFTP 1 ) diff --git a/editors/codelite/patches/patch-CodeLite_CMakeLists.txt b/editors/codelite/patches/patch-CodeLite_CMakeLists.txt new file mode 100644 index 00000000000..2d6164f00f9 --- /dev/null +++ b/editors/codelite/patches/patch-CodeLite_CMakeLists.txt @@ -0,0 +1,15 @@ +$NetBSD: patch-CodeLite_CMakeLists.txt,v 1.1 2016/06/15 22:04:17 kamil Exp $ + +Add switch for NetBSD to not fall under "other OS". + +--- CodeLite/CMakeLists.txt.orig 2016-01-30 10:49:18.000000000 +0000 ++++ CodeLite/CMakeLists.txt +@@ -60,6 +60,8 @@ set( ADDITIONAL_LIBRARIES "" ) + if (UNIX) + if ( IS_FREEBSD ) + set(ADDITIONAL_LIBRARIES "-lkvm") ++ elseif ( IS_NETBSD ) ++ set(ADDITIONAL_LIBRARIES "") + elseif ( UNIX AND NOT APPLE ) + set(ADDITIONAL_LIBRARIES "-ldl -lutil") + else ( ) diff --git a/editors/codelite/patches/patch-CodeLite_unixprocess__impl.cpp b/editors/codelite/patches/patch-CodeLite_unixprocess__impl.cpp new file mode 100644 index 00000000000..7bb6bfab9d7 --- /dev/null +++ b/editors/codelite/patches/patch-CodeLite_unixprocess__impl.cpp @@ -0,0 +1,17 @@ +$NetBSD: patch-CodeLite_unixprocess__impl.cpp,v 1.1 2016/06/15 22:04:17 kamil Exp $ + +Add switch for NetBSD to not fall under "other OS". + +--- CodeLite/unixprocess_impl.cpp.orig 2016-01-30 10:49:18.000000000 +0000 ++++ CodeLite/unixprocess_impl.cpp +@@ -44,6 +44,10 @@ + #include + #include + #include ++#elif defined(__NetBSD__) ++#include ++#include ++#include + #else + #include + #include diff --git a/editors/codelite/patches/patch-LiteEditor_CMakeLists.txt b/editors/codelite/patches/patch-LiteEditor_CMakeLists.txt new file mode 100644 index 00000000000..ac17066cbec --- /dev/null +++ b/editors/codelite/patches/patch-LiteEditor_CMakeLists.txt @@ -0,0 +1,36 @@ +$NetBSD: patch-LiteEditor_CMakeLists.txt,v 1.1 2016/06/15 22:04:17 kamil Exp $ + +Add switch for NetBSD to not fall under "other OS". + +Fix path of installation of manpages. + +--- LiteEditor/CMakeLists.txt.orig 2016-01-30 10:49:18.000000000 +0000 ++++ LiteEditor/CMakeLists.txt +@@ -14,6 +14,9 @@ include( "${wxWidgets_USE_FILE}" ) + # Include paths + include_directories("${CL_SRC_ROOT}/Plugin" "${CL_SRC_ROOT}/sdk/wxsqlite3/include" "${CL_SRC_ROOT}/CodeLite" "${CL_SRC_ROOT}/PCH" "${CL_SRC_ROOT}/Interfaces") + ++# GNU dirs ++include(GNUInstallDirs) ++ + ## On UNIX we require GTK + if (UNIX AND NOT APPLE) + if (GTK_VERSION EQUAL 3) +@@ -68,6 +71,8 @@ set( ADDITIONAL_LIBRARIES "" ) + if (UNIX) + if ( IS_FREEBSD ) + set(ADDITIONAL_LIBRARIES "-lkvm") ++ elseif ( IS_NETBSD ) ++ set(ADDITIONAL_LIBRARIES "") + elseif ( UNIX AND NOT APPLE ) + set(ADDITIONAL_LIBRARIES "-ldl -lutil -lgobject-2.0") + else ( ) +@@ -112,7 +117,7 @@ if(NOT APPLE) + + ## Manual pages + if(UNIX AND NOT APPLE) +- install(DIRECTORY ${CL_SRC_ROOT}/Runtime/man1 DESTINATION ${CL_PREFIX}/share/man) ++ install(DIRECTORY ${CL_SRC_ROOT}/Runtime/man1 DESTINATION ${CL_PREFIX}/${CMAKE_INSTALL_MANDIR}) + endif() + + ## Copy default configuration files diff --git a/editors/codelite/patches/patch-Plugin_CMakeLists.txt b/editors/codelite/patches/patch-Plugin_CMakeLists.txt new file mode 100644 index 00000000000..d4b3014f245 --- /dev/null +++ b/editors/codelite/patches/patch-Plugin_CMakeLists.txt @@ -0,0 +1,15 @@ +$NetBSD: patch-Plugin_CMakeLists.txt,v 1.1 2016/06/15 22:04:17 kamil Exp $ + +Add switch for NetBSD to not fall under "other OS". + +--- Plugin/CMakeLists.txt.orig 2016-01-30 10:49:18.000000000 +0000 ++++ Plugin/CMakeLists.txt +@@ -64,6 +64,8 @@ set( ADDITIONAL_LIBRARIES "" ) + if (UNIX) + if ( IS_FREEBSD ) + set(ADDITIONAL_LIBRARIES "-lkvm") ++ elseif ( IS_NETBSD ) ++ set(ADDITIONAL_LIBRARIES "") + elseif ( UNIX AND NOT APPLE ) + set(ADDITIONAL_LIBRARIES "-ldl -lutil") + else ( ) diff --git a/editors/codelite/patches/patch-Plugin_wxterminal.cpp b/editors/codelite/patches/patch-Plugin_wxterminal.cpp new file mode 100644 index 00000000000..3a6a623d5c4 --- /dev/null +++ b/editors/codelite/patches/patch-Plugin_wxterminal.cpp @@ -0,0 +1,26 @@ +$NetBSD: patch-Plugin_wxterminal.cpp,v 1.1 2016/06/15 22:04:17 kamil Exp $ + +Add switch for NetBSD to not fall under "other OS". + +--- Plugin/wxterminal.cpp.orig 2016-01-30 10:49:18.000000000 +0000 ++++ Plugin/wxterminal.cpp +@@ -39,7 +39,7 @@ + #define SHELL_WRAPPER wxT("") + #else + +-#if defined(__WXMAC__) || defined(__FreeBSD__) ++#if defined(__WXMAC__) || defined(__FreeBSD__) || defined(__NetBSD__) + #include + #else + #include +@@ -55,6 +55,10 @@ + #include + #include + #include ++#elif defined(__NetBSD__) ++#include ++#include ++#include + #else + #include + #endif diff --git a/editors/codelite/patches/patch-codelite__terminal_MainFrame.cpp b/editors/codelite/patches/patch-codelite__terminal_MainFrame.cpp new file mode 100644 index 00000000000..cd0fcfec11a --- /dev/null +++ b/editors/codelite/patches/patch-codelite__terminal_MainFrame.cpp @@ -0,0 +1,18 @@ +$NetBSD: patch-codelite__terminal_MainFrame.cpp,v 1.1 2016/06/15 22:04:17 kamil Exp $ + +Add switch for NetBSD to not fall under "other OS". + +--- codelite_terminal/MainFrame.cpp.orig 2016-01-30 10:49:18.000000000 +0000 ++++ codelite_terminal/MainFrame.cpp +@@ -16,6 +16,11 @@ + #include + #include + #include ++#elif defined(__NetBSD__) ++#include ++#include ++#include ++#include + #elif defined(__WXGTK__) + #include + #else diff --git a/editors/codelite/patches/patch-codelite__terminal_unixprocess__impl.cpp b/editors/codelite/patches/patch-codelite__terminal_unixprocess__impl.cpp new file mode 100644 index 00000000000..0a47107fa72 --- /dev/null +++ b/editors/codelite/patches/patch-codelite__terminal_unixprocess__impl.cpp @@ -0,0 +1,17 @@ +$NetBSD: patch-codelite__terminal_unixprocess__impl.cpp,v 1.1 2016/06/15 22:04:17 kamil Exp $ + +Add switch for NetBSD to not fall under "other OS". + +--- codelite_terminal/unixprocess_impl.cpp.orig 2016-01-30 10:49:18.000000000 +0000 ++++ codelite_terminal/unixprocess_impl.cpp +@@ -18,6 +18,10 @@ + # include + # include + # include ++#elif defined(__NetBSD__) ++# include ++# include ++# include + #else + # include + # include diff --git a/editors/codelite/patches/patch-sdk_codelite__indexer_libctags_read.c b/editors/codelite/patches/patch-sdk_codelite__indexer_libctags_read.c new file mode 100644 index 00000000000..11daa914820 --- /dev/null +++ b/editors/codelite/patches/patch-sdk_codelite__indexer_libctags_read.c @@ -0,0 +1,25 @@ +$NetBSD: patch-sdk_codelite__indexer_libctags_read.c,v 1.1 2016/06/15 22:04:17 kamil Exp $ + +Handle fpos_t on NetBSD. + +--- sdk/codelite_indexer/libctags/read.c.orig 2016-01-30 10:49:18.000000000 +0000 ++++ sdk/codelite_indexer/libctags/read.c +@@ -605,6 +605,9 @@ extern int readChars (char *buffer, size + #if defined(__WXMSW__) || defined(__APPLE__) || defined(__FreeBSD__) + if(location < 0) + return 0; ++#elif defined(__NetBSD__) ++ if(location._pos < 0) ++ return 0; + #else + if(location.__pos < 0) + return 0; +@@ -619,6 +622,8 @@ extern int readChars (char *buffer, size + + #if defined(__WXMSW__) || defined(__APPLE__) || defined(__FreeBSD__) + sizeToRead = endPos - location; ++#elif defined(__NetBSD__) ++ sizeToRead = endPos._pos - location._pos; + #else + sizeToRead = endPos.__pos - location.__pos; + #endif diff --git a/editors/codelite/patches/patch-sdk_wxsqlite3_configure b/editors/codelite/patches/patch-sdk_wxsqlite3_configure new file mode 100644 index 00000000000..3a022b51c9e --- /dev/null +++ b/editors/codelite/patches/patch-sdk_wxsqlite3_configure @@ -0,0 +1,22 @@ +$NetBSD: patch-sdk_wxsqlite3_configure,v 1.1 2016/06/15 22:04:17 kamil Exp $ + +Fix shell portability issue. + +--- sdk/wxsqlite3/configure.orig 2016-01-30 10:49:18.000000000 +0000 ++++ sdk/wxsqlite3/configure +@@ -5717,7 +5717,7 @@ echo "${ECHO_T}$bakefile_cv_gcc31" >&6 + SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o" + fi + +- if test "x$GCC" == "xyes"; then ++ if test "x$GCC" = "xyes"; then + PIC_FLAG="-dynamic -fPIC" + fi + if test "x$XLCC" = "xyes"; then +@@ -8045,6 +8045,3 @@ echo "$as_me: error: + echo " Now, just run make." + echo " ----------------------------------------------------------------" + echo +- +- +- -- cgit v1.2.3