x11/elementary-terminal: Update to 6.1.2

5 files changed, 54 insertions, 15 deletions

diff --git a/x11/elementary-terminal/Makefile b/x11/elementary-terminal/Makefile
index bf56522b3b6c..f12b26161f2d 100644
--- a/x11/elementary-terminal/Makefile
+++ b/x11/elementary-terminal/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	terminal
-DISTVERSION=	6.1.1
-PORTREVISION=	2
+DISTVERSION=	6.1.2
 CATEGORIES=	x11
 PKGNAMEPREFIX=	elementary-
 
diff --git a/x11/elementary-terminal/distinfo b/x11/elementary-terminal/distinfo
index 9c40e4fd6fe9..7670592a37b7 100644
--- a/x11/elementary-terminal/distinfo
+++ b/x11/elementary-terminal/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1666967246
-SHA256 (elementary-terminal-6.1.1_GH0.tar.gz) = 22d86fd35735195a5b93b74697e11569339447887ae121c654a86f486a8ed48b
-SIZE (elementary-terminal-6.1.1_GH0.tar.gz) = 1037361
+TIMESTAMP = 1715545578
+SHA256 (elementary-terminal-6.1.2_GH0.tar.gz) = 6d31e53fa9a1e77fd6c8ff5380d04c53531c3cb70f6b20768a87fce8f2a7d6d1
+SIZE (elementary-terminal-6.1.2_GH0.tar.gz) = 1034110
diff --git a/x11/elementary-terminal/files/patch-data_io.elementary.terminal.gschema.xml b/x11/elementary-terminal/files/patch-data_io.elementary.terminal.gschema.xml
index 7e08f19719ca..fa2ebfeef2f4 100644
--- a/x11/elementary-terminal/files/patch-data_io.elementary.terminal.gschema.xml
+++ b/x11/elementary-terminal/files/patch-data_io.elementary.terminal.gschema.xml
@@ -1,7 +1,7 @@
---- data/io.elementary.terminal.gschema.xml.orig	2021-07-15 21:30:31 UTC
+--- data/io.elementary.terminal.gschema.xml.orig	2023-04-04 17:39:57 UTC
 +++ data/io.elementary.terminal.gschema.xml
-@@ -155,7 +155,7 @@
-       <description>Defines the encoding to be used by the terminal.</description>
+@@ -164,7 +164,7 @@
+       <description>DEPRECATED: This key is deprecated and ignored.</description>
      </key>
      <key name="font" type="s">
 -      <default>""</default>
diff --git a/x11/elementary-terminal/files/patch-data_meson.build b/x11/elementary-terminal/files/patch-data_meson.build
index ce862d4d52ed..15ec1a6a31e5 100644
--- a/x11/elementary-terminal/files/patch-data_meson.build
+++ b/x11/elementary-terminal/files/patch-data_meson.build
@@ -1,16 +1,19 @@
---- data/meson.build.orig	2022-05-18 04:44:45 UTC
+--- data/meson.build.orig	2024-05-13 15:04:10 UTC
 +++ data/meson.build
-@@ -40,13 +40,3 @@ test (
-     find_program('desktop-file-validate'),
-     args: join_paths(meson.current_build_dir (), 'open-pantheon-terminal-here.desktop')
+@@ -32,16 +32,6 @@ install_data(
+     install_dir: datadir / 'glib-2.0' / 'schemas'
  )
--
+ 
 -install_data(
 -    'pantheon_terminal_process_completion_notifications.fish',
--    install_dir: join_paths(get_option('datadir'), 'fish', 'vendor_conf.d')
+-    install_dir: datadir / 'fish' / 'vendor_conf.d'
 -)
 -
 -install_data(
 -    'enable-zsh-completion-notifications',
--    install_dir: join_paths(get_option('datadir'), meson.project_name())
+-    install_dir: datadir / meson.project_name()
 -)
+-
+ terminal_gresource = gnome.compile_resources('gresource', meson.project_name() + '.gresource.xml')
+ 
+ test_schemas = gnome.compile_schemas(depend_files: meson.project_name() + '.gschema.xml', build_by_default: false)
diff --git a/x11/elementary-terminal/files/patch-src_meson.build b/x11/elementary-terminal/files/patch-src_meson.build
new file mode 100644
index 000000000000..52afa8a738e2
--- /dev/null
+++ b/x11/elementary-terminal/files/patch-src_meson.build
@@ -0,0 +1,37 @@
+--- src/meson.build.orig	2023-04-04 17:39:57 UTC
++++ src/meson.build
+@@ -37,34 +37,3 @@ executable(
+     dependencies: terminal_deps,
+     install : true
+ )
+-
+-# tests
+-
+-test_env = [
+-    'G_TEST_SRCDIR=' + meson.current_source_dir(),
+-    'G_TEST_BUILDDIR=' + meson.current_build_dir(),
+-    'GSETTINGS_SCHEMA_DIR=' + meson.project_build_root() / 'data',
+-    'GSETTINGS_BACKEND=memory',
+-    'GIO_USE_VFS=local'
+-]
+-
+-add_test_setup(
+-  'headless',
+-  exe_wrapper: [ find_program('xvfb-run'), '-a', '-s', '-screen 0 1024x768x24 -noreset' ],
+-  is_default: true
+-)
+-
+-app_test = executable(
+-    meson.project_name() + '.tests.application',
+-    terminal_sources + 'tests/Application.vala',
+-    dependencies: terminal_deps,
+-    vala_args: [ '--define', 'TESTS']
+-)
+-
+-test(
+-    'Application',
+-    app_test,
+-    env: test_env,
+-    protocol: 'tap',
+-    depends: test_schemas
+-)