From 636633b719df9d386c70d0201f66ec3ebdd0b28c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 11 May 2015 11:06:55 +0200 Subject: [PATCH] qt5: remove shebang from template (wtf), and fix patches for musl. --- srcpkgs/qt5/patches/qt-musl-iconv-no-bom.patch | 4 ++-- srcpkgs/qt5/patches/qt-musl-socklen.patch | 4 ++-- srcpkgs/qt5/template | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/qt5/patches/qt-musl-iconv-no-bom.patch b/srcpkgs/qt5/patches/qt-musl-iconv-no-bom.patch index 2d15df22e3c..422cdedd795 100644 --- 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 diff --git a/srcpkgs/qt5/patches/qt-musl-socklen.patch b/srcpkgs/qt5/patches/qt-musl-socklen.patch index ae76061340c..582260c2ae0 100644 --- 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 diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template index 453c6e9849a..1e67b68173a 100644 --- a/srcpkgs/qt5/template +++ b/srcpkgs/qt5/template @@ -1,4 +1,3 @@ -#!/bin/bash # Template file for 'qt5' pkgname=qt5 version=5.4.1