| 1 |
eva 08/06/01 21:21:48 |
| 2 |
|
| 3 |
Modified: beast-0.7.1-noinstalltest.patch |
| 4 |
Added: beast-0.7.1-configure.patch beast-0.7.1-glib.patch |
| 5 |
Log: |
| 6 |
Fix compilation with newer glib, bug #223291. |
| 7 |
(Portage version: 2.1.5.2) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 media-sound/beast/files/beast-0.7.1-noinstalltest.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/beast/files/beast-0.7.1-noinstalltest.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/beast/files/beast-0.7.1-noinstalltest.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/beast/files/beast-0.7.1-noinstalltest.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: beast-0.7.1-noinstalltest.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/beast/files/beast-0.7.1-noinstalltest.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- beast-0.7.1-noinstalltest.patch 26 Mar 2007 21:40:54 -0000 1.1 |
| 23 |
+++ beast-0.7.1-noinstalltest.patch 1 Jun 2008 21:21:48 -0000 1.2 |
| 24 |
@@ -14,3 +14,19 @@ |
| 25 |
done |
| 26 |
# Tell versions [3.59,3.63) of GNU make to not export all variables. |
| 27 |
# Otherwise a system limit (for SysV at least) may be exceeded. |
| 28 |
+Index: beast-0.7.1/shell/Makefile.am |
| 29 |
+=================================================================== |
| 30 |
+--- beast-0.7.1.orig/shell/Makefile.am |
| 31 |
++++ beast-0.7.1/shell/Makefile.am |
| 32 |
+@@ -859,10 +859,7 @@ check-before: check-installation |
| 33 |
+ check-installation: |
| 34 |
+ @for p in $(bin_PROGRAMS) ; do \ |
| 35 |
+ pp="$(DESTDIR)$(bindir)/$$p" ; \ |
| 36 |
+- echo "TEST: test -x \"$$pp\"" ; \ |
| 37 |
+- test -x "$$pp" || \ |
| 38 |
+- { echo "Failed to verify installation of executable: $$pp"; \ |
| 39 |
+- exit 1 ; } \ |
| 40 |
++ echo "TEST: test -x \"$$pp\" Test disabled" ; \ |
| 41 |
+ done |
| 42 |
+ # Tell versions [3.59,3.63) of GNU make to not export all variables. |
| 43 |
+ # Otherwise a system limit (for SysV at least) may be exceeded. |
| 44 |
|
| 45 |
|
| 46 |
|
| 47 |
1.1 media-sound/beast/files/beast-0.7.1-configure.patch |
| 48 |
|
| 49 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/beast/files/beast-0.7.1-configure.patch?rev=1.1&view=markup |
| 50 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/beast/files/beast-0.7.1-configure.patch?rev=1.1&content-type=text/plain |
| 51 |
|
| 52 |
Index: beast-0.7.1-configure.patch |
| 53 |
=================================================================== |
| 54 |
--- a/configure.in 2008-06-01 15:19:46.000000000 +0200 |
| 55 |
+++ b/configure.in 2008-06-01 15:27:45.000000000 +0200 |
| 56 |
@@ -159,39 +159,33 @@ |
| 57 |
dnl # Define package requirements. |
| 58 |
dnl # |
| 59 |
dnl ## include acintltool.m4 to provide IT_PROG_INTLTOOL |
| 60 |
-builtin(include, acintltool.m4)dnl |
| 61 |
-AC_DEFUN([AC_I18N_REQUIREMENTS], |
| 62 |
-[ |
| 63 |
- ALL_LINGUAS=`cat "$srcdir/po/LINGUAS" | grep -v '^#' | xargs echo -n ` |
| 64 |
- AC_SUBST(ALL_LINGUAS) |
| 65 |
- AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/po/LINGUAS']) |
| 66 |
- |
| 67 |
- dnl # versioned BEAST gettext domain (po/) |
| 68 |
- BST_GETTEXT_DOMAIN=beast-v$BIN_VERSION # version without -rcZ |
| 69 |
- AC_SUBST(BST_GETTEXT_DOMAIN) |
| 70 |
- AC_DEFINE_UNQUOTED(BST_GETTEXT_DOMAIN, "$BST_GETTEXT_DOMAIN", [Versioned BEAST gettext domain]) |
| 71 |
- GETTEXT_PACKAGE=$BST_GETTEXT_DOMAIN |
| 72 |
- AC_SUBST(GETTEXT_PACKAGE) |
| 73 |
- |
| 74 |
- dnl # locale directory for all domains |
| 75 |
- dnl # (AM_GLIB_DEFINE_LOCALEDIR() could do this if it would do AC_SUBST()) |
| 76 |
- saved_prefix="$prefix" |
| 77 |
- saved_exec_prefix="$exec_prefix" |
| 78 |
- test "x$prefix" = xNONE && prefix=$ac_default_prefix |
| 79 |
- test "x$exec_prefix" = xNONE && exec_prefix=$prefix |
| 80 |
- if test "x$CATOBJEXT" = "x.mo" ; then |
| 81 |
- beastlocaledir=`eval echo "${libdir}/locale"` |
| 82 |
- else |
| 83 |
- beastlocaledir=`eval echo "${datadir}/locale"` |
| 84 |
- fi |
| 85 |
- exec_prefix="$saved_exec_prefix" |
| 86 |
- prefix="$saved_prefix" |
| 87 |
- AC_SUBST(beastlocaledir) |
| 88 |
- |
| 89 |
- dnl # do gettext checks and prepare for intltool |
| 90 |
- AM_GLIB_GNU_GETTEXT |
| 91 |
- IT_PROG_INTLTOOL |
| 92 |
-]) |
| 93 |
+IT_PROG_INTLTOOL([0.35.0]) |
| 94 |
+ |
| 95 |
+dnl # versioned BEAST gettext domain (po/) |
| 96 |
+BST_GETTEXT_DOMAIN=beast-v$BIN_VERSION # version without -rcZ |
| 97 |
+AC_SUBST(BST_GETTEXT_DOMAIN) |
| 98 |
+AC_DEFINE_UNQUOTED(BST_GETTEXT_DOMAIN, "$BST_GETTEXT_DOMAIN", [Versioned BEAST gettext domain]) |
| 99 |
+GETTEXT_PACKAGE=$BST_GETTEXT_DOMAIN |
| 100 |
+AC_SUBST(GETTEXT_PACKAGE) |
| 101 |
+ |
| 102 |
+dnl # locale directory for all domains |
| 103 |
+dnl # (AM_GLIB_DEFINE_LOCALEDIR() could do this if it would do AC_SUBST()) |
| 104 |
+saved_prefix="$prefix" |
| 105 |
+saved_exec_prefix="$exec_prefix" |
| 106 |
+test "x$prefix" = xNONE && prefix=$ac_default_prefix |
| 107 |
+test "x$exec_prefix" = xNONE && exec_prefix=$prefix |
| 108 |
+if test "x$CATOBJEXT" = "x.mo" ; then |
| 109 |
+ beastlocaledir=`eval echo "${libdir}/locale"` |
| 110 |
+else |
| 111 |
+ beastlocaledir=`eval echo "${datadir}/locale"` |
| 112 |
+fi |
| 113 |
+exec_prefix="$saved_exec_prefix" |
| 114 |
+prefix="$saved_prefix" |
| 115 |
+AC_SUBST(beastlocaledir) |
| 116 |
+ |
| 117 |
+dnl # do gettext checks and prepare for intltool |
| 118 |
+AM_GLIB_GNU_GETTEXT |
| 119 |
+ |
| 120 |
AC_DEFUN([AC_SFI_REQUIREMENTS], |
| 121 |
[ |
| 122 |
dnl # check for GLib libs, libbirnet already provides gthread-2.0 and glib-2.0 |
| 123 |
@@ -570,7 +564,6 @@ |
| 124 |
AC_BIRNET_REQUIREMENTS |
| 125 |
|
| 126 |
# Check requirement sets |
| 127 |
-AC_I18N_REQUIREMENTS |
| 128 |
AC_SFI_REQUIREMENTS |
| 129 |
AC_BSE_REQUIREMENTS |
| 130 |
AC_BSESCM_REQUIREMENTS |
| 131 |
|
| 132 |
|
| 133 |
|
| 134 |
1.1 media-sound/beast/files/beast-0.7.1-glib.patch |
| 135 |
|
| 136 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/beast/files/beast-0.7.1-glib.patch?rev=1.1&view=markup |
| 137 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/beast/files/beast-0.7.1-glib.patch?rev=1.1&content-type=text/plain |
| 138 |
|
| 139 |
Index: beast-0.7.1-glib.patch |
| 140 |
=================================================================== |
| 141 |
--- beast-0.7.1.orig/bse/Makefile.am 2008-06-01 13:12:28.116708321 +0200 |
| 142 |
+++ beast-0.7.1/bse/Makefile.am 2008-06-01 13:12:40.000000000 +0200 |
| 143 |
@@ -10,7 +10,7 @@ |
| 144 |
# need -I$(top_builddir) for <sfi/sficonfig.h> |
| 145 |
# need -I$(srcdir) for "bseserver.h" in .genprc.c |
| 146 |
# need -I. (builddir) for "bsecore.genidl.hh" in bsecore.cc |
| 147 |
-INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. $(BSE_CFLAGS) -DG_DISABLE_DEPRECATED -DG_DISABLE_CONST_RETURNS |
| 148 |
+INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. $(BSE_CFLAGS) -DG_DISABLE_CONST_RETURNS |
| 149 |
DEFS += $(strip \ |
| 150 |
$(patsubst %, -DG_LOG_DOMAIN=\"BSE\" -DBSE_COMPILATION, \ |
| 151 |
$(filter $(<F), $(bse_sources) $(bse_sources))) \ |
| 152 |
--- beast-0.7.1.orig/bse/zintern/Makefile.am 2008-06-01 13:14:25.880028999 +0200 |
| 153 |
+++ beast-0.7.1/bse/zintern/Makefile.am 2008-06-01 13:14:38.000000000 +0200 |
| 154 |
@@ -4,7 +4,7 @@ |
| 155 |
## GNU Lesser General Public License version 2 or any later version. |
| 156 |
include $(top_srcdir)/Makefile.decl |
| 157 |
|
| 158 |
-INCLUDES += -I$(top_srcdir) -I$(top_builddir) $(BSE_CFLAGS) -DG_DISABLE_DEPRECATED -DG_DISABLE_CONST_RETURNS |
| 159 |
+INCLUDES += -I$(top_srcdir) -I$(top_builddir) $(BSE_CFLAGS) -DG_DISABLE_CONST_RETURNS |
| 160 |
|
| 161 |
ZFILE_DEFS = $(strip \ |
| 162 |
wave-mono $(srcdir)/wave-mono.bse \ |
| 163 |
|
| 164 |
|
| 165 |
|
| 166 |
-- |
| 167 |
gentoo-commits@l.g.o mailing list |
Archives