From e5ff7e47dc5820e7e0c8c136ad647e9016a410cf Mon Sep 17 00:00:00 2001 From: oreo639 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 " @@ -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 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 -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 " 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 +}