CVS commit: pkgsrc/editors/codelite/patches

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/editors/codelite/patches
From: "Kamil Rytarowski" <kamil%netbsd.org@localhost>
Date: Wed, 15 Jun 2016 22:04:17 +0000

Module Name:    pkgsrc
Committed By:   kamil
Date:           Wed Jun 15 22:04:17 UTC 2016

Added Files:
        pkgsrc/editors/codelite/patches: patch-CMakeLists.txt
            patch-CodeLite_CMakeLists.txt patch-CodeLite_unixprocess__impl.cpp
            patch-LiteEditor_CMakeLists.txt patch-Plugin_CMakeLists.txt
            patch-Plugin_wxterminal.cpp patch-codelite__terminal_MainFrame.cpp
            patch-codelite__terminal_unixprocess__impl.cpp
            patch-sdk_codelite__indexer_libctags_read.c
            patch-sdk_wxsqlite3_configure

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/editors/codelite/patches/patch-CMakeLists.txt \
    pkgsrc/editors/codelite/patches/patch-CodeLite_CMakeLists.txt \
    pkgsrc/editors/codelite/patches/patch-CodeLite_unixprocess__impl.cpp \
    pkgsrc/editors/codelite/patches/patch-LiteEditor_CMakeLists.txt \
    pkgsrc/editors/codelite/patches/patch-Plugin_CMakeLists.txt \
    pkgsrc/editors/codelite/patches/patch-Plugin_wxterminal.cpp \
    pkgsrc/editors/codelite/patches/patch-codelite__terminal_MainFrame.cpp \
    pkgsrc/editors/codelite/patches/patch-codelite__terminal_unixprocess__impl.cpp \
    pkgsrc/editors/codelite/patches/patch-sdk_codelite__indexer_libctags_read.c \
    pkgsrc/editors/codelite/patches/patch-sdk_wxsqlite3_configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: pkgsrc/editors/codelite/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/editors/codelite/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Wed Jun 15 22:04:17 2016
