Attachment #36399 for bug #58375

View | Details | Raw Unified | Return to bug 58375
Collapse All | Expand All

Lines 22-32 Link Here

(-)xcdroast.patched/Makefile (-1 / +4 lines)
22	USE_X_PREFIX= yes	22	USE_X_PREFIX= yes
23	USE_GNOME= gdkpixbuf	23	USE_GNOME= gdkpixbuf
24	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
		25	USE_AUTOCONF_VER= 253
25		26
26	CONFIGURE_ENV+= GTK_CONFIG="${GTK_CONFIG}" \	27	CONFIGURE_ENV+= GTK_CONFIG="${GTK_CONFIG}" \
27	GLIB_CONFIG="${GLIB_CONFIG}"	28	GLIB_CONFIG="${GLIB_CONFIG}"
28		29
29	CONFIGURE_ARGS= --with-cdrtools-prefix=${LOCALBASE}	30	CONFIGURE_ARGS= --with-cdrtools-prefix=${LOCALBASE} \
		31	--with-libintl-prefix=${LOCALBASE} \
		32	--with-libiconv-prefix=${LOCALBASE}
30		33
31	MAN1= xcdroast.1	34	MAN1= xcdroast.1
32		35




--- 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

Lines 1-5 Link Here

(-)xcdroast.patched/pkg-plist (-2 lines)
1	bin/xcdroast	1	bin/xcdroast
2	lib/charset.alias
3	lib/xcdroast-0.98/bin/cddbtool	2	lib/xcdroast-0.98/bin/cddbtool
4	lib/xcdroast-0.98/bin/rmtool	3	lib/xcdroast-0.98/bin/rmtool
5	lib/xcdroast-0.98/bin/vrfytool	4	lib/xcdroast-0.98/bin/vrfytool
Lines 32-38 Link Here
32	share/locale/id/LC_MESSAGES/xcdroast.mo	31	share/locale/id/LC_MESSAGES/xcdroast.mo
33	share/locale/it/LC_MESSAGES/xcdroast.mo	32	share/locale/it/LC_MESSAGES/xcdroast.mo
34	share/locale/ja/LC_MESSAGES/xcdroast.mo	33	share/locale/ja/LC_MESSAGES/xcdroast.mo
35	share/locale/locale.alias
36	share/locale/nl/LC_MESSAGES/xcdroast.mo	34	share/locale/nl/LC_MESSAGES/xcdroast.mo
37	share/locale/no/LC_MESSAGES/xcdroast.mo	35	share/locale/no/LC_MESSAGES/xcdroast.mo
38	share/locale/pl/LC_MESSAGES/xcdroast.mo	36	share/locale/pl/LC_MESSAGES/xcdroast.mo

Return to bug 58375

Line 0 Link Here

(-)xcdroast.patched/files/patch-aclocal.m4 (+43 lines)
	1	--- aclocal.m4.orig Wed Jul 17 20:48:30 2002
	2	+++ aclocal.m4 Thu Jul 18 16:38:49 2002
	3	@@ -545,7 +545,7 @@
	4	rm -f conf.gdk_pixbuftest
	5	])
	6
	7	-# gettext.m4 serial 13 (gettext-0.11.1)
	8	+# gettext.m4 serial 14 (gettext-0.11.2)
	9	dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
	10	dnl This file is free software, distributed under the terms of the GNU
	11	dnl General Public License. As a special exception to the GNU General
	12	@@ -689,14 +689,13 @@
	13	dnl Now see whether libintl exists and does not depend on libiconv.
	14	AC_TRY_LINK([#include <libintl.h>
	15	extern int _nl_msg_cat_cntr;
	16	-extern int *_nl_domain_bindings;
	17	extern
	18	#ifdef __cplusplus
	19	"C"
	20	#endif
	21	const char *_nl_expand_alias ();],
	22	[bindtextdomain ("", "");
	23	-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + _nl_domain_bindings + _nl_expand_alias (0)],
	24	+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
	25	gt_cv_func_gnugettext_libintl=yes,
	26	gt_cv_func_gnugettext_libintl=no)
	27	dnl Now see whether libintl exists and depends on libiconv.
	28	@@ -704,14 +703,13 @@
	29	LIBS="$LIBS $LIBICONV"
	30	AC_TRY_LINK([#include <libintl.h>
	31	extern int _nl_msg_cat_cntr;
	32	-extern int *_nl_domain_bindings;
	33	extern
	34	#ifdef __cplusplus
	35	"C"
	36	#endif
	37	const char *_nl_expand_alias ();],
	38	[bindtextdomain ("", "");
	39	-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + _nl_domain_bindings + _nl_expand_alias (0)],
	40	+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
	41	[LIBINTL="$LIBINTL $LIBICONV"
	42	LTLIBINTL="$LTLIBINTL $LTLIBICONV"
	43	gt_cv_func_gnugettext_libintl=yes