svn commit: r436103 - in head/databases/gtksql: . files
Kirill Ponomarew
krion at FreeBSD.org
Mon Mar 13 18:17:05 UTC 2017
Author: krion
Date: Mon Mar 13 18:17:03 2017
New Revision: 436103
URL: https://svnweb.freebsd.org/changeset/ports/436103
Log:
- Fix build
- Add new necessary dependencies
- Replace portions of CPPFLAGS and LDFLAGS with sed patches for
${WRKSRC}/configure
- Add sed patch to rename some deprecated structure names after
v3.7.1 update of x11-toolkits/scintilla
PR: 217697
Submitted by: lightside at gmx.com
Approved by: mat (mentor)
Differential Revision: https://reviews.freebsd.org/D9974
Modified:
head/databases/gtksql/Makefile
head/databases/gtksql/files/patch-Makefile.in
head/databases/gtksql/files/patch-po__Makefile.in.in
Modified: head/databases/gtksql/Makefile
==============================================================================
--- head/databases/gtksql/Makefile Mon Mar 13 18:15:13 2017 (r436102)
+++ head/databases/gtksql/Makefile Mon Mar 13 18:17:03 2017 (r436103)
@@ -3,7 +3,7 @@
PORTNAME= gtksql
PORTVERSION= 0.4.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= databases
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-testing/${PORTNAME}-${PORTVERSION}
@@ -13,21 +13,17 @@ COMMENT= Graphical query tool for Postgr
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libscintilla.so:x11-toolkits/scintilla
+LIB_DEPENDS= libfreetype.so:print/freetype2 \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libscintilla.so:x11-toolkits/scintilla
RUN_DEPENDS= xdg-open:devel/xdg-utils
-BROKEN= does not build (incomplete definition of type 'struct CharacterRange')
-
-USES= gettext gmake pkgconfig
-USE_GNOME= gtk20 cairo glib20 pango
+USES= gettext gmake localbase pkgconfig
+USE_GNOME= gdkpixbuf2 gtk20 cairo
GNU_CONFIGURE= yes
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
AUTOHEADER="${TRUE}"
-CPPFLAGS+= -I${LOCALBASE}/include/scintilla -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib -lscintilla -lscintilla_lexers
-LDFLAGS+= -lgtk-x11-2.0 -lgdk-x11-2.0 -lpangocairo-1.0 -latk-1.0 -lcairo
-
OPTIONS_DEFINE= AVAHI DOCS
OPTIONS_MULTI= DB
OPTIONS_MULTI_DB= MYSQL PGSQL SQLITE
@@ -49,9 +45,9 @@ SQLITE_CONFIGURE_OFF= --without-sqlite
post-patch:
@${REINPLACE_CMD} -e \
- '/-lstdc++/s|^|#| ; \
- /scintilla.a/s|^|#| ; \
- /\/scintilla\/include/s|^|#| ; \
+ 's|-lstdc++|| ; \
+ /^PACKAGE_LIBS=/s|$${packagesrcdir}.*scintilla.a|-lscintilla -lscintilla_lexers| ; \
+ /^CPPFLAGS=/s|../scintilla/include|${LOCALBASE}/include/scintilla| ; \
/ac_header/s|postgres.h|libpq-fe.h| ; \
s|/usr/local|${PREFIX}| ; \
s|-R|-Wl,-rpath=| ; \
@@ -70,5 +66,10 @@ post-patch:
@${REINPLACE_CMD} -e \
's|/usr/local/gtksql|${PREFIX}/lib/gtksql|' \
${WRKSRC}/src/plugins.c
+# Some structure names were renamed in Scintilla.h (v3.7.1)
+ @${REINPLACE_CMD} -E \
+ 's|^#include <string.h>$$|#include <stdlib.h>\${.newline}&| ; \
+ s|(CharacterRange\|TextRange)|Sci_&|' \
+ ${WRKSRC}/src/gtksql_query_scintilla.c
.include <bsd.port.mk>
Modified: head/databases/gtksql/files/patch-Makefile.in
==============================================================================
--- head/databases/gtksql/files/patch-Makefile.in Mon Mar 13 18:15:13 2017 (r436102)
+++ head/databases/gtksql/files/patch-Makefile.in Mon Mar 13 18:17:03 2017 (r436103)
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2013-10-08 11:01:04.306764000 +0200
-+++ Makefile.in 2013-10-08 11:27:51.000000000 +0200
-@@ -237,14 +237,12 @@
+--- Makefile.in.orig 2007-11-01 14:05:59 UTC
++++ Makefile.in
+@@ -237,14 +237,12 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
Modified: head/databases/gtksql/files/patch-po__Makefile.in.in
==============================================================================
--- head/databases/gtksql/files/patch-po__Makefile.in.in Mon Mar 13 18:15:13 2017 (r436102)
+++ head/databases/gtksql/files/patch-po__Makefile.in.in Mon Mar 13 18:17:03 2017 (r436103)
@@ -1,5 +1,5 @@
---- ./po/Makefile.in.in.orig 2013-02-26 19:25:06.000000000 +0100
-+++ ./po/Makefile.in.in 2013-02-26 19:25:37.000000000 +0100
+--- po/Makefile.in.in.orig 2006-06-13 16:40:55 UTC
++++ po/Makefile.in.in
@@ -13,6 +13,7 @@
PACKAGE = @PACKAGE@
VERSION = @VERSION@
More information about the svn-ports-all
mailing list