From 8f12c4ab196eb36620963dc8fbe080ac9325cc11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 28 Jan 2019 00:03:13 +0100 Subject: [PATCH] obconf-qt: upgrade 0.13.0 -> 0.14.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...-does-not-work-and-is-not-neccessary.patch | 25 +++++++++---------- recipes-lxqt/obconf-qt/obconf-qt_git.bb | 4 +-- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/recipes-lxqt/obconf-qt/files/0001-finding-sed-does-not-work-and-is-not-neccessary.patch b/recipes-lxqt/obconf-qt/files/0001-finding-sed-does-not-work-and-is-not-neccessary.patch index 09ee27b8..8a39001b 100644 --- a/recipes-lxqt/obconf-qt/files/0001-finding-sed-does-not-work-and-is-not-neccessary.patch +++ b/recipes-lxqt/obconf-qt/files/0001-finding-sed-does-not-work-and-is-not-neccessary.patch @@ -1,35 +1,34 @@ From 19c7b3eaa79eb7d6ed9037d6c9efac422356889d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 23 Jul 2015 16:34:45 +0200 +Date: Mon, 28 Jan 2019 00:00:43 +0100 Subject: [PATCH] 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 +Upstream-Status: Pending + +Signed-off-by: Andreas Müller --- CMakeLists.txt | 2 -- src/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9ed9cf4..5a611d2 100644 +index 49ff915..86de6b9 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.12 FATAL_ERROR) +@@ -6,8 +6,6 @@ cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR) + # versions. + project(obconf-qt) -find_program(SED_PROGRAM sed) - include(GNUInstallDirs) - set(LXQTBT_MINIMUM_VERSION "0.5.0") + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 88196b4..fb2d6bb 100644 +index deff6e8..bbdc191 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -48,7 +48,7 @@ set_property(SOURCE ${obconf-qt_UI_H} PROPERTY SKIP_AUTOMOC ON) +@@ -39,7 +39,7 @@ set_property(SOURCE ${obconf-qt_UI_H} PROPERTY SKIP_AUTOMOC ON) # but we don't want that. Fix it with sed. add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ui_obconf_fixed.h @@ -39,5 +38,5 @@ index 88196b4..fb2d6bb 100644 # DEPENDS MAIN_DEPENDENCY ${obconf-qt_UI_H} -- -2.13.6 +2.20.1 diff --git a/recipes-lxqt/obconf-qt/obconf-qt_git.bb b/recipes-lxqt/obconf-qt/obconf-qt_git.bb index da8b50d6..89323e7f 100644 --- a/recipes-lxqt/obconf-qt/obconf-qt_git.bb +++ b/recipes-lxqt/obconf-qt/obconf-qt_git.bb @@ -7,7 +7,7 @@ inherit lxqt pkgconfig DEPENDS += "qtx11extras openbox" SRC_URI += "file://0001-finding-sed-does-not-work-and-is-not-neccessary.patch" -SRCREV = "056881dd2c941936124bafe6657c111ca0627586" -PV = "0.13.0" +SRCREV = "7046f5b23629b7cb74c55b09f7e96e6aed17d8db" +PV = "0.14.0" FILES_${PN} += "${datadir}/icons"