From f4b804b04d7edaccefc75f16d1e374693bb5ded0 Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Fri, 29 Apr 2022 13:14:49 +0530 Subject: [PATCH] gnome-latex: update to 3.39.1 * Change tepl5 to tepl. * Add intltool, appstream-glib and gtk-doc in makedepends. * Reenable 001-win.patch file which was disabled in 0d1bec11c534b7e1cdd379ae78e3adc079e26f25 commit. gnome-latex fails without that patch becuase it can not find ui.xml file. * Add check function. --- mingw-w64-gnome-latex/001-win.patch | 31 ++++++++++++----------------- mingw-w64-gnome-latex/PKGBUILD | 31 +++++++++++++++++++---------- 2 files changed, 34 insertions(+), 28 deletions(-) diff --git a/mingw-w64-gnome-latex/001-win.patch b/mingw-w64-gnome-latex/001-win.patch index d34342e59b..17559f5f91 100644 --- a/mingw-w64-gnome-latex/001-win.patch +++ b/mingw-w64-gnome-latex/001-win.patch @@ -26,9 +26,9 @@ -I$(top_builddir) \ --- ./src/main.vala.orig 2016-08-27 14:54:53.000000000 +0200 +++ ./src/main.vala 2016-11-15 14:54:12.834044200 +0100 -@@ -21,6 +21,16 @@ - - using Gtk; +@@ -19,8 +19,28 @@ + * Author: Sébastien Wilmet + */ +namespace Config +{ @@ -40,26 +40,21 @@ + public string ICONS_DIR; +} + - private void init_i18n () - { - Intl.bindtextdomain (Config.GETTEXT_PACKAGE, Config.LOCALE_DIR); -@@ -30,6 +40,16 @@ - int main (string[] argv) { -+ string p = Win32.get_package_installation_directory_of_module (null); ++ string p = Win32.get_package_installation_directory_of_module (null); + -+ Config.PACKAGE_NAME = RealConfig.PACKAGE_NAME; -+ Config.PACKAGE_VERSION = RealConfig.PACKAGE_VERSION; -+ Config.GETTEXT_PACKAGE = RealConfig.GETTEXT_PACKAGE; ++ Config.PACKAGE_NAME = RealConfig.PACKAGE_NAME; ++ Config.PACKAGE_VERSION = RealConfig.PACKAGE_VERSION; ++ Config.GETTEXT_PACKAGE = RealConfig.GETTEXT_PACKAGE; + -+ Config.DATA_DIR = Path.build_filename (p, "share", "gnome-latex"); -+ Config.LOCALE_DIR = Path.build_filename (p, "share", "locale"); -+ Config.ICONS_DIR = Path.build_filename (p, "share", "icons", "hicolor"); ++ Config.DATA_DIR = Path.build_filename (p, "share", "gnome-latex"); ++ Config.LOCALE_DIR = Path.build_filename (p, "share", "locale"); ++ Config.ICONS_DIR = Path.build_filename (p, "share", "icons", "hicolor"); + - init_i18n (); - - LatexilaApp app = new LatexilaApp (); + Latexila.init (); + Factory factory = new Factory (); + factory.set_singleton (); --- ./vapi/config.vapi.orig 2015-04-18 19:05:46.000000000 +0200 +++ ./vapi/config.vapi 2016-11-15 14:46:40.114808800 +0100 @@ -1,5 +1,5 @@ diff --git a/mingw-w64-gnome-latex/PKGBUILD b/mingw-w64-gnome-latex/PKGBUILD index c2ba5f742c..9f6a8d3d90 100644 --- a/mingw-w64-gnome-latex/PKGBUILD +++ b/mingw-w64-gnome-latex/PKGBUILD @@ -4,8 +4,8 @@ _realname=gnome-latex pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" replaces=("${MINGW_PACKAGE_PREFIX}-latexila") -pkgver=3.38.0 -pkgrel=2 +pkgver=3.39.1 +pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') pkgdesc="LaTeX editor designed for the GNOME desktop (mingw-w64)" @@ -15,29 +15,35 @@ depends=("${MINGW_PACKAGE_PREFIX}-gsettings-desktop-schemas" "${MINGW_PACKAGE_PREFIX}-gtksourceview4" "${MINGW_PACKAGE_PREFIX}-gtk-update-icon-cache" "${MINGW_PACKAGE_PREFIX}-gspell" - "${MINGW_PACKAGE_PREFIX}-tepl5" + "${MINGW_PACKAGE_PREFIX}-tepl" "${MINGW_PACKAGE_PREFIX}-libgee") -makedepends=("itstool" +makedepends=("intltool" + "${MINGW_PACKAGE_PREFIX}-appstream-glib" + "${MINGW_PACKAGE_PREFIX}-itstool" "${MINGW_PACKAGE_PREFIX}-vala" "${MINGW_PACKAGE_PREFIX}-gobject-introspection" + "${MINGW_PACKAGE_PREFIX}-gtk-doc" "${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-cc") license=("GPL 3") url="https://www.gnome.org" -# TODO: update and re-apply 001-win.patch (ideally by contributing upstream). -source=(https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz) -sha256sums=('a82a9fc6f056929ea18d6dffd121e71b2c21768808c86ef1f34da0f86e220d77') +source=(https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz + 001-win.patch) +sha256sums=('253271a66a788ccd331ed11d21e4133336e16eb1cea92b45bec6a1a8fe8661a4' + '36ce116cda3319a654ea754e99a627c84d123ee329620849bd990736c95c3a34') prepare() { cd "${srcdir}"/${_realname}-${pkgver} + patch -p1 -i "${srcdir}/001-win.patch" autoreconf -sf -I m4 } build() { - [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST} - mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST} + [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM} + mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM} + INTLTOOL_PERL=/usr/bin/perl \ ../${_realname}-${pkgver}/configure \ --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ @@ -50,8 +56,13 @@ build() { make } +check() { + cd "${srcdir}/build-${MSYSTEM}" + make check || true +} + package() { - cd "${srcdir}/build-${MINGW_CHOST}" + cd "${srcdir}/build-${MSYSTEM}" make DESTDIR=${pkgdir} install