mirror of
https://github.com/gryf/gryf-overlay.git
synced 2025-12-25 07:32:30 +01:00
Fixes for the easytag compilation issues.
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
AUX easytag-2.1.8-desktop.patch 476 BLAKE2B f66ffc053de79bad4e9e61a60fcd4d0afe79470ce915ca29a46740f6b85e6e3785249a5ce76ee4322f41625d4042ffba761e8c2db192dcaeb71053ab04d091a6 SHA512 82bdc8af5958150037e344f90c06384dfca0597e044a7ad24cf8138fde8212af0d4b2448a1f10f7c78a4bf2324fb5618110763c7ad632578744edd7410129f08
|
||||
AUX easytag-2.1.8-docs.patch 270 BLAKE2B 5f8eb00d9ce7c0b97fe523035de4f8535ba4b4f1e37cc24dd546464253430d3cd14cc56e4b54432528f94c6020ed49126635acb2a11f2fb6bb83ac90f2fad928 SHA512 282f0eda4ea992833c8869040b914505bf079408739727e148f32e800f9b95b412d034f92462030760aaa30224f3241f549eefb6bb6ac07038b089f4974e9bb5
|
||||
AUX easytag-2.1.8-iso-c90.patch 1404 BLAKE2B 6f14bde0f2ac120c8e816e66cdf8281ac379a506df13237690140aac82db5cf25dda2410b167ace2e42e0d590be1793029505e319e63643fe97f3f05745b2456 SHA512 5a0945f029ac1cd10e365531cb7a4c251f6b4dc898a16d3655c0d0a5e8e5e02291ab36ef27a98c882c4269f5e7e5d85caff3c20b79148ce5b62507c6a7f73a08
|
||||
AUX easytag-2.1.8-taglib.patch 398 BLAKE2B 1019cd65b2814ebfa069cbec329e9a389a43d4d5c816b4eeddf4634afeeebbf725c1584cf0887dab7b4092c625e150b2b592ce00fff9d7b20d96ee113bb3fb25 SHA512 eb9c80664c61cf4974b198c4800ffbf5252c5765c1b7069bf442408c89522c86fc272df22d2ac0b1758e0070b4bb2fd1fa9cee8374445d2db34ef37d08386ec2
|
||||
AUX easytag-2.1.8-werror.patch 547 BLAKE2B 5b3a07bae07084ba9e73660052cb78332d8230a273ec2e1fde01278a08ff777b67fc4561431731870fd8c2f0ccb8b197ce0b56b9d8bce1348aa8c023d80152c7 SHA512 0367944be501f741e75c61872840282fddbd2503b3bc25f5d5f392a9cb05fa451623acc157dad2f3b415af0f6c396aab23f4927306c15fea5f1b10435a200e2c
|
||||
AUX easytag-2.1.8-001-format-overflow.patch 537 BLAKE2B b867ced806a1a4e9e6abdc86058add21dad4bd76ce1532c0b8ab7ab8e4615be42cff6d88d789e9b71d5c6494fb809b9b66d4591ba6ae7f1793093fca51782f69 SHA512 1e4bef98318513269c49ac4a69ba75a87c1fd5e5d5b034b4c747ff8c0aa3ef3b1bda6c7892468c7d2321b21d938181f0606cacfe0efd51f3fbbec49baf6b273d
|
||||
AUX easytag-2.1.8-002-declaration-after-statement.patch 971 BLAKE2B 303e5593a428d768701d1bfbbc0ddc11b6f05c58c297dc6c361b2bd89a7fac5d3968470f99bee83e18ba550686ff2cb2311373c9274e4079abeb1bbd785eb3ee SHA512 fe29fe6376b276c63b50c0f9790ca4f262d308e5dac1698278ed21647a21287b2eb389d40b3834e3bedacba678737180c0654d289ca14c2ec6084e6427e4d3ff
|
||||
AUX easytag-2.1.8-003-desktop.patch 603 BLAKE2B c91549d57a3e55e39d762b0d5cdc0cd4f9fe682d7c3536eaf8e4426f40d9a21dc975aec8a9980a9576c357f4426eeb1057593d5a7a2df3e7bc05c37c9b40ac9e SHA512 a57e9d8e532f1fadf9244d5614dce0e3165a2ea45606ae9d1d54a8607f3b83e7a9a724de0fb52ca269dfa0540dbb336ab13df04cfa4cd43a0b1183a98ba4f35b
|
||||
AUX easytag-2.1.8-004-docs.patch 383 BLAKE2B 97eb7b8a8b35c3f34a6a077b38d06229377e98e27315f94a421fa802fdf14a182768c287c9ea850ee890fcf47e31004496ec230e40a3957f529f063e5b875f3f SHA512 1ac1f620da9ca4f579752805346b940d54d928485929429c4ca58bf742de14a73ab0efe312874f2107194a0c1978100f9078d8e55e67d784db2591ff93ba6ad0
|
||||
AUX easytag-2.1.8-005-taglib.patch 485 BLAKE2B 5f73f040135da83a40b8685dde29b9c7be4002b464ca33806bab26ec5f8134e0f95ac5c5463d7380fb2361340f0e9c65788dbf379dc2d1ff334af8d709c0e377 SHA512 fcba54ce34c6373c9d26dc7b9790c8a1f20d52f254b822a59ba56efc683634c1730bc61310f99ef26c2c483808a838ad230d37eae3a86e165ee6f875e2a16877
|
||||
DIST easytag-2.1.8.tar.xz 2459496 BLAKE2B 4ba27728071a3a87af72a37cd0337d361ae690c42a70690ef935d4a0fdf27904c0928b448f64fac61194e02f18e04ea26c600f65365e8ea7aa4d76128f7a5d82 SHA512 cf5d92902276b8d462c695aaa0d1072684d60cbfc45d07fb2ac7b345907a775b94665612088b33f3272db22d4b4eb78f4a4e36f2caf6e151a08f640841208e48
|
||||
EBUILD easytag-2.1.8.ebuild 1486 BLAKE2B 1f6e5155627e67fc72a249c853d74990fe2762a27a72b58fa7760007572ab3023f39c33b84bde2fb808527a0dba07662911d7ab765ea4bdc2a24131e4226827c SHA512 b624e955c4c50458ad61cc552dd71f2217151993b4f30b97a21f93b8a4052f5ed51162e3297b177c16d6a04a51faeffb68cdac7663323a21e659a8fed13f1e40
|
||||
EBUILD easytag-2.1.8.ebuild 1496 BLAKE2B f7c80e79a03357b39b7192e2c7c07ce9cd641f342451c807560e747cc98f54dd45ef04e3c45c4c4016feba302e2337014e7d708355423b8f72fe6c4b6ceb26ca SHA512 77b258a305c9a8760fb828444e5e13dc0678297fb4194c35f5d4b2e0ed387653d3234c609ee85202eecc21e75bef977d2a8dc7559a2f45e8ed4634455dd3cb37
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
inherit autotools gnome.org xdg-utils
|
||||
inherit autotools gnome.org xdg-utils autotools
|
||||
|
||||
DESCRIPTION="GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media tags"
|
||||
HOMEPAGE="https://wiki.gnome.org/Apps/EasyTAG"
|
||||
@@ -33,19 +33,18 @@ DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
nls? ( sys-devel/gettext )"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
epatch "${FILESDIR}"/${P}-desktop.patch
|
||||
epatch "${FILESDIR}"/${P}-werror.patch
|
||||
epatch "${FILESDIR}"/${P}-taglib.patch
|
||||
epatch "${FILESDIR}"/${P}-docs.patch
|
||||
epatch "${FILESDIR}"/${P}-iso-c90.patch
|
||||
eautoreconf
|
||||
}
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-001-format-overflow.patch
|
||||
"${FILESDIR}"/${P}-002-declaration-after-statement.patch
|
||||
"${FILESDIR}"/${P}-003-desktop.patch
|
||||
"${FILESDIR}"/${P}-004-docs.patch
|
||||
"${FILESDIR}"/${P}-005-taglib.patch
|
||||
)
|
||||
|
||||
DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS TODO )
|
||||
|
||||
src_configure() {
|
||||
eautoreconf
|
||||
econf \
|
||||
$(use_enable nls) \
|
||||
$(use_enable mp3) \
|
||||
@@ -55,7 +54,7 @@ src_configure() {
|
||||
$(use_enable flac) \
|
||||
$(use_enable mp4) \
|
||||
$(use_enable wavpack)
|
||||
# workaround for gcc10
|
||||
# workaround for gcc>10
|
||||
sed -i -e 's/\(^CFLAGS = .*\)/\1 -fcommon/' Makefile || die
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
diff -ur a/src/misc.c b/src/misc.c
|
||||
--- a/src/misc.c 2013-02-05 23:42:37.000000000 +0100
|
||||
+++ b/src/misc.c 2023-02-26 17:08:00.397236011 +0100
|
||||
@@ -479,7 +479,7 @@
|
||||
/* Get the current date */
|
||||
memcpy(&t0, localtime(&t), sizeof(struct tm));
|
||||
/* Put the current year in 'current_year' tab */
|
||||
- sprintf(current_year,"%04d",1900+t0.tm_year);
|
||||
+ snprintf(current_year,sizeof(current_year),"%04d",1900+t0.tm_year%1000u);
|
||||
|
||||
tmp = ¤t_year[4-strlen(year)];
|
||||
if ( atoi(year) <= atoi(tmp) )
|
||||
@@ -1,18 +1,6 @@
|
||||
diff -ur easytag-2.1.8/src/misc.c easytag-2.1.8_patched/src/misc.c
|
||||
--- easytag-2.1.8/src/misc.c 2013-02-05 23:42:37.000000000 +0100
|
||||
+++ easytag-2.1.8_patched/src/misc.c 2019-10-19 14:51:12.006783244 +0200
|
||||
@@ -463,7 +463,7 @@
|
||||
{
|
||||
const gchar *year;
|
||||
gchar *tmp, *tmp1;
|
||||
- gchar current_year[5];
|
||||
+ gchar current_year[12];
|
||||
time_t t;
|
||||
struct tm t0;
|
||||
|
||||
diff -ur easytag-2.1.8/src/wavpack_tag.c easytag-2.1.8_patched/src/wavpack_tag.c
|
||||
--- easytag-2.1.8/src/wavpack_tag.c 2013-02-05 23:42:37.000000000 +0100
|
||||
+++ easytag-2.1.8_patched/src/wavpack_tag.c 2019-10-19 14:51:02.606783007 +0200
|
||||
diff -ur a/src/wavpack_tag.c b/src/wavpack_tag.c
|
||||
--- a/src/wavpack_tag.c 2023-02-26 17:09:51.951580194 +0100
|
||||
+++ b/src/wavpack_tag.c 2023-02-26 17:10:41.316617543 +0100
|
||||
@@ -82,8 +82,6 @@
|
||||
*/
|
||||
gboolean Wavpack_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
|
||||
@@ -1,5 +1,6 @@
|
||||
--- easytag.desktop.in
|
||||
+++ easytag.desktop.in
|
||||
diff -ur a/easytag.desktop.in b/easytag.desktop.in
|
||||
--- a/easytag.desktop.in 2013-01-16 10:02:13.000000000 +0100
|
||||
+++ b/easytag.desktop.in 2023-02-26 16:55:03.448909358 +0100
|
||||
@@ -6,7 +6,7 @@
|
||||
Type=Application
|
||||
Icon=easytag
|
||||
@@ -1,5 +1,6 @@
|
||||
--- Makefile.am
|
||||
+++ Makefile.am
|
||||
diff -ur a/Makefile.am b/Makefile.am
|
||||
--- a/Makefile.am 2023-02-26 16:56:34.458821825 +0100
|
||||
+++ b/Makefile.am 2023-02-26 16:56:46.391072567 +0100
|
||||
@@ -197,11 +197,6 @@
|
||||
$(AM_V_at)$(POST_UNINSTALL)
|
||||
test -n "$(DESTDIR)" || $(UPDATE_ICON_CACHE) "$(iconthemedir)"
|
||||
@@ -1,5 +1,6 @@
|
||||
--- easytag-2.1.8/configure.ac
|
||||
+++ easytag-2.1.8/configure.ac
|
||||
diff -ur a/configure.ac b/configure.ac
|
||||
--- a/configure.ac 2023-02-26 16:55:55.682006975 +0100
|
||||
+++ b/configure.ac 2023-02-26 16:56:13.722386073 +0100
|
||||
@@ -202,7 +202,7 @@
|
||||
TAGLIB_DEPS="taglib_c >= 1.6.0"
|
||||
AS_IF([test "x$enable_mp4" != "xno"],
|
||||
@@ -1,11 +0,0 @@
|
||||
--- configure.ac
|
||||
+++ configure.ac
|
||||
@@ -239,7 +239,7 @@
|
||||
AC_MSG_RESULT([$have_ws2])])
|
||||
|
||||
dnl Check that the compiler accepts the given warning flags.
|
||||
-warning_flags="-Wall -Wstrict-prototypes -Wnested-externs -Werror=missing-prototypes -Werror=implicit-function-declaration -Werror=pointer-arith -Werror=init-self -Werror=format-security -Werror=format=2 -Werror=missing-include-dirs -Werror=declaration-after-statement"
|
||||
+warning_flags="-Wall -Wstrict-prototypes -Wnested-externs"
|
||||
|
||||
realsave_CFLAGS="$CFLAGS"
|
||||
for option in $warning_flags; do
|
||||
Reference in New Issue
Block a user