public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qt-4.7.0-beta2: fool phonon version

Browse Source 
Qt guys updated source files but not version number

svn path=/nixpkgs/trunk/; revision=22833
This commit is contained in:
Yury G. Kudryashov 2010-07-31 13:05:46 +00:00
parent d15fdc71f0
commit 59a8bc0744
2 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/libraries/qt-4.x/4.7/default.nix
View File

@ -72,11 +72,6 @@ stdenv.mkDerivation rec {
buildInputs = [ perl ]; buildInputs = [ perl ];
# libQtNetwork will call libQtCore for it to dlopen openssl.
NIX_LDFLAGS = "-rpath ${openssl}/lib";
# Don't shrink the rpath, to keep ${openssl} in it.
dontPatchELF = 1;
prefixKey = "-prefix "; prefixKey = "-prefix ";
configureFlags = '' configureFlags = ''
@ -84,17 +79,18 @@ stdenv.mkDerivation rec {
-system-zlib -system-libpng -system-libjpeg -qt-gif -system-libmng -system-zlib -system-libpng -system-libjpeg -qt-gif -system-libmng
-opengl -xrender -xrandr -xinerama -xcursor -opengl -xrender -xrandr -xinerama -xcursor
-plugin-sql-mysql -system-sqlite -plugin-sql-mysql -system-sqlite
-qdbus -cups -glib -xfixes -dbus-linked -qdbus -cups -glib -xfixes -dbus-linked -openssl-linked
-fontconfig -I${freetype}/include/freetype2 -fontconfig -I${freetype}/include/freetype2
-exceptions -xmlpatterns -exceptions -xmlpatterns
-multimedia -audio-backend -multimedia -audio-backend -phonon -phonon-backend
-phonon -phonon-backend -svg -webkit -javascript-jit
-javascript-jit
${if buildDemos == true then "-make demos" else "-nomake demos"} ${if buildDemos == true then "-make demos" else "-nomake demos"}
${if buildExamples == true then "-make examples" else "-nomake examples"} ${if buildExamples == true then "-make examples" else "-nomake examples"}
${if useDocs then "-make docs" else "-nomake docs"}''; ${if useDocs then "-make docs" else "-nomake docs"}'';
patchPhase = '' patches = [ ./phonon-4.4.0.patch ];
postPatch = ''
substituteInPlace configure --replace /bin/pwd pwd substituteInPlace configure --replace /bin/pwd pwd
substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf
@ -102,12 +98,12 @@ stdenv.mkDerivation rec {
postInstall = if useDocs then "rm -rf $out/share/doc/${name}/{html,src}" else ""; postInstall = if useDocs then "rm -rf $out/share/doc/${name}/{html,src}" else "";
meta = { meta = with stdenv.lib; {
homepage = http://qt.nokia.com/products; homepage = http://qt.nokia.com/products;
description = "A cross-platform application framework for C++"; description = "A cross-platform application framework for C++";
license = "GPL/LGPL"; license = "GPL/LGPL";
maintainers = with stdenv.lib.maintainers; [ urkud sander ]; maintainers = with maintainers; [ urkud sander ];
platforms = stdenv.lib.platforms.mesaPlatforms; platforms = platforms.mesaPlatforms;
priority = 10; priority = 10;
}; };
} }

19
pkgs/development/libraries/qt-4.x/4.7/phonon-4.4.0.patch Normal file
View File

@ -0,0 +1,19 @@
diff --git a/src/3rdparty/phonon/phonon/phononnamespace.h b/src/3rdparty/phonon/phonon/phononnamespace.h
index ec42d51..eb899de 100644
--- a/src/3rdparty/phonon/phonon/phononnamespace.h
+++ b/src/3rdparty/phonon/phonon/phononnamespace.h
@@ -41,12 +41,12 @@
/**
* PHONON_VERSION is (major << 16) + (minor << 8) + patch.
*/
-#define PHONON_VERSION PHONON_VERSION_CHECK(4, 3, 1)
+#define PHONON_VERSION PHONON_VERSION_CHECK(4, 4, 0)
/**
* PHONON_VERSION_STR is "major.minor.patch". E.g. "4.2.1"
*/
-#define PHONON_VERSION_STR "4.3.1"
+#define PHONON_VERSION_STR "4.4.0"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE