Commit 04f77f08 authored by Frank Hunleth's avatar Frank Hunleth Committed by Thomas Petazzoni
Browse files

qwt: bump to version 6.1.2



Qwt 6.1.2 fixes several minor issues in 6.1.0 and removes the need to
carry a patch in Buildroot.

Signed-off-by: default avatarFrank Hunleth <fhunleth@troodon-software.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent e6c7ad17
Loading
Loading
Loading
Loading
+0 −32
Original line number Diff line number Diff line
Remove useless check at build time

At build time, Qwt looks whether the Qwt libraries are already
installed in the destination directory, to avoid confusion between
libraries installed system-wide and locally-built shared
libraries. However, this behaviour conflicts with how Buildroot builds
and installs libraries, so get rid of it.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Index: qwt-6.0.0/qwtbuild.pri
===================================================================
--- qwt-6.0.0.orig/qwtbuild.pri	2011-09-12 19:37:35.663275952 +0200
+++ qwt-6.0.0/qwtbuild.pri	2011-09-12 19:37:41.913275949 +0200
@@ -53,17 +53,3 @@
 !debug_and_release {
     OBJECTS_DIR       = obj
 }
-
-unix {
-
-    exists( $${QMAKE_LIBDIR_QT}/libqwt.* ) {
-
-        # On some Linux distributions the Qwt libraries are installed 
-        # in the same directory as the Qt libraries. Unfortunately
-        # qmake always adds QMAKE_LIBDIR_QT at the beginning of the 
-        # linker path, so that the installed libraries will be
-        # used instead of the local ones.
-
-        error( "local build will conflict with $${QMAKE_LIBDIR_QT}/libqwt.*" )
-    }
-}
+1 −1
Original line number Diff line number Diff line
# Locally computed:
sha256  a7e3d9f1db917d186a973c5f04a316bc9607c7c35794d7a16de323aba5e17402  qwt-6.1.0.tar.bz2
sha256  2b08f18d1d3970e7c3c6096d850f17aea6b54459389731d3ce715d193e243d0c  qwt-6.1.2.tar.bz2
+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@
#
################################################################################

QWT_VERSION = 6.1.0
QWT_VERSION = 6.1.2
QWT_SOURCE = qwt-$(QWT_VERSION).tar.bz2
QWT_SITE = http://downloads.sourceforge.net/project/qwt/qwt/$(QWT_VERSION)
QWT_INSTALL_STAGING = YES