From 180b4beb323926a994091b4323dab97051285b2f Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Jun 16 2018 08:40:15 +0000 Subject: Add Revert-Prefer-qimage-over-pixbuf.patch to prevent flowblade segfault --- diff --git a/Revert-Prefer-qimage-over-pixbuf.patch b/Revert-Prefer-qimage-over-pixbuf.patch new file mode 100644 index 0000000..8e84156 --- /dev/null +++ b/Revert-Prefer-qimage-over-pixbuf.patch @@ -0,0 +1,62 @@ +From 0049e5d5272feea5c803a174f5bb42d67ab177c1 Mon Sep 17 00:00:00 2001 +From: Bernhard Landauer +Date: Fri, 15 Jun 2018 16:39:21 +0200 +Subject: [PATCH] Revert "Prefer qimage over pixbuf." + +This reverts commit 7bf5da86d4f2f8f83f45b9809fb061cbfdd97906. +--- + src/modules/core/loader.dict | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/src/modules/core/loader.dict b/src/modules/core/loader.dict +index ae96f428a..cd68da0ec 100644 +--- a/src/modules/core/loader.dict ++++ b/src/modules/core/loader.dict +@@ -10,18 +10,18 @@ plain:https://*=webvfx:plain: + *.inigo=melt_file + *.asf=avformat + *.avi=mcdv,avformat,libdv +-*.bmp=qimage,pixbuf ++*.bmp=pixbuf,qimage + *.dv=mcdv,avformat,libdv + *.dif=mcdv,avformat,libdv + *.exr=qimage +-*.gif=qimage,pixbuf ++*.gif=pixbuf,qimage + *.graphics=xml + *.htm=webvfx:plain: + *.html=webvfx:plain: + *.jfx=xml + *.jef=xml +-*.jpg=qimage,pixbuf +-*.jpeg=qimage,pixbuf ++*.jpg=pixbuf,qimage ++*.jpeg=pixbuf,qimage + *.kdenlivetitle=kdenlivetitle + *.kino=xml + *.kra=qimage +@@ -31,17 +31,17 @@ plain:https://*=webvfx:plain: + *.mpeg=mcmpeg,avformat + *.mpl=pango + *.ogg=avformat,vorbis +-*.pcx=qimage,pixbuf +-*.pgm=pgm,qimage,pixbuf +-*.png=qimage,pixbuf ++*.pcx=pixbuf,qimage ++*.pgm=pgm,pixbuf,qimage ++*.png=pixbuf,qimage + *.psd=qimage + *.qml=webvfx:plain: + *.story=xml +-*.svg=qimage,pixbuf ++*.svg=pixbuf,qimage + *.swf=avformat,swfdec +-*.tga=qimage,pixbuf +-*.tif=qimage,pixbuf +-*.tiff=qimage,pixbuf ++*.tga=pixbuf,qimage ++*.tif=pixbuf,qimage ++*.tiff=pixbuf,qimage + *.txt=qtext,pango + *.vob=mcmpeg,avformat + *.wav=avformat