Fixed building on on BSD, bug 255840

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 79 insertions, 10 deletions

diff --git a/app-office/orage/ChangeLog b/app-office/orage/ChangeLog
index e44442ca7a98..f88b1bed26e9 100644
--- a/app-office/orage/ChangeLog
+++ b/app-office/orage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/orage
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/orage/ChangeLog,v 1.11 2008/12/22 17:08:57 angelos Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/orage/ChangeLog,v 1.12 2009/01/23 16:30:11 angelos Exp $
+
+  23 Jan 2009; Christoph Mende <angelos@gentoo.org>
+  +files/orage-4.5.14.0-bsd.patch, orage-4.5.14.0.ebuild:
+  Fixed building on on BSD, bug 255840
 
   22 Dec 2008; Christoph Mende <angelos@gentoo.org> -orage-4.4.2.ebuild:
   Removed old
diff --git a/app-office/orage/Manifest b/app-office/orage/Manifest
index 8de960a0cd85..3ced858c3ada 100644
--- a/app-office/orage/Manifest
+++ b/app-office/orage/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX orage-4.5.14.0-bsd.patch 2017 RMD160 1b84a4e4b0bab698d63b9f40d52a20211cd2a595 SHA1 5e723193de4e8f1aa7931fc1d7b8e7a63f877806 SHA256 2108f684cd29f79a93ff8fea4ef419535b472ed9ca10381bec497143831629ac
 DIST orage-4.4.3.tar.bz2 1579582 RMD160 ebe9377fd961ef83bf20ab2de82ff791fac3d1a2 SHA1 716cbe76e992a787c6acb2c6320293e0455b41d2 SHA256 20931ca6efbd362460f1f2a2b505e307bc0b95ffcf5962d3975381f76e41c1e8
 DIST orage-4.5.14.0.tar.bz2 1842455 RMD160 8a6ddc4255dc1850df8cea01595315bbcb4b41c8 SHA1 db25bfbce129632625b4bdfb8b45ccccd79a9f64 SHA256 d2ccfc4abf1bbfa7f67950d9431cb5569b602115baaa0e072d33ca45e9cece33
 EBUILD orage-4.4.3.ebuild 978 RMD160 d45df056558ad29ae3addad11a5983f3c110cbb3 SHA1 4a2cd720f60c1a43d3a71cc9ecd376d41b745af2 SHA256 caaa63e96102adc3fa656a2c0e8c4c821c833770009b8488b16ef4f6060561f8
-EBUILD orage-4.5.14.0.ebuild 1332 RMD160 080732717daf362f2438a7203e7260842918739f SHA1 f456642fe7b12f5394055762bf586f3a51dd7af9 SHA256 20d2f5b146b063bb2e0adcf1821db9a4bfbfcbf3384b52bc952f427a7cc76489
-MISC ChangeLog 6038 RMD160 12c665cabaf10b78592ef4f1778169a64d836133 SHA1 18ccdb665be3521280c46184a4ff44f700b7f5a0 SHA256 516535f7747a71d22e6c5c62e5e97416a02a8e1d911b845926b072cec546f42d
+EBUILD orage-4.5.14.0.ebuild 1418 RMD160 8273b31221611c5c739ee3845dd5235755414a6a SHA1 7ecd4bc21a5c236d6d28e814e52c7e1461ddebdf SHA256 a960e6cb2b4389ed946efe8925800ca1b0030152b0d643062a8a8a77d11b5686
+MISC ChangeLog 6188 RMD160 c8334ea97154479e58de1e22c7d1c3b499b76b48 SHA1 21cc91785237340ab6ecd2bbe69536e403aaab09 SHA256 1d2a6dbc252f4180f6829e9fcd981343f9f35ffc3e66553ed2dfc034c9334c4d
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklPya8ACgkQKhnDs22gwa9nrQCeK0bNzE8kKa7E8zYFEelT/xhy
-emgAoJZ0n+V6RvvPuyi6H2b5oeESjw19
-=8OVe
+iEYEARECAAYFAkl58JwACgkQKhnDs22gwa9U6ACfSb0PyoMlBNBt+Tbm0keGnhRn
+a3kAniaZ0T23CJ4Onra/18s5ZIZ1fI9e
+=L2v1
 -----END PGP SIGNATURE-----
