From a750d5fac34b7f3c2fb244152eef296b702c012a Mon Sep 17 00:00:00 2001 From: Taozuhong Date: Tue, 6 Jul 2021 22:05:27 +0800 Subject: [PATCH 1/5] Add GtkSourceView 5.0 --- mingw-w64-gtksourceview5/PKGBUILD | 47 +++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 mingw-w64-gtksourceview5/PKGBUILD diff --git a/mingw-w64-gtksourceview5/PKGBUILD b/mingw-w64-gtksourceview5/PKGBUILD new file mode 100644 index 0000000000..f725f422da --- /dev/null +++ b/mingw-w64-gtksourceview5/PKGBUILD @@ -0,0 +1,47 @@ +# Maintainer: Christoph Reiter + +_realname=gtksourceview +pkgbase=mingw-w64-${_realname}5 +pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}5" +pkgver=5.0.0 +pkgrel=1 +pkgdesc="A text widget adding syntax highlighting and more to GNOME (mingw-w64)" +arch=('any') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') +url="https://www.gnome.org" +license=("LGPL") +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" + "${MINGW_PACKAGE_PREFIX}-pkg-config" + "${MINGW_PACKAGE_PREFIX}-gobject-introspection" + "${MINGW_PACKAGE_PREFIX}-meson" + "${MINGW_PACKAGE_PREFIX}-ninja") +depends=("${MINGW_PACKAGE_PREFIX}-gtk4" + "${MINGW_PACKAGE_PREFIX}-libxml2" + "${MINGW_PACKAGE_PREFIX}-pcre2" + "${MINGW_PACKAGE_PREFIX}-fribidi") +source=("https://download.gnome.org/sources/gtksourceview/${pkgver:0:3}/gtksourceview-${pkgver}.tar.xz") +sha256sums=('64826633c0c8d2c6a6eb4ec653215ef04e31e13a2d4156a09ca5fd9013acd9c3') + +prepare() { + cd "${srcdir}/${_realname}-${pkgver}" +} + +build() { + [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" + mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}" + + MSYS2_ARG_CONV_EXCL="--prefix=" \ + ${MINGW_PREFIX}/bin/meson.exe \ + --prefix="${MINGW_PREFIX}" \ + --buildtype=plain \ + "../${_realname}-${pkgver}" + + ${MINGW_PREFIX}/bin/meson.exe compile +} + +package() { + cd "${srcdir}/build-${MINGW_CHOST}" + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/meson.exe install + + install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}4/COPYING" +} From 4e00ac18eedad6c4b562f2c2c77cf9afb55eeffa Mon Sep 17 00:00:00 2001 From: Taozuhong Date: Tue, 6 Jul 2021 22:23:37 +0800 Subject: [PATCH 2/5] Add make dependency --- mingw-w64-gtksourceview5/PKGBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mingw-w64-gtksourceview5/PKGBUILD b/mingw-w64-gtksourceview5/PKGBUILD index f725f422da..50826cc698 100644 --- a/mingw-w64-gtksourceview5/PKGBUILD +++ b/mingw-w64-gtksourceview5/PKGBUILD @@ -11,6 +11,7 @@ mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') url="https://www.gnome.org" license=("LGPL") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" + "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-pkg-config" "${MINGW_PACKAGE_PREFIX}-gobject-introspection" "${MINGW_PACKAGE_PREFIX}-meson" @@ -43,5 +44,5 @@ package() { cd "${srcdir}/build-${MINGW_CHOST}" DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/meson.exe install - install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}4/COPYING" + install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}5/COPYING" } From 988e33dfa2daf2e4f893086f0f1152917cf777ca Mon Sep 17 00:00:00 2001 From: Taozuhong Date: Tue, 6 Jul 2021 22:53:10 +0800 Subject: [PATCH 3/5] Update PKGBUILD --- mingw-w64-gtksourceview5/PKGBUILD | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mingw-w64-gtksourceview5/PKGBUILD b/mingw-w64-gtksourceview5/PKGBUILD index 50826cc698..b48739328f 100644 --- a/mingw-w64-gtksourceview5/PKGBUILD +++ b/mingw-w64-gtksourceview5/PKGBUILD @@ -10,12 +10,10 @@ arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') url="https://www.gnome.org" license=("LGPL") -makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" - "${MINGW_PACKAGE_PREFIX}-cmake" +makedepends=("${MINGW_PACKAGE_PREFIX}-vala" "${MINGW_PACKAGE_PREFIX}-pkg-config" "${MINGW_PACKAGE_PREFIX}-gobject-introspection" - "${MINGW_PACKAGE_PREFIX}-meson" - "${MINGW_PACKAGE_PREFIX}-ninja") + "${MINGW_PACKAGE_PREFIX}-meson") depends=("${MINGW_PACKAGE_PREFIX}-gtk4" "${MINGW_PACKAGE_PREFIX}-libxml2" "${MINGW_PACKAGE_PREFIX}-pcre2" From a945575dde6f8a3aebf4126a46f5d6f7bda74e36 Mon Sep 17 00:00:00 2001 From: Taozuhong Date: Tue, 6 Jul 2021 22:56:18 +0800 Subject: [PATCH 4/5] Update dependency and maintainer --- mingw-w64-gtksourceview5/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-gtksourceview5/PKGBUILD b/mingw-w64-gtksourceview5/PKGBUILD index b48739328f..a524216418 100644 --- a/mingw-w64-gtksourceview5/PKGBUILD +++ b/mingw-w64-gtksourceview5/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Christoph Reiter +# Maintainer: Taozuhong _realname=gtksourceview pkgbase=mingw-w64-${_realname}5 @@ -7,7 +7,7 @@ pkgver=5.0.0 pkgrel=1 pkgdesc="A text widget adding syntax highlighting and more to GNOME (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') +mingw_arch=('any') url="https://www.gnome.org" license=("LGPL") makedepends=("${MINGW_PACKAGE_PREFIX}-vala" From a5373e2cbb1c607645d17d86515eba90549e22ae Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sat, 10 Jul 2021 14:14:24 +0200 Subject: [PATCH 5/5] gtksourceview5: missing include --- mingw-w64-gtksourceview5/001-missing-include.patch | 10 ++++++++++ mingw-w64-gtksourceview5/PKGBUILD | 8 ++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 mingw-w64-gtksourceview5/001-missing-include.patch diff --git a/mingw-w64-gtksourceview5/001-missing-include.patch b/mingw-w64-gtksourceview5/001-missing-include.patch new file mode 100644 index 0000000000..c5e66eeff1 --- /dev/null +++ b/mingw-w64-gtksourceview5/001-missing-include.patch @@ -0,0 +1,10 @@ +--- gtksourceview-5.0.0/gtksourceview/gtksourcesnippetbundle-parser.c.orig 2021-07-10 14:07:51.916000000 +0200 ++++ gtksourceview-5.0.0/gtksourceview/gtksourcesnippetbundle-parser.c 2021-07-10 14:07:57.199228300 +0200 +@@ -20,6 +20,7 @@ + #include "config.h" + + #include ++#include + + #include "gtksourcesnippetbundle-private.h" + #include "gtksourcesnippetchunk.h" diff --git a/mingw-w64-gtksourceview5/PKGBUILD b/mingw-w64-gtksourceview5/PKGBUILD index a524216418..cb7f850bdd 100644 --- a/mingw-w64-gtksourceview5/PKGBUILD +++ b/mingw-w64-gtksourceview5/PKGBUILD @@ -18,11 +18,15 @@ depends=("${MINGW_PACKAGE_PREFIX}-gtk4" "${MINGW_PACKAGE_PREFIX}-libxml2" "${MINGW_PACKAGE_PREFIX}-pcre2" "${MINGW_PACKAGE_PREFIX}-fribidi") -source=("https://download.gnome.org/sources/gtksourceview/${pkgver:0:3}/gtksourceview-${pkgver}.tar.xz") -sha256sums=('64826633c0c8d2c6a6eb4ec653215ef04e31e13a2d4156a09ca5fd9013acd9c3') +source=("https://download.gnome.org/sources/gtksourceview/${pkgver:0:3}/gtksourceview-${pkgver}.tar.xz" + "001-missing-include.patch") +sha256sums=('64826633c0c8d2c6a6eb4ec653215ef04e31e13a2d4156a09ca5fd9013acd9c3' + 'e56e7c04b5731b5a89abd02aaf383a359aa72cf1535032f74dae7caacd00b526') prepare() { cd "${srcdir}/${_realname}-${pkgver}" + + patch -Np1 -i "${srcdir}/001-missing-include.patch" } build() {