diff --git a/recipes-kde/porting-aids-tier1/kjs/files/0001-install-icemaker-we-need-the-native-one-for-cross-co.patch b/recipes-kde/porting-aids-tier1/kjs/files/0001-install-icemaker-we-need-the-native-one-for-cross-co.patch deleted file mode 100644 index a8d6a0c2..00000000 --- a/recipes-kde/porting-aids-tier1/kjs/files/0001-install-icemaker-we-need-the-native-one-for-cross-co.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d5c93a4838c8283b0a13ac1ca2395118cefe7e94 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 3 Dec 2014 16:02:52 +0100 -Subject: [PATCH] install icemaker - we need the native one for cross - compilation -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Andreas Müller ---- - src/kjs/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/kjs/CMakeLists.txt b/src/kjs/CMakeLists.txt -index d8406ea..3286334 100644 ---- a/src/kjs/CMakeLists.txt -+++ b/src/kjs/CMakeLists.txt -@@ -67,6 +67,7 @@ endif() - add_executable(icemaker ${icemaker_SRCS}) - ecm_mark_nongui_executable(icemaker) - target_include_directories(icemaker PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/..") -+ install(TARGETS icemaker EXPORT KF5JSTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) - - # get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH) - #get_target_property(ICEMAKER_EXECUTABLE icemaker WRAPPER_SCRIPT) --- -1.8.3.1 - diff --git a/recipes-kde/porting-aids-tier1/kjs/files/0001-native-build-and-install-icemaker-only.patch b/recipes-kde/porting-aids-tier1/kjs/files/0001-native-build-and-install-icemaker-only.patch new file mode 100644 index 00000000..ba612c68 --- /dev/null +++ b/recipes-kde/porting-aids-tier1/kjs/files/0001-native-build-and-install-icemaker-only.patch @@ -0,0 +1,64 @@ +From f01929e72c1a5baadf974a5b3f816ad73dd1d35f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 29 Jan 2015 21:05:23 +0100 +Subject: [PATCH] native: build and install icemaker only +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [embedded-specific] + +Signed-off-by: Andreas Müller +--- + CMakeLists.txt | 2 -- + src/CMakeLists.txt | 2 +- + src/kjs/CMakeLists.txt | 4 +++- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7610111..6c4fa70 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -46,8 +46,6 @@ option(KJS_FORCE_DISABLE_PCRE "Force building of KJS without PCRE. Doing this wi + remove_definitions(-DQT_NO_CAST_FROM_ASCII) + + add_subdirectory(src) +-add_subdirectory(autotests) +-add_subdirectory(tests) + + # create a Config.cmake and a ConfigVersion.cmake file and install them + set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5JS") +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index de1d59f..c559f38 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,3 +1,3 @@ + add_subdirectory(kjs) + +-add_subdirectory(wtf) ++ +diff --git a/src/kjs/CMakeLists.txt b/src/kjs/CMakeLists.txt +index a51a71d..793779d 100644 +--- a/src/kjs/CMakeLists.txt ++++ b/src/kjs/CMakeLists.txt +@@ -67,7 +67,8 @@ endif() + add_executable(icemaker ${icemaker_SRCS}) + ecm_mark_nongui_executable(icemaker) + target_include_directories(icemaker PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/..") +- ++ install(TARGETS icemaker EXPORT KF5JSTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) ++if(FALSE) + # get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH) + #get_target_property(ICEMAKER_EXECUTABLE icemaker WRAPPER_SCRIPT) + #get_target_property(ICEMAKER_EXECUTABLE_DIR icemaker RUNTIME_OUTPUT_DIRECTORY) +@@ -310,6 +311,7 @@ install(FILES + ) + + install(FILES create_hash_table DESTINATION ${KDE_INSTALL_DATADIR_KF5}/kjs/ ) ++endif() + + include(ECMGeneratePriFile) + ecm_generate_pri_file(BASE_NAME KJS LIB_NAME KF5JS DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KJS) +-- +1.8.3.1 + diff --git a/recipes-kde/porting-aids-tier1/kjs/kjs-native.bb b/recipes-kde/porting-aids-tier1/kjs/kjs-native.bb index 2b991fb6..c28169d6 100644 --- a/recipes-kde/porting-aids-tier1/kjs/kjs-native.bb +++ b/recipes-kde/porting-aids-tier1/kjs/kjs-native.bb @@ -3,7 +3,7 @@ require ${BPN}.inc inherit native SRC_URI += " \ - file://0001-install-icemaker-we-need-the-native-one-for-cross-co.patch \ + file://0001-native-build-and-install-icemaker-only.patch \ " DEPENDS += "libpcre-native" diff --git a/recipes-kde/porting-aids-tier1/kjs/kjs.inc b/recipes-kde/porting-aids-tier1/kjs/kjs.inc index 487d859d..129234cf 100644 --- a/recipes-kde/porting-aids-tier1/kjs/kjs.inc +++ b/recipes-kde/porting-aids-tier1/kjs/kjs.inc @@ -4,7 +4,8 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " +require ../../kf5-version.inc + inherit kde perlnative -SRCREV = "c59650a0b873df766de2bbf11e6ef37a7b2c323b" -PV = "5.5.0" +SRCREV = "12cf97b33e96dc45de0486d3dd5501c99a768a54"