Explicitely patch for DATADIRNAME; the hack from the gnome MODULE will
be removed soon.
This commit is contained in:
parent
c6f1b901a0
commit
c0a045b049
16
net/telepathy/folks/patches/patch-configure
Normal file
16
net/telepathy/folks/patches/patch-configure
Normal file
@ -0,0 +1,16 @@
|
||||
$OpenBSD: patch-configure,v 1.1 2012/09/11 07:58:06 ajacoutot Exp $
|
||||
|
||||
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
|
||||
|
||||
--- configure.orig Tue Apr 17 13:47:28 2012
|
||||
+++ configure Tue Sep 11 09:19:38 2012
|
||||
@@ -14462,6 +14462,9 @@ else
|
||||
fi
|
||||
|
||||
;;
|
||||
+ *-*-openbsd*)
|
||||
+ DATADIRNAME=share
|
||||
+ ;;
|
||||
*)
|
||||
DATADIRNAME=lib
|
||||
;;
|
25
x11/gnome/anjuta/patches/patch-m4_intltool_m4
Normal file
25
x11/gnome/anjuta/patches/patch-m4_intltool_m4
Normal file
@ -0,0 +1,25 @@
|
||||
$OpenBSD: patch-m4_intltool_m4,v 1.1 2012/09/11 07:58:06 ajacoutot Exp $
|
||||
|
||||
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
|
||||
|
||||
--- m4/intltool.m4.orig Sat Jul 28 11:56:57 2012
|
||||
+++ m4/intltool.m4 Tue Sep 11 09:10:39 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]
|
73
x11/gnome/at-spi2-atk/patches/patch-aclocal_m4
Normal file
73
x11/gnome/at-spi2-atk/patches/patch-aclocal_m4
Normal file
@ -0,0 +1,73 @@
|
||||
$OpenBSD: patch-aclocal_m4,v 1.1 2012/09/11 07:58:06 ajacoutot Exp $
|
||||
|
||||
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
|
||||
|
||||
--- aclocal.m4.orig Tue Sep 11 09:54:29 2012
|
||||
+++ aclocal.m4 Tue Sep 11 09:55:36 2012
|
||||
@@ -216,31 +216,6 @@ fi
|
||||
# Substitute ALL_LINGUAS so we can use it in po/Makefile
|
||||
AC_SUBST(ALL_LINGUAS)
|
||||
|
||||
-# Set DATADIRNAME correctly if it is not set yet
|
||||
-# (copied from glib-gettext.m4)
|
||||
-if test -z "$DATADIRNAME"; then
|
||||
- AC_LINK_IFELSE(
|
||||
- [AC_LANG_PROGRAM([[]],
|
||||
- [[extern int _nl_msg_cat_cntr;
|
||||
- return _nl_msg_cat_cntr]])],
|
||||
- [DATADIRNAME=share],
|
||||
- [case $host in
|
||||
- *-*-solaris*)
|
||||
- dnl On Solaris, if bind_textdomain_codeset is in libc,
|
||||
- dnl GNU format message catalog is always supported,
|
||||
- dnl since both are added to the libc all together.
|
||||
- dnl Hence, we'd like to go with DATADIRNAME=share
|
||||
- dnl in this case.
|
||||
- AC_CHECK_FUNC(bind_textdomain_codeset,
|
||||
- [DATADIRNAME=share], [DATADIRNAME=lib])
|
||||
- ;;
|
||||
- *)
|
||||
- [DATADIRNAME=lib]
|
||||
- ;;
|
||||
- esac])
|
||||
-fi
|
||||
-AC_SUBST(DATADIRNAME)
|
||||
-
|
||||
IT_PO_SUBDIR([po])
|
||||
|
||||
])
|
||||
@@ -489,6 +464,34 @@ fi
|
||||
_LT_CHECK_OBJDIR
|
||||
|
||||
m4_require([_LT_TAG_COMPILER])dnl
|
||||
+
|
||||
+# Set DATADIRNAME correctly if it is not set yet
|
||||
+# (copied from glib-gettext.m4)
|
||||
+if test -z "$DATADIRNAME"; then
|
||||
+ AC_LINK_IFELSE(
|
||||
+ [AC_LANG_PROGRAM([[]],
|
||||
+ [[extern int _nl_msg_cat_cntr;
|
||||
+ return _nl_msg_cat_cntr]])],
|
||||
+ [DATADIRNAME=share],
|
||||
+ [case $host in
|
||||
+ *-*-solaris*)
|
||||
+ dnl On Solaris, if bind_textdomain_codeset is in libc,
|
||||
+ dnl GNU format message catalog is always supported,
|
||||
+ dnl since both are added to the libc all together.
|
||||
+ dnl Hence, we'd like to go with DATADIRNAME=share
|
||||
+ dnl in this case.
|
||||
+ AC_CHECK_FUNC(bind_textdomain_codeset,
|
||||
+ [DATADIRNAME=share], [DATADIRNAME=lib])
|
||||
+ ;;
|
||||
+ *-*-openbsd*)
|
||||
+ [DATADIRNAME=share]
|
||||
+ ;;
|
||||
+ *)
|
||||
+ [DATADIRNAME=lib]
|
||||
+ ;;
|
||||
+ esac])
|
||||
+fi
|
||||
+AC_SUBST(DATADIRNAME)
|
||||
|
||||
case $host_os in
|
||||
aix3*)
|
25
x11/gnome/controlcenter/patches/patch-m4_intltool_m4
Normal file
25
x11/gnome/controlcenter/patches/patch-m4_intltool_m4
Normal file
@ -0,0 +1,25 @@
|
||||
$OpenBSD: patch-m4_intltool_m4,v 1.1 2012/09/11 07:58:06 ajacoutot Exp $
|
||||
|
||||
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
|
||||
|
||||
--- m4/intltool.m4.orig Mon Apr 30 13:59:38 2012
|
||||
+++ m4/intltool.m4 Tue Sep 11 09:05:57 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]
|
16
x11/gnome/documents/patches/patch-configure
Normal file
16
x11/gnome/documents/patches/patch-configure
Normal file
@ -0,0 +1,16 @@
|
||||
$OpenBSD: patch-configure,v 1.1 2012/09/11 07:58:06 ajacoutot Exp $
|
||||
|
||||
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
|
||||
|
||||
--- configure.orig Mon May 14 21:27:56 2012
|
||||
+++ configure Tue Sep 11 09:32:12 2012
|
||||
@@ -4666,6 +4666,9 @@ else
|
||||
fi
|
||||
|
||||
;;
|
||||
+ *-*-openbsd*)
|
||||
+ DATADIRNAME=share
|
||||
+ ;;
|
||||
*)
|
||||
DATADIRNAME=lib
|
||||
;;
|
16
x11/gnome/glom/patches/patch-configure
Normal file
16
x11/gnome/glom/patches/patch-configure
Normal file
@ -0,0 +1,16 @@
|
||||
$OpenBSD: patch-configure,v 1.1 2012/09/11 07:58:06 ajacoutot Exp $
|
||||
|
||||
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
|
||||
|
||||
--- configure.orig Wed Apr 11 11:22:25 2012
|
||||
+++ configure Tue Sep 11 08:54:26 2012
|
||||
@@ -16425,6 +16425,9 @@ else
|
||||
fi
|
||||
|
||||
;;
|
||||
+ *-*-openbsd*)
|
||||
+ DATADIRNAME=share
|
||||
+ ;;
|
||||
*)
|
||||
DATADIRNAME=lib
|
||||
;;
|
Loading…
Reference in New Issue
Block a user