Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package anjuta for openSUSE:Factory checked in at 2021-05-21 21:50:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/anjuta (Old) and /work/SRC/openSUSE:Factory/.anjuta.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "anjuta" Fri May 21 21:50:16 2021 rev:114 rq:894782 version:3.34.0 Changes: -------- --- /work/SRC/openSUSE:Factory/anjuta/anjuta.changes 2020-01-27 20:13:19.128371649 +0100 +++ /work/SRC/openSUSE:Factory/.anjuta.new.2988/anjuta.changes 2021-05-21 21:50:29.730114319 +0200 @@ -1,0 +2,5 @@ +Sun Feb 14 19:42:44 UTC 2021 - Callum Farmer <gmbr3@opensuse.org> + +- Add libgda-6.patch: support GDA 6 + +------------------------------------------------------------------- New: ---- libgda-6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ anjuta.spec ++++++ --- /var/tmp/diff_new_pack.KjIHuX/_old 2021-05-21 21:50:30.178112464 +0200 +++ /var/tmp/diff_new_pack.KjIHuX/_new 2021-05-21 21:50:30.178112464 +0200 @@ -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 @@ 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: 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(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: 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 @@ %lang_package %prep -%setup -q +%autosetup -p1 translation-update-upstream %build +export AUTOPOINT='intltoolize --automake --copy' +autoreconf -fiv %configure\ --disable-static \ --enable-glade-catalog \ ++++++ libgda-6.patch ++++++ From 77bf4308332d3660c136719c5590dd2e882e3f44 Mon Sep 17 00:00:00 2001 From: Ting-Wei Lan <lantw@src.gnome.org> 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