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

Explicitely patch for DATADIRNAME; the hack from the gnome MODULE will

Browse Source 
be removed soon.
This commit is contained in:
ajacoutot 2012-09-11 08:29:33 +00:00
parent 5c5cddb6fc
commit ad514f53ab
6 changed files with 90 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
x11/gnome/contacts/patches/patch-configure Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-configure,v 1.1 2012/09/11 08:29:33 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Mon Apr 30 14:21:55 2012
+++ configure Tue Sep 11 10:09:19 2012
@@ -12812,6 +12812,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;

16
x11/gnome/empathy/patches/patch-configure Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-configure,v 1.4 2012/09/11 08:29:33 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Mon May 14 13:24:27 2012
+++ configure Tue Sep 11 10:15:36 2012
@@ -15148,6 +15148,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;

8
x11/gnome/shell/patches/patch-configure_ac
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-configure_ac,v 1.4 2012/08/29 11:56:27 jasper Exp $
$OpenBSD: patch-configure_ac,v 1.5 2012/09/11 08:29:33 ajacoutot Exp $
Make Network Manager support optional.
https://bugzilla.gnome.org/show_bug.cgi?id=679871
--- configure.ac.orig Tue Apr 17 19:20:06 2012
+++ configure.ac Sat Jul 14 11:25:47 2012
--- configure.ac.orig Fri Jul 20 20:20:48 2012
+++ configure.ac Tue Sep 11 10:12:12 2012
@@ -94,7 +94,6 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MI
telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION
@ -34,5 +34,5 @@ https://bugzilla.gnome.org/show_bug.cgi?id=679871
+AM_CONDITIONAL(NETWORK_MANAGER, $network_manager)
+GNOME_SHELL=$GNOME_SHELL $NM_LIBS
PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION libedataserverui-3.0 >= $LIBEDATASERVERUI_MIN_VERSION gio-2.0)
PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION libedataserverui-3.0 >= $LIBEDATASERVERUI_MIN_VERSION gio-2.0 gconf-2.0)
AC_SUBST(CALENDAR_SERVER_CFLAGS)

25
x11/gnome/shell/patches/patch-m4_intltool_m4 Normal file
View File

@ -0,0 +1,25 @@
$OpenBSD: patch-m4_intltool_m4,v 1.1 2012/09/11 08:29:33 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- m4/intltool.m4.orig Fri Jul 20 20:05:59 2012
+++ m4/intltool.m4 Tue Sep 11 10:12:18 2012
@@ -155,6 +155,8 @@ fi
# Substitute ALL_LINGUAS so we can use it in po/Makefile
AC_SUBST(ALL_LINGUAS)
+AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
+
# Set DATADIRNAME correctly if it is not set yet
# (copied from glib-gettext.m4)
if test -z "$DATADIRNAME"; then
@@ -172,6 +174,9 @@ if test -z "$DATADIRNAME"; then
dnl in this case.
AC_CHECK_FUNC(bind_textdomain_codeset,
[DATADIRNAME=share], [DATADIRNAME=lib])
+ ;;
+ *-*-openbsd*)
+ [DATADIRNAME=share]
;;
*)
[DATADIRNAME=lib]

5
x11/gnome/totem/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.87 2012/09/06 18:59:54 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.88 2012/09/11 08:29:33 ajacoutot Exp $
COMMENT-main= official media player for GNOME
COMMENT-nautilus= totem properties plugin for nautilus
@ -104,6 +104,9 @@ CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
# Prevent gst-inspect from writing to ${HOME}/.gstreamer-0.10/ at configure stage
CONFIGURE_ENV += GST_REGISTRY=${WRKDIR}/registry.${MACHINE_ARCH}.bin
AUTOCONF_VERSION=2.68
CONFIGURE_STYLE=autoconf
CONFIGURE_ARGS= --enable-nautilus \
--enable-python \
--disable-easy-codec-installation \

25
x11/gnome/totem/patches/patch-aclocal_m4 Normal file
View File

@ -0,0 +1,25 @@
$OpenBSD: patch-aclocal_m4,v 1.1 2012/09/11 08:29:33 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- aclocal.m4.orig Tue Sep 11 10:21:04 2012
+++ aclocal.m4 Tue Sep 11 10:20:44 2012
@@ -2090,6 +2090,8 @@ fi
# Substitute ALL_LINGUAS so we can use it in po/Makefile
AC_SUBST(ALL_LINGUAS)
+AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
+
# Set DATADIRNAME correctly if it is not set yet
# (copied from glib-gettext.m4)
if test -z "$DATADIRNAME"; then
@@ -2107,6 +2109,9 @@ if test -z "$DATADIRNAME"; then
dnl in this case.
AC_CHECK_FUNC(bind_textdomain_codeset,
[DATADIRNAME=share], [DATADIRNAME=lib])
+ ;;
+ *-*-openbsd*)
+ [DATADIRNAME=share]
;;
*)
[DATADIRNAME=lib]