diff options
3 files changed, 0 insertions, 54 deletions
diff --git a/meta-xfce/recipes-panel-plugins/hotcorner/xfce4-hotcorner-plugin/0001-CMakeLists.txt-fix-library-install-path.patch b/meta-xfce/recipes-panel-plugins/hotcorner/xfce4-hotcorner-plugin/0001-CMakeLists.txt-fix-library-install-path.patch deleted file mode 100644 index df348dc852..0000000000 --- a/meta-xfce/recipes-panel-plugins/hotcorner/xfce4-hotcorner-plugin/0001-CMakeLists.txt-fix-library-install-path.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | Upstream-Status: Submitted [https://github.com/brianhsu/xfce4-hotcorner-plugin/pull/8] | ||
2 | |||
3 | The library install path may be ${CMAKE_INSTALL_PREFIX}/lib64 rather | ||
4 | than fixed ${CMAKE_INSTALL_PREFIX}/lib. Provide a variable to make it | ||
5 | could override by cmake command line. | ||
6 | |||
7 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
8 | --- | ||
9 | CMakeLists.txt | 7 ++++--- | ||
10 | 1 file changed, 4 insertions(+), 3 deletions(-) | ||
11 | |||
12 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
13 | index e193787..84cb52d 100644 | ||
14 | --- a/CMakeLists.txt | ||
15 | +++ b/CMakeLists.txt | ||
16 | @@ -10,8 +10,9 @@ include(GNUInstallDirs) | ||
17 | |||
18 | PKG_CHECK_MODULES(GTK REQUIRED libxfce4panel-1.0 libxfce4ui-1 libwnck-3.0) | ||
19 | |||
20 | -set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) | ||
21 | -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) | ||
22 | +set(BASE_LIB_PATH "lib" CACHE STRING "base library install path") | ||
23 | +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BASE_LIB_PATH}) | ||
24 | +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BASE_LIB_PATH}) | ||
25 | set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) | ||
26 | |||
27 | INCLUDE_DIRECTORIES(${GTK_INCLUDE_DIRS}) | ||
28 | @@ -28,7 +29,7 @@ ADD_LIBRARY(hotcorner SHARED src/hotcorner.c src/util.c) | ||
29 | |||
30 | TARGET_LINK_LIBRARIES(hotcorner ${GTK_LIBRARIES}) | ||
31 | |||
32 | -INSTALL(TARGETS hotcorner LIBRARY DESTINATION lib/xfce4/panel/plugins/) | ||
33 | +INSTALL(TARGETS hotcorner LIBRARY DESTINATION ${BASE_LIB_PATH}/xfce4/panel/plugins/) | ||
34 | INSTALL(FILES hotcorner.desktop DESTINATION share/xfce4/panel/plugins/) | ||
35 | GETTEXT_CREATE_TRANSLATIONS(po/xfce4-hotcorner-plugin.pot ALL po/zh_TW.po) | ||
36 | |||
37 | -- | ||
38 | 2.11.0 | ||
39 | |||
diff --git a/meta-xfce/recipes-panel-plugins/hotcorner/xfce4-hotcorner-plugin_0.0.2.bb b/meta-xfce/recipes-panel-plugins/hotcorner/xfce4-hotcorner-plugin_0.0.2.bb deleted file mode 100644 index 57a815b1b5..0000000000 --- a/meta-xfce/recipes-panel-plugins/hotcorner/xfce4-hotcorner-plugin_0.0.2.bb +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | SUMMARY = "Plugin providing hotcorners" | ||
2 | LICENSE = "GPLv2" | ||
3 | LIC_FILES_CHKSUM = "file://README.md;beginline=48;endline=53;md5=2c694b8e0f73274b13465b509e4f5427" | ||
4 | |||
5 | inherit xfce-panel-plugin cmake | ||
6 | |||
7 | DEPENDS += "libwnck3" | ||
8 | |||
9 | SRC_URI = "https://github.com/brianhsu/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz \ | ||
10 | file://0001-CMakeLists.txt-fix-library-install-path.patch" | ||
11 | SRC_URI[md5sum] = "ac31b45cda1867cb6bd69bb285638263" | ||
12 | SRC_URI[sha256sum] = "942684c92f96a158e1417e597947f822769ac56aa1993a8c9f166ee633ef2b8d" | ||
13 | |||
14 | EXTRA_OECMAKE = "-DBASE_LIB_PATH=${baselib}" | ||
diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb index 255d2b5ebd..f8a4b2f687 100644 --- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb +++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb | |||
@@ -46,7 +46,6 @@ RRECOMMENDS_${PN} = " \ | |||
46 | xfce4-whiskermenu-plugin \ | 46 | xfce4-whiskermenu-plugin \ |
47 | xfce4-mailwatch-plugin \ | 47 | xfce4-mailwatch-plugin \ |
48 | xfce4-smartbookmark-plugin \ | 48 | xfce4-smartbookmark-plugin \ |
49 | xfce4-hotcorner-plugin \ | ||
50 | ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'xfce4-pulseaudio-plugin', '', d)} \ | 49 | ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'xfce4-pulseaudio-plugin', '', d)} \ |
51 | xfce4-sensors-plugin \ | 50 | xfce4-sensors-plugin \ |
52 | xfce4-calculator-plugin \ | 51 | xfce4-calculator-plugin \ |