diff --git a/mingw-w64-gedit/PKGBUILD b/mingw-w64-gedit/PKGBUILD index 9a7f14c4b6..ac2e3b5ab1 100644 --- a/mingw-w64-gedit/PKGBUILD +++ b/mingw-w64-gedit/PKGBUILD @@ -3,7 +3,7 @@ _realname=gedit pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=48.1 +pkgver=48.2 pkgrel=1 pkgdesc="A text editor for GNOME (mingw-w64)" arch=('any') @@ -40,15 +40,22 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-itstool" "${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-yelp-tools" - "${MINGW_PACKAGE_PREFIX}-desktop-file-utils") + "${MINGW_PACKAGE_PREFIX}-desktop-file-utils" + "git") optdepends=("${MINGW_PACKAGE_PREFIX}-gedit-plugins: Additional features") -source=("https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz" +source=("git+https://gitlab.gnome.org/GNOME/gedit.git#tag=${pkgver}" + "git+https://gitlab.gnome.org/GNOME/libgd.git" "0001-workaround-no-delayed-loading.patch") -sha256sums=('971e7ac26bc0a3a3ded27a7563772415687db0e5a092b4547e5b10a55858b30a' +sha256sums=('5aec8e65b9e0e5bf0e99233a55080216ec80ba0502212ff96c651dea4631eb08' + 'SKIP' '942d8e9435d8c337d96441f46cb7287b5669890e3df319ab5d49fa576d8e8da3') prepare() { - cd "${srcdir}"/${_realname}-${pkgver} + cd "${_realname}" + + git submodule init + git submodule set-url subprojects/libgd "${srcdir}/libgd" + git -c protocol.file.allow=always submodule update # gedit requires delayed loading which isn't supported by meson # yet, so move the lib to /bin. @@ -65,7 +72,7 @@ build() { --wrap-mode=nodownload \ --default-library=both \ --buildtype=plain \ - "../${_realname}-${pkgver}" + "../${_realname}" ${MINGW_PREFIX}/bin/meson.exe compile } @@ -75,5 +82,5 @@ package() { DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/meson.exe install - install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING" + install -Dm644 "${srcdir}/${_realname}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING" }