From 267dfeb0fad973d593b5424a4bf536cabb3894de Mon Sep 17 00:00:00 2001 From: Tobias Kortkamp Date: Sat, 3 Aug 2019 07:43:34 +0000 Subject: [PATCH] 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) --- databases/tablelog/Makefile | 3 ++ databases/tablelog/files/patch-table__log.c | 48 +++++++++++++++++++++ databases/tablelog/pkg-descr | 2 +- 3 files changed, 52 insertions(+), 1 deletion(-) diff --git a/databases/tablelog/Makefile b/databases/tablelog/Makefile index 81993b2ea7b9..e6bcade59c88 100644 --- a/databases/tablelog/Makefile +++ b/databases/tablelog/Makefile @@ -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 diff --git a/databases/tablelog/files/patch-table__log.c b/databases/tablelog/files/patch-table__log.c index 84311387b42b..6a043b4542d4 100644 --- a/databases/tablelog/files/patch-table__log.c +++ b/databases/tablelog/files/patch-table__log.c @@ -9,3 +9,51 @@ #include /* 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; diff --git a/databases/tablelog/pkg-descr b/databases/tablelog/pkg-descr index 68e7b6062773..4a6603cae3fd 100644 --- a/databases/tablelog/pkg-descr +++ b/databases/tablelog/pkg-descr @@ -3,4 +3,4 @@ any INSERTs, UPDATEs and DELETEs on a specific table into another table. 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/