[arch-commits] Commit in handbrake/trunk (PKGBUILD standard-presets-fix-type.patch)

[Evangelos Foutras]

    Date: Sunday, March 22, 2015 @ 05:22:07
  Author: foutrelis
Revision: 129736

upgpkg: handbrake 0.10.1-2

Fix crash while adding job (FS#43060).

Added:
  handbrake/trunk/standard-presets-fix-type.patch
Modified:
  handbrake/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |   13 ++++-
 standard-presets-fix-type.patch |   88 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-22 00:55:35 UTC (rev 129735)
+++ PKGBUILD	2015-03-22 04:22:07 UTC (rev 129736)
@@ -5,7 +5,7 @@
 
 pkgname=('handbrake' 'handbrake-cli')
 pkgver=0.10.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="https://handbrake.fr/"
 license=('GPL')
@@ -14,8 +14,10 @@
              'fontconfig' 'freetype2' 'libxml2' 'libogg' 'libvorbis' 'cmake'
              'libtheora' 'libsamplerate' 'libbluray' 'x264' 'libx264'
              'libdvdnav' 'librsvg')
-source=(https://handbrake.fr/mirror/HandBrake-$pkgver.tar.bz2)
-sha256sums=('7ea42031fd4d5efd04903a9aae79c952c50fd43b6f7bf08fd1a93f6b358a23f5')
+source=(https://handbrake.fr/mirror/HandBrake-$pkgver.tar.bz2
+        standard-presets-fix-type.patch)
+sha256sums=('7ea42031fd4d5efd04903a9aae79c952c50fd43b6f7bf08fd1a93f6b358a23f5'
+            'dce9dc044321b26a9022b1a4d23950c781c51c8c07653ba19c3eedf30f1d54d4')
 
 prepare() {
   cd "$srcdir/HandBrake-$pkgver"
@@ -28,6 +30,11 @@
     -e '/MODULES += contrib\/libdvdnav/d' \
     -e '/MODULES += contrib\/libdvdread/d' \
     make/include/main.defs
+
+  # Fix crash while adding job (FS#43060)
+  # https://forum.handbrake.fr/viewtopic.php?f=12&t=32090
+  # https://trac.handbrake.fr/changeset/7008/branches/0.10.x
+  patch -Np2 -i ../standard-presets-fix-type.patch
 }
 
 build() {

Added: standard-presets-fix-type.patch
===================================================================
--- standard-presets-fix-type.patch	                        (rev 0)
+++ standard-presets-fix-type.patch	2015-03-22 04:22:07 UTC (rev 129736)
@@ -0,0 +1,88 @@
+Index: branches/0.10.x/gtk/src/standard_presets.xml
+===================================================================
+--- branches/0.10.x/gtk/src/standard_presets.xml	(revision 6995)
++++ branches/0.10.x/gtk/src/standard_presets.xml	(revision 7008)
+@@ -85,5 +85,5 @@
+ 				<string></string>
+ 				<key>PictureDenoiseFilter</key>
+-				<integer>off</integer>
++				<string>off</string>
+ 				<key>PictureDenoiseCustom</key>
+ 				<string></string>
+@@ -216,5 +216,5 @@
+ 				<string></string>
+ 				<key>PictureDenoiseFilter</key>
+-				<integer>off</integer>
++				<string>off</string>
+ 				<key>PictureDenoiseCustom</key>
+ 				<string></string>
+@@ -347,5 +347,5 @@
+ 				<string></string>
+ 				<key>PictureDenoiseFilter</key>
+-				<integer>off</integer>
++				<string>off</string>
+ 				<key>PictureDenoiseCustom</key>
+ 				<string></string>
+@@ -478,5 +478,5 @@
+ 				<string></string>
+ 				<key>PictureDenoiseFilter</key>
+-				<integer>off</integer>
++				<string>off</string>
+ 				<key>PictureDenoiseCustom</key>
+ 				<string></string>
+@@ -625,5 +625,5 @@
+ 				<string></string>
+ 				<key>PictureDenoiseFilter</key>
+-				<integer>off</integer>
++				<string>off</string>
+ 				<key>PictureDenoiseCustom</key>
+ 				<string></string>
+@@ -772,5 +772,5 @@
+ 				<string></string>
+ 				<key>PictureDenoiseFilter</key>
+-				<integer>off</integer>
++				<string>off</string>
+ 				<key>PictureDenoiseCustom</key>
+ 				<string></string>
+@@ -919,5 +919,5 @@
+ 				<string></string>
+ 				<key>PictureDenoiseFilter</key>
+-				<integer>off</integer>
++				<string>off</string>
+ 				<key>PictureDenoiseCustom</key>
+ 				<string></string>
+@@ -1050,5 +1050,5 @@
+ 				<string></string>
+ 				<key>PictureDenoiseFilter</key>
+-				<integer>off</integer>
++				<string>off</string>
+ 				<key>PictureDenoiseCustom</key>
+ 				<string></string>
+@@ -1181,5 +1181,5 @@
+ 				<string></string>
+ 				<key>PictureDenoiseFilter</key>
+-				<integer>off</integer>
++				<string>off</string>
+ 				<key>PictureDenoiseCustom</key>
+ 				<string></string>
+@@ -1312,5 +1312,5 @@
+ 				<string></string>
+ 				<key>PictureDenoiseFilter</key>
+-				<integer>off</integer>
++				<string>off</string>
+ 				<key>PictureDenoiseCustom</key>
+ 				<string></string>
+@@ -1458,5 +1458,5 @@
+ 				<string></string>
+ 				<key>PictureDenoiseFilter</key>
+-				<integer>off</integer>
++				<string>off</string>
+ 				<key>PictureDenoiseCustom</key>
+ 				<string></string>
+@@ -1605,5 +1605,5 @@
+ 				<string></string>
+ 				<key>PictureDenoiseFilter</key>
+-				<integer>off</integer>
++				<string>off</string>
+ 				<key>PictureDenoiseCustom</key>
+ 				<string></string>