Attachment 36399 Details for Bug 58375 – file.diff

[patch] file.diff

file.diff (text/plain), 3.32 KB, created by Simon Barner on 2003-10-22 12:50:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Barner

Created: 2003-10-22 12:50:17 UTC

Size: 3.32 KB

patch

obsolete

>diff -ruN xcdroast/Makefile xcdroast.patched/Makefile
>--- xcdroast/Makefile	Wed Jun  4 16:56:12 2003
>+++ xcdroast.patched/Makefile	Wed Oct 22 13:31:28 2003
>@@ -22,11 +22,14 @@
> USE_X_PREFIX=	yes
> USE_GNOME=	gdkpixbuf
> GNU_CONFIGURE=	yes
>+USE_AUTOCONF_VER=	253
> 
> CONFIGURE_ENV+=	GTK_CONFIG="${GTK_CONFIG}" \
> 		GLIB_CONFIG="${GLIB_CONFIG}"
> 
>-CONFIGURE_ARGS=	--with-cdrtools-prefix=${LOCALBASE}
>+CONFIGURE_ARGS=	--with-cdrtools-prefix=${LOCALBASE} \
>+		--with-libintl-prefix=${LOCALBASE} \
>+		--with-libiconv-prefix=${LOCALBASE}
> 
> MAN1=		xcdroast.1
> 
>diff -ruN xcdroast/files/patch-aclocal.m4 xcdroast.patched/files/patch-aclocal.m4
>--- xcdroast/files/patch-aclocal.m4	Thu Jan  1 01:00:00 1970
>+++ xcdroast.patched/files/patch-aclocal.m4	Wed Oct 22 13:28:38 2003
>@@ -0,0 +1,43 @@
>+--- aclocal.m4.orig	Wed Jul 17 20:48:30 2002
>++++ aclocal.m4	Thu Jul 18 16:38:49 2002
>+@@ -545,7 +545,7 @@
>+   rm -f conf.gdk_pixbuftest
>+ ])
>+ 
>+-# gettext.m4 serial 13 (gettext-0.11.1)
>++# gettext.m4 serial 14 (gettext-0.11.2)
>+ dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
>+ dnl This file is free software, distributed under the terms of the GNU
>+ dnl General Public License.  As a special exception to the GNU General
>+@@ -689,14 +689,13 @@
>+             dnl Now see whether libintl exists and does not depend on libiconv.
>+             AC_TRY_LINK([#include <libintl.h>
>+ extern int _nl_msg_cat_cntr;
>+-extern int *_nl_domain_bindings;
>+ extern
>+ #ifdef __cplusplus
>+ "C"
>+ #endif
>+ const char *_nl_expand_alias ();],
>+               [bindtextdomain ("", "");
>+-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)],
>++return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
>+               gt_cv_func_gnugettext_libintl=yes,
>+               gt_cv_func_gnugettext_libintl=no)
>+             dnl Now see whether libintl exists and depends on libiconv.
>+@@ -704,14 +703,13 @@
>+               LIBS="$LIBS $LIBICONV"
>+               AC_TRY_LINK([#include <libintl.h>
>+ extern int _nl_msg_cat_cntr;
>+-extern int *_nl_domain_bindings;
>+ extern
>+ #ifdef __cplusplus
>+ "C"
>+ #endif
>+ const char *_nl_expand_alias ();],
>+                 [bindtextdomain ("", "");
>+-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)],
>++return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
>+                [LIBINTL="$LIBINTL $LIBICONV"
>+                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
>+                 gt_cv_func_gnugettext_libintl=yes
>diff -ruN xcdroast/pkg-plist xcdroast.patched/pkg-plist
>--- xcdroast/pkg-plist	Wed Jun  4 16:56:12 2003
>+++ xcdroast.patched/pkg-plist	Wed Oct 22 13:27:35 2003
>@@ -1,5 +1,4 @@
> bin/xcdroast
>-lib/charset.alias
> lib/xcdroast-0.98/bin/cddbtool
> lib/xcdroast-0.98/bin/rmtool
> lib/xcdroast-0.98/bin/vrfytool
>@@ -32,7 +31,6 @@
> share/locale/id/LC_MESSAGES/xcdroast.mo
> share/locale/it/LC_MESSAGES/xcdroast.mo
> share/locale/ja/LC_MESSAGES/xcdroast.mo
>-share/locale/locale.alias
> share/locale/nl/LC_MESSAGES/xcdroast.mo
> share/locale/no/LC_MESSAGES/xcdroast.mo
> share/locale/pl/LC_MESSAGES/xcdroast.mo

Actions: View | Diff

Attachments on bug 58375: 36399