Fri Mar 21 14:38:01 2014 UTC ()
Various portability fixes for SunOS.
(jperkin)
diff -r1.3 -r1.4 pkgsrc/x11/deforaos-panel/distinfo
diff -r0 -r1.1 pkgsrc/x11/deforaos-panel/patches/patch-data_pkgconfig.sh
diff -r0 -r1.1 pkgsrc/x11/deforaos-panel/patches/patch-src_applets_main.c
diff -r0 -r1.1 pkgsrc/x11/deforaos-panel/patches/patch-src_applets_volume.c
--- pkgsrc/x11/deforaos-panel/distinfo 2013/06/15 12:47:46 1.3
+++ pkgsrc/x11/deforaos-panel/distinfo 2014/03/21 14:38:01 1.4
| @@ -1,7 +1,10 @@ | | | @@ -1,7 +1,10 @@ |
| 1 | $NetBSD: distinfo,v 1.3 2013/06/15 12:47:46 khorben Exp $ | | 1 | $NetBSD: distinfo,v 1.4 2014/03/21 14:38:01 jperkin Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (Panel-0.2.18.tar.gz) = 2920631f99b3c9f4d91de1765b2588dfbf0f6645 | | 3 | SHA1 (Panel-0.2.18.tar.gz) = 2920631f99b3c9f4d91de1765b2588dfbf0f6645 |
| 4 | RMD160 (Panel-0.2.18.tar.gz) = c8dae6a9cb028814a24b01a5fcf04b6b34f4c6c6 | | 4 | RMD160 (Panel-0.2.18.tar.gz) = c8dae6a9cb028814a24b01a5fcf04b6b34f4c6c6 |
| 5 | Size (Panel-0.2.18.tar.gz) = 111036 bytes | | 5 | Size (Panel-0.2.18.tar.gz) = 111036 bytes |
| | | 6 | SHA1 (patch-data_pkgconfig.sh) = a4fae097b46becc6d98fb6b42707188d8ed3e048 |
| | | 7 | SHA1 (patch-src_applets_main.c) = 239eebc72b7d113a72e42633e838c3294003e931 |
| 6 | SHA1 (patch-src_applets_memory.c) = bcc44e38c03fc60e6720e71d815178f7129fa798 | | 8 | SHA1 (patch-src_applets_memory.c) = bcc44e38c03fc60e6720e71d815178f7129fa798 |
| 7 | SHA1 (patch-src_applets_swap.c) = 75599dd9b7aed08895c542376d2a6b7883a91f7f | | 9 | SHA1 (patch-src_applets_swap.c) = 75599dd9b7aed08895c542376d2a6b7883a91f7f |
| | | 10 | SHA1 (patch-src_applets_volume.c) = 10a4dfe01b6576a7f39a344ddd669725666d72a7 |
$NetBSD: patch-data_pkgconfig.sh,v 1.1 2014/03/21 14:38:01 jperkin Exp $
Use correct rpath flag on SunOS.
--- data/pkgconfig.sh.orig 2013-02-04 22:23:50.000000000 +0000
+++ data/pkgconfig.sh
@@ -114,6 +114,9 @@ while [ $# -gt 0 ]; do
Darwin)
RPATH="-Wl,-rpath,\${libdir}"
;;
+ SunOS)
+ RPATH="-Wl,-R\${libdir}"
+ ;;
esac
fi
$NetBSD: patch-src_applets_main.c,v 1.1 2014/03/21 14:38:01 jperkin Exp $
Need sys/fcntl.h for O_RDONLY on SunOS.
--- src/applets/main.c.orig 2013-06-01 23:34:31.000000000 +0000
+++ src/applets/main.c
@@ -23,6 +23,9 @@
#include <errno.h>
#include <libintl.h>
#include <System.h>
+#ifdef __sun
+#include <sys/fcntl.h>
+#endif
#include "Panel.h"
#include "../../config.h"
#define _(string) gettext(string)
$NetBSD: patch-src_applets_volume.c,v 1.1 2014/03/21 14:38:01 jperkin Exp $
Fix SunOS includes.
--- src/applets/volume.c.orig 2013-02-04 22:23:50.000000000 +0000
+++ src/applets/volume.c
@@ -19,7 +19,7 @@
#include <sys/ioctl.h>
-#if defined(__NetBSD__) || defined(__sun__)
+#if defined(__NetBSD__)
# include <sys/audioio.h>
#elif defined(__linux__)
# include <alsa/asoundlib.h>