Hello community,

here is the log from the commit of package codelite for openSUSE:Factory 
checked in at 2016-04-22 16:23:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/codelite (Old)
 and      /work/SRC/openSUSE:Factory/.codelite.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "codelite"

Changes:
--------
--- /work/SRC/openSUSE:Factory/codelite/codelite.changes        2014-12-21 
12:04:13.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.codelite.new/codelite.changes   2016-04-22 
16:23:05.000000000 +0200
@@ -1,0 +2,25 @@
+Mon Mar 21 12:49:11 UTC 2016 - mplus...@suse.com
+
+- Install COPYING
+
+-------------------------------------------------------------------
+Sun Oct 11 07:49:26 UTC 2015 - mplus...@suse.com
+
+- Use cmake macros
+- Remove conditonals for unsupported releases
+- Simplify bconds and enable lldb and llvm by default on Factory
+
+-------------------------------------------------------------------
+Mon Oct  5 14:23:38 UTC 2015 - r...@fthiessen.de
+
+- Update to upstream version 8.1:
+  * Removed upstream merged: codelite-date-time-usage-fix.patch
+  * Cleanup SPEC, new dependencies added and workarounds removed.
+  * Using bundled version of .desktop, removed our codelite.desktop
+  * Added fix-use-system-sqlite3.patch to use system sqlite3
+    version instead of the version from codelite. Fixed already
+    upstream in git commit: fe554119c772d8579094b2c3315e0bab92cd4afe
+  * Added fix-no-return-in-nonvoid-function.patch to avoid RPMLint
+    error, because of non void function without return.
+
+-------------------------------------------------------------------

Old:
----
  codelite-5.4-gtk.src.tar.gz
  codelite-date-time-usage-fix.patch
  codelite.desktop

New:
----
  codelite-8.1.tar.gz
  fix-no-return-in-nonvoid-function.patch
  fix-use-system-sqlite3.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ codelite.spec ++++++
--- /var/tmp/diff_new_pack.oiuoA5/_old  2016-04-22 16:23:07.000000000 +0200
+++ /var/tmp/diff_new_pack.oiuoA5/_new  2016-04-22 16:23:07.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package codelite
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2012-2014 Mariusz Fik <fi...@opensuse.org>.
 #
 # All modifications and additions to the file contributed by third parties
@@ -17,139 +17,118 @@
 #
 
 
+%if 0%{?suse_version} >= 1315
+# Only available on x86_64 and %%arm (see lldb package)
+  %ifarch %arm x86_64
+    %bcond_without lldb
+  %endif
+# Not available on ppc
+  %ifnarch ppc
+    %bcond_without clang
+  %endif
+%endif
+
 Name:           codelite
-Version:        5.4
+Version:        8.1
 Release:        0
-Summary:        Powerful open-source, cross platform code editor for the C/C++
-License:        GPL-3.0+
+Summary:        Powerful open-source, cross platform code editor for C,C++,PHP 
and Node.js
+License:        GPL-3.0
 Group:          Development/Tools/IDE
+# parts of package contain LGPL-3.0 licenced code thus license needs to be
+# GPL-3.0
 Url:            http://codelite.org/
-Source0:        
https://downloads.sourceforge.net/project/codelite/Mirrors/%{name}-%{version}-gtk.src.tar.gz
-Source1:        %{name}.desktop
-Source2:        %name-rpmlintrc
-# PATCH-FIX-OPENSUSE codelite-date-time-usage-fix.patch fi...@opensuse.org -- 
It removes usage of __DATE__ and __TIME__
-Patch0:         %{name}-date-time-usage-fix.patch
+Source0:        
https://github.com/eranif/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
+# Template files are identified by RPMLint as Development-Files --> Ignore 
this errors
+Source1:        %{name}-rpmlintrc
 # PATCH-FEATURE-OPENSUSE codelite-disable-new-version-check.patch 
