cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to lgi-0.7.0

Browse Source
This commit is contained in:
jasper 2013-03-08 10:26:26 +00:00
parent d9aa3a9a02
commit 552cb75c8b
9 changed files with 44 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
devel/lua-lgi/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.13 2012/09/20 21:10:42 jasper Exp $
# $OpenBSD: Makefile,v 1.14 2013/03/08 10:26:26 jasper Exp $
SHARED_ONLY= Yes
COMMENT= lua bindings to libraries using GObject-Introspection
DISTNAME= lgi-0.6.2
DISTNAME= lgi-0.7.0
PKGNAME= lua-${DISTNAME}
REVISION= 2
CATEGORIES= devel
HOMEPAGE= https://github.com/pavouk/lgi
@ -21,12 +20,11 @@ MODULES= devel/gettext \
lang/lua
WANTLIB += ffi girepository-1.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += gthread-2.0
WANTLIB += pthread
LIB_DEPENDS= devel/gobject-introspection
MASTER_SITES= https://github.com/downloads/pavouk/lgi/ \
http://distfiles.nl/
MASTER_SITES= http://distfiles.nl/
USE_GMAKE= Yes
MAKE_ENV= MAKE=${MAKE_PROGRAM} LUA_CFLAGS="-I${MODLUA_INCL_DIR}" \

4
devel/lua-lgi/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (lgi-0.6.2.tar.gz) = k7ClIPA4InlNlMuGJz0HRKOAh5Ligytn8X7gPX3th3M=
SIZE (lgi-0.6.2.tar.gz) = 257541
SHA256 (lgi-0.7.0.tar.gz) = gsHsurJKIlEIbvSXxoA6syFBs408Jc2Ip13zmgfXYeY=
SIZE (lgi-0.7.0.tar.gz) = 270203

24
devel/lua-lgi/patches/patch-lgi_Makefile
View File

@ -1,20 +1,20 @@
$OpenBSD: patch-lgi_Makefile,v 1.2 2012/07/19 20:26:26 jasper Exp $
--- lgi/Makefile.orig Mon Jun 25 10:25:20 2012
+++ lgi/Makefile Thu Jul 19 22:21:24 2012
@@ -6,8 +6,8 @@
#
$OpenBSD: patch-lgi_Makefile,v 1.3 2013/03/08 10:26:26 jasper Exp $
--- lgi/Makefile.orig Sat Feb 23 10:44:48 2013
+++ lgi/Makefile Sat Feb 23 10:45:21 2013
@@ -7,8 +7,8 @@
PREFIX = /usr/local
-LUA_LIBDIR = $(PREFIX)/lib/lua/5.1
-LUA_SHAREDIR = $(PREFIX)/share/lua/5.1
+LUA_LIBDIR ?= $(PREFIX)/lib/lua/5.1
+LUA_SHAREDIR ?= $(PREFIX)/share/lua/5.1
LUA_VERSION=5.1
-LUA_LIBDIR = $(PREFIX)/lib/lua/$(LUA_VERSION)
-LUA_SHAREDIR = $(PREFIX)/share/lua/$(LUA_VERSION)
+LUA_LIBDIR ?= $(PREFIX)/lib/lua/$(LUA_VERSION)
+LUA_SHAREDIR ?= $(PREFIX)/share/lua/$(LUA_VERSION)
GINAME = gobject-introspection-1.0
PKGS = $(GINAME) gmodule-2.0 libffi
@@ -18,7 +18,7 @@ CORE = corelgilua51.dll
LIBFLAG = -shared
LIBS += -llua
@@ -24,7 +24,7 @@ CORE = corelgilua51.so
LIBFLAG = -bundle -undefined dynamic_lookup
CCSHARED = -fno-common
else
-CORE = corelgilua51.so
+CORE = corelgilua${MODLUA_DEP_VERSION}.so

31
devel/lua-lgi/patches/patch-lgi_core_c
View File

