[gtranslator/use-libgda-5] Revert "Add GDA 6 compatibility"




commit 8bb519c99e81a889b83901cc4df6a280a63883aa
Author: Daniel Garcia Moreno <daniel garcia suse com>
Date:   Thu Sep 22 08:20:11 2022 +0200

    Revert "Add GDA 6 compatibility"
    
    This reverts commit 27c3f164422c193246aa4f71facf77d2a97ee94c

 build-aux/flatpak/org.gnome.Gtranslator.json | 22 +++++++---------------
 meson.build                                  |  2 +-
 2 files changed, 8 insertions(+), 16 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.Gtranslator.json b/build-aux/flatpak/org.gnome.Gtranslator.json
index 193a660d..0b895b5c 100644
--- a/build-aux/flatpak/org.gnome.Gtranslator.json
+++ b/build-aux/flatpak/org.gnome.Gtranslator.json
@@ -57,10 +57,10 @@
             ]
         },
         {
-            "name" : "libgda",
-            "buildsystem" : "meson",
-            "config-opts" : [
-                "-Djson=true"
+            "name": "libgda",
+            "config-opts": [
+                "--enable-json=yes",
+                "--enable-system-sqlite=yes"
             ],
             "build-options" : {
                 "env" : {
@@ -70,17 +70,9 @@
             },
             "sources" : [
                 {
-                    "type" : "archive",
-                    "url" : "http://ftp.gnome.org/pub/GNOME/sources/libgda/6.0/libgda-6.0.0.tar.xz";,
-                    "sha256" : "995f4b420e666da5c8bac9faf55e7aedbe3789c525d634720a53be3ccf27a670"
-                },
-                {
-                    "type" : "patch",
-                    "path" : "patches/0001-Fix-undefined-behavior-due-to-signed-integer-overflo.patch"
-                },
-                {
-                    "type" : "patch",
-                    "path" : "patches/libgda-no-gtkdoc-markers.patch"
+                    "type": "archive",
+                    "url": "http://ftp.gnome.org/pub/GNOME/sources/libgda/5.2/libgda-5.2.9.tar.xz";,
+                    "sha256": "59caed8ca72b1ac6437c9844f0677f8a296d52cfd1c0049116026abfb1d87d9b"
                 }
             ],
             "modules" : [
diff --git a/meson.build b/meson.build
index 1ba7be07..15481e99 100644
--- a/meson.build
+++ b/meson.build
@@ -111,7 +111,7 @@ gtr_deps = [
   glib_dep,
   gtk_dep,
   libhandy_dep,
-  dependency('libgda-6.0'),
+  dependency('libgda-5.0'),
   dependency('gio-2.0', version: '>= 2.36.0'),
   dependency('gsettings-desktop-schemas'),
   dependency('gspell-1', version: '>= 1.2.0'),


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]