Hello community, here is the log from the commit of package wxlua for openSUSE:Factory checked in at 2020-07-01 14:26:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wxlua (Old) and /work/SRC/openSUSE:Factory/.wxlua.new.3060 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wxlua" Wed Jul 1 14:26:32 2020 rev:5 rq:817825 version:3.0.0.8 Changes: -------- --- /work/SRC/openSUSE:Factory/wxlua/wxlua.changes 2018-02-15 13:25:00.401064854 +0100 +++ /work/SRC/openSUSE:Factory/.wxlua.new.3060/wxlua.changes 2020-07-01 14:26:35.506748367 +0200 @@ -1,0 +2,12 @@ +Sun Jun 28 09:56:25 UTC 2020 - Matthias Mailänder <mailaen...@opensuse.org> + +- Added wxMemoryBuffer.patch (will be fixed next release) + +------------------------------------------------------------------- +Sat Jun 13 17:52:29 UTC 2020 - Matthias Mailänder <mailaen...@opensuse.org> + +- Drop desktop.patch (included upstream) +- Update to version 3.0.0.8 +- Drop wx-webview.patch (it is disabled by default now) + +------------------------------------------------------------------- Old: ---- WX_3_1_0-7d9d59.tar.gz desktop.patch wx-webview.patch New: ---- v3.0.0.8.tar.gz wxMemoryBuffer.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wxlua.spec ++++++ --- /var/tmp/diff_new_pack.nseEnU/_old 2020-07-01 14:26:36.622751827 +0200 +++ /var/tmp/diff_new_pack.nseEnU/_new 2020-07-01 14:26:36.626751840 +0200 @@ -1,7 +1,7 @@ # # spec file for package wxlua # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,25 +12,25 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define lua_version 5.1 Name: wxlua -Version: 3.1.0.git.7d9d59 +Version: 3.0.0.8 Release: 0 Summary: Lua IDE with a GUI debugger and binding generator License: SUSE-wxWidgets-3.1 Group: Development/Languages/Other -Url: https://github.com/pkulchenko/wxlua -Source: https://github.com/pkulchenko/wxlua/archive/WX_3_1_0-7d9d59.tar.gz -# PATCH-FIX-UPSTREAM https://github.com/pkulchenko/wxlua/pull/8 -Patch0: desktop.patch -# PATCH-FIX-OPENSUSE Remoevd because webkit is exiting openSUSE:Factory -Patch1: wx-webview.patch -BuildRequires: cmake >= 2.8.3 +URL: https://github.com/pkulchenko/wxlua +Source: https://github.com/pkulchenko/wxlua/archive/v%{version}.tar.gz +# PATCH-FIX-UPSTREAM https://github.com/pkulchenko/wxlua/pull/64 +Patch0: wxMemoryBuffer.patch +BuildRequires: ccache +BuildRequires: cmake >= 2.8 +BuildRequires: cppcheck BuildRequires: desktop-file-utils BuildRequires: doxygen BuildRequires: gcc-c++ @@ -39,11 +39,8 @@ BuildRequires: ncurses-devel BuildRequires: pkgconfig BuildRequires: readline-devel -BuildRequires: wxWidgets-devel >= 3 +BuildRequires: wxGTK2-devel BuildRequires: pkgconfig(glu) -%if 0%{?suse_version} > 1320 -BuildRequires: cppcheck -%endif %description This package contains Integrated Development Environments (IDE, written in @@ -71,29 +68,39 @@ interpreter with the wxWidgets API. %prep -%setup -q -n wxlua-WX_3_1_0-7d9d59 +%setup -q %patch0 -p1 -%patch1 -p1 + cd wxLua sed -r -i 's|LIBRARY DESTINATION .*$|LIBRARY DESTINATION %{_lib}|' CMakeLists.txt %build -cd wxLua -%cmake \ +cd wxLua/build +cmake .. \ -DwxWidgets_CONFIG_EXECUTABLE=%{_bindir}/wx-config \ -DwxLua_LUA_LIBRARY_BUILD_SHARED=TRUE \ -DwxLua_LUA_LIBRARY_USE_BUILTIN=FALSE \ - -DwxLua_LUA_LIBRARY_VERSION=%lua_version \ + -DwxLua_LUA_LIBRARY_VERSION=%{lua_version} \ -DwxLua_LUA_INCLUDE_DIR=%{lua_incdir} \ - -DwxLua_LUA_LIBRARY=%{_libdir}/liblua.so.%lua_version \ + -DwxLua_LUA_LIBRARY=%{_libdir}/liblua.so.%{lua_version} \ -DBUILD_SHARED_LIBS=TRUE \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo + -DwxWidgets_COMPONENTS="gl;xrc;xml;net;media;propgrid;richtext;aui;stc;html;adv;core;base" \ + -DwxLuaBind_COMPONENTS="gl;xrc;xml;net;media;propgrid;richtext;aui;stc;html;adv;core;base" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} + +pushd modules/luamodule +make %{?_smp_mflags} +popd + make %{?_smp_mflags} %install cd wxLua %cmake_install +rm -f %{buildroot}%{_bindir}/lua{,c} + mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ install -p art/wxlualogo.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ chmod -x %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/wxlualogo.svg @@ -106,24 +113,8 @@ install -Dm644 distrib/autopackage/wxlua.xml %{buildroot}%{_datadir}/mime/packages/%{name}.xml -# packaged in separate package wxstedit -rm -rf %{buildroot}%{_datadir}/wxstedit -rm -rf %{buildroot}%{_datadir}/wxStEdit -rm -rf %{buildroot}%{_includedir}/wx/stedit/ -rm -rf %{buildroot}%{_prefix}/lib/libwxstedit*.so - -mkdir -p %{buildroot}%{_libdir}/lua/%lua_version/ -mv %{buildroot}%{_libdir}/libwx.so %{buildroot}%{_libdir}/lua/%lua_version/wx.so - -%post -%desktop_database_post -%icon_theme_cache_post -%mime_database_post - -%postun -%desktop_database_postun -%icon_theme_cache_postun -%mime_database_postun +mkdir -p %{buildroot}%{_libdir}/lua/%{lua_version}/ +mv %{buildroot}%{_libdir}/libwx.so %{buildroot}%{_libdir}/lua/%{lua_version}/wx.so %post -n lib%{name} -p /sbin/ldconfig %postun -n lib%{name} -p /sbin/ldconfig @@ -137,7 +128,7 @@ %{_datadir}/mime/packages/%{name}.xml %files -n lib%{name} -%{_libdir}/lua/%lua_version/wx.so +%{_libdir}/lua/%{lua_version}/wx.so %{_libdir}/libwxlua*.so %files devel ++++++ wxMemoryBuffer.patch ++++++ >From b8e7d43a4fe1897cb4e1f7b6749ee3184d3a9011 Mon Sep 17 00:00:00 2001 Message-Id: <b8e7d43a4fe1897cb4e1f7b6749ee3184d3a9011.1593283264.git.matth...@mailaender.name> From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matth...@mailaender.name> Date: Sat, 27 Jun 2020 20:40:47 +0200 Subject: [PATCH] Fix undefined reference to `wxluatype_wxMemoryBuffer' --- wxLua/bindings/wxwidgets/wxbase_rules.lua | 1 + wxLua/modules/wxbind/src/wxbase_bind.cpp | 1 + wxLua/modules/wxlua/wxlbind.cpp | 1 + wxLua/modules/wxlua/wxlbind.h | 1 + wxLua/modules/wxlua/wxllua.cpp | 9 +++------ 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/wxLua/bindings/wxwidgets/wxbase_rules.lua b/wxLua/bindings/wxwidgets/wxbase_rules.lua index 3b98165..e6b76ff 100644 --- a/wxLua/bindings/wxwidgets/wxbase_rules.lua +++ b/wxLua/bindings/wxwidgets/wxbase_rules.lua @@ -183,6 +183,7 @@ wxLuaBinding_class_implementation = p_wxluatype_wxSortedArrayString = &wxluatype_wxSortedArrayString; p_wxluatype_wxArrayInt = &wxluatype_wxArrayInt; p_wxluatype_wxArrayDouble = &wxluatype_wxArrayDouble; + p_wxluatype_wxMemoryBuffer = &wxluatype_wxMemoryBuffer; return ret; } diff --git a/wxLua/modules/wxbind/src/wxbase_bind.cpp b/wxLua/modules/wxbind/src/wxbase_bind.cpp index 6be3088..d34ec0c 100644 --- a/wxLua/modules/wxbind/src/wxbase_bind.cpp +++ b/wxLua/modules/wxbind/src/wxbase_bind.cpp @@ -3138,6 +3138,7 @@ bool wxLuaBinding_wxbase::RegisterBinding(const wxLuaState& wxlState) p_wxluatype_wxSortedArrayString = &wxluatype_wxSortedArrayString; p_wxluatype_wxArrayInt = &wxluatype_wxArrayInt; p_wxluatype_wxArrayDouble = &wxluatype_wxArrayDouble; + p_wxluatype_wxMemoryBuffer = &wxluatype_wxMemoryBuffer; return ret; } diff --git a/wxLua/modules/wxlua/wxlbind.cpp b/wxLua/modules/wxlua/wxlbind.cpp index c7a1ab2..abeeabf 100644 --- a/wxLua/modules/wxlua/wxlbind.cpp +++ b/wxLua/modules/wxlua/wxlbind.cpp @@ -55,6 +55,7 @@ int* p_wxluatype_wxArrayString = &wxluatype_TUNKNOWN; int* p_wxluatype_wxSortedArrayString = &wxluatype_TUNKNOWN; int* p_wxluatype_wxArrayInt = &wxluatype_TUNKNOWN; int* p_wxluatype_wxArrayDouble = &wxluatype_TUNKNOWN; +int* p_wxluatype_wxMemoryBuffer = &wxluatype_TUNKNOWN; int* p_wxluatype_wxPoint = &wxluatype_TUNKNOWN; // ---------------------------------------------------------------------------- diff --git a/wxLua/modules/wxlua/wxlbind.h b/wxLua/modules/wxlua/wxlbind.h index 90aef63..71141ec 100644 --- a/wxLua/modules/wxlua/wxlbind.h +++ b/wxLua/modules/wxlua/wxlbind.h @@ -123,6 +123,7 @@ extern WXDLLIMPEXP_DATA_WXLUA(int*) p_wxluatype_wxArrayString; // wxLua type for extern WXDLLIMPEXP_DATA_WXLUA(int*) p_wxluatype_wxSortedArrayString; // wxLua type for wxSortedArrayString extern WXDLLIMPEXP_DATA_WXLUA(int*) p_wxluatype_wxArrayInt; // wxLua type for wxArrayInt extern WXDLLIMPEXP_DATA_WXLUA(int*) p_wxluatype_wxArrayDouble; // wxLua type for wxArrayDouble +extern WXDLLIMPEXP_DATA_WXLUA(int*) p_wxluatype_wxMemoryBuffer; // wxLua type for wxMemoryBuffer extern WXDLLIMPEXP_DATA_WXLUA(int*) p_wxluatype_wxPoint; // wxLua type for wxPoint // ---------------------------------------------------------------------------- diff --git a/wxLua/modules/wxlua/wxllua.cpp b/wxLua/modules/wxlua/wxllua.cpp index d910816..2214b13 100644 --- a/wxLua/modules/wxlua/wxllua.cpp +++ b/wxLua/modules/wxlua/wxllua.cpp @@ -982,15 +982,13 @@ const wxLuaBindClass* LUACALL wxluaT_getclass(lua_State* L, const char* class_na bool wxluaT_isuserdatatype(lua_State* L, int stack_idx, int wxl_type) { - extern int wxluatype_wxMemoryBuffer; - int stack_type = wxluaT_type(L, stack_idx); if (wxlua_iswxuserdatatype(stack_type) && ((wxluatype_NULL == stack_type) || // FIXME, how to check when NULL is valid or not? ((wxl_type == WXLUA_TSTRING) && ((wxluaT_isderivedtype(L, stack_type, *p_wxluatype_wxString) >= 0) || - (wxluaT_isderivedtype(L, stack_type, wxluatype_wxMemoryBuffer) >= 0))) || + (wxluaT_isderivedtype(L, stack_type, *p_wxluatype_wxMemoryBuffer) >= 0))) || (wxluaT_isderivedtype(L, stack_type, wxl_type) >= 0))) return true; @@ -1407,7 +1405,6 @@ const char* LUACALL wxlua_getstringtypelen(lua_State *L, int stack_idx, size_t * return lua_tolstring(L, stack_idx, len); else if (wxlua_iswxuserdata(L, stack_idx)) { - extern int wxluatype_wxMemoryBuffer; int stack_type = wxluaT_type(L, stack_idx); if (wxluaT_isderivedtype(L, stack_type, *p_wxluatype_wxString) >= 0) @@ -1419,9 +1416,9 @@ const char* LUACALL wxlua_getstringtypelen(lua_State *L, int stack_idx, size_t * *len = strlen(retp); return retp; } - else if (wxluaT_isderivedtype(L, stack_type, wxluatype_wxMemoryBuffer) >= 0) + else if (wxluaT_isderivedtype(L, stack_type, *p_wxluatype_wxMemoryBuffer) >= 0) { - wxMemoryBuffer * wxmem = (wxMemoryBuffer *)wxluaT_getuserdatatype(L, stack_idx, wxluatype_wxMemoryBuffer); + wxMemoryBuffer * wxmem = (wxMemoryBuffer *)wxluaT_getuserdatatype(L, stack_idx, *p_wxluatype_wxMemoryBuffer); const char *datap = (const char *)wxmem->GetData(); if (len != NULL) *len = wxmem->GetDataLen(); -- 2.26.2
