+cc maintainer

On Thu, Sep 28 2017, David Coppa <[email protected]> wrote:
> On Wed, 27 Sep 2017, Christian Weisgerber wrote:
>
>> Jeremie Courreges-Anglas:
>> 
>> > > * Mark as BROKEN the remaining ports that have failed to build since
>> > >   the clang switch on amd64/i386.
>> > 
>> > Should probably use NOT_FOR_ARCHS = ${CLANG_ARCHS}.
>> 
>> >   
>> > http://exopi.exo.bsdfrog.org/logs/old/amd64/2017-09-26T21:25:35+0200/paths/x11/kde4/cantor.log
>> 
>> No.  cantor only fails sometimes.  Something in the build environment
>> causes -I/usr/local/include to be lost.
>
> The diff below (from upstream) should fix the thing.
>
> I did five, six test builds without problems, but who knows...
>
> BTW, it's a more elegant solution and I'd like to have it in
> nonetheless.

It looks better indeed, and you seem to have performed sufficient
testing.  This should probably be committed for 6.2.

> Ciao!
> David
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/kde4/cantor/Makefile,v
> retrieving revision 1.17
> diff -u -p -u -p -r1.17 Makefile
> --- Makefile  27 Jul 2017 11:57:48 -0000      1.17
> +++ Makefile  28 Sep 2017 11:11:50 -0000
> @@ -2,7 +2,7 @@
>  
>  COMMENT =    KDE mathematical applications
>  DISTNAME =   cantor-${MODKDE4_VERSION}
> -REVISION =   7
> +REVISION =   8
>  
>  # Bogus message about "backend /usr/local/bin/latex" at startup when no
>  # backend is choosen on the command line.
> Index: patches/patch-cmake_FindLuaJIT_cmake
> ===================================================================
> RCS file: /cvs/ports/x11/kde4/cantor/patches/patch-cmake_FindLuaJIT_cmake,v
> retrieving revision 1.1
> diff -u -p -u -p -r1.1 patch-cmake_FindLuaJIT_cmake
> --- patches/patch-cmake_FindLuaJIT_cmake      6 Aug 2017 20:04:16 -0000       
> 1.1
> +++ patches/patch-cmake_FindLuaJIT_cmake      28 Sep 2017 11:11:50 -0000
> @@ -1,23 +1,40 @@
>  $OpenBSD: patch-cmake_FindLuaJIT_cmake,v 1.1 2017/08/06 20:04:16 zhuk Exp $
> -The luajit headers are included using <luajit-2.0/...> idiom,
> -so use the same for LUAJIT_INCLUDE_DIR.
> -Tweak DIR vs. DIRS while there.
> +
> +commit 0b6f7a5721e779dc6f67bc22d5b2511d010f19da
> +Author: Vadim A. Misbakh-Soloviov <[email protected]>
> +Date:   Wed, 15 Feb 2017 15:21:47 -0300
> +
> +Fix the hardcoded include for lua backend
> +
> +Currently Cantor has a hardcoded include to get lua.hpp library.
> +This patch fix the search to include different versions of lua
> +library. The hardcoded solution is no more necessary.
>  
>  Index: cmake/FindLuaJIT.cmake
>  --- cmake/FindLuaJIT.cmake.orig
>  +++ cmake/FindLuaJIT.cmake
> -@@ -1,12 +1,12 @@
> - SET (LuaJIT_FOUND FALSE)
> - SET (LUAJIT_LIBRARY_NAME luajit-5.1)
> +@@ -1,14 +1,13 @@
> +-SET (LuaJIT_FOUND FALSE)
> +-SET (LUAJIT_LIBRARY_NAME luajit-5.1)
>  -SET (LUAJIT_INCLUDE_DIRS /usr/include/luajit-2.0 
> /usr/local/include/luajit-2.0)
> ++find_package(PkgConfig)
>   
>  -FIND_PATH    (LUAJIT_INCLUDE_DIR lua.h ${LUAJIT_INCLUDE_DIRS} )
> -+FIND_PATH    (LUAJIT_INCLUDE_DIR luajit-2.0/lua.h)
> - FIND_LIBRARY (LUAJIT_LIBRARY NAMES ${LUAJIT_LIBRARY_NAME} PATHS 
> ${CMAKE_LIBRARY_PATH})
> +-FIND_LIBRARY (LUAJIT_LIBRARY NAMES ${LUAJIT_LIBRARY_NAME} PATHS 
> ${CMAKE_LIBRARY_PATH})
> ++pkg_check_modules(LUAJIT QUIET luajit)
>   
> - IF (LUAJIT_INCLUDE_DIR AND LUAJIT_LIBRARY)
> -     SET (LuaJIT_FOUND TRUE)
> -+    SET (LUAJIT_INCLUDE_DIRS ${LUAJIT_INCLUDE_DIR})
> - ENDIF (LUAJIT_INCLUDE_DIR AND LUAJIT_LIBRARY)
> +-IF (LUAJIT_INCLUDE_DIR AND LUAJIT_LIBRARY)
> +-    SET (LuaJIT_FOUND TRUE)
> +-ENDIF (LUAJIT_INCLUDE_DIR AND LUAJIT_LIBRARY)
> ++find_path(LUAJIT_INCLUDE_DIR lua.hpp HINTS ${LUAJIT_INCLUDEDIR} 
> ${LUAJIT_INCLUDE_DIRS})
> ++find_library(LUAJIT_LIBRARY NAMES luajit-5.1 luajit HINTS ${LUAJIT_LIBDIR} 
> ${LUAJIT_LIBRARY_DIRS})
>   
> - INCLUDE(FindPackageHandleStandardArgs)
> +-INCLUDE(FindPackageHandleStandardArgs)
> +-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LuaJIT DEFAULT_MSG LUAJIT_LIBRARY 
> LUAJIT_INCLUDE_DIR)
> +-MARK_AS_ADVANCED ( LUAJIT_INCLUDE_DIR LUAJIT_LIBRARY)
> ++set(LUAJIT_LIBRARIES ${LUAJIT_LIBRARY})
> ++set(LUAJIT_INCLUDE_DIRS ${LUAJIT_INCLUDE_DIR})
> ++
> ++include(FindPackageHandleStandardArgs)
> ++find_package_handle_standard_args(LuaJIT DEFAULT_MSG LUAJIT_LIBRARY 
> LUAJIT_INCLUDE_DIR)
> ++mark_as_advanced(LUAJIT_INCLUDE_DIR LUAJIT_LIBRARY)
> Index: patches/patch-src_backends_lua_luaexpression_cpp
> ===================================================================
> RCS file: patches/patch-src_backends_lua_luaexpression_cpp
> diff -N patches/patch-src_backends_lua_luaexpression_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_backends_lua_luaexpression_cpp  28 Sep 2017 11:11:50 
> -0000
> @@ -0,0 +1,24 @@
> +$OpenBSD$
> +
> +commit 0b6f7a5721e779dc6f67bc22d5b2511d010f19da
> +Author: Vadim A. Misbakh-Soloviov <[email protected]>
> +Date:   Wed, 15 Feb 2017 15:21:47 -0300
> +
> +Fix the hardcoded include for lua backend
> +
> +Currently Cantor has a hardcoded include to get lua.hpp library.
> +This patch fix the search to include different versions of lua
> +library. The hardcoded solution is no more necessary.
> +
> +Index: src/backends/lua/luaexpression.cpp
> +--- src/backends/lua/luaexpression.cpp.orig
> ++++ src/backends/lua/luaexpression.cpp
> +@@ -26,7 +26,7 @@
> + #include "imageresult.h"
> + #include "helpresult.h"
> + 
> +-#include <luajit-2.0/lua.hpp> // need the luajit-2.0 prefix to avoid 
> conflicts with Lua 5.2
> ++#include <lua.hpp>
> + #include <kdebug.h>
> + 
> + #include <QString>
> Index: patches/patch-src_backends_lua_luahelper_cpp
> ===================================================================
> RCS file: patches/patch-src_backends_lua_luahelper_cpp
> diff -N patches/patch-src_backends_lua_luahelper_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_backends_lua_luahelper_cpp      28 Sep 2017 11:11:50 
> -0000
> @@ -0,0 +1,24 @@
> +$OpenBSD$
> +
> +commit 0b6f7a5721e779dc6f67bc22d5b2511d010f19da
> +Author: Vadim A. Misbakh-Soloviov <[email protected]>
> +Date:   Wed, 15 Feb 2017 15:21:47 -0300
> +
> +Fix the hardcoded include for lua backend
> +
> +Currently Cantor has a hardcoded include to get lua.hpp library.
> +This patch fix the search to include different versions of lua
> +library. The hardcoded solution is no more necessary.
> +
> +Index: src/backends/lua/luahelper.cpp
> +--- src/backends/lua/luahelper.cpp.orig
> ++++ src/backends/lua/luahelper.cpp
> +@@ -20,7 +20,7 @@
> + 
> + #include "luahelper.h"
> + 
> +-#include <luajit-2.0/lua.hpp> // need the luajit-2.0 prefix to avoid 
> conflicts with Lua 5.2
> ++#include <lua.hpp>
> + #include <QString>
> + #include <QStringList>
> + #include <kdebug.h>
> Index: patches/patch-src_backends_lua_luasession_h
> ===================================================================
> RCS file: patches/patch-src_backends_lua_luasession_h
> diff -N patches/patch-src_backends_lua_luasession_h
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_backends_lua_luasession_h       28 Sep 2017 11:11:50 
> -0000
> @@ -0,0 +1,24 @@
> +$OpenBSD$
> +
> +commit 0b6f7a5721e779dc6f67bc22d5b2511d010f19da
> +Author: Vadim A. Misbakh-Soloviov <[email protected]>
> +Date:   Wed, 15 Feb 2017 15:21:47 -0300
> +
> +Fix the hardcoded include for lua backend
> +
> +Currently Cantor has a hardcoded include to get lua.hpp library.
> +This patch fix the search to include different versions of lua
> +library. The hardcoded solution is no more necessary.
> +
> +Index: src/backends/lua/luasession.h
> +--- src/backends/lua/luasession.h.orig
> ++++ src/backends/lua/luasession.h
> +@@ -22,7 +22,7 @@
> + #define _LUASESSION_H
> + 
> + #include "session.h"
> +-#include <luajit-2.0/lua.hpp> // need the luajit-2.0 prefix to avoid 
> conflicts with Lua 5.2
> ++#include <lua.hpp>
> + 
> + class LuaExpression;
> + 
> Index: patches/patch-src_backends_python2_python2extensions_cpp
> ===================================================================
> RCS file: 
> /cvs/ports/x11/kde4/cantor/patches/patch-src_backends_python2_python2extensions_cpp,v
> retrieving revision 1.1
> diff -u -p -u -p -r1.1 patch-src_backends_python2_python2extensions_cpp
> --- patches/patch-src_backends_python2_python2extensions_cpp  9 Jul 2014 
> 20:03:23 -0000       1.1
> +++ patches/patch-src_backends_python2_python2extensions_cpp  28 Sep 2017 
> 11:11:50 -0000
> @@ -1,8 +1,9 @@
>  $OpenBSD: patch-src_backends_python2_python2extensions_cpp,v 1.1 2014/07/09 
> 20:03:23 zhuk Exp $
>  Unbreak build.
> ---- src/backends/python2/python2extensions.cpp.orig  Thu Jun 26 19:08:58 2014
> -+++ src/backends/python2/python2extensions.cpp       Thu Jun 26 19:12:18 2014
> -@@ -69,7 +69,7 @@ QString Python2VariableManagementExtension::removeVari
> +Index: src/backends/python2/python2extensions.cpp
> +--- src/backends/python2/python2extensions.cpp.orig
> ++++ src/backends/python2/python2extensions.cpp
> +@@ -203,7 +203,7 @@ QString Python2VariableManagementExtension::removeVari
>   QString Python2VariableManagementExtension::clearVariables()
>   {
>       QString delVariablesPythonSession = "for keyPythonBackend in dir():\n"  
>                                \
> @@ -11,7 +12,7 @@ Unbreak build.
>                                           "and (not '__' in 
> keyPythonBackend):\n"                            \
>                                           "        
> del(globals()[keyPythonBackend])\n"                       \
>                                           "del(keyPythonBackend)\n";
> -@@ -81,8 +81,8 @@ QString Python2VariableManagementExtension::saveVariab
> +@@ -215,8 +215,8 @@ QString Python2VariableManagementExtension::saveVariab
>       QString classSavePythonSession = "import shelve\n"                      
>                                          \
>                                        "shelvePythonBackend = 
> shelve.open('%1', 'n')\n"                                \
>                                        "for keyPythonBackend in dir():\n"     
>                                          \

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply via email to