Skip to contentSkip to conversation

qwt: bump to version 6.1.2

PATCH New Frank Hunleth 2 participants 2 messages Apr 24, 2015 – Apr 25, 2015

lore
Share & tools
lore

Frank Hunleth

author
#0 lore raw

PATCH 1/1 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 Frank Hunleth <[email protected]>
---
 package/qwt/0001-remove-installed-check.patch | 32 ---------------------------
 package/qwt/qwt.hash                          |  2 +-
 package/qwt/qwt.mk                            |  2 +-
 3 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 package/qwt/0001-remove-installed-check.patch
package/qwt/0001-remove-installed-check.patch deleted +0 -32
deleted file mode 100644
index 7490a7b..0000000
@@ -1,32 +0,0 @@
-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 <[email protected]>
-
-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.*" )
--    }
--}
package/qwt/qwt.hash +1 -1
index dfc9c31..fc78b75 100644
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  a7e3d9f1db917d186a973c5f04a316bc9607c7c35794d7a16de323aba5e17402  qwt-6.1.0.tar.bz2
+sha256  2b08f18d1d3970e7c3c6096d850f17aea6b54459389731d3ce715d193e243d0c  qwt-6.1.2.tar.bz2
package/qwt/qwt.mk +1 -1
index c565ba0..8a46c25 100644
@@ -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
Signature · 1 line
1.9.1
Applied
#1 lore raw

PATCH 1/1 qwt: bump to version 6.1.2

Dear Frank Hunleth,

Quoted 10 lines · Frank Hunleth

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 Frank Hunleth <[email protected]>
---
 package/qwt/0001-remove-installed-check.patch | 32 ---------------------------
 package/qwt/qwt.hash                          |  2 +-
 package/qwt/qwt.mk                            |  2 +-
 3 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 package/qwt/0001-remove-installed-check.patch

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com