fi...@opensuse.org -- Disable 'new version' check on startup
-Patch1:         %{name}-disable-new-version-check.patch
+Patch0:         %{name}-disable-new-version-check.patch
+# TODO: Remove following patch next release
+# PATCH-FIX-UPSTREAM fix-use-system-sqlite3.patch -- Use system sqlite3 
version instead of projects own version. Fixed already upstream in git commit: 
fe554119c772d8579094b2c3315e0bab92cd4afe
+Patch1:         fix-use-system-sqlite3.patch
+# PATH-FIX-UPSTREAM fix-no-return-in-nonvoid-function.patch -- Fix non void 
function without return to avoid rpmlint error. Reported Upstream: 
https://github.com/eranif/codelite/issues/946
+Patch2:         fix-no-return-in-nonvoid-function.patch
 BuildRequires:  cmake
-BuildRequires:  dos2unix
-BuildRequires:  gcc-c++
-%if 0%{?suse_version}
 BuildRequires:  fdupes
+BuildRequires:  gcc-c++
+BuildRequires:  hicolor-icon-theme
+BuildRequires:  pkg-config
 BuildRequires:  update-desktop-files
-%endif
-BuildRequires:  libmysqlclient-devel
-BuildRequires:  llvm-clang-devel
+BuildRequires:  wxWidgets-3_0-devel >= 3.0.0
 BuildRequires:  wxWidgets-devel >= 3.0.0
 BuildRequires:  pkgconfig(gtk+-2.0)
+BuildRequires:  pkgconfig(hunspell)
 BuildRequires:  pkgconfig(libssh)
-%define _use_internal_dependency_generator 0
+BuildRequires:  pkgconfig(sqlite3)
+%if %{with lldb}
+BuildRequires:  lldb-devel
+%endif
+%if %{with clang}
+BuildRequires:  llvm-clang-devel
+%endif
+Requires:       hicolor-icon-theme
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} > 1320
 Requires:       xterm-bin
 %else
 Requires:       xterm
 %endif
-Recommends:     gcc
-Recommends:     wxWidgets-devel
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
-CodeLite is a powerful open-source, cross platform code editor for the C/C++
-programming language. It uses a sophisticated, yet intuitive interface which
-allows user easily to create, build and debug complex projects.
+CodeLite is a powerful open-source, cross platform code editor for the
+C,C++,PHP and Node.js programming languages.
+It uses a sophisticated, yet intuitive interface which allows user
+easily to create, build and debug complex projects.
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p0
-### FIXME: Bug reported, remove line belowe with next codelite version update.
-mv -v translations/cz translations/zh_CN
+%patch0
+%patch1 -p1
+%patch2 -p1
 
 %build
-mkdir build && cd build
-export CFLAGS="%{optflags}"
-export CXXFLAGS="%{optflags}"
-
-cmake .. \
-    -DCMAKE_BUILD_TYPE=Debug \
-    -DCMAKE_SKIP_RPATH=ON \
+%cmake \
+   %if %{with clang}
     -DENABLE_CLANG=1 \
-    -DWITH_MYSQL=1 \
-    -DWITH_WXC=0 \
-    -DCOPY_WX_LIBS=0
+  %endif
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_INSTALL_LIBDIR=%{_lib}
 
 make %{?_smp_mflags}
 
 %install
-pushd build
-%makeinstall
-popd
-
-### Install desktop menu entry
-install -D -m 644 "%{SOURCE1}" 
"%{buildroot}%{_datadir}/applications/%{name}.desktop"
-### Fix desktop menu icon
-install -D Runtime/images/cubes.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
-
+%cmake_install
+%find_lang %{name}
 ### Add mime types
 mkdir -p %{buildroot}%{_datadir}/mime/packages/
 cp -p %{name}.xml %{buildroot}%{_datadir}/mime/packages/
 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/mimetypes/