+++ pkgsrc/editors/codelite/patches/patch-CMakeLists.txt        Wed Jun 15 22:04:17 2016
@@ -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 )
Index: pkgsrc/editors/codelite/patches/patch-CodeLite_CMakeLists.txt
diff -u /dev/null pkgsrc/editors/codelite/patches/patch-CodeLite_CMakeLists.txt:1.1
--- /dev/null   Wed Jun 15 22:04:17 2016
+++ pkgsrc/editors/codelite/patches/patch-CodeLite_CMakeLists.txt       Wed Jun 15 22:04:17 2016
@@ -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 ( )
Index: pkgsrc/editors/codelite/patches/patch-CodeLite_unixprocess__impl.cpp
diff -u /dev/null pkgsrc/editors/codelite/patches/patch-CodeLite_unixprocess__impl.cpp:1.1
--- /dev/null   Wed Jun 15 22:04:17 2016
+++ pkgsrc/editors/codelite/patches/patch-CodeLite_unixprocess__impl.cpp        Wed Jun 15 22:04:17 2016
@@ -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 <sys/ioctl.h>
+ #include <termios.h>
+ #include <libutil.h>
++#elif defined(__NetBSD__)
++#include <sys/ioctl.h>
++#include <termios.h>
++#include <util.h>
+ #else
+ #include <pty.h>
+ #include <utmp.h>
Index: pkgsrc/editors/codelite/patches/patch-LiteEditor_CMakeLists.txt
diff -u /dev/null pkgsrc/editors/codelite/patches/patch-LiteEditor_CMakeLists.txt:1.1
--- /dev/null   Wed Jun 15 22:04:17 2016
+++ pkgsrc/editors/codelite/patches/patch-LiteEditor_CMakeLists.txt     Wed Jun 15 22:04:17 2016
@@ -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
Index: pkgsrc/editors/codelite/patches/patch-Plugin_CMakeLists.txt
diff -u /dev/null pkgsrc/editors/codelite/patches/patch-Plugin_CMakeLists.txt:1.1
--- /dev/null   Wed Jun 15 22:04:17 2016
+++ pkgsrc/editors/codelite/patches/patch-Plugin_CMakeLists.txt Wed Jun 15 22:04:17 2016
@@ -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 ( )
Index: pkgsrc/editors/codelite/patches/patch-Plugin_wxterminal.cpp
diff -u /dev/null pkgsrc/editors/codelite/patches/patch-Plugin_wxterminal.cpp:1.1
--- /dev/null   Wed Jun 15 22:04:17 2016
+++ pkgsrc/editors/codelite/patches/patch-Plugin_wxterminal.cpp Wed Jun 15 22:04:17 2016
@@ -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 <sys/wait.h>
+ #else
+ #include <wait.h>
+@@ -55,6 +55,10 @@
+ #include <sys/ioctl.h>
+ #include <termios.h>
+ #include <libutil.h>
++#elif defined(__NetBSD__)
++#include <sys/ioctl.h>
++#include <termios.h>
++#include <util.h>
+ #else
+ #include <pty.h>
+ #endif
Index: pkgsrc/editors/codelite/patches/patch-codelite__terminal_MainFrame.cpp
diff -u /dev/null pkgsrc/editors/codelite/patches/patch-codelite__terminal_MainFrame.cpp:1.1
--- /dev/null   Wed Jun 15 22:04:17 2016
+++ pkgsrc/editors/codelite/patches/patch-codelite__terminal_MainFrame.cpp      Wed Jun 15 22:04:17 2016
@@ -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 <sys/ioctl.h>
+ #include <termios.h>
+ #include <libutil.h>
++#elif defined(__NetBSD__)
++#include <sys/types.h>
++#include <sys/ioctl.h>
++#include <termios.h>
++#include <util.h>
+ #elif defined(__WXGTK__)
+ #include <pty.h>
+ #else
Index: pkgsrc/editors/codelite/patches/patch-codelite__terminal_unixprocess__impl.cpp
diff -u /dev/null pkgsrc/editors/codelite/patches/patch-codelite__terminal_unixprocess__impl.cpp:1.1
--- /dev/null   Wed Jun 15 22:04:17 2016
+++ pkgsrc/editors/codelite/patches/patch-codelite__terminal_unixprocess__impl.cpp      Wed Jun 15 22:04:17 2016
@@ -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 <sys/ioctl.h>
+ #    include <termios.h>
+ #    include <libutil.h>
++#elif defined(__NetBSD__)
++#    include <sys/ioctl.h>
++#    include <termios.h>
++#    include <util.h>
+ #else
+ #    include <pty.h>
+ #    include <utmp.h>
Index: pkgsrc/editors/codelite/patches/patch-sdk_codelite__indexer_libctags_read.c
diff -u /dev/null pkgsrc/editors/codelite/patches/patch-sdk_codelite__indexer_libctags_read.c:1.1
--- /dev/null   Wed Jun 15 22:04:17 2016
+++ pkgsrc/editors/codelite/patches/patch-sdk_codelite__indexer_libctags_read.c Wed Jun 15 22:04:17 2016
@@ -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
Index: pkgsrc/editors/codelite/patches/patch-sdk_wxsqlite3_configure
diff -u /dev/null pkgsrc/editors/codelite/patches/patch-sdk_wxsqlite3_configure:1.1
--- /dev/null   Wed Jun 15 22:04:17 2016
+++ pkgsrc/editors/codelite/patches/patch-sdk_wxsqlite3_configure       Wed Jun 15 22:04:17 2016
@@ -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
+-
+-
+-

Prev by Date: CVS commit: pkgsrc/editors/sasm
Next by Date: CVS commit: pkgsrc/editors
Previous by Thread: CVS commit: pkgsrc/editors/sasm
Next by Thread: CVS commit: pkgsrc/editors
Indexes:

Home | Main Index | Thread Index | Old Index