[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bministro/build-on-ark=5D_Necessitas=5FSDK=3A_Add_pa?=
From:       Bernhard Rosenkraenzer <bero () arklinux ! org>
Date:       2011-06-17 16:01:05
Message-ID: 20110617160105.10CD6A60A4 () git ! kde ! org
[Download RAW message or body]

Git commit 0f76a1a552d417e47b7e4d2654a40d81fc2e5898 by Bernhard Rosenkraenzer.
Committed on 17/06/2011 at 19:59.
Pushed by bero into branch 'build-on-ark'.

Add patch to make Qt with the internal libpng build on Ark Linux
(+infrastructure to apply Qt patches in build_sdk.sh)

M  +3    -0    Necessitas_SDK/build_sdk.sh     
A  +11   -0    Necessitas_SDK/patches/001-qt-libpng-glibc-2.14.patch     

http://commits.kde.org/ministro/0f76a1a552d417e47b7e4d2654a40d81fc2e5898

diff --git a/Necessitas_SDK/build_sdk.sh b/Necessitas_SDK/build_sdk.sh
index ea9f4c4..db71dd5 100755
--- a/Necessitas_SDK/build_sdk.sh
+++ b/Necessitas_SDK/build_sdk.sh
@@ -169,6 +169,9 @@ function prepareHostQt
         then
             tar -xzvf $HOST_QT_VERSION.tar.gz || error_msg "Can't untar \
$HOST_QT_VERSION.tar.gz"  fi
+        for i in $REPO_SRC_PATH/patches/*-qt-*.patch; do
+            patch -p0 <$i
+        done
     fi
 
     #build qt statically, needed by Sdk installer
diff --git a/Necessitas_SDK/patches/001-qt-libpng-glibc-2.14.patch \
b/Necessitas_SDK/patches/001-qt-libpng-glibc-2.14.patch new file mode 100644
index 0000000..bffb238
--- /dev/null
+++ b/Necessitas_SDK/patches/001-qt-libpng-glibc-2.14.patch
@@ -0,0 +1,11 @@
+--- qt-everywhere-opensource-src-4.7.3/src/3rdparty/libpng/pngconf.h.ark	2011-06-17 \
17:46:32.816391891 +0000 ++++ \
qt-everywhere-opensource-src-4.7.3/src/3rdparty/libpng/pngconf.h	2011-06-17 \
17:47:27.853057654 +0000 +@@ -357,7 +357,7 @@
+ #        define PNG_SAVE_BSD_SOURCE
+ #        undef _BSD_SOURCE
+ #      endif
+-#      ifdef _SETJMP_H
++#      if 0//def _SETJMP_H
+        /* If you encounter a compiler error here, see the explanation
+         * near the end of INSTALL.
+         */


[prev in list] [next in list] [prev in thread] [next in thread]