philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Merge pull request #161 from bbenoist/qtupdatefix

Browse source 
qt: fix update to 4.8.3
This commit is contained in:
Peter Simons 2012-11-15 08:21:49 -08:00
commit 7c146f01e1
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/qt-4.x/4.8/default.nix
View file

@ -138,7 +138,7 @@ stdenv.mkDerivation rec {
}; };
meta = { meta = {
homepage = http://qt.nokia.com/products; homepage = http://qt-project.org/;
description = "A cross-platform application framework for C++"; description = "A cross-platform application framework for C++";
license = "GPL/LGPL"; license = "GPL/LGPL";
maintainers = with maintainers; [ urkud sander ]; maintainers = with maintainers; [ urkud sander ];

14
pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff
View file

@ -1,15 +1,17 @@
--- a/src/gui/styles/qgtkstyle_p.cpp 2011-12-08 09:06:02.000000000 +0400 diff --git a/src/gui/styles/qgtkstyle_p.cpp b/src/gui/styles/qgtkstyle_p.cpp
+++ b/src/gui/styles/qgtkstyle_p.cpp 2011-12-24 17:56:46.000000000 +0400 index 3b128e6..39434db 100644
@@ -312,7 +312,7 @@ --- a/src/gui/styles/qgtkstyle_p.cpp
+++ b/src/gui/styles/qgtkstyle_p.cpp
@@ -312,7 +312,7 @@ GtkStyle* QGtkStylePrivate::gtkStyle(const QHashableLatin1Literal &path)
void QGtkStylePrivate::resolveGtk() const void QGtkStylePrivate::resolveGtk() const
{ {
// enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0 // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0
- QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0); - QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0);
+ QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0); + QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0);
libgtk.setLoadHints(QLibrary::ImprovedSearchHeuristics);
gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init"); gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init");
gtk_window_new = (Ptr_gtk_window_new)libgtk.resolve("gtk_window_new"); @@ -435,8 +435,8 @@ void QGtkStylePrivate::resolveGtk() const
@@ -434,8 +434,8 @@
pango_font_description_get_family = (Ptr_pango_font_description_get_family)libgtk.resolve("pango_font_description_get_family"); pango_font_description_get_family = (Ptr_pango_font_description_get_family)libgtk.resolve("pango_font_description_get_family");
pango_font_description_get_style = (Ptr_pango_font_description_get_style)libgtk.resolve("pango_font_description_get_style"); pango_font_description_get_style = (Ptr_pango_font_description_get_style)libgtk.resolve("pango_font_description_get_style");
@ -20,7 +22,7 @@
} }
/* \internal /* \internal
@@ -607,9 +607,9 @@ @@ -608,9 +608,9 @@ void QGtkStylePrivate::cleanupGtkWidgets()
static bool resolveGConf() static bool resolveGConf()
{ {
if (!QGtkStylePrivate::gconf_client_get_default) { if (!QGtkStylePrivate::gconf_client_get_default) {