heliocastro pushed to libqtxdg (f20). "- Upstream patch fix"

notifications at fedoraproject.org notifications at fedoraproject.org
Sun Apr 12 22:04:25 UTC 2015


>From 296aec9e469703dffc57aff27369dc0e694100c3 Mon Sep 17 00:00:00 2001
From: Helio Chissini de Castro <helio at kde.org>
Date: Wed, 11 Feb 2015 15:01:12 -0200
Subject: - Upstream patch fix


diff --git a/libqtxdg-1.1.0-qiconfix-loader.patch b/libqtxdg-1.1.0-qiconfix-loader.patch
new file mode 100644
index 0000000..443bb12
--- /dev/null
+++ b/libqtxdg-1.1.0-qiconfix-loader.patch
@@ -0,0 +1,10 @@
+--- libqtxdg-1.1.0/qiconfix/qiconloader.cpp.orig	2015-02-11 14:55:32.449576420 -0200
++++ libqtxdg-1.1.0/qiconfix/qiconloader.cpp	2015-02-11 14:56:37.668729867 -0200
+@@ -252,6 +252,7 @@
+         // Parent themes provide fallbacks for missing icons
+         m_parents = indexReader.value(
+                 QLatin1String("Icon Theme/Inherits")).toStringList();
++		m_parents.removeAll(QString());
+ 
+         // Ensure a default platform fallback for all themes
+         if (m_parents.isEmpty()) {
diff --git a/libqtxdg.spec b/libqtxdg.spec
index bcd85f3..a70cfcd 100644
--- a/libqtxdg.spec
+++ b/libqtxdg.spec
@@ -1,11 +1,13 @@
 Name:           libqtxdg
 Summary:        Qt5Xdg, a Qt5 implementation of XDG standards
 Version:        1.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Group:          Applications/System
 License:        LGPLv2+
 URL:            https://github.com/lxde/libqtxdg
 Source0:        http://downloads.lxqt.org/%{name}/%{version}/%{name}-%{version}.tar.xz
+# Upstream
+Patch100:		libqtxdg-1.1.0-qiconfix-loader.patch
 
 BuildRequires:  cmake >= 2.8.3
 BuildRequires:  pkgconfig(Qt5Widgets)
@@ -29,6 +31,7 @@ Files used for developing and building software that uses qtxdg.
 
 %prep
 %setup -q 
+%patch100 -p1
 
 %build
 mkdir -p %{_target_platform}
@@ -57,6 +60,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %{_datadir}/cmake/qt5xdg/*
 
 %changelog
+* Wed Feb 11 2015 Helio Chissini de Castro <helio at kde.org> - 1.1.0-2
+- Upstream patch for qiconfix
+
 * Mon Feb 09 2015 Helio Chissini de Castro <helio at kde.org> - 1.1.0-1
 - New upstream version 1.1.0
 - Only Qt5 now
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libqtxdg.git/commit/?h=f20&id=296aec9e469703dffc57aff27369dc0e694100c3


More information about the scm-commits mailing list