diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-20 05:27:57 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-20 05:27:57 +0000 |
| commit | 4c5aaf3736baf1f24dfa27d1e3ddea26647a3a17 (patch) | |
| tree | 9ddad9f096ebfb6cbcd8247dd9717eaf1b7f835b /pkgs/development/libraries/qtscriptgenerator | |
| parent | ebe141d306f28f110c0602d751470307221f0aa8 (diff) | |
| download | nixpkgs-4c5aaf3736baf1f24dfa27d1e3ddea26647a3a17.tar nixpkgs-4c5aaf3736baf1f24dfa27d1e3ddea26647a3a17.tar.gz nixpkgs-4c5aaf3736baf1f24dfa27d1e3ddea26647a3a17.tar.bz2 nixpkgs-4c5aaf3736baf1f24dfa27d1e3ddea26647a3a17.tar.lz nixpkgs-4c5aaf3736baf1f24dfa27d1e3ddea26647a3a17.tar.xz nixpkgs-4c5aaf3736baf1f24dfa27d1e3ddea26647a3a17.tar.zst nixpkgs-4c5aaf3736baf1f24dfa27d1e3ddea26647a3a17.zip | |
qtscriptgenerator: qt-4.8 patch
svn path=/nixpkgs/trunk/; revision=32414
Diffstat (limited to 'pkgs/development/libraries/qtscriptgenerator')
| -rw-r--r-- | pkgs/development/libraries/qtscriptgenerator/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch | 23 |
2 files changed, 24 insertions, 1 deletions
diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/pkgs/development/libraries/qtscriptgenerator/default.nix index 913f4acdc7d..64e535bf272 100644 --- a/pkgs/development/libraries/qtscriptgenerator/default.nix +++ b/pkgs/development/libraries/qtscriptgenerator/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { }; buildInputs = [ qt4 ]; - patches = [./qtscriptgenerator.gcc-4.4.patch]; + patches = [ ./qtscriptgenerator.gcc-4.4.patch ./qt-4.8.patch ]; # Why isn't the author providing proper Makefile or a CMakeLists.txt ? buildPhase = '' diff --git a/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch b/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch new file mode 100644 index 00000000000..0b02b009725 --- /dev/null +++ b/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch @@ -0,0 +1,23 @@ +Origin: http://pkgs.fedoraproject.org/gitweb/?p=qtscriptgenerator.git;a=blob_plain;f=qtscriptgenerator-src-0.1.0-no_QFileOpenEvent.patch;h=f397b5ab13bcfc268e6d7b7ba4c6bc66ae38b5c0;hb=HEAD +diff -up qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml +--- qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent 2011-12-22 11:34:52.615149619 -0600 ++++ qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml 2011-12-22 11:35:31.808659632 -0600 +@@ -2233,7 +2233,6 @@ + + + </object-type> +- <object-type name="QFileOpenEvent" polymorphic-id-expression="%1->type() == QEvent::FileOpen"/> + <object-type name="QFocusEvent" polymorphic-id-expression="%1->type() == QEvent::FocusIn || %1->type() == QEvent::FocusOut"> + <modify-function signature="reason()const"> + <remove/> +diff -up qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml.no_QFileOpenEvent qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml +--- qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml.no_QFileOpenEvent 2009-02-20 05:42:24.000000000 -0600 ++++ qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml 2011-12-22 11:33:43.058019203 -0600 +@@ -2555,7 +2555,6 @@ + + + </object-type> +- <object-type name="QFileOpenEvent" polymorphic-id-expression="%1->type() == QEvent::FileOpen"/> + <object-type name="QFocusEvent" polymorphic-id-expression="%1->type() == QEvent::FocusIn || %1->type() == QEvent::FocusOut"> + <modify-function signature="reason()const"> + <remove/> |