add obconf-qt

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2015-07-23 16:53:31 +02:00
parent 1ee3ba929e
commit f52d9b7449
4 changed files with 94 additions and 0 deletions

View File

@@ -0,0 +1,32 @@
From 65de29e11d7bb4932aefd56aa8b3a48c76402bb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Thu, 23 Jul 2015 16:41:36 +0200
Subject: [PATCH 1/2] src/CMakeLists.txt: do not completely overwrite
CMAKE_CXX_FLAGS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
causes for hardfloat machine:
/usr/include/gnu/stubs.h:7:29: fatal error: gnu/stubs-soft.h: No such file or directory
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
src/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 85b8c25..d2843a2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
# set visibility to hidden to hide symbols, unlesss they're exporeted manually in the code
-set(CMAKE_CXX_FLAGS "-DQT_NO_KEYWORDS -fno-exceptions")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_KEYWORDS -fno-exceptions")
if(USE_QT4)
set(QTX_INCLUDE_DIRS ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTDBUS_DIR})
--
1.9.3

View File

@@ -0,0 +1,43 @@
From 76ba8b96c2a5281b1b549e6512b4d998e05b4304 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Thu, 23 Jul 2015 16:34:45 +0200
Subject: [PATCH 2/2] finding sed does not work and is not neccessary
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
CMakeLists.txt | 2 --
src/CMakeLists.txt | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 789b14f..0f78001 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,8 +2,6 @@ project(obconf-qt)
# newer cmake is required for CMAKE_AUTOMOC Qt support
cmake_minimum_required(VERSION 2.8.6)
-find_program(SED_PROGRAM sed)
-
# additional cmake files
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d2843a2..ac0eb85 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -46,7 +46,7 @@ endif()
# but we don't want that. Fix it with sed.
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ui_obconf_fixed.h
- COMMAND ${SED_PROGRAM}
+ COMMAND sed
ARGS "/connectSlotsByName/d" ${obconf-qt_UI_H} > ${CMAKE_CURRENT_BINARY_DIR}/ui_obconf_fixed.h
# DEPENDS
MAIN_DEPENDENCY ${obconf-qt_UI_H}
--
1.9.3

View File

@@ -0,0 +1,18 @@
SUMMARY = "Qt port of obconf, the Openbox configuration tool"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
inherit lxqt pkgconfig
DEPENDS += "qtx11extras"
SRC_URI += " \
file://0001-src-CMakeLists.txt-do-not-completely-overwrite-CMAKE.patch \
file://0002-finding-sed-does-not-work-and-is-not-neccessary.patch \
"
SRCREV = "1ce85f193385adba843d9257639442578db4170e"
PV = "0.9.0+git${SRCPV}"
FILES_${PN} += "${datadir}/icons"
RDEPENDS_${PN} += "openbox-core"

View File

@@ -25,5 +25,6 @@ RDEPENDS_${PN} = " \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "lxqt-runner", "",d)} \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "lxqt-session", "",d)} \
menu-cache \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "obconf-qt", "",d)} \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "pcmanfm-qt", "",d)} \
"