-cp -p %{buildroot}%{_datadir}/%{name}/images/cubes.png 
%{buildroot}%{_datadir}/icons/hicolor/32x32/mimetypes/application-x-%{name}-workspace.png
-cp -p %{buildroot}%{_datadir}/%{name}/images/cubes.png 
%{buildroot}%{_datadir}/icons/hicolor/32x32/mimetypes/application-x-%{name}-project.png
-
-%if 0%{?suse_version}
-### Search for duplicates
+ln -s %{_datadir}/%{name}/images/cubes.png 
%{buildroot}%{_datadir}/icons/hicolor/32x32/mimetypes/application-x-%{name}-workspace.png
+ln -s %{_datadir}/%{name}/images/cubes.png 
%{buildroot}%{_datadir}/icons/hicolor/32x32/mimetypes/application-x-%{name}-project.png
 %fdupes %{buildroot}%{_prefix}
-### Update translation in desktop menu entry
-%suse_update_desktop_file %{name}
-%endif
-
-### Fix for wrong-script-end-of-line-encoding
-dos2unix %{buildroot}%{_bindir}/%{name}_kill_children
+### Update translation in desktop menu entry and add IDE as category
+%suse_update_desktop_file %{name} IDE
 
-### Fix unstripped-binary-or-object warning for SLE and openSUSE
-%if 0%{?sles_version} == 11
-strip -s -v %{buildroot}%{_bindir}/%{name}{,_indexer,_cppcheck,gcc,-clang}
-strip -s -v %{buildroot}%{_libdir}/%{name}/*.so
-strip -s -v %{buildroot}%{_libdir}/%{name}/debuggers/*.so
-%else
-strip -s -v %{buildroot}%{_libdir}/%{name}/libclang.so
-%endif
+%post
+%desktop_database_post
+%icon_theme_cache_post
 
-%clean
-%{?buildroot:rm -rf "%{buildroot}"}
+%postun
+%desktop_database_postun
+%icon_theme_cache_postun
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
-%doc about.html AUTHORS 
+%doc about.html AUTHORS COPYING
 %{_bindir}/%{name}*
 %{_bindir}/clg++
 %{_bindir}/clgcc
 %{_libdir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%{_mandir}/man1/%{name}*.1%{ext_man}
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/icons/hicolor/32x32/mimetypes/application-x-%{name}-workspace.png
 %{_datadir}/icons/hicolor/32x32/mimetypes/application-x-%{name}-project.png
-### TODO Shoould we put it in separate -lang package?
-%{_datadir}/locale/cs/LC_MESSAGES/codelite.mo
-%{_datadir}/locale/zh_CN/LC_MESSAGES/codelite.mo
-
-%post
-update-mime-database %{_datadir}/mime >/dev/null 2>&1 || :
-update-desktop-database >/dev/null 2>&1 || :
-touch --no-create %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
-
-%postun
-update-mime-database %{_datadir}/mime >/dev/null 2>&1 || :
-update-desktop-database >/dev/null 2>&1 || :
-if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/hicolor >/dev/null 2>&1
-    gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
-fi
-
-%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
 
 %changelog

++++++ codelite-5.4-gtk.src.tar.gz -> codelite-8.1.tar.gz ++++++
/work/SRC/openSUSE:Factory/codelite/codelite-5.4-gtk.src.tar.gz 
/work/SRC/openSUSE:Factory/.codelite.new/codelite-8.1.tar.gz differ: char 5, 
line 1

++++++ codelite-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.oiuoA5/_old  2016-04-22 16:23:07.000000000 +0200
+++ /var/tmp/diff_new_pack.oiuoA5/_new  2016-04-22 16:23:07.000000000 +0200
@@ -1,3 +1,2 @@
 # codelite templates
 addFilter("devel-file-in-non-devel-package")
-

++++++ fix-no-return-in-nonvoid-function.patch ++++++
diff -rupN codelite-8.1/CodeFormatter/codeformatter.cpp 
codelite-8.1-new/CodeFormatter/codeformatter.cpp
--- codelite-8.1/CodeFormatter/codeformatter.cpp        2015-08-01 
08:16:28.000000000 +0200
+++ codelite-8.1-new/CodeFormatter/codeformatter.cpp    2015-10-06 
20:50:06.878881643 +0200
@@ -22,6 +22,7 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
+#include <cassert>
 #include "precompiled_header.h"
 #include "globals.h"
 #include "editor_config.h"
@@ -804,6 +805,10 @@ bool CodeFormatter::BatchFormat(const st
     } else if(options.GetEngine() == kFormatEngineClangFormat) {
         return ClangBatchFormat(files, options);
     }
+    CL_DEBUG("ERROR: WRONG ENGINE SET");
+    // Make sure to not return random data.
+    assert(false);
+    return false;
 }
 
 bool CodeFormatter::ClangBatchFormat(const std::vector<wxFileName>& files, 
const FormatOptions& options)
diff -rupN codelite-8.1/CodeFormatter/formatoptions.h 
codelite-8.1-new/CodeFormatter/formatoptions.h
--- codelite-8.1/CodeFormatter/formatoptions.h  2015-08-01 08:16:28.000000000 
+0200
+++ codelite-8.1-new/CodeFormatter/formatoptions.h      2015-10-06 
20:53:47.210875133 +0200
@@ -182,7 +182,7 @@ public:
     void SetClangFormatOptions(size_t clangFormatOptions) { 
this->m_clangFormatOptions = clangFormatOptions; }
     size_t GetClangFormatOptions() const { return m_clangFormatOptions; }
     size_t GetPHPFormatterOptions() const { return m_phpFormatOptions; }
-    size_t SetPHPFormatterOptions(size_t options) { m_phpFormatOptions = 
options; }
+    void SetPHPFormatterOptions(size_t options) { m_phpFormatOptions = 
options; }
     bool HasFlag(eCF_GeneralOptions flag) const { return m_generalFlags & 
flag; }
     void SetFlag(eCF_GeneralOptions flag, bool b) { b ? m_generalFlags |= flag 
: m_generalFlags &= ~flag; }
     void SetPHPCSFixerPhar(const wxString& PHPCSFixerPhar) { 
this->m_PHPCSFixerPhar = PHPCSFixerPhar; }
++++++ fix-use-system-sqlite3.patch ++++++
diff -rupN codelite-8.1/cmake/Modules/FindSqlite3.cmake 
codelite-8.1-new/cmake/Modules/FindSqlite3.cmake
--- codelite-8.1/cmake/Modules/FindSqlite3.cmake        1970-01-01 
01:00:00.000000000 +0100
+++ codelite-8.1-new/cmake/Modules/FindSqlite3.cmake    2015-10-10 
17:42:47.659742053 +0200
@@ -0,0 +1,26 @@
+if(UNIX AND NOT APPLE)
+    find_library(SQLITE3_LIBRARY
+                 NAMES libsqlite3.so
+                 HINTS
+                 /usr/local/lib
+                 /usr/lib
+                 /usr/lib/x86_64-linux-gnu
+                 )
+                 
+    find_path(SQLITE3_INCLUDE_DIR NAMES sqlite3.h
+              HINTS 
+              /usr/local/include
+              /usr/include
+              /usr/include/sqlite3
+              )
+    if (SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY)
+       set(SQLITE3_FOUND TRUE)
+    endif()
+    
+    if(NOT SQLITE3_FOUND)
+        message(FATAL_ERROR " **** Could not find Sqlite3. Please install 
libsqlite3-dev package **** ")
+    else()
+        message("-- SQLITE3_INCLUDE_DIR: " ${SQLITE3_INCLUDE_DIR})
+        message("-- SQLITE3_LIBRARY: " ${SQLITE3_LIBRARY})
+    endif()
+endif() 
diff -rupN codelite-8.1/CMakeLists.txt codelite-8.1-new/CMakeLists.txt
--- codelite-8.1/CMakeLists.txt 2015-08-01 08:16:28.000000000 +0200
+++ codelite-8.1-new/CMakeLists.txt     2015-10-10 17:47:34.419733580 +0200
@@ -29,7 +29,6 @@ cmake_minimum_required(VERSION 2.8 FATAL
 
#################################################################################################################################################################
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} 
"${CMAKE_SOURCE_DIR}/cmake/Modules/")
-include(FindLibClang)
 
 #############################################
 ## Defaults
@@ -46,6 +45,13 @@ else()
     set( CL_SRC_ROOT ${CMAKE_CURRENT_SOURCE_DIR}) # which seems to be the 
same, at least in this situation
 endif()
 
+include(FindLibClang)
+include(FindSqlite3)
+if(NOT SQLITE3_FOUND)
+    set(SQLITE3_INCLUDE_DIR ${CL_SRC_ROOT}/sqlite3)
+    set(SQLITE3_LIBRARY "-lsqlite3lib")
+endif()
+
 set( USE_CLANG 1 )
 set( IS_FREEBSD 0 )
 set( BUILD_WXC 0 )
@@ -440,7 +446,7 @@ endif(WITH_SFTP)
 if (UNIX AND NOT APPLE)
     SET(CMAKE_INSTALL_RPATH ${PLUGINS_DIR})
     SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
-    SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+    #SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 endif(UNIX AND NOT APPLE)
 
 if ( WITH_PCH )
@@ -459,7 +465,11 @@ if ( APPLE )
     add_definitions( -mmacosx-version-min=10.8 )
 endif()
 
-add_subdirectory(sqlite3)
+
+if(APPLE OR NOT SQLITE3_FOUND)
+    # On Linux, we use the distro's libsqlite3
+    add_subdirectory(sqlite3)
+endif()
 add_subdirectory(sdk/wxsqlite3)
 add_subdirectory(sdk/wxshapeframework)
 add_subdirectory(sdk/databaselayer)
@@ -530,11 +540,12 @@ add_subdirectory(WebTools)
 ##
 ## Setup the proper dependencies
 ##
-if ( USE_PCH )
-    add_dependencies(sqlite3lib ${CL_PCH_TARGET})
-endif ( USE_PCH )
-
-add_dependencies(wxsqlite3 sqlite3lib)
+if(APPLE OR NOT SQLITE3_FOUND)
+    if ( USE_PCH )
+        add_dependencies(sqlite3lib ${CL_PCH_TARGET})
+    endif ( USE_PCH )
+    add_dependencies(wxsqlite3 sqlite3lib)
+endif()
 add_dependencies(databaselayersqlite wxsqlite3)
 add_dependencies(wxshapeframework wxsqlite3)
 add_dependencies(libcodelite wxshapeframework databaselayersqlite wxsqlite3)
diff -rupN codelite-8.1/CodeLite/CMakeLists.txt 
codelite-8.1-new/CodeLite/CMakeLists.txt
--- codelite-8.1/CodeLite/CMakeLists.txt        2015-08-01 08:16:28.000000000 
+0200
+++ codelite-8.1-new/CodeLite/CMakeLists.txt    2015-10-10 17:42:47.660742053 
+0200
@@ -105,7 +105,7 @@ if (UNIX AND NOT APPLE )
                          ${LINKER_OPTIONS} 
                          ${wxWidgets_LIBRARIES} 
                          -L"${CL_LIBPATH}" 
-                         sqlite3lib 
+                         ${SQLITE3_LIBRARY} 
                          wxsqlite3 
                          ${LIBSSH_LIB} 
                          ${ADDITIONAL_LIBRARIES})
diff -rupN codelite-8.1/sdk/databaselayer/CMakeLists.txt 
codelite-8.1-new/sdk/databaselayer/CMakeLists.txt
--- codelite-8.1/sdk/databaselayer/CMakeLists.txt       2015-08-01 
08:16:28.000000000 +0200
+++ codelite-8.1-new/sdk/databaselayer/CMakeLists.txt   2015-10-10 
17:42:47.661742053 +0200
@@ -33,7 +33,11 @@ if ( APPLE )
 endif()
 
 
-FILE(GLOB SRCS "src/dblayer/Sqlite*.cpp" "src/dblayer/Database*.cpp" 
"src/dblayer/Prepared*.cpp" "src/sqlite3/*.c")
+if(APPLE)
+    FILE(GLOB SRCS "src/dblayer/Sqlite*.cpp" "src/dblayer/Database*.cpp" 
"src/dblayer/Prepared*.cpp" "src/sqlite3/*.c")
+else()
+    FILE(GLOB SRCS "src/dblayer/Sqlite*.cpp" "src/dblayer/Database*.cpp" 
"src/dblayer/Prepared*.cpp")
+endif()
 
 if ( WITH_MYSQL )
     find_library(LIBMYSQLCLIENT NAMES mysql mysqlclient mariadb mariadbclient)
@@ -57,7 +61,10 @@ endif ( WITH_MYSQL )
 
 # Define the output
 add_library(databaselayersqlite SHARED ${SRCS} ${MYSQL_SRCS})
-target_link_libraries(databaselayersqlite ${LINKER_OPTIONS} 
${wxWidgets_LIBRARIES})
+target_link_libraries(databaselayersqlite
+                     ${LINKER_OPTIONS}
+                     ${SQLITE3_LIBRARY}
+                     ${wxWidgets_LIBRARIES})
 
 if(APPLE)
     install(TARGETS databaselayersqlite DESTINATION 
${CMAKE_BINARY_DIR}/codelite.app/Contents/MacOS/)
diff -rupN codelite-8.1/sdk/wxsqlite3/CMakeLists.txt 
codelite-8.1-new/sdk/wxsqlite3/CMakeLists.txt
--- codelite-8.1/sdk/wxsqlite3/CMakeLists.txt   2015-08-01 08:16:28.000000000 
+0200
+++ codelite-8.1-new/sdk/wxsqlite3/CMakeLists.txt       2015-10-10 
17:42:47.661742053 +0200
@@ -20,7 +20,7 @@ if ( USE_PCH )
     add_definitions(-include "${CL_PCH_FILE}")
     add_definitions(-Winvalid-pch)
 endif ( USE_PCH )
-include_directories(./include ../../sqlite3)
+include_directories(./include ${SQLITE3_INCLUDE_DIR})
 
 if (UNIX AND NOT APPLE)
     set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC" )
@@ -38,7 +38,7 @@ set(SRCS src/wxsqlite3.cpp)
 
 # 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}" ${SQLITE3_LIBRARY})
 
 if (NOT MINGW)
     if(APPLE)
diff -rupN codelite-8.1/ZoomNavigator/zoomnavigator.cpp 
codelite-8.1-new/ZoomNavigator/zoomnavigator.cpp
--- codelite-8.1/ZoomNavigator/zoomnavigator.cpp        2015-08-01 
08:16:28.000000000 +0200
+++ codelite-8.1-new/ZoomNavigator/zoomnavigator.cpp    2015-10-10 
17:42:47.662742053 +0200
@@ -45,7 +45,7 @@
 static ZoomNavigator* thePlugin = NULL;
 #define CHECK_CONDITION( cond ) if ( !cond ) return;
 
-const char* ZOOM_PANE_TITLE = _("Zoom Navigator");
+const wxString ZOOM_PANE_TITLE = _("Zoom Navigator");
 
 //Define the plugin entry point
 extern "C" EXPORT IPlugin *CreatePlugin(IManager *manager)
diff -rupN codelite-8.1/ZoomNavigator/zoomnavigator.h 
codelite-8.1-new/ZoomNavigator/zoomnavigator.h
--- codelite-8.1/ZoomNavigator/zoomnavigator.h  2015-08-01 08:16:28.000000000 
+0200
+++ codelite-8.1-new/ZoomNavigator/zoomnavigator.h      2015-10-10 
17:42:47.663742053 +0200
@@ -39,7 +39,7 @@
 #include <set>
 #include "cl_command_event.h"
 
-extern const char* ZOOM_PANE_TITLE;
+extern const wxString ZOOM_PANE_TITLE;
 
 class ZoomNavUpdateTimer;
 

Reply via email to