Fix evolution-data-server with gcc-7

OpenIndiana · May 23, 2017 · d3fc3bb · d3fc3bb
1 parent 0cc9e9d
commit d3fc3bb
Show file tree

Hide file tree

Showing 17 changed files with 26 additions and 8 deletions.
diff --git a/components/evolution-data-server/Makefile → ...top/gnome2/evolution-data-server/Makefile b/components/evolution-data-server/Makefile → ...top/gnome2/evolution-data-server/Makefile
@@ -12,7 +12,7 @@
 # Copyright (c) 2013 Alexander Pyhalov
 #
 
-include ../../make-rules/shared-macros.mk
+include ../../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		evolution-data-server
 COMPONENT_VERSION=	2.32.3
@@ -25,17 +25,17 @@ COMPONENT_ARCHIVE_HASH=	\
     sha256:744026a745b711b3e393b61fed21c4926d1b10a3aa7da64f4b33a3e3bf5b085c
 COMPONENT_ARCHIVE_URL=	http://ftp.gnome.org/pub/GNOME/sources/$(COMPONENT_NAME)/2.32/$(COMPONENT_NAME)-$(COMPONENT_VERSION).tar.bz2
 
-include $(WS_TOP)/make-rules/prep.mk
-include $(WS_TOP)/make-rules/configure.mk
-include $(WS_TOP)/make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 PATH=/usr/gnu/bin:/usr/bin:/usr/perl5/bin
 
 COMPONENT_PREP_ACTION = (cd $(@D) ; autoreconf -f -i)
 gcc_OPT		= -O2
 
 LDFLAGS+=	-L/usr/lib/mps -R/usr/lib/mps
-CFLAGS+=	-D__EXTENSIONS__
+CFLAGS+=	-std=gnu89 -D__EXTENSIONS__
 
 CONFIGURE_ENV+=		INTLTOOL_PERL=$(PERL)
 
@@ -57,6 +57,24 @@ install:	$(INSTALL_32)
 
 test:		$(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
-
-include $(WS_TOP)/make-rules/depend.mk
+# Auto-generated dependencies
+REQUIRED_PACKAGES += database/berkeleydb-5
+REQUIRED_PACKAGES += database/sqlite-3
+REQUIRED_PACKAGES += gnome/config/gconf
+REQUIRED_PACKAGES += library/desktop/atk
+REQUIRED_PACKAGES += library/desktop/cairo
+REQUIRED_PACKAGES += library/desktop/gdk-pixbuf
+REQUIRED_PACKAGES += library/desktop/gtk2
+REQUIRED_PACKAGES += library/desktop/libgdata
+REQUIRED_PACKAGES += library/desktop/libgweather
+REQUIRED_PACKAGES += library/desktop/pango
+REQUIRED_PACKAGES += library/glib2
+REQUIRED_PACKAGES += library/libical
+REQUIRED_PACKAGES += library/libsoup
+REQUIRED_PACKAGES += library/libxml2
+REQUIRED_PACKAGES += library/nspr
+REQUIRED_PACKAGES += library/zlib
+REQUIRED_PACKAGES += service/security/kerberos-5
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/mozilla-nss
+REQUIRED_PACKAGES += system/library/security/gss
diff --git a/...ion-data-server/evolution-data-server.p5m → ...ion-data-server/evolution-data-server.p5m b/...ion-data-server/evolution-data-server.p5m → ...ion-data-server/evolution-data-server.p5m
diff --git a/...data-server/manifests/sample-manifest.p5m → ...data-server/manifests/sample-manifest.p5m b/...data-server/manifests/sample-manifest.p5m → ...data-server/manifests/sample-manifest.p5m
diff --git a/...erver/patches/e-book-backend-ldap.c.patch → ...erver/patches/e-book-backend-ldap.c.patch b/...erver/patches/e-book-backend-ldap.c.patch → ...erver/patches/e-book-backend-ldap.c.patch
diff --git a/...a-server-01-open-address-book-sparc.patch → ...a-server-01-open-address-book-sparc.patch b/...a-server-01-open-address-book-sparc.patch → ...a-server-01-open-address-book-sparc.patch
diff --git a/...volution-data-server-02-ldap-search.patch → ...volution-data-server-02-ldap-search.patch b/...volution-data-server-02-ldap-search.patch → ...volution-data-server-02-ldap-search.patch
diff --git a/...ution-data-server-04-not-build-test.patch → ...ution-data-server-04-not-build-test.patch b/...ution-data-server-04-not-build-test.patch → ...ution-data-server-04-not-build-test.patch
diff --git a/...s/evolution-data-server-05-comm-err.patch → ...s/evolution-data-server-05-comm-err.patch b/...s/evolution-data-server-05-comm-err.patch → ...s/evolution-data-server-05-comm-err.patch
diff --git a/...tion-data-server-07-fixxref-modules.patch → ...tion-data-server-07-fixxref-modules.patch b/...tion-data-server-07-fixxref-modules.patch → ...tion-data-server-07-fixxref-modules.patch
diff --git a/...n-data-server-08-groupwise-makefile.patch → ...n-data-server-08-groupwise-makefile.patch b/...n-data-server-08-groupwise-makefile.patch → ...n-data-server-08-groupwise-makefile.patch
diff --git a/...hes/evolution-data-server-09-socket.patch → ...hes/evolution-data-server-09-socket.patch b/...hes/evolution-data-server-09-socket.patch → ...hes/evolution-data-server-09-socket.patch
diff --git a/...lution-data-server-10-vfolder-count.patch → ...lution-data-server-10-vfolder-count.patch b/...lution-data-server-10-vfolder-count.patch → ...lution-data-server-10-vfolder-count.patch
diff --git a/...hes/evolution-data-server-12-sqlite.patch → ...hes/evolution-data-server-12-sqlite.patch b/...hes/evolution-data-server-12-sqlite.patch → ...hes/evolution-data-server-12-sqlite.patch
diff --git a/...atches/evolution-data-server-13-gpg.patch → ...atches/evolution-data-server-13-gpg.patch b/...atches/evolution-data-server-13-gpg.patch → ...atches/evolution-data-server-13-gpg.patch
diff --git a/...volution-data-server-14-build-issue.patch → ...volution-data-server-14-build-issue.patch b/...volution-data-server-14-build-issue.patch → ...volution-data-server-14-build-issue.patch
diff --git a/...lution-data-server-15-automake-1.15.patch → ...lution-data-server-15-automake-1.15.patch b/...lution-data-server-15-automake-1.15.patch → ...lution-data-server-15-automake-1.15.patch
diff --git a/...tion-data-server/patches/libxml-2.9.patch → ...tion-data-server/patches/libxml-2.9.patch b/...tion-data-server/patches/libxml-2.9.patch → ...tion-data-server/patches/libxml-2.9.patch