Date: Sun, 18 Aug 2019 13:28:54 +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: r509208 - in head/databases/skytools: . files Message-ID: <201908181328.x7IDSsE4071037@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Sun Aug 18 13:28:54 2019 New Revision: 509208 URL: https://svnweb.freebsd.org/changeset/ports/509208 Log: databases/skytools: Unbreak build with PostgreSQL 11 logutriga.c:57:24: error: member reference type 'FormData_pg_attribute' (aka 'struct FormData_pg_attribute') is not a pointer; did you mean to use '.'? if (tupdesc->attrs[i]->attisdropped) ~~~~~~~~~~~~~~~~~^~ . logutriga.c:148:24: error: member reference type 'FormData_pg_attribute' (aka 'struct FormData_pg_attribute') is not a pointer; did you mean to use '.'? if (tupdesc->attrs[i]->attisdropped) ~~~~~~~~~~~~~~~~~^~ . 2 errors generated. http://package18.nyi.freebsd.org/data/120amd64-default-PR239514/2019-07-29_20h41m52s/logs/skytools-3.2_3.log While here deprecate it. It was last updated in 2014 and seems to have been abandoned. PR: 239652 Approved by: sam@cassiba.com (maintainer timeout, 2 weeks) Added: head/databases/skytools/files/ head/databases/skytools/files/patch-sql_pgq_triggers_common.c (contents, props changed) head/databases/skytools/files/patch-sql_pgq_triggers_logutriga.c (contents, props changed) head/databases/skytools/files/patch-sql_pgq_triggers_makesql.c (contents, props changed) head/databases/skytools/files/patch-sql_pgq_triggers_stringutil.c (contents, props changed) head/databases/skytools/files/patch-sql_txid_Makefile (contents, props changed) Modified: head/databases/skytools/Makefile Modified: head/databases/skytools/Makefile ============================================================================== --- head/databases/skytools/Makefile Sun Aug 18 13:23:40 2019 (r509207) +++ head/databases/skytools/Makefile Sun Aug 18 13:28:54 2019 (r509208) @@ -10,6 +10,9 @@ MASTER_SITES= http://pgfoundry.org/frs/download.php/36 MAINTAINER= sam@cassiba.com COMMENT= PostgreSQL tools from Skype: walshipping, queueing, replication +DEPRECATED= Abandonware +EXPIRATION_DATE= 2019-09-15 + GNU_CONFIGURE= yes USES= gmake python:2.7 shebangfix pgsql LLD_UNSAFE= yes Added: head/databases/skytools/files/patch-sql_pgq_triggers_common.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/skytools/files/patch-sql_pgq_triggers_common.c Sun Aug 18 13:28:54 2019 (r509208) @@ -0,0 +1,62 @@ +--- sql/pgq/triggers/common.c.orig 2019-08-05 04:40:08 UTC ++++ sql/pgq/triggers/common.c +@@ -125,9 +125,15 @@ static void fill_magic_columns(PgqTriggerEvent *ev) + + for (i = 0; i < tupdesc->natts; i++) { + /* Skip dropped columns */ ++#if PG_VERSION_NUM < 110000 + if (tupdesc->attrs[i]->attisdropped) + continue; + col_name = NameStr(tupdesc->attrs[i]->attname); ++#else ++ if (TupleDescAttr(tupdesc, i)->attisdropped) ++ continue; ++ col_name = NameStr(TupleDescAttr(tupdesc, i)->attname); ++#endif + if (!is_magic_field(col_name)) + continue; + if (strcmp(col_name, "_pgq_ev_type") == 0) +@@ -481,7 +487,11 @@ static void parse_oldstyle_args(PgqTriggerEvent *ev, T + */ + tupdesc = tg->tg_relation->rd_att; + for (i = 0, attcnt = 0; i < tupdesc->natts; i++) { ++#if PG_VERSION_NUM < 110000 + if (!tupdesc->attrs[i]->attisdropped) ++#else ++ if (!TupleDescAttr(tupdesc, i)->attisdropped) ++#endif + attcnt++; + } + +@@ -598,9 +608,15 @@ bool pgqtriga_skip_col(PgqTriggerEvent *ev, int i, int + const char *name; + + tupdesc = tg->tg_relation->rd_att; ++#if PG_VERSION_NUM < 110000 + if (tupdesc->attrs[i]->attisdropped) + return true; + name = NameStr(tupdesc->attrs[i]->attname); ++#else ++ if (TupleDescAttr(tupdesc, i)->attisdropped) ++ return true; ++ name = NameStr(TupleDescAttr(tupdesc, i)->attname); ++#endif + + if (is_magic_field(name)) { + ev->tgargs->custom_fields = 1; +@@ -632,9 +648,15 @@ bool pgqtriga_is_pkey(PgqTriggerEvent *ev, int i, int + return ev->attkind[attkind_idx] == 'k'; + } else if (ev->pkey_list) { + tupdesc = tg->tg_relation->rd_att; ++#if PG_VERSION_NUM < 110000 + if (tupdesc->attrs[i]->attisdropped) + return false; + name = NameStr(tupdesc->attrs[i]->attname); ++#else ++ if (TupleDescAttr(tupdesc, i)->attisdropped) ++ return false; ++ name = NameStr(TupleDescAttr(tupdesc, i)->attname); ++#endif + if (is_magic_field(name)) { + ev->tgargs->custom_fields = 1; + return false; Added: head/databases/skytools/files/patch-sql_pgq_triggers_logutriga.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/skytools/files/patch-sql_pgq_triggers_logutriga.c Sun Aug 18 13:28:54 2019 (r509208) @@ -0,0 +1,26 @@ +--- sql/pgq/triggers/logutriga.c.orig 2019-08-05 04:38:03 UTC ++++ sql/pgq/triggers/logutriga.c +@@ -54,7 +54,11 @@ static int is_interesting_change(PgqTriggerEvent *ev, + /* + * Ignore dropped columns + */ ++#if PG_VERSION_NUM < 110000 + if (tupdesc->attrs[i]->attisdropped) ++#else ++ if (TupleDescAttr(tupdesc, i)->attisdropped) ++#endif + continue; + attkind_idx++; + +@@ -145,7 +149,11 @@ void pgq_urlenc_row(PgqTriggerEvent *ev, HeapTuple row + + for (i = 0; i < tg->tg_relation->rd_att->natts; i++) { + /* Skip dropped columns */ ++#if PG_VERSION_NUM < 110000 + if (tupdesc->attrs[i]->attisdropped) ++#else ++ if (TupleDescAttr(tupdesc, i)->attisdropped) ++#endif + continue; + + attkind_idx++; Added: head/databases/skytools/files/patch-sql_pgq_triggers_makesql.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/skytools/files/patch-sql_pgq_triggers_makesql.c Sun Aug 18 13:28:54 2019 (r509208) @@ -0,0 +1,86 @@ +--- sql/pgq/triggers/makesql.c.orig 2019-08-05 04:44:33 UTC ++++ sql/pgq/triggers/makesql.c +@@ -71,7 +71,11 @@ static void process_insert(PgqTriggerEvent *ev, String + char *col_ident; + + /* Skip dropped columns */ ++#if PG_VERSION_NUM < 110000 + if (tupdesc->attrs[i]->attisdropped) ++#else ++ if (TupleDescAttr(tupdesc, i)->attisdropped) ++#endif + continue; + + /* Check if allowed by colstring */ +@@ -103,7 +107,11 @@ static void process_insert(PgqTriggerEvent *ev, String + char *col_value; + + /* Skip dropped columns */ ++#if PG_VERSION_NUM < 110000 + if (tupdesc->attrs[i]->attisdropped) ++#else ++ if (TupleDescAttr(tupdesc, i)->attisdropped) ++#endif + continue; + + /* Check if allowed by colstring */ +@@ -154,7 +162,11 @@ static int process_update(PgqTriggerEvent *ev, StringI + /* + * Ignore dropped columns + */ ++#if PG_VERSION_NUM < 110000 + if (tupdesc->attrs[i]->attisdropped) ++#else ++ if (TupleDescAttr(tupdesc, i)->attisdropped) ++#endif + continue; + + attkind_idx++; +@@ -240,7 +252,11 @@ static int process_update(PgqTriggerEvent *ev, StringI + return 0; + + for (i = 0, attkind_idx = -1; i < tupdesc->natts; i++) { ++#if PG_VERSION_NUM < 110000 + if (tupdesc->attrs[i]->attisdropped) ++#else ++ if (TupleDescAttr(tupdesc, i)->attisdropped) ++#endif + continue; + + attkind_idx++; +@@ -259,7 +275,11 @@ static int process_update(PgqTriggerEvent *ev, StringI + /* + * Ignore dropped columns + */ ++#if PG_VERSION_NUM < 110000 + if (tupdesc->attrs[i]->attisdropped) ++#else ++ if (TupleDescAttr(tupdesc, i)->attisdropped) ++#endif + continue; + + attkind_idx++; +@@ -291,7 +311,11 @@ static void process_delete(PgqTriggerEvent *ev, String + int attkind_idx; + + for (i = 0, attkind_idx = -1; i < tupdesc->natts; i++) { ++#if PG_VERSION_NUM < 110000 + if (tupdesc->attrs[i]->attisdropped) ++#else ++ if (TupleDescAttr(tupdesc, i)->attisdropped) ++#endif + continue; + + attkind_idx++; +@@ -323,7 +347,11 @@ int pgqtriga_make_sql(PgqTriggerEvent *ev, StringInfo + * Count number of active columns + */ + for (i = 0, attcnt = 0; i < tupdesc->natts; i++) { ++#if PG_VERSION_NUM < 110000 + if (tupdesc->attrs[i]->attisdropped) ++#else ++ if (TupleDescAttr(tupdesc, i)->attisdropped) ++#endif + continue; + attcnt++; + } Added: head/databases/skytools/files/patch-sql_pgq_triggers_stringutil.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/skytools/files/patch-sql_pgq_triggers_stringutil.c Sun Aug 18 13:28:54 2019 (r509208) @@ -0,0 +1,14 @@ +--- sql/pgq/triggers/stringutil.c.orig 2019-08-05 04:48:30 UTC ++++ sql/pgq/triggers/stringutil.c +@@ -19,7 +19,11 @@ + #include <postgres.h> + #include <lib/stringinfo.h> + #include <mb/pg_wchar.h> ++#if PG_VERSION_NUM < 110000 + #include <parser/keywords.h> ++#else ++#include <common/keywords.h> ++#endif + #include <utils/memutils.h> + + #include "stringutil.h" Added: head/databases/skytools/files/patch-sql_txid_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/skytools/files/patch-sql_txid_Makefile Sun Aug 18 13:28:54 2019 (r509208) @@ -0,0 +1,11 @@ +--- sql/txid/Makefile.orig 2013-07-29 08:14:55 UTC ++++ sql/txid/Makefile +@@ -12,7 +12,7 @@ pg83 = $(shell test $(PGVER) "<" "8.3" && echo "false" + pg82 = $(shell test $(PGVER) "<" "8.2" && echo "false" || echo "true") + endif + +-ifeq ($(pg83),true) # we have 8.3 with internal txid ++ifeq (1,1) # we always have >= 9.4 with internal txid + + # install empty txid.sql + DATA_built = txid.sql
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908181328.x7IDSsE4071037>