From ae5c648d3197b3b6b83e87a673e60b0f839bc85c Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Thu, 7 Apr 2011 09:21:02 +0000 Subject: [PATCH] Add introspection support (needed for on-going GNOME 3 work). --- x11/gnome/nautilus/Makefile | 15 ++++++++++----- .../patch-libnautilus-extension_Makefile_in | 15 +++++++++++++++ x11/gnome/nautilus/pkg/PLIST | 10 +++------- 3 files changed, 28 insertions(+), 12 deletions(-) create mode 100644 x11/gnome/nautilus/patches/patch-libnautilus-extension_Makefile_in diff --git a/x11/gnome/nautilus/Makefile b/x11/gnome/nautilus/Makefile index b3bd2ca9f5b..2f479c60a97 100644 --- a/x11/gnome/nautilus/Makefile +++ b/x11/gnome/nautilus/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.79 2011/01/18 20:03:07 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.80 2011/04/07 09:21:02 ajacoutot Exp $ COMMENT= GNOME shell and file manager @@ -18,7 +18,7 @@ COMMENT= GNOME shell and file manager GNOME_PROJECT= nautilus GNOME_VERSION= 2.32.2.1 -REVISION= 0 +REVISION= 1 SHARED_LIBS += nautilus-extension 2.0 # .2.0 @@ -46,7 +46,9 @@ MODULES= devel/gettext \ x11/gnome \ devel/gconf2 -BUILD_DEPENDS= misc/shared-mime-info>=0.21 +BUILD_DEPENDS= misc/shared-mime-info>=0.21 \ + devel/gobject-introspection + RUN_DEPENDS= misc/shared-mime-info>=0.21 \ x11/gnome/icon-theme \ x11/gnome/gvfs>=1.0.3 @@ -63,9 +65,9 @@ USE_GROFF = Yes CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ --disable-gtk-doc \ - --disable-introspection \ --disable-update-mimedb \ - --disable-packagekit + --disable-packagekit \ + --enable-introspection # XXX build error when textproc/exempi is installed CONFIGURE_ARGS+= --enable-xmp=no @@ -74,4 +76,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ REGRESS_IS_INTERACTIVE=x11 +pre-configure: + ${SUBST_CMD} ${WRKSRC}/libnautilus-extension/Makefile.in + .include diff --git a/x11/gnome/nautilus/patches/patch-libnautilus-extension_Makefile_in b/x11/gnome/nautilus/patches/patch-libnautilus-extension_Makefile_in new file mode 100644 index 00000000000..a45fc6859b0 --- /dev/null +++ b/x11/gnome/nautilus/patches/patch-libnautilus-extension_Makefile_in @@ -0,0 +1,15 @@ +$OpenBSD: patch-libnautilus-extension_Makefile_in,v 1.1 2011/04/07 09:21:02 ajacoutot Exp $ + +g-ir-scanner error: +.../libnautilus-extension/nautilus-extension-i18n.h:7:20: error: libintl.h: No such file or directory + +--- libnautilus-extension/Makefile.in.orig Thu Apr 7 10:56:51 2011 ++++ libnautilus-extension/Makefile.in Thu Apr 7 10:57:32 2011 +@@ -392,6 +392,7 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) + @HAVE_INTROSPECTION_TRUE@Nautilus_2_0_gir_CFLAGS = \ + @HAVE_INTROSPECTION_TRUE@ -I$(top_srcdir) \ + @HAVE_INTROSPECTION_TRUE@ -I$(top_builddir) \ ++@HAVE_INTROSPECTION_TRUE@ -I${LOCALBASE}/include \ + @HAVE_INTROSPECTION_TRUE@ $(LIBNAUTILUS_EXTENSION_CFLAGS) + + @HAVE_INTROSPECTION_TRUE@Nautilus_2_0_gir_LIBS = libnautilus-extension.la diff --git a/x11/gnome/nautilus/pkg/PLIST b/x11/gnome/nautilus/pkg/PLIST index 83a091ec92e..4266687e35f 100644 --- a/x11/gnome/nautilus/pkg/PLIST +++ b/x11/gnome/nautilus/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.31 2010/09/30 07:46:04 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.32 2011/04/07 09:21:02 ajacoutot Exp $ @bin bin/nautilus @bin bin/nautilus-autorun-software @bin bin/nautilus-connect-server @@ -16,6 +16,7 @@ include/nautilus/libnautilus-extension/nautilus-menu-provider.h include/nautilus/libnautilus-extension/nautilus-menu.h include/nautilus/libnautilus-extension/nautilus-property-page-provider.h include/nautilus/libnautilus-extension/nautilus-property-page.h +lib/girepository-1.0/Nautilus-2.0.typelib lib/libnautilus-extension.a lib/libnautilus-extension.la lib/pkgconfig/libnautilus-extension.pc @@ -31,6 +32,7 @@ share/applications/nautilus-folder-handler.desktop share/applications/nautilus-home.desktop share/applications/nautilus.desktop share/applications/network-scheme.desktop +share/gir-1.0/Nautilus-2.0.gir share/gtk-doc/html/libnautilus-extension/ share/gtk-doc/html/libnautilus-extension/ch01.html share/gtk-doc/html/libnautilus-extension/home.png @@ -171,8 +173,6 @@ share/locale/oc/LC_MESSAGES/nautilus.mo share/locale/or/LC_MESSAGES/nautilus.mo share/locale/pa/LC_MESSAGES/nautilus.mo share/locale/pl/LC_MESSAGES/nautilus.mo -share/locale/ps/ -share/locale/ps/LC_MESSAGES/ share/locale/ps/LC_MESSAGES/nautilus.mo share/locale/pt/LC_MESSAGES/nautilus.mo share/locale/pt_BR/LC_MESSAGES/nautilus.mo @@ -184,8 +184,6 @@ share/locale/sk/LC_MESSAGES/nautilus.mo share/locale/sl/LC_MESSAGES/nautilus.mo share/locale/sq/LC_MESSAGES/nautilus.mo share/locale/sr/LC_MESSAGES/nautilus.mo -share/locale/sr@ije/ -share/locale/sr@ije/LC_MESSAGES/ share/locale/sr@ije/LC_MESSAGES/nautilus.mo share/locale/sr@latin/LC_MESSAGES/nautilus.mo share/locale/sv/LC_MESSAGES/nautilus.mo @@ -205,8 +203,6 @@ share/locale/uz@cyrillic/ share/locale/uz@cyrillic/LC_MESSAGES/ share/locale/uz@cyrillic/LC_MESSAGES/nautilus.mo share/locale/vi/LC_MESSAGES/nautilus.mo -share/locale/wa/ -share/locale/wa/LC_MESSAGES/ share/locale/wa/LC_MESSAGES/nautilus.mo share/locale/xh/LC_MESSAGES/nautilus.mo share/locale/yi/LC_MESSAGES/nautilus.mo