From cdb747b791914a30c287a3a8e33d1b635e431707 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 Jul 2022 03:08:54 +0100 Subject: gentoo auto-resync : 30:07:2022 - 03:08:54 --- .../tagtool/files/tagtool-0.12.3-QA-desktop.patch | 10 +++ .../tagtool/files/tagtool-0.12.3-autotools.patch | 88 ++++++++++++++++++++++ .../files/tagtool-0.12.3-underlinking.patch | 80 -------------------- 3 files changed, 98 insertions(+), 80 deletions(-) create mode 100644 media-sound/tagtool/files/tagtool-0.12.3-QA-desktop.patch create mode 100644 media-sound/tagtool/files/tagtool-0.12.3-autotools.patch delete mode 100644 media-sound/tagtool/files/tagtool-0.12.3-underlinking.patch (limited to 'media-sound/tagtool/files') diff --git a/media-sound/tagtool/files/tagtool-0.12.3-QA-desktop.patch b/media-sound/tagtool/files/tagtool-0.12.3-QA-desktop.patch new file mode 100644 index 000000000000..50c290d0ee15 --- /dev/null +++ b/media-sound/tagtool/files/tagtool-0.12.3-QA-desktop.patch @@ -0,0 +1,10 @@ +--- a/data/tagtool.desktop.in ++++ b/data/tagtool.desktop.in +@@ -3,6 +3,6 @@ + _Comment=MP3 and Ogg Vorbis tag editor + Exec=tagtool + Icon=TagTool +-Terminal=False ++Terminal=false + Type=Application + Categories=Audio;AudioVideo;AudioVideoEditing; diff --git a/media-sound/tagtool/files/tagtool-0.12.3-autotools.patch b/media-sound/tagtool/files/tagtool-0.12.3-autotools.patch new file mode 100644 index 000000000000..40d1f5e80441 --- /dev/null +++ b/media-sound/tagtool/files/tagtool-0.12.3-autotools.patch @@ -0,0 +1,88 @@ +* Fix underlinking issues caused by missing libm and libogg linking + https://bugs.gentoo.org/513012 +* Fix spurious test failure caused by incomplete POTFILES.in + https://bugs.gentoo.org/631236 +* In addition, fix nonidiomatic AC_ARG_ENABLE option handling. + +--- a/configure.ac ++++ b/configure.ac +@@ -13,20 +13,16 @@ + + + dnl Command line options +-AC_ARG_ENABLE(mp3, +- AC_HELP_STRING([--disable-mp3], [Disable MP3 support (if enabled, id3lib is required)]), +- [enable_mp3=no; disable_mp3_reason="(disabled)"], +- [enable_mp3=yes]) +- +-AC_ARG_ENABLE(vorbis, +- AC_HELP_STRING([--disable-vorbis], [Disable Ogg Vorbis support (if enabled, libvorbis is required)]), +- [enable_vorbis=no; disable_vorbis_reason="(disabled)"], +- [enable_vorbis=yes]) ++AC_ARG_ENABLE([mp3], ++ AS_HELP_STRING([--disable-mp3], [Disable MP3 support (if enabled, id3lib is required)])) + +-if test "$enable_mp3" = "no" && test "$enable_vorbis" = "no"; then +- AC_MSG_ERROR([At least one of 'mp3' or 'vorbis' must be enabled. Try './configure --help' for a list of options.]) +-fi; ++AC_ARG_ENABLE([vorbis], ++ AS_HELP_STRING([--disable-vorbis], [Disable Ogg Vorbis support (if enabled, libvorbis is required)])) + ++dnl Test for no flags being enabled ++AS_IF([test "x$enable_mp3" != "xyes" && test "x$enable_vorbis" != "xyes" ], [ ++ AC_MSG_ERROR([At least one of 'mp3' or 'vorbis' must be enabled. Try './configure --help' for a list of options.]) ++]) + + dnl Checks for programs. + AC_PROG_CC +@@ -50,6 +46,12 @@ + fi; + + ++dnl Check for libm for ceil() ++AC_SEARCH_LIBS([ceil], [m], [], [ ++ AC_MSG_ERROR([unable to find the ceil() function]) ++]) ++ ++ + dnl Check for gtk and related libraries + PKG_CHECK_MODULES(GTK, [glib-2.0 >= 2.12.0 + gtk+-2.0 >= 2.8.0 +@@ -91,6 +93,9 @@ + AC_CHECK_LIB(vorbisfile, main,, + [enable_vorbis=no; disable_vorbis_reason="(missing vorbisfile library)"]) + fi; ++if test "$enable_vorbis" = "yes"; then ++ PKG_CHECK_MODULES([OGG], [ogg]) ++fi; + + AM_CONDITIONAL(ENABLE_MP3, test "$enable_mp3" = "yes") + AM_CONDITIONAL(ENABLE_VORBIS, test "$enable_vorbis" = "yes") +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -22,3 +22,4 @@ + src/vorbis_edit.c + src/vorbis_edit_field.c + src/vorbis_file.c ++src/vcedit.c +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -28,7 +28,8 @@ + vorbis_sources = vorbis_file.c vorbis_file.h vorbis_edit.c \ + vorbis_edit.h vorbis_edit_field.c vorbis_edit_field.h vcedit.c \ + vcedit.h +-vorbis_cflags = -DENABLE_VORBIS ++vorbis_cflags = $(OGG_CFLAGS) -DENABLE_VORBIS ++vorbis_libs = $(OGG_LIBS) + else + vorbis_sources = + vorbis_cflags = +@@ -39,7 +40,7 @@ + ${vorbis_cflags} -DDATADIR='"$(datadir)/${PACKAGE_NAME}"' + + tagtool_LDFLAGS = -export-dynamic +-tagtool_LDADD = $(GTK_LIBS) ++tagtool_LDADD = $(GTK_LIBS) ${vorbis_libs} + + tagtool_SOURCES = file_list.c file_list.h file_util.c file_util.h \ + edit_tab.c edit_tab.h elist.c elist.h main.c math_util.c \ diff --git a/media-sound/tagtool/files/tagtool-0.12.3-underlinking.patch b/media-sound/tagtool/files/tagtool-0.12.3-underlinking.patch deleted file mode 100644 index 9569ad2fbaf5..000000000000 --- a/media-sound/tagtool/files/tagtool-0.12.3-underlinking.patch +++ /dev/null @@ -1,80 +0,0 @@ -Fix underlinking issues caused by missing libm and libogg linking -Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=513012 - -In addition, fix nonidiomatic AC_ARG_ENABLE option handling. - ---- tagtool-0.12.3/configure.ac -+++ tagtool-0.12.3/configure.ac -@@ -13,20 +13,16 @@ - - - dnl Command line options --AC_ARG_ENABLE(mp3, -- AC_HELP_STRING([--disable-mp3], [Disable MP3 support (if enabled, id3lib is required)]), -- [enable_mp3=no; disable_mp3_reason="(disabled)"], -- [enable_mp3=yes]) -- --AC_ARG_ENABLE(vorbis, -- AC_HELP_STRING([--disable-vorbis], [Disable Ogg Vorbis support (if enabled, libvorbis is required)]), -- [enable_vorbis=no; disable_vorbis_reason="(disabled)"], -- [enable_vorbis=yes]) -+AC_ARG_ENABLE([mp3], -+ AS_HELP_STRING([--disable-mp3], [Disable MP3 support (if enabled, id3lib is required)])) - --if test "$enable_mp3" = "no" && test "$enable_vorbis" = "no"; then -- AC_MSG_ERROR([At least one of 'mp3' or 'vorbis' must be enabled. Try './configure --help' for a list of options.]) --fi; -+AC_ARG_ENABLE([vorbis], -+ AS_HELP_STRING([--disable-vorbis], [Disable Ogg Vorbis support (if enabled, libvorbis is required)])) - -+dnl Test for no flags being enabled -+AS_IF([test "x$enable_mp3" != "xyes" && test "x$enable_vorbis" != "xyes" ], [ -+ AC_MSG_ERROR([At least one of 'mp3' or 'vorbis' must be enabled. Try './configure --help' for a list of options.]) -+]) - - dnl Checks for programs. - AC_PROG_CC -@@ -50,6 +46,12 @@ - fi; - - -+dnl Check for libm for ceil() -+AC_SEARCH_LIBS([ceil], [m], [], [ -+ AC_MSG_ERROR([unable to find the ceil() function]) -+]) -+ -+ - dnl Check for gtk and related libraries - PKG_CHECK_MODULES(GTK, [glib-2.0 >= 2.12.0 - gtk+-2.0 >= 2.8.0 -@@ -91,6 +93,9 @@ - AC_CHECK_LIB(vorbisfile, main,, - [enable_vorbis=no; disable_vorbis_reason="(missing vorbisfile library)"]) - fi; -+if test "$enable_vorbis" = "yes"; then -+ PKG_CHECK_MODULES([OGG], [ogg]) -+fi; - - AM_CONDITIONAL(ENABLE_MP3, test "$enable_mp3" = "yes") - AM_CONDITIONAL(ENABLE_VORBIS, test "$enable_vorbis" = "yes") ---- tagtool-0.12.3/src/Makefile.am -+++ tagtool-0.12.3/src/Makefile.am -@@ -28,7 +28,8 @@ - vorbis_sources = vorbis_file.c vorbis_file.h vorbis_edit.c \ - vorbis_edit.h vorbis_edit_field.c vorbis_edit_field.h vcedit.c \ - vcedit.h --vorbis_cflags = -DENABLE_VORBIS -+vorbis_cflags = $(OGG_CFLAGS) -DENABLE_VORBIS -+vorbis_libs = $(OGG_LIBS) - else - vorbis_sources = - vorbis_cflags = -@@ -39,7 +40,7 @@ - ${vorbis_cflags} -DDATADIR='"$(datadir)/${PACKAGE_NAME}"' - - tagtool_LDFLAGS = -export-dynamic --tagtool_LDADD = $(GTK_LIBS) -+tagtool_LDADD = $(GTK_LIBS) ${vorbis_libs} - - tagtool_SOURCES = file_list.c file_list.h file_util.c file_util.h \ - edit_tab.c edit_tab.h elist.c elist.h main.c math_util.c \ -- cgit v1.2.3