qt5: remove shebang from template (wtf), and fix patches for musl.

2015-05-11 11:06:55 +02:00 · 2015-05-11 11:06:55 +02:00 · 636633b719
commit 636633b719
parent 1563fad8d5
3 changed files with 4 additions and 5 deletions
--- a/srcpkgs/qt5/patches/qt-musl-iconv-no-bom.patch
+++ b/srcpkgs/qt5/patches/qt-musl-iconv-no-bom.patch
@ -1,5 +1,5 @@
--- src/corelib/codecs/qiconvcodec.cpp.orig
-+++ src/corelib/codecs/qiconvcodec.cpp
+--- qtbase/src/corelib/codecs/qiconvcodec.cpp.orig
+++ qtbase/src/corelib/codecs/qiconvcodec.cpp
@@ -62,7 +62,7 @@
 #elif defined(Q_OS_AIX)
 #  define NO_BOM
--- a/srcpkgs/qt5/patches/qt-musl-socklen.patch
+++ b/srcpkgs/qt5/patches/qt-musl-socklen.patch
@ -1,5 +1,5 @@
--- mkspecs/linux-g++/qplatformdefs.h.orig
-+++ mkspecs/linux-g++/qplatformdefs.h
+--- qtbase/mkspecs/linux-g++/qplatformdefs.h.orig
+++ qtbase/mkspecs/linux-g++/qplatformdefs.h
@@ -86,11 +86,7 @@
 
 #undef QT_SOCKLEN_T
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@ -1,4 +1,3 @@
-#!/bin/bash
 # Template file for 'qt5'
 pkgname=qt5
 version=5.4.1