SF.net SVN: gar:[22678] csw/mgar/pkg/dia/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Thu Dec 12 18:09:37 CET 2013
Revision: 22678
http://sourceforge.net/p/gar/code/22678
Author: dmichelsen
Date: 2013-12-12 17:09:37 +0000 (Thu, 12 Dec 2013)
Log Message:
-----------
dia/trunk: Update to 0.97.2 and new dependencies
Modified Paths:
--------------
csw/mgar/pkg/dia/trunk/Makefile
csw/mgar/pkg/dia/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/dia/trunk/files/0001-Keep-norunpath-during-libtool.patch
Removed Paths:
-------------
csw/mgar/pkg/dia/trunk/files/0001-Make-sure-for-loop-is-not-empty.patch
Modified: csw/mgar/pkg/dia/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dia/trunk/Makefile 2013-12-12 16:59:15 UTC (rev 22677)
+++ csw/mgar/pkg/dia/trunk/Makefile 2013-12-12 17:09:37 UTC (rev 22678)
@@ -1,44 +1,80 @@
# $Id$
NAME = dia
-VERSION = 0.97
+VERSION = 0.97.2
GARTYPE = v2
DESCRIPTION = A GTK+ based diagram creation program
-define BLURB
-endef
MASTER_SITES = $(GNOME_MIRROR)
-DISTFILES = $(NAME)-$(VERSION).tar.bz2
+DISTFILES += $(NAME)-$(VERSION).tar.xz
-PATCHFILES = 0001-Make-sure-for-loop-is-not-empty.patch
+PATCHFILES += 0001-Keep-norunpath-during-libtool.patch
-# File name regex to get notifications about upstream software releases
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-
VENDOR_URL = http://live.gnome.org/Dia
+# BUILD_DEP_PKGS +=
+
+PACKAGES += CSWdia
+SPKG_DESC_CSWdia = A GTK+ based diagram creation program
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWdia += CSWlibpango1-0-0
+RUNTIME_DEP_PKGS_CSWdia += CSWlibgthread2-0-0
+RUNTIME_DEP_PKGS_CSWdia += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWdia += CSWlibatk1-0-0
+RUNTIME_DEP_PKGS_CSWdia += CSWlibpng15-15
+RUNTIME_DEP_PKGS_CSWdia += CSWlibemf1
+RUNTIME_DEP_PKGS_CSWdia += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWdia += CSWlibz1
+RUNTIME_DEP_PKGS_CSWdia += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWdia += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWdia += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWdia += CSWlibgtk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWdia += CSWlibbz2-1-0
+RUNTIME_DEP_PKGS_CSWdia += CSWlibpangoft2-1-0-0
+RUNTIME_DEP_PKGS_CSWdia += CSWlibgdk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWdia += CSWlibgdk-pixbuf2-0-0
+RUNTIME_DEP_PKGS_CSWdia += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWdia += CSWlibxslt1
+RUNTIME_DEP_PKGS_CSWdia += CSWlibgio2-0-0
+RUNTIME_DEP_PKGS_CSWdia += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWdia += CSWlibpangocairo1-0-0
+RUNTIME_DEP_PKGS_CSWdia += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWdia += CSWlibart
+
+# Linker difference between sparc and i386
+CHECKPKG_OVERRIDES_CSWdia += surplus-dependency|CSWlibgio2-0-0
+CHECKPKG_OVERRIDES_CSWdia += surplus-dependency|CSWlibiconv2
+CHECKPKG_OVERRIDES_CSWdia += surplus-dependency|CSWlibbz2-1-0
+CHECKPKG_OVERRIDES_CSWdia += surplus-dependency|CSWlibfontconfig1
+CHECKPKG_OVERRIDES_CSWdia += surplus-dependency|CSWlibatk1-0-0
+
+# Locations of locale.alias:
+# /usr/share/locale/locale.alias: not used in Solaris
+# /usr/local/share/locale/locale.alias: replace with /opt/csw/share/locale/locale.alias
+# /usr/lib/X11/locale/locale.alias: not used in Solaris
+# /usr/openwin/lib/locale/locale.alias: ok
+REINPLACEMENTS += locale
+REINPLACE_MATCH_locale = /usr/local/share/locale/locale.alias
+REINPLACE_WITH_locale = $(sharedstatedir)/locale/locale.alias
+REINPLACE_FILES_locale += lib/intl.c
+
+# Doesn't harm, see above
+CHECKPKG_OVERRIDES_CSWdia += file-with-bad-content|/usr/share|root/opt/csw/lib/dia/libdia.so
+
+# For GNU gettext like msgmerge
+CONFIGURE_ENV_PATH = $(prefix)/gnu:$(PATH)
+
+EXTRA_INC += $(includedir)/libEMF
+
+EXTRA_LINKER_FLAGS += -norunpath
+
CONFIGURE_ARGS = $(DIRPATHS)
# Tests for i386 fail in /Dia/Objects/Istar - goal/Copy with
# g_str_hash (100) + 16
-TEST_TARGET ?= check
-RUNTIME_DEP_PKGS_CSWdia += CSWlibxslt
-RUNTIME_DEP_PKGS_CSWdia += CSWlibatk
-RUNTIME_DEP_PKGS_CSWdia += CSWggettextrt
-RUNTIME_DEP_PKGS_CSWdia += CSWpng
-RUNTIME_DEP_PKGS_CSWdia += CSWlibxml2
-RUNTIME_DEP_PKGS_CSWdia += CSWfconfig
-RUNTIME_DEP_PKGS_CSWdia += CSWglib2
-RUNTIME_DEP_PKGS_CSWdia += CSWftype2
-RUNTIME_DEP_PKGS_CSWdia += CSWpango
-RUNTIME_DEP_PKGS_CSWdia += CSWzlib
-RUNTIME_DEP_PKGS_CSWdia += CSWlibart
-RUNTIME_DEP_PKGS_CSWdia += CSWgtk2
-RUNTIME_DEP_PKGS_CSWdia += CSWlibcairo
-RUNTIME_DEP_PKGS_CSWdia += CSWiconv
+# For GNU xgettext
+TEST_ENV_PATH = $(prefix)/gnu:$(PATH)
include gar/category.mk
-# For GNU gettext like msgmerge
-PATH := /opt/csw/gnu:$(PATH)
Modified: csw/mgar/pkg/dia/trunk/checksums
===================================================================
--- csw/mgar/pkg/dia/trunk/checksums 2013-12-12 16:59:15 UTC (rev 22677)
+++ csw/mgar/pkg/dia/trunk/checksums 2013-12-12 17:09:37 UTC (rev 22678)
@@ -1 +1 @@
-3d11f9aaa5a4923f0a5533962c87bdfb dia-0.97.tar.bz2
+1e1180a513fb567709b09bc19f12105e dia-0.97.2.tar.xz
Added: csw/mgar/pkg/dia/trunk/files/0001-Keep-norunpath-during-libtool.patch
===================================================================
--- csw/mgar/pkg/dia/trunk/files/0001-Keep-norunpath-during-libtool.patch (rev 0)
+++ csw/mgar/pkg/dia/trunk/files/0001-Keep-norunpath-during-libtool.patch 2013-12-12 17:09:37 UTC (rev 22678)
@@ -0,0 +1,25 @@
+From 2b9f48028b669ad74c060998e3e947251885cd4b Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 12 Dec 2013 16:06:44 +0100
+Subject: [PATCH] Keep -norunpath during libtool
+
+---
+ ltmain.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ltmain.sh b/ltmain.sh
+index 04eaea4..fd4ac68 100755
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -5091,7 +5091,7 @@ func_mode_link ()
+ # @file GCC response files
+ # -tp=* Portland pgcc target processor selection
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-norunpath)
+ func_quote_for_eval "$arg"
+ arg="$func_quote_for_eval_result"
+ func_append compile_command " $arg"
+--
+1.8.4.1
+
Deleted: csw/mgar/pkg/dia/trunk/files/0001-Make-sure-for-loop-is-not-empty.patch
===================================================================
--- csw/mgar/pkg/dia/trunk/files/0001-Make-sure-for-loop-is-not-empty.patch 2013-12-12 16:59:15 UTC (rev 22677)
+++ csw/mgar/pkg/dia/trunk/files/0001-Make-sure-for-loop-is-not-empty.patch 2013-12-12 17:09:37 UTC (rev 22678)
@@ -1,52 +0,0 @@
-From 109bdcb02d7e43bf9b3d15382dd54681b09edc29 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Tue, 23 Nov 2010 11:09:26 +0100
-Subject: [PATCH] Make sure for-loop is not empty
-
----
- doc/Makefile.in | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/doc/Makefile.in b/doc/Makefile.in
-index ec95c51..85a9b44 100644
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
-@@ -382,7 +382,7 @@ ctags-recursive:
- done
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+ list='x$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-@@ -408,7 +408,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
-- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+ list='x$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-@@ -423,7 +423,7 @@ ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+ list='x$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-@@ -589,7 +589,7 @@ uninstall-am: uninstall-local
- install-data-local: $(distfiles)
- -(cd $(DESTDIR)$(helpdir) && rm -f C && ln -s en C)
- $(mkinstalldirs) $(sysdoc)
-- for i in $^; do \
-+ for i in x $^; do \
- if test -f "$$i"; then \
- echo "installing $$i" ;\
- $(INSTALL_DATA) $$i $(sysdoc)/$$(basename $$i); \
---
-1.7.3
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list