From 86ec21fd727b47b92c747b5399e3e18bb635b2913f1d20ea7cd807467a164376 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 21 May 2021 12:01:18 +0000 Subject: [PATCH] Accepting request 894769 from GNOME:Next Scripted push from GNOME:Next OBS-URL: https://build.opensuse.org/request/show/894769 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gtranslator?expand=0&rev=77 --- gtranslator-3.38.0.tar.xz | 3 -- gtranslator-40.0.tar.xz | 3 ++ gtranslator-remove-statusbar.patch | 33 ------------------- gtranslator.changes | 12 +++++++ gtranslator.spec | 14 ++++---- libgda-6.patch | 53 ++++++++++++++++++++++++++++++ 6 files changed, 75 insertions(+), 43 deletions(-) delete mode 100644 gtranslator-3.38.0.tar.xz create mode 100644 gtranslator-40.0.tar.xz delete mode 100644 gtranslator-remove-statusbar.patch create mode 100644 libgda-6.patch diff --git a/gtranslator-3.38.0.tar.xz b/gtranslator-3.38.0.tar.xz deleted file mode 100644 index 15a0bf9..0000000 --- a/gtranslator-3.38.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dbcda9b81a22d9233be18e99fd5c448f6ab05759d1e94c10580bb831ca2d7635 -size 1440104 diff --git a/gtranslator-40.0.tar.xz b/gtranslator-40.0.tar.xz new file mode 100644 index 0000000..af662cd --- /dev/null +++ b/gtranslator-40.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec3eba36dee1c549377d1475aef71748dbaebd295005e1990ea9821f02b38834 +size 1509940 diff --git a/gtranslator-remove-statusbar.patch b/gtranslator-remove-statusbar.patch deleted file mode 100644 index 031825f..0000000 --- a/gtranslator-remove-statusbar.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Naur a/doc/reference/gtranslator-docs.sgml b/doc/reference/gtranslator-docs.sgml ---- a/doc/reference/gtranslator-docs.sgml 2020-09-18 02:20:52.751001000 -0500 -+++ b/doc/reference/gtranslator-docs.sgml 2020-10-07 21:06:17.131336942 -0500 -@@ -50,7 +50,6 @@ - - - -- - - - -diff -Naur a/doc/reference/gtranslator.types b/doc/reference/gtranslator.types ---- a/doc/reference/gtranslator.types 2020-09-18 02:20:52.751001000 -0500 -+++ b/doc/reference/gtranslator.types 2020-10-07 21:06:34.699107985 -0500 -@@ -10,7 +10,6 @@ - #include "gtr-notebook.h" - #include "gtr-po.h" - #include "gtr-profile.h" --#include "gtr-statusbar.h" - #include "gtr-tab.h" - #include "gtr-utils.h" - #include "gtr-view.h" -diff -Naur a/plugins/dictionary/gtr-dict-panel.c b/plugins/dictionary/gtr-dict-panel.c ---- a/plugins/dictionary/gtr-dict-panel.c 2020-09-18 02:20:52.775001000 -0500 -+++ b/plugins/dictionary/gtr-dict-panel.c 2020-10-07 21:06:57.058816577 -0500 -@@ -22,7 +22,6 @@ - #include "gtr-dict-panel.h" - #include "gtr-gdict-sidebar.h" - #include "gtr-window.h" --#include "gtr-statusbar.h" - #include "gtr-dirs.h" - - #include diff --git a/gtranslator.changes b/gtranslator.changes index 51ec7db..478244e 100644 --- a/gtranslator.changes +++ b/gtranslator.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Apr 5 11:50:38 UTC 2021 - Callum Farmer + +- Update to version 40.0: + + Add libhandy widgets to improve the user interface for + different sizes. + + Add new integration with l10n.gnome.org so now it's possible + to reserve a file and upload using the desktop app. +- Add pkgconfig(libhandy-1) BuildRequires: New dependency. +- Remove gtranslator-remove-statusbar.patch: merged +- Add libgda-6.patch: support GDA 6 + ------------------------------------------------------------------- Thu Oct 8 02:09:52 UTC 2020 - malcolmlewis@opensuse.org diff --git a/gtranslator.spec b/gtranslator.spec index 5cb45cf..d9b04eb 100644 --- a/gtranslator.spec +++ b/gtranslator.spec @@ -17,16 +17,16 @@ Name: gtranslator -Version: 3.38.0 +Version: 40.0 Release: 0 Summary: A gettext po file editor for the GNOME desktop License: GPL-3.0-or-later Group: Development/Tools/Other URL: https://wiki.gnome.org/Apps/Gtranslator -Source0: https://download.gnome.org/sources/gtranslator/3.38/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/gtranslator/40/%{name}-%{version}.tar.xz Source99: gtranslator-rpmlintrc -#PATCH-FIX-UPSTREAM gtranslator-remove-statusbar.patch glgo#GNOME/gtranslator!70 malcolmlewis@opensuse.org -- Remove leftovers of statusbar. -Patch0: gtranslator-remove-statusbar.patch +# PATCH-FIX-UPSTREAM libgda-6.patch gmbr3@opensuse.org -- Require and support GDA 6 +Patch0: libgda-6.patch BuildRequires: fdupes BuildRequires: gettext-tools BuildRequires: intltool @@ -45,12 +45,13 @@ BuildRequires: pkgconfig(gtksourceview-4) >= 4.0.2 BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(json-glib-1.0) >= 1.2.0 BuildRequires: pkgconfig(libdazzle-1.0) >= 3.33.90 -BuildRequires: pkgconfig(libgda-5.0) +BuildRequires: pkgconfig(libgda-6.0) >= 6.0.0 BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(libxml-2.0) >= 2.4.12 +BuildRequires: pkgconfig(libhandy-1) Requires: gsettings-desktop-schemas Requires: iso-codes -Requires: libgda-5_0-sqlite +Requires: libgda-sqlite >= 6.0.0 Obsoletes: gtranslator-devel <= 2.91.7 %description @@ -92,7 +93,6 @@ find %{buildroot} -type f -name "gtr-marshal.h" -delete -print %{_datadir}/glib-2.0/schemas/*.gschema.xml %{_datadir}/icons/hicolor/*/apps/org.gnome.Gtranslator*.svg %{_datadir}/metainfo/org.gnome.Gtranslator.appdata.xml -%{_datadir}/pixmaps/gtranslator-*.png %files doc %doc AUTHORS MAINTAINERS NEWS THANKS diff --git a/libgda-6.patch b/libgda-6.patch new file mode 100644 index 0000000..08b79cc --- /dev/null +++ b/libgda-6.patch @@ -0,0 +1,53 @@ +From 3764a9c0c5f33ff07a3c08664f945a526d12bfa1 Mon Sep 17 00:00:00 2001 +From: Callum Farmer +Date: Mon, 29 Mar 2021 16:46:10 +0100 +Subject: [PATCH] Bump gda dependency to 6.0 + +--- + build-aux/flatpak/org.gnome.Gtranslator.json | 8 ++++---- + meson.build | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/build-aux/flatpak/org.gnome.Gtranslator.json b/build-aux/flatpak/org.gnome.Gtranslator.json +index 65cb5082..b726a69e 100644 +--- a/build-aux/flatpak/org.gnome.Gtranslator.json ++++ b/build-aux/flatpak/org.gnome.Gtranslator.json +@@ -76,9 +76,9 @@ + }, + { + "name": "libgda", ++ "buildsystem": "meson", + "config-opts": [ +- "--enable-json=yes", +- "--enable-system-sqlite=yes" ++ "-Djson=true" + ], + "build-options" : { + "env" : { +@@ -89,8 +89,8 @@ + "sources": [ + { + "type": "archive", +- "url": "http://ftp.gnome.org/pub/GNOME/sources/libgda/5.2/libgda-5.2.9.tar.xz", +- "sha256": "59caed8ca72b1ac6437c9844f0677f8a296d52cfd1c0049116026abfb1d87d9b" ++ "url": "http://ftp.gnome.org/pub/GNOME/sources/libgda/6.0/libgda-6.0.0.tar.xz", ++ "sha256": "995f4b420e666da5c8bac9faf55e7aedbe3789c525d634720a53be3ccf27a670" + } + ], + "modules": [ +diff --git a/meson.build b/meson.build +index 94734ce2..021ac296 100644 +--- a/meson.build ++++ b/meson.build +@@ -109,7 +109,7 @@ gtr_deps = [ + gtk_dep, + libhandy_dep, + dependency('libdazzle-1.0', version: '>= 3.33.90'), +- dependency('libgda-5.0'), ++ dependency('libgda-6.0'), + dependency('gio-2.0', version: '>= 2.36.0'), + dependency('gsettings-desktop-schemas'), + dependency('gspell-1', version: '>= 1.2.0'), +-- +GitLab +