summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2019-05-24 19:47:06 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-05-25 21:13:17 +0200
commit088f6edf5557bbd1610af6eaf219b6508ecc63cf (patch)
tree29692a487681e01df605fa225f7a024f5d082c6a
parent7900d96ebf3c9b6330d85f101cff70103bfd3f2f (diff)
downloadptxdist-088f6edf5557bbd1610af6eaf219b6508ecc63cf.tar.gz
ptxdist-088f6edf5557bbd1610af6eaf219b6508ecc63cf.tar.xz
qxt: remove after on year in staging
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/libqxt-0.6.1/0001-don-t-add-builddir-lib-to-the-rpath.patch20
-rw-r--r--patches/libqxt-0.6.1/series4
-rw-r--r--rules/libqxt.in59
-rw-r--r--rules/libqxt.make76
4 files changed, 0 insertions, 159 deletions
diff --git a/patches/libqxt-0.6.1/0001-don-t-add-builddir-lib-to-the-rpath.patch b/patches/libqxt-0.6.1/0001-don-t-add-builddir-lib-to-the-rpath.patch
deleted file mode 100644
index d2a8b0b7c..000000000
--- a/patches/libqxt-0.6.1/0001-don-t-add-builddir-lib-to-the-rpath.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Sat, 15 Oct 2011 17:20:48 +0200
-Subject: [PATCH] don't add <builddir>/lib to the rpath
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- src/qxtlibs.pri | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/src/qxtlibs.pri b/src/qxtlibs.pri
-index 2fb27b6..c371b75 100644
---- a/src/qxtlibs.pri
-+++ b/src/qxtlibs.pri
-@@ -1,6 +1,5 @@
- INCLUDEPATH += $${QXT_SOURCE_TREE}/include
- DEPENDPATH += $${QXT_SOURCE_TREE}/include
--unix:!macx:LIBS += -Wl,-rpath,$${QXT_BUILD_TREE}/lib
- macx:LIBS += -F$${QXT_BUILD_TREE}/lib
- LIBS += -L$${QXT_BUILD_TREE}/lib
-
diff --git a/patches/libqxt-0.6.1/series b/patches/libqxt-0.6.1/series
deleted file mode 100644
index 9282f1dfe..000000000
--- a/patches/libqxt-0.6.1/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-don-t-add-builddir-lib-to-the-rpath.patch
-# 749e84e9575dc3cc9a6621c41c956d47 - git-ptx-patches magic
diff --git a/rules/libqxt.in b/rules/libqxt.in
deleted file mode 100644
index c3a4aade2..000000000
--- a/rules/libqxt.in
+++ /dev/null
@@ -1,59 +0,0 @@
-## SECTION=staging
-## old section:
-### SECTION=qt
-
-menuconfig LIBQXT
- tristate
- select QT4
- select QT4_BUILD_GUI if LIBQXT_GUI
- select QT4_BUILD_NETWORK if LIBQXT_NETWORK
- select DB if LIBQXT_BERKELEY
- select AVAHI if LIBQXT_ZEROCONF
- select AVAHI_COMPAT if LIBQXT_ZEROCONF
- prompt "libqxt "
- help
- LibQxt is an extension library for Qt providing a suite of
- cross-platform utility classes to add functionality not readily
- available in the Qt toolkit.
-
- STAGING: remove in ptxdist-2019.04.0
- Old, unmaintained package that fails to build with gcc 7x.
-
-if LIBQXT
-
-config LIBQXT_CORE
- bool
- prompt "core"
-
-config LIBQXT_GUI
- bool
- select LIBQXT_CORE
- prompt "gui"
-
-config LIBQXT_NETWORK
- bool
- select LIBQXT_CORE
- prompt "network"
-
-config LIBQXT_SQL
- bool
- select LIBQXT_CORE
- prompt "sql"
-
-config LIBQXT_BERKELEY
- bool
- select LIBQXT_CORE
- prompt "berkeley"
-
-config LIBQXT_ZEROCONF
- bool
- select LIBQXT_NETWORK
- prompt "zeroconf"
-
-config LIBQXT_WEB
- bool
- select LIBQXT_NETWORK
- prompt "web"
-
-endif
-
diff --git a/rules/libqxt.make b/rules/libqxt.make
deleted file mode 100644
index b1c593f1c..000000000
--- a/rules/libqxt.make
+++ /dev/null
@@ -1,76 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2011 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_LIBQXT) += libqxt
-
-#
-# Paths and names
-#
-LIBQXT_VERSION := 0.6.1
-LIBQXT_MD5 := b83cb8c105366c4cf9d9282211d5db31
-LIBQXT := libqxt-$(LIBQXT_VERSION)
-LIBQXT_SUFFIX := tar.bz2
-LIBQXT_URL := https://bitbucket.org/libqxt/libqxt/get/v$(LIBQXT_VERSION).$(LIBQXT_SUFFIX)
-LIBQXT_SOURCE := $(SRCDIR)/$(LIBQXT).$(LIBQXT_SUFFIX)
-LIBQXT_DIR := $(BUILDDIR)/$(LIBQXT)
-LIBQXT_LICENSE := LGPL-2.1-only AND CPLv1.0
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-LIBQXT_MODULES- := docs designer
-
-LIBQXT_MODULES-$(PTXCONF_LIBQXT_CORE) += Core
-LIBQXT_MODULES-$(PTXCONF_LIBQXT_GUI) += Gui
-LIBQXT_MODULES-$(PTXCONF_LIBQXT_NETWORK) += Network
-LIBQXT_MODULES-$(PTXCONF_LIBQXT_SQL) += Sql
-LIBQXT_MODULES-$(PTXCONF_LIBQXT_BERKELEY) += Berkeley
-LIBQXT_MODULES-$(PTXCONF_LIBQXT_ZEROCONF) += Zeroconf
-LIBQXT_MODULES-$(PTXCONF_LIBQXT_WEB) += Web
-
-LIBQXT_CONF_TOOL := autoconf
-LIBQXT_CONF_OPT = \
- -verbose \
- -prefix /usr \
- -featuredir /usr/mkspecs/features \
- -release \
- -nomake "$(shell echo $(LIBQXT_MODULES-) | tr "A-Z" "a-z")" \
- $(call ptx/ifdef,PTXCONF_QT4_PLATFORM_EMBEDDED,-qws) \
- $(call ptx/ifdef,PTXCONF_QT4_X11_XRANDR,,-no-xrandr)
-
-ifdef PTXCONF_LIBQXT_ZEROCONF
-LIBQXT_CXXFLAGS := -isystem "$(SYSROOT)/usr/include/avahi-compat-libdns_sd"
-endif
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/libqxt.targetinstall:
- @$(call targetinfo)
-
- @$(call install_init, libqxt)
- @$(call install_fixup, libqxt,PRIORITY,optional)
- @$(call install_fixup, libqxt,SECTION,base)
- @$(call install_fixup, libqxt,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
- @$(call install_fixup, libqxt,DESCRIPTION,missing)
-
- @$(foreach lib, $(LIBQXT_MODULES-y), \
- $(call install_lib, libqxt, 0, 0, 0644, libQxt$(lib));)
-
- @$(call install_finish, libqxt)
-
- @$(call touch)
-
-# vim: syntax=make