diff --git a/pcmanfm-qt-0.1.0-libfm120-icontheme.patch b/pcmanfm-qt-0.1.0-libfm120-icontheme.patch new file mode 100644 index 0000000..015b3ca --- /dev/null +++ b/pcmanfm-qt-0.1.0-libfm120-icontheme.patch @@ -0,0 +1,26 @@ +From b467d4f96bd1d5525f59186551196fd5964c56b8 Mon Sep 17 00:00:00 2001 +From: "Hone Jen Yee (PCMan)" +Date: Tue, 6 Aug 2013 16:16:09 +0800 +Subject: [PATCH] Adopt recent changes of libfm. FmIcon is essentially + identical to GIcon now. + +--- + libfm-qt/icontheme.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libfm-qt/icontheme.cpp b/libfm-qt/icontheme.cpp +index 3c4e660..daf3017 100644 +--- a/libfm-qt/icontheme.cpp ++++ b/libfm-qt/icontheme.cpp +@@ -83,7 +83,7 @@ QIcon IconTheme::icon(FmIcon* fmicon) { + QIcon* picon = reinterpret_cast(fm_icon_get_user_data(fmicon)); + if(!picon) { // we don't have a cache yet + picon = new QIcon(); // what a waste! +- *picon = convertFromGIcon(fmicon->gicon); ++ *picon = convertFromGIcon(G_ICON(fmicon)); + fm_icon_set_user_data(fmicon, picon); // store it in FmIcon + } + return *picon; +-- +1.8.5.1 + diff --git a/pcmanfm-qt.spec b/pcmanfm-qt.spec index 2230a4d..a94b693 100644 --- a/pcmanfm-qt.spec +++ b/pcmanfm-qt.spec @@ -1,11 +1,13 @@ Name: pcmanfm-qt Version: 0.1.0 -Release: 4%{?dist} +Release: 4.100%{?dist} Summary: Qt port of the LXDE file manager PCManFM License: GPLv2+ URL: http://pcmanfm.sourceforge.net/ Source0: http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}-Source.tar.bz2 +# https://github.com/lxde/pcmanfm-qt/commit/b467d4f96bd1d5525f59186551196fd5964c56b8.patch +Patch0: pcmanfm-qt-0.1.0-libfm120-icontheme.patch BuildRequires: cmake BuildRequires: desktop-file-utils @@ -35,6 +37,7 @@ developing applications that use libfm-qt. %prep %setup -q -n %{name}-%{version}-Source +%patch0 -p1 -b .libfm120 # Honor %%optflags sed -i.flags \ @@ -105,6 +108,9 @@ update-desktop-database &> /dev/null || : %{_includedir}/libfm-qt/ %changelog +* Thu Feb 11 2014 Mamoru TASAKA - 0.1.0-5 +- Apply git patch for libfm API change + * Sat Aug 03 2013 Fedora Release Engineering - 0.1.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild