vorbis-tools-gettext.patch

   1 --- vorbis-tools-1.4.2/configure.ac.orig        2021-02-22 19:19:35.132876726 +0100
   2 +++ vorbis-tools-1.4.2/configure.ac     2021-02-22 19:20:30.112578875 +0100
   3 @@ -30,7 +30,7 @@
   4  AC_PROG_LIBTOOL
   5
   6  ALL_LINGUAS="be cs da en_GB eo es fr hr hu nl pl ro ru sk sv uk vi"
   7 -AM_GNU_GETTEXT
   8 +AM_GNU_GETTEXT([external])
   9
  10  dnl --------------------------------------------------
  11  dnl System checks
  12 @@ -129,9 +129,6 @@
  13  SHARE_LIBS='$(top_builddir)/share/libutf8.a $(top_builddir)/share/libgetopt.a'
  14  SHARE_CFLAGS='-I$(top_srcdir)/include'
  15
  16 -I18N_CFLAGS='-I$(top_srcdir)/intl'
  17 -I18N_LIBS=$INTLLIBS
  18 -
  19  SOCKET_LIBS=
  20  AC_CHECK_FUNC(socket, , [
  21  AC_CHECK_LIB(socket, socket, SOCKET_LIBS="-lsocket")
  22 @@ -341,15 +338,12 @@
  23  AC_SUBST(SHARE_LIBS)
  24  AC_SUBST(CURL_CFLAGS)
  25  AC_SUBST(CURL_LIBS)
  26 -AC_SUBST(I18N_CFLAGS)
  27 -AC_SUBST(I18N_LIBS)
  28
  29
  30  AC_CONFIG_FILES([
  31  Makefile
  32  m4/Makefile
  33  po/Makefile.in
  34 -intl/Makefile
  35  include/Makefile
  36  share/Makefile
  37  win32/Makefile
  38 --- vorbis-tools-1.4.2/ogg123/Makefile.am.orig  2021-01-03 22:35:16.000000000 +0100
  39 +++ vorbis-tools-1.4.2/ogg123/Makefile.am       2021-02-22 19:39:09.833179495 +0100
  40 @@ -31,12 +31,12 @@
  41  bin_PROGRAMS = ogg123
  42
  43  AM_CPPFLAGS = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @OPUSFILE_CFLAGS@ @AO_CFLAGS@ @CURL_CFLAGS@ \
  44 -              @PTHREAD_CFLAGS@ @SHARE_CFLAGS@ @I18N_CFLAGS@
  45 +              @PTHREAD_CFLAGS@ @SHARE_CFLAGS@
  46
  47  ogg123_LDADD = @SHARE_LIBS@ $(top_builddir)/share/libpicture.a $(top_builddir)/share/libbase64.a \
  48                @VORBISFILE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @AO_LIBS@ \
  49                 @SOCKET_LIBS@ @LIBICONV@ @CURL_LIBS@ @PTHREAD_CFLAGS@ \
  50 -               @PTHREAD_LIBS@ @I18N_LIBS@ @FLAC_LIBS@ @SPEEX_LIBS@ @OPUSFILE_LIBS@ \
  51 +               @PTHREAD_LIBS@ @INTLLIBS@ @FLAC_LIBS@ @SPEEX_LIBS@ @OPUSFILE_LIBS@ \
  52                -lm
  53
  54  ogg123_DEPENDENCIES = @SHARE_LIBS@ $(top_builddir)/share/libpicture.a $(top_builddir)/share/libbase64.a
  55 --- vorbis-tools-1.4.2/oggenc/Makefile.am.orig  2020-12-18 15:49:34.000000000 +0100
  56 +++ vorbis-tools-1.4.2/oggenc/Makefile.am       2021-02-22 20:52:03.496151995 +0100
  57 @@ -19,11 +19,11 @@
  58
  59  bin_PROGRAMS = oggenc
  60
  61 -AM_CPPFLAGS = @SHARE_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@ @KATE_CFLAGS@ @I18N_CFLAGS@
  62 +AM_CPPFLAGS = @SHARE_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@ @KATE_CFLAGS@
  63
  64  oggenc_LDADD = @SHARE_LIBS@ \
  65                @VORBISENC_LIBS@ @VORBIS_LIBS@ @KATE_LIBS@ @OGG_LIBS@ \
  66 -              @LIBICONV@ @I18N_LIBS@ @FLAC_LIBS@ -lm
  67 +              @LIBICONV@ @INTLLIBS@ @FLAC_LIBS@ -lm
  68
  69  oggenc_DEPENDENCIES = @SHARE_LIBS@
  70
  71 --- vorbis-tools-1.4.2/oggdec/Makefile.am.orig  2020-12-18 15:49:34.000000000 +0100
  72 +++ vorbis-tools-1.4.2/oggdec/Makefile.am       2021-02-22 20:56:42.011309816 +0100
  73 @@ -9,9 +9,9 @@
  74
  75  bin_PROGRAMS = oggdec
  76
  77 -AM_CPPFLAGS = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @SHARE_CFLAGS@ @I18N_CFLAGS@
  78 +AM_CPPFLAGS = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @SHARE_CFLAGS@
  79
  80 -oggdec_LDADD = @LIBICONV@ @SHARE_LIBS@ @VORBISFILE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @I18N_LIBS@
  81 +oggdec_LDADD = @LIBICONV@ @SHARE_LIBS@ @VORBISFILE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @INTLLIBS@
  82  oggdec_DEPENDENCIES = @SHARE_LIBS@
  83
  84  oggdec_SOURCES = $(oggdecsources)
  85 --- vorbis-tools-1.4.2/ogginfo/Makefile.am.orig 2021-01-08 11:26:00.000000000 +0100
  86 +++ vorbis-tools-1.4.2/ogginfo/Makefile.am      2021-02-22 20:59:48.440299843 +0100
  87 @@ -27,9 +27,9 @@
  88  mandir = @MANDIR@
  89  man_MANS = $(mans)
  90
  91 -AM_CPPFLAGS = @SHARE_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@ @KATE_CFLAGS@ @I18N_CFLAGS@
  92 +AM_CPPFLAGS = @SHARE_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@ @KATE_CFLAGS@
  93
  94 -ogginfo_LDADD = @SHARE_LIBS@ @VORBIS_LIBS@ @KATE_LIBS@ @OGG_LIBS@ @LIBICONV@ @I18N_LIBS@ \
  95 +ogginfo_LDADD = @SHARE_LIBS@ @VORBIS_LIBS@ @KATE_LIBS@ @OGG_LIBS@ @LIBICONV@ @INTLLIBS@ \
  96                 $(top_builddir)/share/libpicture.a $(top_builddir)/share/libbase64.a
  97  ogginfo_DEPENDENCIES = @SHARE_LIBS@ \
  98                        $(top_builddir)/share/libpicture.a $(top_builddir)/share/libbase64.a
  99 --- vorbis-tools-1.4.2/vcut/Makefile.am.orig    2020-12-18 15:49:34.000000000 +0100
 100 +++ vorbis-tools-1.4.2/vcut/Makefile.am 2021-02-22 21:02:54.509291821 +0100
 101 @@ -11,9 +11,9 @@
 102  mandir = @MANDIR@
 103  man_MANS = $(mans)
 104
 105 -AM_CPPFLAGS = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @SHARE_CFLAGS@ @I18N_CFLAGS@
 106 +AM_CPPFLAGS = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @SHARE_CFLAGS@
 107
 108 -vcut_LDADD = @VORBIS_LIBS@ @OGG_LIBS@ @I18N_LIBS@
 109 +vcut_LDADD = @VORBIS_LIBS@ @OGG_LIBS@ @INTLLIBS@
 110
 111  vcut_SOURCES = $(vcutsources)
 112  EXTRA_vcut_SOURCES = $(man_MANS)
 113 --- vorbis-tools-1.4.2/vorbiscomment/Makefile.am.orig   2020-12-18 15:49:34.000000000 +0100
 114 +++ vorbis-tools-1.4.2/vorbiscomment/Makefile.am        2021-02-22 21:04:13.268865144 +0100
 115 @@ -11,9 +11,9 @@
 116  mandir = @MANDIR@
 117  man_MANS = $(mans)
 118
 119 -AM_CPPFLAGS = @SHARE_CFLAGS@ @I18N_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@
 120 +AM_CPPFLAGS = @SHARE_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@
 121
 122 -vorbiscomment_LDADD = @SHARE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @LIBICONV@ @I18N_LIBS@
 123 +vorbiscomment_LDADD = @SHARE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @LIBICONV@ @INTLLIBS@
 124  vorbiscomment_DEPENDENCIES = @SHARE_LIBS@
 125
 126  vorbiscomment_SOURCES = $(vorbiscommentsources)