public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Rex Dieter <rdieter@math.unl.edu>
To: git-commits@fedoraproject.org
Subject: [rpms/amarok] epel10.2: restore taglib patch
Date: Mon, 06 Jul 2026 18:32:05 GMT	[thread overview]
Message-ID: <178336272531.1.17018879199025577750.rpms-amarok-05fe2af544f2@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/amarok
            Branch : epel10.2
            Commit : 05fe2af544f2837e0c7f81348d99d71e06a4d81e
            Author : Rex Dieter <rdieter@math.unl.edu>
            Date   : 2015-09-11T14:22:51-05:00
            Stats  : +47/-0 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/amarok/c/05fe2af544f2837e0c7f81348d99d71e06a4d81e?branch=epel10.2

            Log:
            restore taglib patch

commited after 2.8.90 release

---
diff --git a/0003-Fix-TagLib-version-check.patch b/0003-Fix-TagLib-version-check.patch
new file mode 100644
index 0000000..10c4a90
--- /dev/null
+++ b/0003-Fix-TagLib-version-check.patch
@@ -0,0 +1,43 @@
+From fec8817c530ce42b6485fdabff6051784b8d9904 Mon Sep 17 00:00:00 2001
+From: Omar Plummer <omarplummer@imergetechnologies.com>
+Date: Fri, 7 Aug 2015 00:24:27 +0200
+Subject: [PATCH 3/6] Fix TagLib version check.
+
+The version check compared version strings lexicographically, so "1.7"
+(the min version) compared as greater than "1.10.0".
+
+BUG: 351013
+REVIEW: 124639
+---
+ cmake/modules/FindTaglib.cmake | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+index 76b83ac..f485a42 100644
+--- a/cmake/modules/FindTaglib.cmake
++++ b/cmake/modules/FindTaglib.cmake
+@@ -29,10 +29,10 @@ if(TAGLIBCONFIG_EXECUTABLE)
+ 
+   exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+ 
+-  if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++  if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+      message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+      set(TAGLIB_FOUND FALSE)
+-  else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++  else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ 
+      exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+ 
+@@ -42,7 +42,7 @@ if(TAGLIBCONFIG_EXECUTABLE)
+         set(TAGLIB_FOUND TRUE)
+      endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+      string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+-  endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") 
++  endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+   mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+ 
+ else(TAGLIBCONFIG_EXECUTABLE)
+-- 
+2.5.0
+

diff --git a/amarok.spec b/amarok.spec
index 070e479..ddf0f40 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -31,6 +31,7 @@ Patch1: amarok-2.8.0-no_kdewebkit.patch
 ## upstreamable patches
 
 ## upstream patches
+Patch3: 0003-Fix-TagLib-version-check.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -139,6 +140,9 @@ Requires: %{name} = %{version}-%{release}
 %patch1 -p1 -b .no_kdewebkit
 %endif
 
+## upstream
+%patch3 -p1 -b .taglib_version_check
+
 
 %build
 mkdir %{_target_platform}

                 reply	other threads:[~2026-07-06 18:32 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178336272531.1.17018879199025577750.rpms-amarok-05fe2af544f2@fedoraproject.org \
    --to=rdieter@math.unl.edu \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox