From ef41fdb5424c8a13fa397c7de93613e77ba6bbf4 Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Thu, 15 Dec 2022 20:18:56 +0530 Subject: [PATCH] kjs-qt5: Remove redundant patch which includes qtcore --- mingw-w64-kjs-qt5/001-fix-build.patch | 11 ----------- mingw-w64-kjs-qt5/PKGBUILD | 11 +++-------- 2 files changed, 3 insertions(+), 19 deletions(-) delete mode 100644 mingw-w64-kjs-qt5/001-fix-build.patch diff --git a/mingw-w64-kjs-qt5/001-fix-build.patch b/mingw-w64-kjs-qt5/001-fix-build.patch deleted file mode 100644 index f3b6396748..0000000000 --- a/mingw-w64-kjs-qt5/001-fix-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kjs-5.59.0/src/kjs/CMakeLists.txt.orig 2019-06-24 14:28:21.227677000 +0300 -+++ kjs-5.59.0/src/kjs/CMakeLists.txt 2019-06-24 14:31:48.084966700 +0300 -@@ -10,6 +10,8 @@ - check_cxx_compiler_flag(-fvisibility=hidden __KDE_HAVE_GCC_VISIBILITY) - configure_file(global.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/global.h ) - -+include_directories(${Qt5Core_INCLUDE_DIRS}) -+ - # the check for pcre is in ../CMakeLists.txt - if(PCRE_FOUND AND NOT KJS_FORCE_DISABLE_PCRE) - include_directories(${PCRE_INCLUDE_DIR}) diff --git a/mingw-w64-kjs-qt5/PKGBUILD b/mingw-w64-kjs-qt5/PKGBUILD index c6d2ba677f..3afe08d555 100644 --- a/mingw-w64-kjs-qt5/PKGBUILD +++ b/mingw-w64-kjs-qt5/PKGBUILD @@ -23,19 +23,14 @@ _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-bzip2" _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-pcre${_namesuff}" _kde_f5_add_depends "${_variant}" "${MINGW_PACKAGE_PREFIX}-kdoctools-qt5${_namesuff}>=${pkgver}" groups=("${MINGW_PACKAGE_PREFIX}-kf5") -source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/portingAids/${_basename}-${pkgver}.tar.xz"{,.sig} - 001-fix-build.patch) +source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/portingAids/${_basename}-${pkgver}.tar.xz"{,.sig}) sha256sums=('eefef4a9791fb14d3c3a7655df9cd7fbd7068ece4e889f464569ddb83666dc0b' - 'SKIP' - '9f57ba22b4d73b46d94966aba2ad0f74be3c51b3d7b92e8b922d69e1bb617cd1') + 'SKIP') validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure prepare() { - cd ${_basename}-${pkgver} - patch -p1 -i "${srcdir}"/001-fix-build.patch - - cd ${srcdir} mkdir -p build-${MSYSTEM}${_variant} + } build() {