Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 3 Aug 2019 07:43:35 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r507933 - in head/databases/tablelog: . files
Message-ID:  <201908030743.x737hZV2014648@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Sat Aug  3 07:43:34 2019
New Revision: 507933
URL: https://svnweb.freebsd.org/changeset/ports/507933

Log:
  databases/tablelog: Unbreak build with PostgreSQL >= 11.0
  
  table_log.c:76:29: error: member reference type 'FormData_pg_attribute' (aka 'struct FormData_pg_attribute') is not a pointer; did you mean to use '.'?
      if (!tupleDesc->attrs[i]->attisdropped) {
           ~~~~~~~~~~~~~~~~~~~^~
                              .
  table_log.c:303:59: error: member reference type 'FormData_pg_attribute' (aka 'struct FormData_pg_attribute') is not a pointer; did you mean to use '.'?
        if (trigdata->tg_relation->rd_att->attrs[col_nr - 1]->attisdropped) {
            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~
                                                            .
  table_log.c:348:59: error: member reference type 'FormData_pg_attribute' (aka 'struct FormData_pg_attribute') is not a pointer; did you mean to use '.'?
        if (trigdata->tg_relation->rd_att->attrs[col_nr - 1]->attisdropped) {
            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~
                                                            .
  table_log.c:375:59: error: member reference type 'FormData_pg_attribute' (aka 'struct FormData_pg_attribute') is not a pointer; did you mean to use '.'?
        if (trigdata->tg_relation->rd_att->attrs[col_nr - 1]->attisdropped) {
            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~
                                                            .
  4 errors generated.
  
  http://package18.nyi.freebsd.org/data/120amd64-default-PR239514/2019-07-29_20h41m52s/logs/tablelog-0.4.4_3.log
  
  While here
  
  - Mark it as deprecated.  The last release was in 2007 and upstream
    has been inactive since then.
  - Fix WWW
  
  PR:		239514
  Reported by:	antoine (via exp-run)

Modified:
  head/databases/tablelog/Makefile
  head/databases/tablelog/files/patch-table__log.c
  head/databases/tablelog/pkg-descr

Modified: head/databases/tablelog/Makefile
==============================================================================
--- head/databases/tablelog/Makefile	Sat Aug  3 07:25:18 2019	(r507932)
+++ head/databases/tablelog/Makefile	Sat Aug  3 07:43:34 2019	(r507933)
@@ -12,6 +12,9 @@ COMMENT=	Logs changes on a table in PostgreSQL
 
 LICENSE=	PostgreSQL
 
+DEPRECATED=	Abandonware
+EXPIRATION_DATE=	2019-09-15
+
 WRKSRC=		${WRKDIR}/table_log-${DISTVERSION}
 
 USES=		gmake pgsql

Modified: head/databases/tablelog/files/patch-table__log.c
==============================================================================
--- head/databases/tablelog/files/patch-table__log.c	Sat Aug  3 07:25:18 2019	(r507932)
+++ head/databases/tablelog/files/patch-table__log.c	Sat Aug  3 07:43:34 2019	(r507933)
@@ -9,3 +9,51 @@
  #include <funcapi.h>
  
  /* for PostgreSQL >= 8.2.x */
+@@ -71,7 +73,11 @@ int count_columns (TupleDesc tupleDesc) {
+   int i;
+ 
+   for (i = 0; i < tupleDesc->natts; ++i) {
++#if PG_VERSION_NUM < 110000
+     if (!tupleDesc->attrs[i]->attisdropped) {
++#else
++    if (!tupleDesc->attrs[i].attisdropped) {
++#endif
+       ++count;
+     }
+   }
+@@ -298,7 +304,11 @@ static void __table_log (TriggerData *trigdata, char *
+     col_nr++;
+     found_col = 0;
+     do {
++#if PG_VERSION_NUM < 110000
+       if (trigdata->tg_relation->rd_att->attrs[col_nr - 1]->attisdropped) {
++#else
++      if (trigdata->tg_relation->rd_att->attrs[col_nr - 1].attisdropped) {
++#endif
+         /* this column is dropped, skip it */
+         col_nr++;
+         continue;
+@@ -343,7 +353,11 @@ static void __table_log (TriggerData *trigdata, char *
+     col_nr++;
+     found_col = 0;
+     do {
++#if PG_VERSION_NUM < 110000
+       if (trigdata->tg_relation->rd_att->attrs[col_nr - 1]->attisdropped) {
++#else
++      if (trigdata->tg_relation->rd_att->attrs[col_nr - 1].attisdropped) {
++#endif
+         /* this column is dropped, skip it */
+         col_nr++;
+         continue;
+@@ -370,7 +384,11 @@ static void __table_log (TriggerData *trigdata, char *
+     col_nr++;
+     found_col = 0;
+     do {
++#if PG_VERSION_NUM < 110000
+       if (trigdata->tg_relation->rd_att->attrs[col_nr - 1]->attisdropped) {
++#else
++      if (trigdata->tg_relation->rd_att->attrs[col_nr - 1].attisdropped) {
++#endif
+         /* this column is dropped, skip it */
+         col_nr++;
+         continue;

Modified: head/databases/tablelog/pkg-descr
==============================================================================
--- head/databases/tablelog/pkg-descr	Sat Aug  3 07:25:18 2019	(r507932)
+++ head/databases/tablelog/pkg-descr	Sat Aug  3 07:43:34 2019	(r507933)
@@ -3,4 +3,4 @@ any INSERTs, UPDATEs and DELETEs on a specific table i
 The second part of tablelog is able to restore the state of the original
 table or of a specific row for any time in the past.
 
-WWW: http://tablelog.projects.postgresql.org/
+WWW: http://pgfoundry.org/projects/tablelog/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908030743.x737hZV2014648>