Hello community, here is the log from the commit of package geany-plugins for openSUSE:Factory checked in at 2012-01-20 20:23:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/geany-plugins (Old) and /work/SRC/openSUSE:Factory/.geany-plugins.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "geany-plugins", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/geany-plugins/geany-plugins.changes 2012-01-05 19:10:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.geany-plugins.new/geany-plugins.changes 2012-01-20 20:23:29.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Jan 10 21:42:26 UTC 2012 - dims...@opensuse.org + +- Use versioned BuildRequires where they are specified in the build + system. +- Add geany-plugins-lua-5_2.patch: Fix build with lua 5.2. + +------------------------------------------------------------------- New: ---- geany-plugins-lua-5_2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ geany-plugins.spec ++++++ --- /var/tmp/diff_new_pack.2OZ1Cd/_old 2012-01-20 20:23:30.000000000 +0100 +++ /var/tmp/diff_new_pack.2OZ1Cd/_new 2012-01-20 20:23:30.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: geany-plugins Version: 0.21.1 Release: 0 @@ -24,20 +25,22 @@ Group: Development/Tools/IDE Url: http://plugins.geany.org/geany-plugins/ Source: http://plugins.geany.org/geany-plugins/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM geany-plugins-lua-5_2.patch sf#3476581 dims...@opensuse.org -- Fix build with lua 5.2. +Patch0: geany-plugins-lua-5_2.patch BuildRequires: fdupes BuildRequires: intltool BuildRequires: libgpgme-devel -BuildRequires: pkgconfig(enchant) -BuildRequires: pkgconfig(geany) -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(enchant) >= 1.3 +BuildRequires: pkgconfig(geany) >= 0.21 +BuildRequires: pkgconfig(glib-2.0) >= 2.16 +BuildRequires: pkgconfig(gtk+-2.0) >= 2.16 BuildRequires: pkgconfig(gtkspell-2.0) -BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(lua) -BuildRequires: pkgconfig(vte) -BuildRequires: pkgconfig(webkit-1.0) +BuildRequires: pkgconfig(libxml-2.0) >= 2.6.27 +BuildRequires: pkgconfig(lua) >= 5.1 +BuildRequires: pkgconfig(vte) >= 0.24 +BuildRequires: pkgconfig(webkit-1.0) >= 1.1.18 Requires: %{name}-lang = %{version} -Requires: geany >= 0.19 +Requires: geany >= 0.21 Requires: lua Enhances: geany BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -49,6 +52,7 @@ %lang_package %prep %setup -q +%patch0 -p1 %build %configure ++++++ geany-plugins-lua-5_2.patch ++++++ diff -ur geany-plugins-0.21.1/geanylua/glspi_app.c geany-plugins-0.21.1.patch/geanylua/glspi_app.c --- geany-plugins-0.21.1/geanylua/glspi_app.c 2011-01-04 14:15:31.000000000 +0100 +++ geany-plugins-0.21.1.patch/geanylua/glspi_app.c 2012-01-18 23:55:27.494668050 +0100 @@ -603,7 +603,7 @@ -static const struct luaL_reg glspi_app_funcs[] = { +static const struct luaL_Reg glspi_app_funcs[] = { {"pluginver", glspi_pluginver}, {"appinfo", glspi_appinfo}, {"xsel", glspi_xsel}, diff -ur geany-plugins-0.21.1/geanylua/glspi_dlg.c geany-plugins-0.21.1.patch/geanylua/glspi_dlg.c --- geany-plugins-0.21.1/geanylua/glspi_dlg.c 2010-06-10 18:46:27.000000000 +0200 +++ geany-plugins-0.21.1.patch/geanylua/glspi_dlg.c 2012-01-18 23:55:27.494668050 +0100 @@ -130,7 +130,7 @@ arg1=lua_tostring(L, 1); } - n=lua_objlen(L,2); + n=lua_rawlen(L,2); for (i=1;i<=n; i++) { lua_rawgeti(L,2,i); if (!lua_isstring(L, -1)) { @@ -539,7 +539,7 @@ -static const struct luaL_reg glspi_dlg_funcs[] = { +static const struct luaL_Reg glspi_dlg_funcs[] = { {"choose", glspi_choose}, {"confirm", glspi_confirm}, {"input", glspi_input}, diff -ur geany-plugins-0.21.1/geanylua/glspi_doc.c geany-plugins-0.21.1.patch/geanylua/glspi_doc.c --- geany-plugins-0.21.1/geanylua/glspi_doc.c 2010-06-10 18:46:27.000000000 +0200 +++ geany-plugins-0.21.1.patch/geanylua/glspi_doc.c 2012-01-18 23:55:27.498668099 +0100 @@ -325,7 +325,7 @@ -static const struct luaL_reg glspi_doc_funcs[] = { +static const struct luaL_Reg glspi_doc_funcs[] = { {"filename", glspi_filename}, {"fileinfo", glspi_fileinfo}, {"documents", glspi_documents}, diff -ur geany-plugins-0.21.1/geanylua/glspi.h geany-plugins-0.21.1.patch/geanylua/glspi.h --- geany-plugins-0.21.1/geanylua/glspi.h 2011-10-02 06:17:30.000000000 +0200 +++ geany-plugins-0.21.1.patch/geanylua/glspi.h 2012-01-18 23:51:04.043495617 +0100 @@ -9,6 +9,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#define LUA_COMPAT_MODULE 1 #include <lua.h> #include <lualib.h> diff -ur geany-plugins-0.21.1/geanylua/glspi_init.c geany-plugins-0.21.1.patch/geanylua/glspi_init.c --- geany-plugins-0.21.1/geanylua/glspi_init.c 2010-06-10 18:46:27.000000000 +0200 +++ geany-plugins-0.21.1.patch/geanylua/glspi_init.c 2012-01-18 23:55:27.498668099 +0100 @@ -551,7 +551,7 @@ return 0; } -static const struct luaL_reg glspi_mnu_funcs[] = { +static const struct luaL_Reg glspi_mnu_funcs[] = { {"rescan", glspi_rescan}, {NULL,NULL} }; diff -ur geany-plugins-0.21.1/geanylua/glspi_kfile.c geany-plugins-0.21.1.patch/geanylua/glspi_kfile.c --- geany-plugins-0.21.1/geanylua/glspi_kfile.c 2010-06-10 18:46:27.000000000 +0200 +++ geany-plugins-0.21.1.patch/geanylua/glspi_kfile.c 2012-01-18 23:57:04.319865376 +0100 @@ -8,6 +8,7 @@ #include <glib.h> #include <glib/gi18n.h> +#define LUA_COMPAT_MODULE 1 #include <lua.h> #include <lualib.h> #include <lauxlib.h> @@ -370,7 +371,7 @@ -static const struct luaL_reg kfile_funcs[] = { +static const struct luaL_Reg kfile_funcs[] = { {"new", kfile_new}, {"data", kfile_data}, {"groups", kfile_groups}, diff -ur geany-plugins-0.21.1/geanylua/glspi_run.c geany-plugins-0.21.1.patch/geanylua/glspi_run.c --- geany-plugins-0.21.1/geanylua/glspi_run.c 2010-06-10 18:46:27.000000000 +0200 +++ geany-plugins-0.21.1.patch/geanylua/glspi_run.c 2012-01-18 23:55:27.502668148 +0100 @@ -301,7 +301,7 @@ -static const struct luaL_reg glspi_timer_funcs[] = { +static const struct luaL_Reg glspi_timer_funcs[] = { {"timeout", glspi_timeout}, {"yield", glspi_yield}, {"optimize", glspi_optimize}, @@ -315,7 +315,9 @@ /* Catch and report script errors */ static gint glspi_traceback(lua_State *L) { - lua_getfield(L, LUA_GLOBALSINDEX, "debug"); + lua_pushglobaltable(L); + lua_getfield(L,-1,"debug"); + lua_remove(L,-2); if (!lua_istable(L, -1)) { lua_pop(L, 1); return 1; diff -ur geany-plugins-0.21.1/geanylua/glspi_sci.c geany-plugins-0.21.1.patch/geanylua/glspi_sci.c --- geany-plugins-0.21.1/geanylua/glspi_sci.c 2010-06-10 18:46:27.000000000 +0200 +++ geany-plugins-0.21.1.patch/geanylua/glspi_sci.c 2012-01-18 23:55:27.506668197 +0100 @@ -774,7 +774,7 @@ ttf.chrg.cpMin=lua_tonumber(L,2); ttf.chrg.cpMax=lua_tonumber(L,3); - n=lua_objlen(L,4); + n=lua_rawlen(L,4); for (i=1;i<=n; i++) { lua_rawgeti(L,4,i); if (lua_isstring(L, -1)) { @@ -841,7 +841,7 @@ -static const struct luaL_reg glspi_sci_funcs[] = { +static const struct luaL_Reg glspi_sci_funcs[] = { {"text", glspi_text}, {"selection", glspi_selection}, {"select", glspi_select}, diff -ur geany-plugins-0.21.1/geanylua/gsdlg_lua.c geany-plugins-0.21.1.patch/geanylua/gsdlg_lua.c --- geany-plugins-0.21.1/geanylua/gsdlg_lua.c 2010-06-10 18:46:27.000000000 +0200 +++ geany-plugins-0.21.1.patch/geanylua/gsdlg_lua.c 2012-01-18 23:55:27.510668247 +0100 @@ -30,7 +30,7 @@ */ - +#define LUA_COMPAT_MODULE 1 #include <lua.h> #include <lualib.h> #include <lauxlib.h> @@ -323,7 +323,7 @@ if (argc>=2) { if (!lua_istable(L,2)) { return FAIL_TABLE_ARG(2); } } - n=lua_objlen(L,2); + n=lua_rawlen(L,2); for (i=1;i<=n; i++) { lua_rawgeti(L,2,i); if (!lua_isstring(L, -1)) { @@ -387,7 +387,7 @@ -static const struct luaL_reg gsdl_funcs[] = { +static const struct luaL_Reg gsdl_funcs[] = { {"new", gsdl_new}, {"run", gsdl_run}, {"label", gsdl_label}, -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
