From 394b0d94a8ca75acf2573fd82f0ec57a7bd2830f Mon Sep 17 00:00:00 2001 From: Mike Gardiner Date: Wed, 2 Nov 2005 14:07:25 +0000 Subject: [PATCH] Moved all of the xpm's to png's for the sheets. See bug #103401, and Gnome Bug, #154079 for more information. Package-Manager: portage-2.0.53_rc7 --- app-office/dia/ChangeLog | 9 +- app-office/dia/Manifest | 6 +- app-office/dia/dia-0.94-r4.ebuild | 68 ++++++++++ app-office/dia/files/dia-0.94-png.patch | 127 ++++++++++++++++++ .../dia/files/dia-0.94-sheets-png.tar.bz2 | Bin 0 -> 5449 bytes app-office/dia/files/digest-dia-0.94-r4 | 1 + 6 files changed, 209 insertions(+), 2 deletions(-) create mode 100644 app-office/dia/dia-0.94-r4.ebuild create mode 100644 app-office/dia/files/dia-0.94-png.patch create mode 100644 app-office/dia/files/dia-0.94-sheets-png.tar.bz2 create mode 100644 app-office/dia/files/digest-dia-0.94-r4 diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog index ca035c093a0d..71163f4fce40 100644 --- a/app-office/dia/ChangeLog +++ b/app-office/dia/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-office/dia # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.73 2005/10/04 18:42:05 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.74 2005/11/02 14:07:25 obz Exp $ + +*dia-0.94-r4 (02 Nov 2005) + + 02 Nov 2005; Mike Gardiner +files/dia-0.94-png.patch, + +files/dia-0.94-sheets-png.tar.bz2, +dia-0.94-r4.ebuild: + Moved all of the xpm's to png's for the sheets. See bug #103401, and Gnome + Bug, #154079 for more information. 04 Oct 2005; Michael Hanselmann dia-0.94-r3.ebuild: Stable on ppc. diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest index 5d79c56a5688..4dfd6e73bd45 100644 --- a/app-office/dia/Manifest +++ b/app-office/dia/Manifest @@ -1,14 +1,18 @@ -MD5 0eadea95c1e7e3b42021ca2f9584a7a9 ChangeLog 8798 +MD5 5c1fc913a41a807ab3e428cec7b0b990 ChangeLog 9070 MD5 a2e230eb1d422d8da320507fb3de7838 dia-0.94-r1.ebuild 1479 MD5 e64a64c8b1e5e3be5cf29d34c7374513 dia-0.94-r2.ebuild 1655 MD5 126c5416e6df9153e3d83cc38a6559b6 dia-0.94-r3.ebuild 1738 +MD5 0246566e2cfd2158ad43ea52cb27c8c8 dia-0.94-r4.ebuild 2019 MD5 275b4e09a76a808202872cae5ac90f7c files/0.94-disable_python_gtk_import.patch 313 MD5 bf246d9c1eae9246fd3026d76077d7c3 files/dia-0.94-db2man.patch 901 MD5 159070f80a109b691f1a945755bf2b7c files/dia-0.94-gcc4.patch 934 MD5 364d452e7bd501c01910f613c066608e files/dia-0.94-help.patch 2766 MD5 5825798492b196ec96d3757e9e1d0de8 files/dia-0.94-no_font_cache.patch 473 +MD5 8e5bd10e3f779bffcb360641329e3ef1 files/dia-0.94-png.patch 3093 MD5 84f2dd6bc760e8dce273ceda328ef76e files/dia-0.94-secure-eval.patch 1940 +MD5 8905a098072f0dbd22a14ea86e790b85 files/dia-0.94-sheets-png.tar.bz2 5449 MD5 c6257d6dad2b46a83757991db3f3e6c5 files/digest-dia-0.94-r1 62 MD5 c6257d6dad2b46a83757991db3f3e6c5 files/digest-dia-0.94-r2 62 MD5 c6257d6dad2b46a83757991db3f3e6c5 files/digest-dia-0.94-r3 62 +MD5 c6257d6dad2b46a83757991db3f3e6c5 files/digest-dia-0.94-r4 62 MD5 005c0ccc7908df18dd83361a36ed07ee metadata.xml 596 diff --git a/app-office/dia/dia-0.94-r4.ebuild b/app-office/dia/dia-0.94-r4.ebuild new file mode 100644 index 000000000000..5731ce2e6816 --- /dev/null +++ b/app-office/dia/dia-0.94-r4.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.94-r4.ebuild,v 1.1 2005/11/02 14:07:25 obz Exp $ + +inherit eutils gnome2 libtool + +DESCRIPTION="Diagram/flowchart creation program" +HOMEPAGE="http://www.gnome.org/projects/dia/" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="gnome png python static zlib" + +RDEPEND=">=x11-libs/gtk+-2 + >=x11-libs/pango-1.1.5 + >=dev-libs/libxml2-2.3.9 + >=dev-libs/libxslt-1 + >=media-libs/freetype-2.0.9 + dev-libs/popt + zlib? ( sys-libs/zlib ) + png? ( media-libs/libpng + >=media-libs/libart_lgpl-2 ) + gnome? ( >=gnome-base/libgnome-2.0 + >=gnome-base/libgnomeui-2.0 ) + python? ( >=dev-lang/python-1.5.2 + >=dev-python/pygtk-1.99 ) + ~app-text/docbook-xml-dtd-4.2 + app-text/docbook-xsl-stylesheets" + +DEPEND="${RDEPEND} + >=dev-util/intltool-0.21 + dev-util/pkgconfig" + +G2CONF="${G2CONF} $(use_enable gnome) $(use_with python) $(use_enable static)" + +DOCS="AUTHORS ChangeLog KNOWN_BUGS NEWS README RELEASE-PROCESS THANKS TODO" + +src_unpack() { + unpack ${A} + cd ${S} + + # Disable python -c 'import gtk' during compile to prevent using + # X being involved (#31589) + epatch ${FILESDIR}/${PV}-disable_python_gtk_import.patch + + libtoolize --force --copy || die "Elibtoolize failed" + + # Install png's instead of xpm's, (bug #103401) and upstream. + epatch ${FILESDIR}/${P}-png.patch + tar jxf ${FILESDIR}/${P}-sheets-png.tar.bz2 + aclocal || die "Aclocal failed" + automake || die "Automake failed" + + # Fix generation of the man page (bug #98610). + rm doc/en/dia.1 + epatch ${FILESDIR}/${P}-db2man.patch + autoconf || die "Autoconf failed" + + # Disable buggy font cache. See bug #81227. + epatch ${FILESDIR}/${P}-no_font_cache.patch + # Fix help display. See bug #83726. + epatch ${FILESDIR}/${P}-help.patch + # GCC 4 compile fixes + epatch ${FILESDIR}/${P}-gcc4.patch + # Fix python execution hole. bug #107916 + epatch ${FILESDIR}/${P}-secure-eval.patch +} diff --git a/app-office/dia/files/dia-0.94-png.patch b/app-office/dia/files/dia-0.94-png.patch new file mode 100644 index 000000000000..84ca2ae4d4c4 --- /dev/null +++ b/app-office/dia/files/dia-0.94-png.patch @@ -0,0 +1,127 @@ +diff -ur dia-0.94/sheets/ER/Makefile.am dia-0.94-png/sheets/ER/Makefile.am +--- dia-0.94/sheets/ER/Makefile.am 2004-08-16 15:56:30.000000000 +0800 ++++ dia-0.94-png/sheets/ER/Makefile.am 2005-11-02 16:56:49.000000000 +0800 +@@ -1,7 +1,7 @@ + ERsheetdir = $(pkgdatadir)/sheets/ER + + PIX = \ +- weakentity.xpm ++ weakentity.png + + ERsheet_DATA = $(PIX) + +diff -ur dia-0.94/sheets/GRAFCET/Makefile.am dia-0.94-png/sheets/GRAFCET/Makefile.am +--- dia-0.94/sheets/GRAFCET/Makefile.am 2004-08-16 15:56:30.000000000 +0800 ++++ dia-0.94-png/sheets/GRAFCET/Makefile.am 2005-11-02 17:00:04.000000000 +0800 +@@ -2,12 +2,12 @@ + GRAFCETsheetdir = $(pkgdatadir)/sheets/GRAFCET + + PIX = \ +- etapei.xpm \ +- etapems.xpm \ +- etapeme.xpm \ +- etapemc.xpm \ +- etapesp.xpm \ +- vergent_and.xpm ++ etapei.png \ ++ etapems.png \ ++ etapeme.png \ ++ etapemc.png \ ++ etapesp.png \ ++ vergent_and.png + + GRAFCETsheet_DATA = $(PIX) + EXTRA_DIST = $(PIX) +diff -ur dia-0.94/sheets/Istar/Makefile.am dia-0.94-png/sheets/Istar/Makefile.am +--- dia-0.94/sheets/Istar/Makefile.am 2004-08-16 15:56:31.000000000 +0800 ++++ dia-0.94-png/sheets/Istar/Makefile.am 2005-11-02 17:10:13.000000000 +0800 +@@ -2,16 +2,16 @@ + Istarsheetdir = $(pkgdatadir)/sheets/Istar + + PIX = \ +- agent.xpm \ +- decomposition.xpm \ +- dependency.xpm \ +- goal.xpm \ +- means_ends.xpm \ +- neg_contrib.xpm \ +- pos_contrib.xpm \ +- position.xpm \ +- role.xpm \ +- task.xpm ++ agent.png \ ++ decomposition.png \ ++ dependency.png \ ++ goal.png \ ++ means_ends.png \ ++ neg_contrib.png \ ++ pos_contrib.png \ ++ position.png \ ++ role.png \ ++ task.png + + Istarsheet_DATA = $(PIX) + EXTRA_DIST = $(PIX) +diff -ur dia-0.94/sheets/Jackson/Makefile.am dia-0.94-png/sheets/Jackson/Makefile.am +--- dia-0.94/sheets/Jackson/Makefile.am 2004-08-16 15:56:31.000000000 +0800 ++++ dia-0.94-png/sheets/Jackson/Makefile.am 2005-11-02 17:11:00.000000000 +0800 +@@ -2,9 +2,9 @@ + Jacksonsheetdir = $(pkgdatadir)/sheets/Jackson + + PIX = \ +- designed_domain.xpm \ +- machine_domain.xpm \ +- req_phen.xpm ++ designed_domain.png \ ++ machine_domain.png \ ++ req_phen.png + + Jacksonsheet_DATA = $(PIX) + EXTRA_DIST = $(PIX) +diff -ur dia-0.94/sheets/KAOS/Makefile.am dia-0.94-png/sheets/KAOS/Makefile.am +--- dia-0.94/sheets/KAOS/Makefile.am 2004-08-16 15:56:31.000000000 +0800 ++++ dia-0.94-png/sheets/KAOS/Makefile.am 2005-11-02 18:16:47.000000000 +0800 +@@ -2,24 +2,24 @@ + KAOSsheetdir = $(pkgdatadir)/sheets/KAOS + + PIX = \ +- and-complete-ref.xpm \ +- and-ref.xpm \ +- assumption.xpm \ +- capable-of.xpm \ +- conflicts.xpm \ +- controls.xpm \ +- input.xpm \ +- monitors.xpm \ +- obstacle.xpm \ +- obstructs.xpm \ +- op-ref.xpm \ +- or-complete-ref.xpm \ +- or-ref.xpm \ +- output.xpm \ +- performs.xpm \ +- requirement.xpm \ +- responsibility.xpm \ +- softgoal.xpm ++ and-complete-ref.png \ ++ and-ref.png \ ++ assumption.png \ ++ capable-of.png \ ++ conflicts.png \ ++ controls.png \ ++ input.png \ ++ monitors.png \ ++ obstacle.png \ ++ obstructs.png \ ++ op-ref.png \ ++ or-complete-ref.png \ ++ or-ref.png \ ++ output.png \ ++ performs.png \ ++ requirement.png \ ++ responsibility.png \ ++ softgoal.png + + KAOSsheet_DATA = $(PIX) + EXTRA_DIST = $(PIX) + diff --git a/app-office/dia/files/dia-0.94-sheets-png.tar.bz2 b/app-office/dia/files/dia-0.94-sheets-png.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..d6b23e16cf2b49180c2155814cb063f5f5946373 GIT binary patch literal 5449 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 literal 0 HcmV?d00001 diff --git a/app-office/dia/files/digest-dia-0.94-r4 b/app-office/dia/files/digest-dia-0.94-r4 new file mode 100644 index 000000000000..a4366b0c6a35 --- /dev/null +++ b/app-office/dia/files/digest-dia-0.94-r4 @@ -0,0 +1 @@ +MD5 63584224912dab49fed8d2cf87ea2d85 dia-0.94.tar.bz2 3348869 -- 2.26.2