diff --git a/app-office/orage/files/orage-4.5.14.0-bsd.patch b/app-office/orage/files/orage-4.5.14.0-bsd.patch
new file mode 100644
index 000000000000..0c9f2ff3105d
--- /dev/null
+++ b/app-office/orage/files/orage-4.5.14.0-bsd.patch
@@ -0,0 +1,58 @@
+diff -u -r a/configure.in b/configure.in
+--- a/configure.in	2009-01-23 17:22:08.468513692 +0100
++++ b/configure.in	2009-01-23 17:24:07.636680538 +0100
+@@ -172,6 +172,21 @@
+ esac
+ AC_SUBST([PTHREAD_LIBS])
+ 
++dnl **********************************
++dnl *** check if we have _NL_TIME_FIRST_WEEKDAY 
++dnl *** note that it is an enum and not a define
++dnl **********************************
++AC_MSG_CHECKING([for _NL_TIME_FIRST_WEEKDAY])
++AC_TRY_LINK([#include <langinfo.h>], [
++char c;
++c = *((unsigned char *)  nl_langinfo(_NL_TIME_FIRST_WEEKDAY));
++], nl_ok=yes, nl_ok=no)
++AC_MSG_RESULT($nl_ok)
++if test "$nl_ok" = "yes"; then
++  AC_DEFINE([HAVE__NL_TIME_FIRST_WEEKDAY], [1],
++      [Define if _NL_TIME_FIRST_WEEKDAY is available])
++fi
++
+ AM_CONDITIONAL([INCLUDED_LIBICAL], [test x"$ac_INCLUDED_LIBICAL" = x"yes"])
+ AM_CONDITIONAL([HAVE_PTHREAD], [test x"$have_pthread" = x"yes"])
+ AM_CONDITIONAL([WITH_BDB4], [test x"$WITH_BDB4" = x"yes"])
+diff -u -r a/src/parameters.c b/src/parameters.c
+--- a/src/parameters.c	2009-01-23 17:22:08.529511185 +0100
++++ b/src/parameters.c	2009-01-23 17:23:43.167509746 +0100
+@@ -30,7 +30,10 @@
+ 
+ #include <stdio.h>
+ #include <locale.h>
++
++#ifdef HAVE__NL_TIME_FIRST_WEEKDAY
+ #include <langinfo.h>
++#endif
+ 
+ #include <glib.h>
+ #include <glib/gprintf.h>
+@@ -129,6 +132,7 @@
+  *     to return 0..6 mon..sun, which is what libical uses */
+ int get_first_weekday_from_locale()
+ {
++#ifdef HAVE__NL_TIME_FIRST_WEEKDAY
+     union { unsigned int word; char *string; } langinfo;
+     int week_1stday = 0;
+     int first_weekday = 1;
+@@ -147,6 +151,10 @@
+         orage_message(150, "get_first_weekday: unknown value of _NL_TIME_WEEK_1STDAY.");
+ 
+     return((week_1stday + first_weekday - 2 + 7) % 7);
++#else
++    orage_message(150, "get_first_weekday: Can not find first weekday. Using default: Monday=0. If this is wrong guess. please set undocumented parameter: Ical week start day (Sunday=6)");
++    return(0);
++#endif
+ }
+ 
+ static void dialog_response(GtkWidget *dialog, gint response_id
diff --git a/app-office/orage/orage-4.5.14.0.ebuild b/app-office/orage/orage-4.5.14.0.ebuild
index a2cf6accb713..a8b5927cb30e 100644
--- a/app-office/orage/orage-4.5.14.0.ebuild
+++ b/app-office/orage/orage-4.5.14.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/orage/orage-4.5.14.0.ebuild,v 1.1 2008/09/19 16:07:18 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/orage/orage-4.5.14.0.ebuild,v 1.2 2009/01/23 16:30:11 angelos Exp $
 
-inherit gnome2-utils
+inherit eutils gnome2-utils
 
 DESCRIPTION="Calendar suite for Xfce4"
 HOMEPAGE="http://www.kolumbus.fi/~w408237/orage"
@@ -27,6 +27,12 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	sys-devel/gettext"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-bsd.patch
+}
+
 src_compile() {
 	econf $(use_enable dbus) \
 		$(use_enable debug) \