From fa539593c9c97f06b3574a8dab28ef81bcd53d69 Mon Sep 17 00:00:00 2001
From: dimstar <>
Date: May 21 2021 20:04:33 +0000
Subject: Update anjuta to version 3.34.0 / rev 114 via SR 894782
https://build.opensuse.org/request/show/894782
by user dimstar + dimstar_suse
Scripted push from GNOME:Next (forwarded request 894770 from dimstar)
---
diff --git a/.files b/.files
index bb3949f..e2f8ae1 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index acef693..d75f8be 100644
--- a/.rev
+++ b/.rev
@@ -842,4 +842,12 @@
Eliminate the -lang recommends (forwarded request 767096 from dimstar)
767337
+
+ 3927fef4fad831fa681f90791091e85b
+ 3.34.0
+
+ dimstar_suse
+ Scripted push from GNOME:Next (forwarded request 894770 from dimstar)
+ 894782
+
diff --git a/anjuta.changes b/anjuta.changes
index ec7808c..658c3dd 100644
--- a/anjuta.changes
+++ b/anjuta.changes
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Sun Feb 14 19:42:44 UTC 2021 - Callum Farmer
+
+- Add libgda-6.patch: support GDA 6
+
+-------------------------------------------------------------------
Sat Jan 25 14:05:22 UTC 2020 - Dominique Leuenberger
- No longer recommend -lang: supplements are in use
diff --git a/anjuta.spec b/anjuta.spec
index 76a14cb..bcc81af 100644
--- a/anjuta.spec
+++ b/anjuta.spec
@@ -1,7 +1,7 @@
#
# spec file for package anjuta
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,6 +25,8 @@ Group: Development/Tools/IDE
URL: https://wiki.gnome.org/Apps/Anjuta
Source0: https://download.gnome.org/sources/anjuta/3.34/%{name}-%{version}.tar.xz
Source99: %{name}-rpmlintrc
+# PATCH-FIX-UPSTREAM libgda-6.patch gmbr3@opensuse.org -- Require and support GDA 6
+Patch0: libgda-6.patch
BuildRequires: autogen
BuildRequires: binutils-devel
BuildRequires: bison
@@ -44,6 +46,7 @@ BuildRequires: subversion-devel
BuildRequires: translation-update-upstream
BuildRequires: vala
BuildRequires: yelp-tools
+BuildRequires: gnome-common
BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.0.0
BuildRequires: pkgconfig(gdl-3.0) >= 3.5.5
BuildRequires: pkgconfig(gladeui-2.0) >= 3.12.0
@@ -51,7 +54,7 @@ BuildRequires: pkgconfig(glib-2.0) >= 2.34.0
BuildRequires: pkgconfig(gtk+-3.0) >= 3.6.0
BuildRequires: pkgconfig(gtksourceview-3.0) >= 3.0.0
BuildRequires: pkgconfig(libdevhelp-3.0) >= 3.7.5
-BuildRequires: pkgconfig(libgda-5.0) >= 5.0.0
+BuildRequires: pkgconfig(libgda-6.0) >= 6.0.0
BuildRequires: pkgconfig(libgvc)
BuildRequires: pkgconfig(libxml-2.0) >= 2.4.23
BuildRequires: pkgconfig(serf-1)
@@ -62,7 +65,7 @@ Requires: autogen
Requires: automake
Requires: gettext
# libgda-sqlite is needed by the symbol-db plugin. See bnc#624924.
-Requires: libgda-sqlite
+Requires: libgda-sqlite >= 6.0.0
Requires: libtool
%ifnarch ia64 s390 s390x aarch64 ppc64le
BuildRequires: valgrind-devel
@@ -125,10 +128,12 @@ GNOME desktop.
%lang_package
%prep
-%setup -q
+%autosetup -p1
translation-update-upstream
%build
+export AUTOPOINT='intltoolize --automake --copy'
+autoreconf -fiv
%configure\
--disable-static \
--enable-glade-catalog \
diff --git a/libgda-6.patch b/libgda-6.patch
new file mode 100644
index 0000000..7a22359
--- /dev/null
+++ b/libgda-6.patch
@@ -0,0 +1,87 @@
+From 77bf4308332d3660c136719c5590dd2e882e3f44 Mon Sep 17 00:00:00 2001
+From: Ting-Wei Lan
+Date: Sat, 22 Sep 2018 14:51:42 +0800
+Subject: [PATCH] symbol-db: Fix build with the current libgda master branch
+
+GdaTimestamp has been removed and replaced by GDateTime. The version
+number went back to 5.90 and bumped to 5.91 on the libgda master branch.
+---
+ configure.ac | 2 +-
+ plugins/symbol-db/symbol-db-engine-core.c | 21 +++++++++++++++++++++
+ 2 files changed, 22 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index eeda3ed3e..569b81fe1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -37,7 +37,7 @@ GTHREAD_REQUIRED=2.22.0
+ GDK_PIXBUF_REQUIRED=2.0.0
+ GDA4_REQUIRED=4.2.0
+ GDA5_REQUIRED=5.0.0
+-GDA6_REQUIRED=5.99.0
++GDA6_REQUIRED=6.0.0
+ LIBXML_REQUIRED=2.4.23
+ GDL_REQUIRED=3.5.5
+ LIBWNCK_REQUIRED=2.12
+diff --git a/plugins/symbol-db/symbol-db-engine-core.c b/plugins/symbol-db/symbol-db-engine-core.c
+index 37d6e048a..c3f0d4f55 100644
+--- a/plugins/symbol-db/symbol-db-engine-core.c
++++ b/plugins/symbol-db/symbol-db-engine-core.c
+@@ -5443,7 +5443,11 @@ symbol_db_engine_update_project_symbols (SymbolDBEngine *dbe,
+ G_TYPE_STRING,
+ G_TYPE_INT,
+ G_TYPE_INT,
++#ifdef HAVE_GDA6
++ G_TYPE_DATE_TIME,
++#else
+ GDA_TYPE_TIMESTAMP,
++#endif
+ G_TYPE_NONE
+ };
+ data_model = gda_connection_statement_execute_select_full (priv->db_connection,
+@@ -5473,7 +5477,11 @@ symbol_db_engine_update_project_symbols (SymbolDBEngine *dbe,
+ for (i = 0; i < num_rows; i++)
+ {
+ const GValue *value, *value1;
++#ifdef HAVE_GDA6
++ GDateTime *timestamp;
++#else
+ const GdaTimestamp *timestamp;
++#endif
+ const gchar *file_name;
+ gchar *file_abs_path = NULL;
+ struct tm filetm;
+@@ -5530,17 +5538,30 @@ symbol_db_engine_update_project_symbols (SymbolDBEngine *dbe,
+ }
+
+
++#ifdef HAVE_GDA6
++ timestamp = g_value_get_boxed (value1);
++#else
+ timestamp = gda_value_get_timestamp (value1);
++#endif
+
+ /* fill a struct tm with the date retrieved by the string. */
+ /* string is something like '2007-04-18 23:51:39' */
+ memset (&filetm, 0, sizeof (struct tm));
++#ifdef HAVE_GDA6
++ filetm.tm_year = g_date_time_get_year (timestamp) - 1900;
++ filetm.tm_mon = g_date_time_get_month (timestamp) - 1;
++ filetm.tm_mday = g_date_time_get_day_of_month (timestamp);
++ filetm.tm_hour = g_date_time_get_hour (timestamp);
++ filetm.tm_min = g_date_time_get_minute (timestamp);
++ filetm.tm_sec = g_date_time_get_second (timestamp);
++#else
+ filetm.tm_year = timestamp->year - 1900;
+ filetm.tm_mon = timestamp->month - 1;
+ filetm.tm_mday = timestamp->day;
+ filetm.tm_hour = timestamp->hour;
+ filetm.tm_min = timestamp->minute;
+ filetm.tm_sec = timestamp->second;
++#endif
+
+ /* remove one hour to the db_file_time. */
+ db_time = mktime (&filetm) - 3600;
+--
+GitLab
+