From 63f91abda1e0e3a4faec2b331b1ce2a8a2b17b82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= Date: Fri, 9 Feb 2024 18:18:48 +0100 Subject: [PATCH] geany-plugins: drop 32-bit environments --- mingw-w64-geany-plugins/PKGBUILD | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/mingw-w64-geany-plugins/PKGBUILD b/mingw-w64-geany-plugins/PKGBUILD index 4938b5985c..096ea124dc 100644 --- a/mingw-w64-geany-plugins/PKGBUILD +++ b/mingw-w64-geany-plugins/PKGBUILD @@ -11,9 +11,13 @@ pkgver=1.38.0 pkgrel=4 pkgdesc='Plugins for Geany (mingw-w64)' arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') +mingw_arch=('mingw64' 'ucrt64' 'clang64') url='https://plugins.geany.org/' -license=('GPL') +msys2_repository_url="https://github.com/geany/geany-plugins" +msys2_references=( + 'archlinux: geany-plugins' +) +license=('spdx:GPL-2.0-or-later AND GPL-3.0-or-later AND BSD-2-Clause') depends=("${MINGW_PACKAGE_PREFIX}-geany>=${pkgver}" "${MINGW_PACKAGE_PREFIX}-discount" "${MINGW_PACKAGE_PREFIX}-gtkspell3" @@ -25,11 +29,11 @@ depends=("${MINGW_PACKAGE_PREFIX}-geany>=${pkgver}" "${MINGW_PACKAGE_PREFIX}-libgit2" "${MINGW_PACKAGE_PREFIX}-gtk-update-icon-cache" "${MINGW_PACKAGE_PREFIX}-hicolor-icon-theme") -makedepends=('intltool' +makedepends=("${MINGW_PACKAGE_PREFIX}-cc" + "${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-vala" "${MINGW_PACKAGE_PREFIX}-gdb" - "${MINGW_PACKAGE_PREFIX}-cc" - "${MINGW_PACKAGE_PREFIX}-autotools") + 'intltool') # "${MINGW_PACKAGE_PREFIX}-cppcheck") # optdepends=("${MINGW_PACKAGE_PREFIX}-hspell: hebrew spell checker") source=(#"https://plugins.geany.org/${_realname}/${_realname}-${pkgver}.tar.bz2" @@ -46,6 +50,7 @@ noextract=(${_realname}-${pkgver}.tar.gz) prepare() { [[ -d ${srcdir}/${_realname}-${pkgver} ]] && rm -rf ${srcdir}/${_realname}-${pkgver} tar -xzf ${srcdir}/${_realname}-${pkgver}.tar.gz -C ${srcdir} || true + cd ${_realname}-${pkgver} patch -p1 -i ${srcdir}/001-no-undefined.patch @@ -59,9 +64,7 @@ prepare() { } build() { - rm -rf "build-${MINGW_CHOST}" - mkdir -p "build-${MINGW_CHOST}" - cd "build-${MINGW_CHOST}" + mkdir -p "build-${MSYSTEM}" && cd "build-${MSYSTEM}" export lt_cv_deplibs_check_method='pass_all' @@ -80,6 +83,6 @@ build() { } package() { - cd "build-${MINGW_CHOST}" + cd "build-${MSYSTEM}" make DESTDIR="${pkgdir}" install }