* [PR PATCH] gnome-latex: update to 3.40.0, tepl: update to 6.1.1.
@ 2022-07-09 10:05 paper42
2022-07-09 10:26 ` [PR PATCH] [Merged]: " paper42
0 siblings, 1 reply; 2+ messages in thread
From: paper42 @ 2022-07-09 10:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1267 bytes --]
There is a new pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome-latex
https://github.com/void-linux/void-packages/pull/37936
gnome-latex: update to 3.40.0, tepl: update to 6.1.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/37936.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome-latex-37936.patch --]
[-- Type: text/x-diff, Size: 8493 bytes --]
From 17b9f9308577197518df50d37f869de101534558 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Jul 2022 12:53:43 +0200
Subject: [PATCH 1/2] tepl: update to 6.1.1.
---
srcpkgs/tepl/patches/no-gir.patch | 45 -------------------------------
srcpkgs/tepl/template | 27 +++++++++++--------
2 files changed, 16 insertions(+), 56 deletions(-)
delete mode 100644 srcpkgs/tepl/patches/no-gir.patch
diff --git a/srcpkgs/tepl/patches/no-gir.patch b/srcpkgs/tepl/patches/no-gir.patch
deleted file mode 100644
index 890095602857..000000000000
--- a/srcpkgs/tepl/patches/no-gir.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 17e57ed156450fe59001cb0a14f8d87c40d6bf77 Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Sat, 15 Aug 2020 00:09:15 +0200
-Subject: [PATCH] Allow disabling gir
-
----
- meson_options.txt | 5 +++++
- tepl/meson.build | 4 ++++
- 2 files changed, 9 insertions(+)
-
-diff --git meson_options.txt meson_options.txt
-index cad97dd..5e99084 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -3,3 +3,8 @@ option(
- type: 'boolean', value: false,
- description: 'Build API reference (requires gtk-doc)'
- )
-+option(
-+ 'gir',
-+ type: 'boolean', value: true,
-+ description: 'Build gobject-introspection'
-+)
-diff --git tepl/meson.build tepl/meson.build
-index 226d913..b35dd3a 100644
---- a/tepl/meson.build
-+++ b/tepl/meson.build
-@@ -164,6 +164,8 @@ PKG_CONFIG.generate(tepl_lib,
- libraries: TEPL_PUBLIC_DEPS,
- )
-
-+if get_option('gir')
-+
- GNOME.generate_gir(
- tepl_lib,
- export_packages: 'tepl-@0@'.format(TEPL_API_VERSION),
-@@ -182,3 +184,5 @@ GNOME.generate_gir(
- # Support for deps being built as subprojects:
- dependencies: TEPL_DEPS,
- )
-+
-+endif
---
-2.28.0
-
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 2991585cf549..fae1e1d3a3f3 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,27 +1,29 @@
# Template file for 'tepl'
pkgname=tepl
-version=6.00.0
-revision=4
+version=6.1.1
+revision=1
build_style=meson
build_helper=gir
-configure_args="$(vopt_bool gir gir)"
-hostmakedepends="glib-devel pkg-config"
+configure_args="$(vopt_bool gir gobject_introspection) $(vopt_bool gtk_doc gtk_doc)"
+hostmakedepends="glib-devel pkg-config gettext $(vopt_if gtk_doc gtk-doc)"
makedepends="amtk-devel libglib-devel gtksourceview4-devel gtk+3-devel
- libxml2-devel uchardet-devel"
+ libxml2-devel uchardet-devel gsettings-desktop-schemas-devel"
+checkdepends="xvfb-run"
short_desc="Text editor product line"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Projects/Tepl"
+changelog="https://gitlab.gnome.org/swilmet/tepl/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a86397a895dca9c0de7a5ccb063bda8f7ef691cccb950ce2cfdee367903e7a63
+checksum=a0fbcbcf82dbcb031e1cbea286ab3edc70d5a6ea4125038242a1b1d3ff0278aa
+make_check_pre="xvfb-run"
-build_options="gir"
+build_options="gir gtk_doc"
build_options_default="gir"
-do_check() {
- # Need X
- :
-}
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
tepl-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
@@ -33,5 +35,8 @@ tepl-devel_package() {
if [ "$build_option_gir" ]; then
vmove usr/share/gir-1.0
fi
+ if [ "$build_option_gtk_doc" ]; then
+ vmove usr/share/gtk-doc
+ fi
}
}
From b2b043863695b4cfa70079e0c9041e966ad8f6a1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Jul 2022 13:22:42 +0200
Subject: [PATCH 2/2] gnome-latex: update to 3.40.0.
---
.../patches/00-port-to-tepl-6.patch | 99 -------------------
srcpkgs/gnome-latex/template | 6 +-
2 files changed, 3 insertions(+), 102 deletions(-)
delete mode 100644 srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch
diff --git a/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch b/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch
deleted file mode 100644
index db767a514a15..000000000000
--- a/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From e1b01186f8a4e5d3fee4c9ccfbedd6d098517df9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9bastien=20Wilmet?= <swilmet@gnome.org>
-Date: Fri, 20 Nov 2020 15:46:36 +0100
-Subject: [PATCH] Port to Tepl 6 (currently 5.99.0, from git master)
-
----
- README | 2 +-
- configure.ac | 4 ++--
- src/Makefile.am | 2 +-
- src/document.vala | 2 +-
- src/liblatexila/Makefile.am | 4 ++--
- 5 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git README README
-index ed0faf7..0dc67d9 100644
---- a/README
-+++ b/README
-@@ -21,7 +21,7 @@ Dependencies
- * GLib >= 2.56
- * GTK >= 3.22
- * GtkSourceView >= 4.0
--* Tepl >= 5.0 - https://wiki.gnome.org/Projects/Tepl
-+* Tepl >= 5.99 - https://wiki.gnome.org/Projects/Tepl
- * gspell >= 1.8
- * gee-0.8 >= 0.10
- * gsettings-desktop-schemas
-diff --git configure.ac configure.ac
-index 743a7da..66d5719 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -32,7 +32,7 @@ GLIB_REQUIRED_VERSION="2.56"
- GTK_REQUIRED_VERSION="3.22"
- GTKSOURCEVIEW_REQUIRED_VERSION="4.0"
- AMTK_REQUIRED_VERSION="5.2"
--TEPL_REQUIRED_VERSION="5.0"
-+TEPL_REQUIRED_VERSION="5.99"
- GSPELL_REQUIRED_VERSION="1.8"
- VALA_REQUIRED_VERSION="0.46"
- GEE_REQUIRED_VERSION="0.10"
-@@ -96,7 +96,7 @@ PKG_CHECK_MODULES([DEP], [
- gtk+-3.0 >= ${GTK_REQUIRED_VERSION}
- gtksourceview-4 >= ${GTKSOURCEVIEW_REQUIRED_VERSION}
- amtk-5 >= ${AMTK_REQUIRED_VERSION}
-- tepl-5 >= ${TEPL_REQUIRED_VERSION}
-+ tepl-6 >= ${TEPL_REQUIRED_VERSION}
- gspell-1 >= ${GSPELL_REQUIRED_VERSION}
- gee-0.8 >= ${GEE_REQUIRED_VERSION}
- gsettings-desktop-schemas
-diff --git src/Makefile.am src/Makefile.am
-index 636ca25..73f5a9a 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -8,7 +8,7 @@ AM_VALAFLAGS = \
- --disable-since-check \
- --pkg gtk+-3.0 \
- --pkg gtksourceview-4 \
-- --pkg Tepl-5 \
-+ --pkg Tepl-6 \
- --pkg gspell-1 \
- --pkg gee-0.8 \
- --pkg posix \
-diff --git src/document.vala src/document.vala
-index 520945d..f3afa35 100644
---- a/src/document.vala
-+++ b/src/document.vala
-@@ -224,7 +224,7 @@ public class Document : Tepl.Buffer
- string primary_msg = _("Impossible to save the file.");
- Tepl.InfoBar infobar = new Tepl.InfoBar.simple (MessageType.ERROR,
- primary_msg, e.message);
-- infobar.add_close_button ();
-+ infobar.setup_close_button ();
- tab.add_info_bar (infobar);
- infobar.show ();
- }
-diff --git src/liblatexila/Makefile.am src/liblatexila/Makefile.am
-index b4e53b5..25c20a9 100644
---- a/src/liblatexila/Makefile.am
-+++ b/src/liblatexila/Makefile.am
-@@ -135,7 +135,7 @@ INTROSPECTION_GIRS = Latexila.gir
-
- Latexila.gir: liblatexila.la
- Latexila_gir_NAMESPACE = Latexila
--Latexila_gir_INCLUDES = Gtk-3.0 GtkSource-4 Tepl-5
-+Latexila_gir_INCLUDES = Gtk-3.0 GtkSource-4 Tepl-6
- Latexila_gir_LIBS = liblatexila.la
- Latexila_gir_FILES = \
- $(liblatexila_public_headers) \
-@@ -156,7 +156,7 @@ latexila.vapi: Latexila.gir
-
- VAPIGEN_VAPIS = latexila.vapi
-
--latexila_vapi_DEPS = gio-2.0 gtk+-3.0 gtksourceview-4 Tepl-5
-+latexila_vapi_DEPS = gio-2.0 gtk+-3.0 gtksourceview-4 Tepl-6
- latexila_vapi_FILES = Latexila.gir
-
- noinst_DATA += latexila.vapi
---
-GitLab
-
diff --git a/srcpkgs/gnome-latex/template b/srcpkgs/gnome-latex/template
index 4739891c8ff2..7e00a38a07c2 100644
--- a/srcpkgs/gnome-latex/template
+++ b/srcpkgs/gnome-latex/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-latex'
pkgname=gnome-latex
-version=3.38.0
-revision=2
+version=3.40.0
+revision=1
build_helper="gir"
build_style=gnu-configure
configure_args="--disable-appstream-util --disable-dconf-migration
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/GNOME-LaTeX"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a82a9fc6f056929ea18d6dffd121e71b2c21768808c86ef1f34da0f86e220d77
+checksum=c5a77fe79bd40e378ea28c8f45a66327fbc8cc5c3b5b8f0f09c0217ee7cc0a90
# for 00-port-to-tepl-6.patch
hostmakedepends+=" automake gettext-devel-tools libtool"
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: gnome-latex: update to 3.40.0, tepl: update to 6.1.1.
2022-07-09 10:05 [PR PATCH] gnome-latex: update to 3.40.0, tepl: update to 6.1.1 paper42
@ 2022-07-09 10:26 ` paper42
0 siblings, 0 replies; 2+ messages in thread
From: paper42 @ 2022-07-09 10:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1112 bytes --]
There's a merged pull request on the void-packages repository
gnome-latex: update to 3.40.0, tepl: update to 6.1.1.
https://github.com/void-linux/void-packages/pull/37936
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-07-09 10:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-09 10:05 [PR PATCH] gnome-latex: update to 3.40.0, tepl: update to 6.1.1 paper42
2022-07-09 10:26 ` [PR PATCH] [Merged]: " paper42
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).