Drop patch that's included in this release.

Changes:
 - Fix double g_error_free call in remote_close_callback
 - Fix build with taglib 2.0
 - Set project gnu++11 c++ language version explicitely

Signed-off-by: Gyorgy Sarvari <[email protected]>
---
 ...001-Build-fix-needed-with-taglib-2.0.patch | 37 -------------------
 ...er_1.16.1.bb => gnome-commander_1.16.2.bb} |  3 +-
 2 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 
meta-gnome/recipes-gnome/gnome-commander/gnome-commander/0001-Build-fix-needed-with-taglib-2.0.patch
 rename meta-gnome/recipes-gnome/gnome-commander/{gnome-commander_1.16.1.bb => 
gnome-commander_1.16.2.bb} (86%)

diff --git 
a/meta-gnome/recipes-gnome/gnome-commander/gnome-commander/0001-Build-fix-needed-with-taglib-2.0.patch
 
b/meta-gnome/recipes-gnome/gnome-commander/gnome-commander/0001-Build-fix-needed-with-taglib-2.0.patch
deleted file mode 100644
index 8f6920c2cc..0000000000
--- 
a/meta-gnome/recipes-gnome/gnome-commander/gnome-commander/0001-Build-fix-needed-with-taglib-2.0.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From dc3aa0ff5a41114b17816f1f36f6bb5631c6ab5c Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Thu, 7 Mar 2024 17:17:29 -0800
-Subject: [PATCH] Build fix needed with taglib 2.0
-
-Fixes
-| ../gnome-commander-1.16.1/src/tags/gnome-cmd-tags-taglib.cc:153:29: error: 
no member named 'sampleWidth' in 'TagLib::FLAC::Properties'
-|   153 |         if (flacProperties->sampleWidth())
-|       |             ~~~~~~~~~~~~~~  ^
-| ../gnome-commander-1.16.1/src/tags/gnome-cmd-tags-taglib.cc:154:67: error: 
no member named 'sampleWidth' in 'TagLib::FLAC::Properties'
-|   154 |             cout << "Audio.FLAC.SampleWidth  " << 
flacProperties->sampleWidth()<< endl;
-|       |                                                   ~~~~~~~~~~~~~~  ^
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <[email protected]>
----
- src/tags/gnome-cmd-tags-taglib.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/tags/gnome-cmd-tags-taglib.cc 
b/src/tags/gnome-cmd-tags-taglib.cc
-index 9e65836..573f5eb 100644
---- a/src/tags/gnome-cmd-tags-taglib.cc
-+++ b/src/tags/gnome-cmd-tags-taglib.cc
-@@ -150,8 +150,8 @@ bool getAudioProperties(GnomeCmdFileMetadata &metadata, 
const TagLib::AudioPrope
-     if (flacProperties)
-     {
-         metadata.add(TAG_AUDIO_CODEC,"FLAC");
--        if (flacProperties->sampleWidth())
--            cout << "Audio.FLAC.SampleWidth  " << 
flacProperties->sampleWidth()<< endl;
-+        if (flacProperties->bitsPerSample())
-+            cout << "Audio.FLAC.BitsPerSample  " << 
flacProperties->bitsPerSample()<< endl;
- 
-         return true;
-     }
--- 
-2.44.0
-
diff --git a/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.16.1.bb 
b/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.16.2.bb
similarity index 86%
rename from meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.16.1.bb
rename to meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.16.2.bb
index d96371de3c..012f50d85e 100644
--- a/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.16.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.16.2.bb
@@ -16,8 +16,7 @@ ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
 GIR_MESON_ENABLE_FLAG = 'enabled'
 GIR_MESON_DISABLE_FLAG = 'disabled'
 
-SRC_URI += "file://0001-Build-fix-needed-with-taglib-2.0.patch"
-SRC_URI[archive.sha256sum] = 
"3f1d00c4a650fe7902167648286b32c9ca4ef86e31a5d8ccca0139f12d10d0b3"
+SRC_URI[archive.sha256sum] = 
"7cf5d56c77a95d828f25407294312abaae20dc6b556ceafd9424dbfe209e5ed3"
 
 PACKAGECONFIG ??= "exiv2 taglib libgsf poppler"
 PACKAGECONFIG[exiv2] = "-Dexiv2=enabled,-Dexiv2=disabled,exiv2"
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#124285): 
https://lists.openembedded.org/g/openembedded-devel/message/124285
Mute This Topic: https://lists.openembedded.org/mt/117708972/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

  • [oe] [meta-gnome][PATCH 1/2] gno... Gyorgy Sarvari via lists.openembedded.org

Reply via email to