@ -1,31 +0,0 @@
$OpenBSD: patch-lgi_core_c,v 1.2 2012/09/21 13:57:32 jasper Exp $
commit 44676d0ec67ac19385917eb537423f235d5d3a7b
Author: Jasper Lievisse Adriaanse <jasper@humppa.nl>
Date: Thu Sep 20 22:41:59 2012 +0200
Subject: Unbreak loading of shared objects/modules on OpenBSD.
https://github.com/pavouk/lgi/commit/44676d0ec67ac19385917eb537423f235d5d3a7b
--- lgi/core.c.orig Mon Jun 25 10:25:21 2012
+++ lgi/core.c Thu Sep 20 22:29:55 2012
@@ -487,12 +487,18 @@ core_module (lua_State *L)
{
char *name;
- /* If the version is present, combine it with basename. */
+ /* If the version is present, combine it with basename.
+ Except on OpenBSD, where libraries are versioned like libfoo.so.0.0
+ and we will always load the shared object with the highest version
+ number.
+ */
+#ifndef __OpenBSD__
if (!lua_isnoneornil (L, 2))
name = g_strdup_printf (MODULE_NAME_FORMAT_VERSION,
luaL_checkstring (L, 1),
(int) luaL_checkinteger (L, 2));
else
+#endif
name = g_strdup_printf (MODULE_NAME_FORMAT_PLAIN,
luaL_checkstring (L, 1));

17
devel/lua-lgi/patches/patch-lgi_override_Gtk_lua
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-lgi_override_Gtk_lua,v 1.1 2012/08/21 09:36:19 jasper Exp $
Gtk: make Gtk-2.0.typelib usable again
https://github.com/pavouk/lgi/commit/90aa6c8491db0b2587ca094802a594bf5834fb7e
--- lgi/override/Gtk.lua.orig Tue Aug 21 11:32:54 2012
+++ lgi/override/Gtk.lua Tue Aug 21 11:33:20 2012
@@ -572,7 +572,8 @@ end
-- Workaround for bug in GTK+; text_column accessors don't do an extra
-- needed work which is done properly in
-- gtk_entry_completion_{set/get}_text_column
-if Gtk.get_major_version() == 3 and Gtk.get_minor_version() < 4 then
+if Gtk._version == '2.0' or (Gtk.get_major_version() == 3 and
+ Gtk.get_minor_version() < 4) then
Gtk.EntryCompletion._attribute = {
text_column = { get = Gtk.EntryCompletion.get_text_column,
set = Gtk.EntryCompletion.set_text_column }

25
devel/lua-lgi/patches/patch-samples_gtk-demo_demo-uimanager_lua
View File

@ -1,25 +0,0 @@
$OpenBSD: patch-samples_gtk-demo_demo-uimanager_lua,v 1.1 2012/08/21 09:36:19 jasper Exp $
gtk-demo: fix uimanager demo, which assigned the same value to all
accelerators
https://github.com/pavouk/lgi/commit/36945b9aa52e68a55ea0c5d6b8e2fcd8a9688c44
--- samples/gtk-demo/demo-uimanager.lua.orig Tue Aug 21 11:30:35 2012
+++ samples/gtk-demo/demo-uimanager.lua Tue Aug 21 11:31:01 2012
@@ -17,6 +17,7 @@ local COLOR = { RED = 1, GREEN = 2, BLUE = 3 }
local SHAPE = { SQUARE = 1, RECTANGLE = 2, OVAL = 3 }
local actions = Gtk.ActionGroup {
+ name = 'Actions',
Gtk.Action { name = 'FileMenu', label = "_File" },
Gtk.Action { name = 'PreferencesMenu', label = "_Preferences" },
Gtk.Action { name = 'ColorMenu', label = "_Color" },
@@ -139,6 +140,7 @@ local window = Gtk.Window {
Gtk.Box {
orientation = 'VERTICAL',
spacing = 10,
+ border_width = 10,
Gtk.Button {
id = 'close',
label = "close",

30
devel/lua-lgi/patches/patch-samples_gtkhello_lua
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-samples_gtkhello_lua,v 1.1 2012/08/21 09:36:19 jasper Exp $
Gtk: make Gtk-2.0.typelib usable again
https://github.com/pavouk/lgi/commit/90aa6c8491db0b2587ca094802a594bf5834fb7e
--- samples/gtkhello.lua.orig Tue Aug 21 11:31:55 2012
+++ samples/gtkhello.lua Tue Aug 21 11:32:44 2012
@@ -7,7 +7,7 @@
--
local lgi = require 'lgi'
-local Gtk = lgi.Gtk
+local Gtk = lgi.require('Gtk')
-- Create top level window with some properties and connect its 'destroy'
-- signal to the event loop termination.
@@ -15,9 +15,12 @@ local window = Gtk.Window {
title = 'window',
default_width = 400,
default_height = 300,
- has_resize_grip = true,
on_destroy = Gtk.main_quit
}
+
+if tonumber(Gtk._version) >= 3 then
+ window.has_resize_grip = true
+end
-- Create some more widgets for the window.
local status_bar = Gtk.Statusbar()

24
devel/lua-lgi/patches/patch-tests_Makefile
View File

@ -1,20 +1,28 @@
$OpenBSD: patch-tests_Makefile,v 1.3 2012/07/19 20:06:34 jasper Exp $
$OpenBSD: patch-tests_Makefile,v 1.4 2013/03/08 10:26:26 jasper Exp $
First chunk:
- Ensure the libraries needed by libregress.so can also be located and are preloaded.
--- tests/Makefile.orig Thu Jul 19 22:00:55 2012
+++ tests/Makefile Thu Jul 19 22:02:44 2012
@@ -41,7 +41,7 @@ clean :
--- tests/Makefile.orig Sat Feb 23 10:39:13 2013
+++ tests/Makefile Sat Feb 23 10:49:10 2013
@@ -24,7 +24,7 @@ endif
endif
PKGS = gio-2.0 cairo cairo-gobject gobject-introspection-1.0 gmodule-2.0 libffi
-LUA = lua
+LUA = ${MODLUA_BIN}
ifndef CFLAGS
ifndef COPTFLAGS
@@ -52,7 +52,7 @@ clean :
rm -f $(REGRESS) $(REGRESS_OBJS) Regress-1.0.gir Regress-1.0.typelib
check : all
- cd .. && LD_LIBRARY_PATH=tests:$$LD_LIBRARY_PATH GI_TYPELIB_PATH=tests:$$GI_TYPELIB_PATH $(LUA) tests/test.lua
+ cd .. && LD_PRELOAD=/usr/lib/libpthread.so LD_LIBRARY_PATH=tests:$$LD_LIBRARY_PATH GI_TYPELIB_PATH=tests:$$GI_TYPELIB_PATH $(LUA) tests/test.lua
+ cd .. && LD_PRELOAD=/usr/lib/libpthread.so LD_LIBRARY_PATH=tests:$$LD_LIBRARY_PATH GI_TYPELIB_PATH=tests:$$GI_TYPELIB_PATH $(LUA) tests/test.lua
$(REGRESS) : regress.o
$(CC) $(LDFLAGS) -o $@ regress.o $(LIBS)
@@ -58,7 +58,7 @@ Regress-1.0.gir : $(REGRESS)
$(CC) $(ALL_LDFLAGS) -o $@ regress.o $(LIBS)
@@ -69,7 +69,7 @@ Regress-1.0.gir : $(REGRESS)
--namespace=Regress --nsversion=1.0 \
--include=cairo-1.0 --include=Gio-2.0 \
--library-path=/usr/lib --library-path=/usr/X11R6/lib \

11
devel/lua-lgi/pkg/PLIST
View File

@ -1,7 +1,11 @@
@comment $OpenBSD: PLIST,v 1.7 2012/07/19 20:06:34 jasper Exp $
@comment $OpenBSD: PLIST,v 1.8 2013/03/08 10:26:26 jasper Exp $
lib/lua/${MODLUA_VERSION}/lgi/
lib/lua/${MODLUA_VERSION}/lgi/corelgi${MODLUA_DEP}.so
share/examples/${FULLPKGNAME}/
share/examples/${FULLPKGNAME}/GDbus/
share/examples/${FULLPKGNAME}/GDbus/list-system-services.lua
share/examples/${FULLPKGNAME}/GnomeKeyring/
share/examples/${FULLPKGNAME}/GnomeKeyring/list-keyrings-passwords.lua
share/examples/${FULLPKGNAME}/cairo.lua
share/examples/${FULLPKGNAME}/clutterdemo.lua
share/examples/${FULLPKGNAME}/console.lua
@ -32,6 +36,8 @@ share/examples/${FULLPKGNAME}/gtk-demo/demo-images.lua
share/examples/${FULLPKGNAME}/gtk-demo/demo-infobar.lua
share/examples/${FULLPKGNAME}/gtk-demo/demo-links.lua
share/examples/${FULLPKGNAME}/gtk-demo/demo-menus.lua
share/examples/${FULLPKGNAME}/gtk-demo/demo-ofw-mirror.lua
share/examples/${FULLPKGNAME}/gtk-demo/demo-ofw-rotbutton.lua
share/examples/${FULLPKGNAME}/gtk-demo/demo-paned.lua
share/examples/${FULLPKGNAME}/gtk-demo/demo-pickers.lua
share/examples/${FULLPKGNAME}/gtk-demo/demo-pixbufs.lua
@ -66,6 +72,7 @@ share/examples/${FULLPKGNAME}/gtkpad.lua
share/examples/${FULLPKGNAME}/gtkterminal.lua
share/examples/${FULLPKGNAME}/mxwidgets.lua
share/examples/${FULLPKGNAME}/repobrowser.lua
share/examples/${FULLPKGNAME}/soupsvr.lua
share/lua/${MODLUA_VERSION}/lgi/
share/lua/${MODLUA_VERSION}/lgi.lua
share/lua/${MODLUA_VERSION}/lgi/class.lua
@ -78,6 +85,7 @@ share/lua/${MODLUA_VERSION}/lgi/log.lua
share/lua/${MODLUA_VERSION}/lgi/namespace.lua
share/lua/${MODLUA_VERSION}/lgi/override/
share/lua/${MODLUA_VERSION}/lgi/override/Clutter.lua
share/lua/${MODLUA_VERSION}/lgi/override/GLib-Timer.lua
share/lua/${MODLUA_VERSION}/lgi/override/GLib-Variant.lua
share/lua/${MODLUA_VERSION}/lgi/override/GLib.lua
share/lua/${MODLUA_VERSION}/lgi/override/GObject-Closure.lua
@ -91,5 +99,6 @@ share/lua/${MODLUA_VERSION}/lgi/override/Gtk.lua
share/lua/${MODLUA_VERSION}/lgi/override/Pango.lua
share/lua/${MODLUA_VERSION}/lgi/override/PangoCairo.lua
share/lua/${MODLUA_VERSION}/lgi/override/cairo.lua
share/lua/${MODLUA_VERSION}/lgi/package.lua
share/lua/${MODLUA_VERSION}/lgi/record.lua
share/lua/${MODLUA_VERSION}/lgi/version.lua