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

From upstream:

Browse Source 
Add -I argument for g-ir-scanner to use the include files from the local tree
instead of the ones installed in the system.
This commit is contained in:
ajacoutot 2012-01-19 15:37:08 +00:00
parent 954633047e
commit 321b4fd169
3 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
x11/gnome/libxklavier/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.39 2012/01/19 14:25:10 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.40 2012/01/19 15:37:08 ajacoutot Exp $
COMMENT= utility library for XKB
GNOME_PROJECT= libxklavier
GNOME_VERSION= 5.2
REVISION= 0
REVISION= 1
SHARED_LIBS += xklavier 17.0 # .17.0
@ -16,16 +16,13 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += X11 Xext Xi m pcre xkbfile z ffi
WANTLIB += xcb glib-2.0 gthread-2.0 gobject-2.0 xml2
WANTLIB += X11 Xext Xi ffi glib-2.0 gobject-2.0 gthread-2.0 m
WANTLIB += pcre xcb xkbfile xml2 z
MODULES= devel/gettext \
x11/gnome
# XXX -I. -I.. missing?
# /usr/ports/pobj/libxklavier-5.2/libxklavier-5.2/libxklavier/xkl_config_registry.h:24:36:
# error: libxklavier/xkl_engine.h: No such file or directory
#MODGNOME_TOOLS= goi
MODGNOME_TOOLS= goi
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= devel/iso-codes

18
x11/gnome/libxklavier/patches/patch-libxklavier_Makefile_in Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-libxklavier_Makefile_in,v 1.3 2012/01/19 15:37:08 ajacoutot Exp $
From 57785c952444e4cb9d13e43d4f9cc9713d66958b Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Mon, 16 Jan 2012 15:00:18 +0000
Subject: Use local include files for building GIR
--- libxklavier/Makefile.in.orig Thu Jan 19 16:15:43 2012
+++ libxklavier/Makefile.in Thu Jan 19 16:16:10 2012
@@ -343,7 +343,7 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
# avoid introspecting private headers
@HAVE_INTROSPECTION_TRUE@introspection_sources = $(xklavier_headers) $(filter %.c, $(libxklavier_la_SOURCES))
@HAVE_INTROSPECTION_TRUE@Xkl_1_0_gir_INCLUDES = GObject-2.0 xlib-2.0
-@HAVE_INTROSPECTION_TRUE@Xkl_1_0_gir_CFLAGS = $(INCLUDES) $(X_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS)
+@HAVE_INTROSPECTION_TRUE@Xkl_1_0_gir_CFLAGS = -I$(top_srcdir) $(INCLUDES) $(X_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS)
@HAVE_INTROSPECTION_TRUE@Xkl_1_0_gir_LIBS = libxklavier.la
@HAVE_INTROSPECTION_TRUE@Xkl_1_0_gir_FILES = $(xklavier_headers) $(introspection_sources)
@HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0

6
x11/gnome/libxklavier/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.9 2012/01/19 14:25:10 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.10 2012/01/19 15:37:08 ajacoutot Exp $
%%SHARED%%
include/libxklavier/
include/libxklavier/xkl-enum-types.h
@ -8,9 +8,13 @@ include/libxklavier/xkl_config_registry.h
include/libxklavier/xkl_engine.h
include/libxklavier/xkl_engine_marshal.h
include/libxklavier/xklavier.h
lib/girepository-1.0/
lib/girepository-1.0/Xkl-1.0.typelib
lib/libxklavier.a
lib/libxklavier.la
lib/pkgconfig/libxklavier.pc
share/gir-1.0/
share/gir-1.0/Xkl-1.0.gir
share/gtk-doc/
share/gtk-doc/html/
share/gtk-doc/html/libxklavier/