rpms/gimp
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't have duplicate mime types in desktop file

Browse Source
This commit is contained in:
Nils Philippsen 2013-03-06 15:36:38 +01:00
parent f63ee8a6cb
commit f498beaea8
2 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
gimp-2.8.4-mime-types.patch Normal file
View File

@ -0,0 +1,44 @@
From 684426ba6a623ee2473c852152dee013652ca49c Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Wed, 6 Mar 2013 15:28:29 +0100
Subject: [PATCH] patch: mime-types
Squashed commit of the following:
commit 7b32db4ac0653fa375258287843b2dabe57dadfc
Author: Kevin Cozens <kcozens@svn.gnome.org>
Date: Sun Dec 30 10:43:50 2012 -0500
Fixed MIME_TYPES. Postscript and PDF are compiled conditionally. Fixes #690882.
(cherry picked from commit d17622dce6228bebd646ed1eb3063fc952905cfd)
---
configure.ac | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 2e66736..c32eff3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1024,7 +1024,7 @@ AC_SUBST(GIMP_COMMAND)
# The list of MIME types that are supported by plug-ins that are compiled
# unconditionally:
-MIME_TYPES="application/postscript;application/pdf;image/bmp;image/g3fax;image/gif;image/x-fits;image/x-pcx;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-psd;image/x-sgi;image/x-tga;image/x-xbitmap;image/x-xwindowdump;image/x-xcf;image/x-compressed-xcf;image/x-gimp-gbr;image/x-gimp-pat;image/x-gimp-gih"
+MIME_TYPES="image/bmp;image/g3fax;image/gif;image/x-fits;image/x-pcx;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-psd;image/x-sgi;image/x-tga;image/x-xbitmap;image/x-xwindowdump;image/x-xcf;image/x-compressed-xcf;image/x-gimp-gbr;image/x-gimp-pat;image/x-gimp-gih"
###################
@@ -1201,6 +1201,10 @@ if test "x$with_gs" != xno; then
fi
fi
+if test "x$have_gs" = xyes; then
+ MIME_TYPES="$MIME_TYPES;application/postscript"
+fi
+
AC_SUBST(FILE_PS)
AM_CONDITIONAL(HAVE_GS, test "x$have_gs" = xyes)
AC_SUBST(GS_LIBS)
--
1.8.1.4

5
gimp.spec
View File

@ -206,6 +206,9 @@ Patch1: gimp-2.8.2-cm-system-monitor-profile-by-default.patch
# Don't trip strict overflow warning.
# Upstream commit bc610c8fbd61e9574a2c378829b6ab91047d61b7.
Patch2: gimp-2.8.4-strict-overflow-warning.patch
# Don't have duplicate mime types in desktop file.
# Upstream commit 0ed3b482a422ff684c8921b7de9f44ea7b20345c.
Patch3: gimp-2.8.4-mime-types.patch
%description
GIMP (GNU Image Manipulation Program) is a powerful image composition and
@ -293,6 +296,7 @@ EOF
%patch1 -p1 -b .cm-system-monitor-profile-by-default
%patch2 -p1 -b .strict-overflow-warning
%patch3 -p1 -b .mime-types
%build
%if %{with hardening}
@ -589,6 +593,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
* Wed Mar 06 2013 Nils Philippsen <nils@redhat.com>
- get rid of strict overflow warning
- don't have duplicate mime types in desktop file
* Wed Feb 06 2013 Nils Philippsen <nils@redhat.com> - 2:2.8.4-1
- version 2.8.4