* [PR PATCH] gtranslator: update to 45.3.
@ 2024-02-23 13:44 oreo639
2024-02-23 13:56 ` [PR PATCH] [Updated] " oreo639
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: oreo639 @ 2024-02-23 13:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]
There is a new pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gtranslator
https://github.com/void-linux/void-packages/pull/48896
gtranslator: update to 45.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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/48896.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gtranslator-48896.patch --]
[-- Type: text/x-diff, Size: 4347 bytes --]
From 685df2dbb0c44ddd7521d299bfd798115fd1ffa6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 23 Feb 2024 05:36:02 -0800
Subject: [PATCH 1/2] libgda: disable libgda-web provider
Avoid conflict in gtranslator 45 with libsoup3 and libsoup2.
Also add missing dependency for sqlite provider.
---
srcpkgs/libgda/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index f70e258544cda9..367f13e07a97ed 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,16 +1,17 @@
# Template file for 'libgda'
pkgname=libgda
version=5.2.9
-revision=6
+revision=7
build_style=gnu-configure
build_helper="gir"
configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
- --enable-system-sqlite"
+ --enable-system-sqlite --without-libsoup"
hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
makedepends="gtk+3-devel libxml2-devel libxslt-devel
- openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel
libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
json-glib-devel readline-devel libmariadbclient-devel"
+depends="sqlite"
conf_files="/etc/libgda-5.0/config"
short_desc="Database and data abstraction layer"
maintainer="Orphaned <orphan@voidlinux.org>"
From 77079adafca0a6e12da105376edb1133bc2d9310 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 23 Feb 2024 05:39:40 -0800
Subject: [PATCH 2/2] gtranslator: update to 45.3.
---
srcpkgs/gtranslator/patches/meson-0.61.patch | 36 --------------------
srcpkgs/gtranslator/template | 14 +++++---
2 files changed, 9 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/gtranslator/patches/meson-0.61.patch
diff --git a/srcpkgs/gtranslator/patches/meson-0.61.patch b/srcpkgs/gtranslator/patches/meson-0.61.patch
deleted file mode 100644
index 54063041fe1663..00000000000000
--- a/srcpkgs/gtranslator/patches/meson-0.61.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7ac572cc8c8c37ca3826ecf0d395edd3c38e8e22 Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 24 Jan 2022 11:57:43 +0000
-Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
-
-Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
-
-data/meson.build:15:0: ERROR: Function does not take positional arguments.
-data/meson.build:37:0: ERROR: Function does not take positional arguments.
----
- data/meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 2ca0be0b..2ebbfb12 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -13,7 +13,6 @@ desktop_in = configure_file(
- )
-
- i18n.merge_file(
-- desktop,
- type: 'desktop',
- input: desktop_in,
- output: '@0@.desktop'.format(gtr_app_id),
-@@ -35,7 +34,6 @@ appdata_in = configure_file(
- )
-
- i18n.merge_file(
-- appdata,
- input: appdata_in,
- output: appdata,
- po_dir: po_dir,
---
-GitLab
-
diff --git a/srcpkgs/gtranslator/template b/srcpkgs/gtranslator/template
index 9f5b702461df2b..dc408b139c1958 100644
--- a/srcpkgs/gtranslator/template
+++ b/srcpkgs/gtranslator/template
@@ -1,16 +1,20 @@
# Template file for 'gtranslator'
pkgname=gtranslator
-version=40.0
+version=45.3
revision=1
build_style=meson
hostmakedepends="gettext pkg-config glib-devel itstool"
makedepends="gettext-devel libglib-devel libdazzle-devel libsoup-devel
- gsettings-desktop-schemas-devel gtk+3-devel gspell-devel
- libxml2-devel json-glib-devel gtksourceview4-devel libgda-devel
- libhandy1-devel"
+ gsettings-desktop-schemas-devel gtk4-devel libadwaita-devel gspell-devel
+ libxml2-devel json-glib-devel gtksourceview5-devel libgda-devel"
short_desc="GNOME translation making program"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Gtranslator"
distfiles="${GNOME_SITE}/gtranslator/${version%.*}/gtranslator-${version}.tar.xz"
-checksum=ec3eba36dee1c549377d1475aef71748dbaebd295005e1990ea9821f02b38834
+checksum=3010204df5c7a5ae027f5a30b1544d6977d417f0e4bb9de297f0ad1a80331873
+
+post_patch() {
+ vsed -e "s/dependency('libgda-6.0'/dependency('libgda-5.0'/" \
+ -i meson.build
+}
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] gtranslator: update to 45.3.
2024-02-23 13:44 [PR PATCH] gtranslator: update to 45.3 oreo639
@ 2024-02-23 13:56 ` oreo639
2024-02-23 14:07 ` oreo639
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: oreo639 @ 2024-02-23 13:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1249 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gtranslator
https://github.com/void-linux/void-packages/pull/48896
gtranslator: update to 45.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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/48896.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gtranslator-48896.patch --]
[-- Type: text/x-diff, Size: 4422 bytes --]
From 685df2dbb0c44ddd7521d299bfd798115fd1ffa6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 23 Feb 2024 05:36:02 -0800
Subject: [PATCH 1/2] libgda: disable libgda-web provider
Avoid conflict in gtranslator 45 with libsoup3 and libsoup2.
Also add missing dependency for sqlite provider.
---
srcpkgs/libgda/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index f70e258544cda..367f13e07a97e 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,16 +1,17 @@
# Template file for 'libgda'
pkgname=libgda
version=5.2.9
-revision=6
+revision=7
build_style=gnu-configure
build_helper="gir"
configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
- --enable-system-sqlite"
+ --enable-system-sqlite --without-libsoup"
hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
makedepends="gtk+3-devel libxml2-devel libxslt-devel
- openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel
libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
json-glib-devel readline-devel libmariadbclient-devel"
+depends="sqlite"
conf_files="/etc/libgda-5.0/config"
short_desc="Database and data abstraction layer"
maintainer="Orphaned <orphan@voidlinux.org>"
From 96784ed52a607af6a484ef4f7d8ce888e9b0cedf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 23 Feb 2024 05:39:40 -0800
Subject: [PATCH 2/2] gtranslator: update to 45.3.
---
srcpkgs/gtranslator/patches/meson-0.61.patch | 36 --------------------
srcpkgs/gtranslator/template | 16 +++++----
2 files changed, 10 insertions(+), 42 deletions(-)
delete mode 100644 srcpkgs/gtranslator/patches/meson-0.61.patch
diff --git a/srcpkgs/gtranslator/patches/meson-0.61.patch b/srcpkgs/gtranslator/patches/meson-0.61.patch
deleted file mode 100644
index 54063041fe166..0000000000000
--- a/srcpkgs/gtranslator/patches/meson-0.61.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7ac572cc8c8c37ca3826ecf0d395edd3c38e8e22 Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 24 Jan 2022 11:57:43 +0000
-Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
-
-Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
-
-data/meson.build:15:0: ERROR: Function does not take positional arguments.
-data/meson.build:37:0: ERROR: Function does not take positional arguments.
----
- data/meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 2ca0be0b..2ebbfb12 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -13,7 +13,6 @@ desktop_in = configure_file(
- )
-
- i18n.merge_file(
-- desktop,
- type: 'desktop',
- input: desktop_in,
- output: '@0@.desktop'.format(gtr_app_id),
-@@ -35,7 +34,6 @@ appdata_in = configure_file(
- )
-
- i18n.merge_file(
-- appdata,
- input: appdata_in,
- output: appdata,
- po_dir: po_dir,
---
-GitLab
-
diff --git a/srcpkgs/gtranslator/template b/srcpkgs/gtranslator/template
index 9f5b702461df2..3e97ea3ef389d 100644
--- a/srcpkgs/gtranslator/template
+++ b/srcpkgs/gtranslator/template
@@ -1,16 +1,20 @@
# Template file for 'gtranslator'
pkgname=gtranslator
-version=40.0
+version=45.3
revision=1
build_style=meson
-hostmakedepends="gettext pkg-config glib-devel itstool"
+hostmakedepends="gettext pkg-config glib-devel itstool gtk-update-icon-cache"
makedepends="gettext-devel libglib-devel libdazzle-devel libsoup-devel
- gsettings-desktop-schemas-devel gtk+3-devel gspell-devel
- libxml2-devel json-glib-devel gtksourceview4-devel libgda-devel
- libhandy1-devel"
+ gsettings-desktop-schemas-devel gtk4-devel libadwaita-devel gspell-devel
+ libxml2-devel json-glib-devel gtksourceview5-devel libgda-devel"
short_desc="GNOME translation making program"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Gtranslator"
distfiles="${GNOME_SITE}/gtranslator/${version%.*}/gtranslator-${version}.tar.xz"
-checksum=ec3eba36dee1c549377d1475aef71748dbaebd295005e1990ea9821f02b38834
+checksum=3010204df5c7a5ae027f5a30b1544d6977d417f0e4bb9de297f0ad1a80331873
+
+post_patch() {
+ vsed -e "s/dependency('libgda-6.0'/dependency('libgda-5.0'/" \
+ -i meson.build
+}
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] gtranslator: update to 45.3.
2024-02-23 13:44 [PR PATCH] gtranslator: update to 45.3 oreo639
2024-02-23 13:56 ` [PR PATCH] [Updated] " oreo639
@ 2024-02-23 14:07 ` oreo639
2024-02-23 14:08 ` oreo639
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: oreo639 @ 2024-02-23 14:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1249 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gtranslator
https://github.com/void-linux/void-packages/pull/48896
gtranslator: update to 45.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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/48896.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gtranslator-48896.patch --]
[-- Type: text/x-diff, Size: 5098 bytes --]
From e5ff7e47dc5820e7e0c8c136ad647e9016a410cf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 23 Feb 2024 05:36:02 -0800
Subject: [PATCH 1/2] libgda: disable libgda-web provider
Avoid conflict in gtranslator 45 with libsoup3 and libsoup2.
Also add missing dependency for sqlite provider.
---
srcpkgs/libgda/template | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index f70e258544cda9..b2523574aa1046 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,16 +1,18 @@
# Template file for 'libgda'
pkgname=libgda
version=5.2.9
-revision=6
+revision=7
build_style=gnu-configure
build_helper="gir"
configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
- --enable-system-sqlite"
+ --enable-system-sqlite --without-libsoup"
hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
makedepends="gtk+3-devel libxml2-devel libxslt-devel
- openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel
libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
json-glib-devel readline-devel libmariadbclient-devel"
+depends="sqlite"
+checkdepends="xvfb-run"
conf_files="/etc/libgda-5.0/config"
short_desc="Database and data abstraction layer"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -18,6 +20,7 @@ license="GPL-2.0-only"
homepage="http://www.gnome-db.org/"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=59caed8ca72b1ac6437c9844f0677f8a296d52cfd1c0049116026abfb1d87d9b
+make_check_pre=xvfb-run
python_version=3
if [ "$CROSS_BUILD" ]; then
@@ -33,6 +36,11 @@ post_extract() {
vsed -e 's,defined(LIBRESSL,!defined(OPENSSL,' -i providers/sqlcipher/sqlite3.c
}
+do_check() {
+ # Tests cannot run multithreaded
+ ${make_check_pre} make check
+}
+
libgda-devel_package() {
short_desc+=" - development files"
depends="libxslt-devel libgda>=${version}_${revision}"
From ff647b79c34e1e6fd3687a458f9da61fdf4fb557 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 23 Feb 2024 05:39:40 -0800
Subject: [PATCH 2/2] gtranslator: update to 45.3.
---
srcpkgs/gtranslator/patches/meson-0.61.patch | 36 --------------------
srcpkgs/gtranslator/template | 16 +++++----
2 files changed, 10 insertions(+), 42 deletions(-)
delete mode 100644 srcpkgs/gtranslator/patches/meson-0.61.patch
diff --git a/srcpkgs/gtranslator/patches/meson-0.61.patch b/srcpkgs/gtranslator/patches/meson-0.61.patch
deleted file mode 100644
index 54063041fe1663..00000000000000
--- a/srcpkgs/gtranslator/patches/meson-0.61.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7ac572cc8c8c37ca3826ecf0d395edd3c38e8e22 Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 24 Jan 2022 11:57:43 +0000
-Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
-
-Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
-
-data/meson.build:15:0: ERROR: Function does not take positional arguments.
-data/meson.build:37:0: ERROR: Function does not take positional arguments.
----
- data/meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 2ca0be0b..2ebbfb12 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -13,7 +13,6 @@ desktop_in = configure_file(
- )
-
- i18n.merge_file(
-- desktop,
- type: 'desktop',
- input: desktop_in,
- output: '@0@.desktop'.format(gtr_app_id),
-@@ -35,7 +34,6 @@ appdata_in = configure_file(
- )
-
- i18n.merge_file(
-- appdata,
- input: appdata_in,
- output: appdata,
- po_dir: po_dir,
---
-GitLab
-
diff --git a/srcpkgs/gtranslator/template b/srcpkgs/gtranslator/template
index 9f5b702461df2b..3e97ea3ef389d3 100644
--- a/srcpkgs/gtranslator/template
+++ b/srcpkgs/gtranslator/template
@@ -1,16 +1,20 @@
# Template file for 'gtranslator'
pkgname=gtranslator
-version=40.0
+version=45.3
revision=1
build_style=meson
-hostmakedepends="gettext pkg-config glib-devel itstool"
+hostmakedepends="gettext pkg-config glib-devel itstool gtk-update-icon-cache"
makedepends="gettext-devel libglib-devel libdazzle-devel libsoup-devel
- gsettings-desktop-schemas-devel gtk+3-devel gspell-devel
- libxml2-devel json-glib-devel gtksourceview4-devel libgda-devel
- libhandy1-devel"
+ gsettings-desktop-schemas-devel gtk4-devel libadwaita-devel gspell-devel
+ libxml2-devel json-glib-devel gtksourceview5-devel libgda-devel"
short_desc="GNOME translation making program"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Gtranslator"
distfiles="${GNOME_SITE}/gtranslator/${version%.*}/gtranslator-${version}.tar.xz"
-checksum=ec3eba36dee1c549377d1475aef71748dbaebd295005e1990ea9821f02b38834
+checksum=3010204df5c7a5ae027f5a30b1544d6977d417f0e4bb9de297f0ad1a80331873
+
+post_patch() {
+ vsed -e "s/dependency('libgda-6.0'/dependency('libgda-5.0'/" \
+ -i meson.build
+}
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] gtranslator: update to 45.3.
2024-02-23 13:44 [PR PATCH] gtranslator: update to 45.3 oreo639
2024-02-23 13:56 ` [PR PATCH] [Updated] " oreo639
2024-02-23 14:07 ` oreo639
@ 2024-02-23 14:08 ` oreo639
2024-02-25 2:03 ` oreo639
2024-02-25 2:15 ` [PR PATCH] [Merged]: " oreo639
4 siblings, 0 replies; 6+ messages in thread
From: oreo639 @ 2024-02-23 14:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1249 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gtranslator
https://github.com/void-linux/void-packages/pull/48896
gtranslator: update to 45.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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/48896.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gtranslator-48896.patch --]
[-- Type: text/x-diff, Size: 5087 bytes --]
From a72085e7aba8e1677058938fd43eb014498cec50 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 23 Feb 2024 05:36:02 -0800
Subject: [PATCH 1/2] libgda: disable libgda-web provider
Avoid conflict in gtranslator 45 with libsoup3 and libsoup2.
Also add missing dependency for sqlite provider.
---
srcpkgs/libgda/template | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index f70e258544cda..b284245abf12e 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,16 +1,18 @@
# Template file for 'libgda'
pkgname=libgda
version=5.2.9
-revision=6
+revision=7
build_style=gnu-configure
build_helper="gir"
configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
- --enable-system-sqlite"
+ --enable-system-sqlite --without-libsoup"
hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
makedepends="gtk+3-devel libxml2-devel libxslt-devel
- openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel
libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
json-glib-devel readline-devel libmariadbclient-devel"
+depends="sqlite"
+checkdepends="xvfb-run"
conf_files="/etc/libgda-5.0/config"
short_desc="Database and data abstraction layer"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -18,6 +20,7 @@ license="GPL-2.0-only"
homepage="http://www.gnome-db.org/"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=59caed8ca72b1ac6437c9844f0677f8a296d52cfd1c0049116026abfb1d87d9b
+make_check_pre=xvfb-run
python_version=3
if [ "$CROSS_BUILD" ]; then
@@ -33,6 +36,11 @@ post_extract() {
vsed -e 's,defined(LIBRESSL,!defined(OPENSSL,' -i providers/sqlcipher/sqlite3.c
}
+do_check() {
+ # Tests cannot run parallel
+ ${make_check_pre} make check
+}
+
libgda-devel_package() {
short_desc+=" - development files"
depends="libxslt-devel libgda>=${version}_${revision}"
From 1cabab96f2f27bc8d25347ace2db05e9fc28424f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 23 Feb 2024 05:39:40 -0800
Subject: [PATCH 2/2] gtranslator: update to 45.3.
---
srcpkgs/gtranslator/patches/meson-0.61.patch | 36 --------------------
srcpkgs/gtranslator/template | 16 +++++----
2 files changed, 10 insertions(+), 42 deletions(-)
delete mode 100644 srcpkgs/gtranslator/patches/meson-0.61.patch
diff --git a/srcpkgs/gtranslator/patches/meson-0.61.patch b/srcpkgs/gtranslator/patches/meson-0.61.patch
deleted file mode 100644
index 54063041fe166..0000000000000
--- a/srcpkgs/gtranslator/patches/meson-0.61.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7ac572cc8c8c37ca3826ecf0d395edd3c38e8e22 Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 24 Jan 2022 11:57:43 +0000
-Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
-
-Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
-
-data/meson.build:15:0: ERROR: Function does not take positional arguments.
-data/meson.build:37:0: ERROR: Function does not take positional arguments.
----
- data/meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 2ca0be0b..2ebbfb12 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -13,7 +13,6 @@ desktop_in = configure_file(
- )
-
- i18n.merge_file(
-- desktop,
- type: 'desktop',
- input: desktop_in,
- output: '@0@.desktop'.format(gtr_app_id),
-@@ -35,7 +34,6 @@ appdata_in = configure_file(
- )
-
- i18n.merge_file(
-- appdata,
- input: appdata_in,
- output: appdata,
- po_dir: po_dir,
---
-GitLab
-
diff --git a/srcpkgs/gtranslator/template b/srcpkgs/gtranslator/template
index 9f5b702461df2..3e97ea3ef389d 100644
--- a/srcpkgs/gtranslator/template
+++ b/srcpkgs/gtranslator/template
@@ -1,16 +1,20 @@
# Template file for 'gtranslator'
pkgname=gtranslator
-version=40.0
+version=45.3
revision=1
build_style=meson
-hostmakedepends="gettext pkg-config glib-devel itstool"
+hostmakedepends="gettext pkg-config glib-devel itstool gtk-update-icon-cache"
makedepends="gettext-devel libglib-devel libdazzle-devel libsoup-devel
- gsettings-desktop-schemas-devel gtk+3-devel gspell-devel
- libxml2-devel json-glib-devel gtksourceview4-devel libgda-devel
- libhandy1-devel"
+ gsettings-desktop-schemas-devel gtk4-devel libadwaita-devel gspell-devel
+ libxml2-devel json-glib-devel gtksourceview5-devel libgda-devel"
short_desc="GNOME translation making program"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Gtranslator"
distfiles="${GNOME_SITE}/gtranslator/${version%.*}/gtranslator-${version}.tar.xz"
-checksum=ec3eba36dee1c549377d1475aef71748dbaebd295005e1990ea9821f02b38834
+checksum=3010204df5c7a5ae027f5a30b1544d6977d417f0e4bb9de297f0ad1a80331873
+
+post_patch() {
+ vsed -e "s/dependency('libgda-6.0'/dependency('libgda-5.0'/" \
+ -i meson.build
+}
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] gtranslator: update to 45.3.
2024-02-23 13:44 [PR PATCH] gtranslator: update to 45.3 oreo639
` (2 preceding siblings ...)
2024-02-23 14:08 ` oreo639
@ 2024-02-25 2:03 ` oreo639
2024-02-25 2:15 ` [PR PATCH] [Merged]: " oreo639
4 siblings, 0 replies; 6+ messages in thread
From: oreo639 @ 2024-02-25 2:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1249 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gtranslator
https://github.com/void-linux/void-packages/pull/48896
gtranslator: update to 45.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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/48896.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gtranslator-48896.patch --]
[-- Type: text/x-diff, Size: 5094 bytes --]
From d7fecab4e532a6c2feeb0736851493265d64abbd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 23 Feb 2024 05:36:02 -0800
Subject: [PATCH 1/2] libgda: disable libgda-web provider
Avoid conflict in gtranslator 45 with libsoup3 and libsoup2.
Also add missing dependency for sqlite provider.
---
srcpkgs/libgda/template | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index f70e258544cda9..b284245abf12e5 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,16 +1,18 @@
# Template file for 'libgda'
pkgname=libgda
version=5.2.9
-revision=6
+revision=7
build_style=gnu-configure
build_helper="gir"
configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
- --enable-system-sqlite"
+ --enable-system-sqlite --without-libsoup"
hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
makedepends="gtk+3-devel libxml2-devel libxslt-devel
- openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel
libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
json-glib-devel readline-devel libmariadbclient-devel"
+depends="sqlite"
+checkdepends="xvfb-run"
conf_files="/etc/libgda-5.0/config"
short_desc="Database and data abstraction layer"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -18,6 +20,7 @@ license="GPL-2.0-only"
homepage="http://www.gnome-db.org/"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=59caed8ca72b1ac6437c9844f0677f8a296d52cfd1c0049116026abfb1d87d9b
+make_check_pre=xvfb-run
python_version=3
if [ "$CROSS_BUILD" ]; then
@@ -33,6 +36,11 @@ post_extract() {
vsed -e 's,defined(LIBRESSL,!defined(OPENSSL,' -i providers/sqlcipher/sqlite3.c
}
+do_check() {
+ # Tests cannot run parallel
+ ${make_check_pre} make check
+}
+
libgda-devel_package() {
short_desc+=" - development files"
depends="libxslt-devel libgda>=${version}_${revision}"
From fb5bd8eaafdfbdca02f8b81907c9bc2d56f9de81 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 23 Feb 2024 05:39:40 -0800
Subject: [PATCH 2/2] gtranslator: update to 45.3.
---
srcpkgs/gtranslator/patches/meson-0.61.patch | 36 --------------------
srcpkgs/gtranslator/template | 16 +++++----
2 files changed, 10 insertions(+), 42 deletions(-)
delete mode 100644 srcpkgs/gtranslator/patches/meson-0.61.patch
diff --git a/srcpkgs/gtranslator/patches/meson-0.61.patch b/srcpkgs/gtranslator/patches/meson-0.61.patch
deleted file mode 100644
index 54063041fe1663..00000000000000
--- a/srcpkgs/gtranslator/patches/meson-0.61.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7ac572cc8c8c37ca3826ecf0d395edd3c38e8e22 Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 24 Jan 2022 11:57:43 +0000
-Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
-
-Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
-
-data/meson.build:15:0: ERROR: Function does not take positional arguments.
-data/meson.build:37:0: ERROR: Function does not take positional arguments.
----
- data/meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 2ca0be0b..2ebbfb12 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -13,7 +13,6 @@ desktop_in = configure_file(
- )
-
- i18n.merge_file(
-- desktop,
- type: 'desktop',
- input: desktop_in,
- output: '@0@.desktop'.format(gtr_app_id),
-@@ -35,7 +34,6 @@ appdata_in = configure_file(
- )
-
- i18n.merge_file(
-- appdata,
- input: appdata_in,
- output: appdata,
- po_dir: po_dir,
---
-GitLab
-
diff --git a/srcpkgs/gtranslator/template b/srcpkgs/gtranslator/template
index 9f5b702461df2b..c65dfb98bd332e 100644
--- a/srcpkgs/gtranslator/template
+++ b/srcpkgs/gtranslator/template
@@ -1,16 +1,20 @@
# Template file for 'gtranslator'
pkgname=gtranslator
-version=40.0
+version=45.3
revision=1
build_style=meson
-hostmakedepends="gettext pkg-config glib-devel itstool"
+hostmakedepends="gettext pkg-config glib-devel itstool gtk4-update-icon-cache"
makedepends="gettext-devel libglib-devel libdazzle-devel libsoup-devel
- gsettings-desktop-schemas-devel gtk+3-devel gspell-devel
- libxml2-devel json-glib-devel gtksourceview4-devel libgda-devel
- libhandy1-devel"
+ gsettings-desktop-schemas-devel gtk4-devel libadwaita-devel gspell-devel
+ libxml2-devel json-glib-devel gtksourceview5-devel libgda-devel"
short_desc="GNOME translation making program"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Gtranslator"
distfiles="${GNOME_SITE}/gtranslator/${version%.*}/gtranslator-${version}.tar.xz"
-checksum=ec3eba36dee1c549377d1475aef71748dbaebd295005e1990ea9821f02b38834
+checksum=3010204df5c7a5ae027f5a30b1544d6977d417f0e4bb9de297f0ad1a80331873
+
+post_patch() {
+ vsed -e "s/dependency('libgda-6.0'/dependency('libgda-5.0'/" \
+ -i meson.build
+}
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: gtranslator: update to 45.3.
2024-02-23 13:44 [PR PATCH] gtranslator: update to 45.3 oreo639
` (3 preceding siblings ...)
2024-02-25 2:03 ` oreo639
@ 2024-02-25 2:15 ` oreo639
4 siblings, 0 replies; 6+ messages in thread
From: oreo639 @ 2024-02-25 2:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1089 bytes --]
There's a merged pull request on the void-packages repository
gtranslator: update to 45.3.
https://github.com/void-linux/void-packages/pull/48896
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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] 6+ messages in thread
end of thread, other threads:[~2024-02-25 2:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-23 13:44 [PR PATCH] gtranslator: update to 45.3 oreo639
2024-02-23 13:56 ` [PR PATCH] [Updated] " oreo639
2024-02-23 14:07 ` oreo639
2024-02-23 14:08 ` oreo639
2024-02-25 2:03 ` oreo639
2024-02-25 2:15 ` [PR PATCH] [Merged]: " oreo639
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).