diff --git a/WX_3_1_0-7d9d59.tar.gz b/WX_3_1_0-7d9d59.tar.gz new file mode 100644 index 0000000..691c6ce --- /dev/null +++ b/WX_3_1_0-7d9d59.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:735fb9014a1c983ee30cefe5f6269141d138118c5b29c2870d148f5dcb37c120 +size 3101998 diff --git a/_disabled_service b/_disabled_service deleted file mode 100644 index fed8c9b..0000000 --- a/_disabled_service +++ /dev/null @@ -1,15 +0,0 @@ - - - - svn://svn.code.sf.net/p/wxlua/svn/trunk/wxLua - svn - 2.8.12.3 - r%r - wxlua - - - - *.tar - bz2 - - diff --git a/desktop.patch b/desktop.patch new file mode 100644 index 0000000..e3e150b --- /dev/null +++ b/desktop.patch @@ -0,0 +1,76 @@ +From 070d7003f92c877985c2df2cc956170e41a0999f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= + +Date: Tue, 12 Dec 2017 07:51:14 +0100 +Subject: [PATCH 1/3] The binary is called wxLua instead of wxluaedit. + +--- + wxLua/distrib/autopackage/wxlua.desktop | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/wxLua/distrib/autopackage/wxlua.desktop b/wxLua/distrib/autopackage/wxlua.desktop +index 9ef83c1..47bac57 100644 +--- a/wxLua/distrib/autopackage/wxlua.desktop ++++ b/wxLua/distrib/autopackage/wxlua.desktop +@@ -1,11 +1,11 @@ + [Desktop Entry] + Name=wxLua Editor + Comment=Editor for Lua script files +-Exec=wxluaedit %F ++Exec=wxLua %F + Encoding=UTF-8 + Terminal=false + Type=Application + MimeType=application/lua; + Categories=Application;Development; + Icon=wxlualogo.xpm +-X-GNOME-DocPath= +\ No newline at end of file ++X-GNOME-DocPath= + +From 179dacff6fedc8be28d0df6c9d0c38151054dc58 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= + +Date: Tue, 12 Dec 2017 07:52:28 +0100 +Subject: [PATCH 2/3] Avoid the deprecated .xpm file format extension + +as the art folder also contains a modern .svg +--- + wxLua/distrib/autopackage/wxlua.desktop | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wxLua/distrib/autopackage/wxlua.desktop b/wxLua/distrib/autopackage/wxlua.desktop +index 47bac57..1b269ac 100644 +--- a/wxLua/distrib/autopackage/wxlua.desktop ++++ b/wxLua/distrib/autopackage/wxlua.desktop +@@ -7,5 +7,5 @@ Terminal=false + Type=Application + MimeType=application/lua; + Categories=Application;Development; +-Icon=wxlualogo.xpm ++Icon=wxlualogo + X-GNOME-DocPath= + +From f276216494ab244630a186b79cdba33ed177df85 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= + +Date: Tue, 12 Dec 2017 07:54:20 +0100 +Subject: [PATCH 3/3] Update the .desktop categories + +according to https://specifications.freedesktop.org/menu-spec/menu-spec-latest.html#main-category-registry +--- + wxLua/distrib/autopackage/wxlua.desktop | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wxLua/distrib/autopackage/wxlua.desktop b/wxLua/distrib/autopackage/wxlua.desktop +index 1b269ac..911f34c 100644 +--- a/wxLua/distrib/autopackage/wxlua.desktop ++++ b/wxLua/distrib/autopackage/wxlua.desktop +@@ -6,6 +6,6 @@ Encoding=UTF-8 + Terminal=false + Type=Application + MimeType=application/lua; +-Categories=Application;Development; ++Categories=Development;IDE; + Icon=wxlualogo + X-GNOME-DocPath= diff --git a/wx-webview.patch b/wx-webview.patch index 7918e56..6a51d11 100644 --- a/wx-webview.patch +++ b/wx-webview.patch @@ -1,26 +1,25 @@ -From: Jan Engelhardt -Date: 2017-09-07 23:28:26.066615635 +0200 - -Unlike FindwxWidgets.cmake suggests, there is no autodetection of wx components -- at least not for Linux - just this manual list. - -Remove webview because it is no longer available in wxWidgets (itself because -webkit is exiting openSUSE:Factory). +From 611ba030fc18c5df43ddc02ea16ce50691bd786e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= + +Date: Wed, 13 Dec 2017 08:58:28 +0100 +Subject: [PATCH] Remove webview because it is broken in wxWidgets --- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + wxLua/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) -Index: wxlua-2.8.12.3.r252/CMakeLists.txt -=================================================================== ---- wxlua-2.8.12.3.r252.orig/CMakeLists.txt -+++ wxlua-2.8.12.3.r252/CMakeLists.txt -@@ -46,7 +46,7 @@ set( wxLua_SUBRELEASE_NUMBER "3") +diff --git a/wxLua/CMakeLists.txt b/wxLua/CMakeLists.txt +index a80a011..3339ae3 100644 +--- a/wxLua/CMakeLists.txt ++++ b/wxLua/CMakeLists.txt +@@ -46,8 +46,8 @@ set( wxLua_SUBRELEASE_NUMBER "3") # Specify what wxWidgets libs we need to link to. Note: 'core' must be before 'base'. # If this CMakeLists.txt was called from another, FIND_WXWIDGETS() may have already been called. if (NOT DEFINED wxWidgets_COMPONENTS) - set(wxWidgets_COMPONENTS webview gl xrc xml net media propgrid richtext aui stc html adv core base) # complete set for static lib/dll +- #set(wxWidgets_COMPONENTS webview gl xrc xml net media propgrid richtext aui stc html adv core base) # for multilib/dll + set(wxWidgets_COMPONENTS gl xrc xml net media propgrid richtext aui stc html adv core base) # complete set for static lib/dll - #set(wxWidgets_COMPONENTS webview gl xrc xml net media propgrid richtext aui stc html adv core base) # for multilib/dll ++ #set(wxWidgets_COMPONENTS gl xrc xml net media propgrid richtext aui stc html adv core base) # for multilib/dll #set(wxWidgets_COMPONENTS stc mono) # for monolithic endif() + diff --git a/wxlstate.patch b/wxlstate.patch deleted file mode 100644 index 5542a58..0000000 --- a/wxlstate.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: modules/wxlua/wxlstate.cpp -=================================================================== ---- modules/wxlua/wxlstate.cpp (revision 251) -+++ modules/wxlua/wxlstate.cpp (working copy) -@@ -404,6 +404,9 @@ - if ((m_lua_State == NULL) || m_wxlStateData->m_is_closing || m_lua_State_coroutine) - return true; - -+ if (lua_status(m_lua_State) != 0) -+ return true; -+ - m_wxlStateData->m_is_closing = true; - - //wxCHECK_MSG(m_lua_State, false, wxT("Interpreter not created")); diff --git a/wxlua-2.8.12.3.r252.tar.bz2 b/wxlua-2.8.12.3.r252.tar.bz2 deleted file mode 100644 index 031797a..0000000 --- a/wxlua-2.8.12.3.r252.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bf4e29dc28b0364b706b6e998921845db97f99c8e5104c0f505aa6dc2443aa2e -size 2968167 diff --git a/wxlua.changes b/wxlua.changes index 020da2c..31bdd3b 100644 --- a/wxlua.changes +++ b/wxlua.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Dec 12 06:18:57 UTC 2017 - mailaender@opensuse.org + +- Update to the 3.1 series fork +- Drop wxlstate.patch +- Add desktop.patch + ------------------------------------------------------------------- Thu Sep 7 21:21:49 UTC 2017 - jengelh@inai.de diff --git a/wxlua.spec b/wxlua.spec index 6e0bf56..5223d2e 100644 --- a/wxlua.spec +++ b/wxlua.spec @@ -16,16 +16,19 @@ # +%define lua_version 5.1 + Name: wxlua -Version: 2.8.12.3.r252 +Version: 3.1.0.git.7d9d59 Release: 0 Summary: Lua IDE with a GUI debugger and binding generator License: SUSE-wxWidgets-3.1 Group: Development/Languages/Other -Url: http://wxlua.sourceforge.net/ -Source: %{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM https://sourceforge.net/p/wxlua/bugs/36/ -Patch0: wxlstate.patch +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 BuildRequires: desktop-file-utils @@ -68,24 +71,27 @@ This package contains files to be used in your C++ programs to embed a Lua interpreter with the wxWidgets API. %prep -%setup -q -%patch0 +%setup -q -n wxlua-WX_3_1_0-7d9d59 +%patch0 -p1 %patch1 -p1 +cd wxLua sed -r -i 's|LIBRARY DESTINATION .*$|LIBRARY DESTINATION %{_lib}|' CMakeLists.txt %build +cd wxLua %cmake \ -DwxWidgets_CONFIG_EXECUTABLE=%{_bindir}/wx-config \ -DwxLua_LUA_LIBRARY_BUILD_SHARED=TRUE \ -DwxLua_LUA_LIBRARY_USE_BUILTIN=FALSE \ - -DwxLua_LUA_LIBRARY_VERSION=5.1 \ + -DwxLua_LUA_LIBRARY_VERSION=%lua_version \ -DwxLua_LUA_INCLUDE_DIR=%{lua_incdir} \ - -DwxLua_LUA_LIBRARY=%{_libdir}/liblua.so.5.1 \ + -DwxLua_LUA_LIBRARY=%{_libdir}/liblua.so.%lua_version \ -DBUILD_SHARED_LIBS=TRUE \ -DCMAKE_BUILD_TYPE=RelWithDebInfo make %{?_smp_mflags} %install +cd wxLua %cmake_install mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ @@ -96,15 +102,9 @@ mkdir -p %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/ install -p art/wxlualogo.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/ mkdir -p %{buildroot}%{_datadir}/applications/ -install -p distrib/autopackage/%{name}.desktop %{buildroot}%{_datadir}/applications/ -sed -r -i "s|wxluaedit|wxLuaEdit|" %{buildroot}%{_datadir}/applications/%{name}.desktop -sed -r -i "s|wxlualogo.xpm|wxlualogo|" %{buildroot}%{_datadir}/applications/%{name}.desktop -desktop-file-install --dir %{buildroot}%{_datadir}/applications \ - --remove-category=Application \ - --add-category=IDE \ - %{buildroot}%{_datadir}/applications/%{name}.desktop +install -p distrib/autopackage/wxlua.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop -install -Dm644 distrib/autopackage/wxlua.xml %{buildroot}%{_datadir}/mime/packages/wxlua.xml +install -Dm644 distrib/autopackage/wxlua.xml %{buildroot}%{_datadir}/mime/packages/%{name}.xml # packaged in separate package wxstedit rm -rf %{buildroot}%{_datadir}/wxstedit @@ -112,8 +112,8 @@ rm -rf %{buildroot}%{_datadir}/wxStEdit rm -rf %{buildroot}%{_includedir}/wx/stedit/ rm -rf %{buildroot}%{_prefix}/lib/libwxstedit*.so -mkdir -p %{buildroot}%{_libdir}/lua/5.1/ -mv %{buildroot}%{_libdir}/libwx.so %{buildroot}%{_libdir}/lua/5.1/wx.so +mkdir -p %{buildroot}%{_libdir}/lua/%lua_version/ +mv %{buildroot}%{_libdir}/libwx.so %{buildroot}%{_libdir}/lua/%lua_version/wx.so %post %desktop_database_post @@ -129,17 +129,19 @@ mv %{buildroot}%{_libdir}/libwx.so %{buildroot}%{_libdir}/lua/5.1/wx.so %postun -n lib%{name} -p /sbin/ldconfig %files -%{_bindir}/* +%{_bindir}/wxLua +%{_bindir}/wxLuaCan +%{_bindir}/wxLuaFreeze %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/apps/* -%{_datadir}/mime/packages/wxlua.xml +%{_datadir}/mime/packages/%{name}.xml %files -n lib%{name} -%{_libdir}/lua/5.1/wx.so +%{_libdir}/lua/%lua_version/wx.so %{_libdir}/libwxlua*.so %files devel -%{_includedir}/%{name} +%{_includedir}/wxlua/ %{_datadir}/wxlua/ %changelog