ports/contrib
3
3
Fork 2
Code Issues Pull Requests Activity

dia: fixed build

Browse Source
This commit is contained in:
Tim Biermann 2020-05-24 14:55:40 +00:00
parent 11bda2b717
commit 3b99cf2e56
Signed by: tb
GPG Key ID: 42F8B4E30B673606
6 changed files with 179 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dia/.footprint
View File

@ -73,45 +73,27 @@ drwxr-xr-x root/root usr/lib/dia/
-rwxr-xr-x root/root usr/lib/dia/libxfig_filter.so
-rwxr-xr-x root/root usr/lib/dia/libxslt_filter.la
-rwxr-xr-x root/root usr/lib/dia/libxslt_filter.so
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/dia.1.gz
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/applications/
-rw-r--r-- root/root usr/share/applications/dia.desktop
drwxr-xr-x root/root usr/share/dia/
-rw-r--r-- root/root usr/share/dia/dia-splash.png
-rw-r--r-- root/root usr/share/dia/python-startup.py
-rw-r--r-- root/root usr/share/dia/python-startup.pyc
drwxr-xr-x root/root usr/share/dia/python/
-rw-r--r-- root/root usr/share/dia/python/allprops.py
-rw-r--r-- root/root usr/share/dia/python/allprops.pyc
-rw-r--r-- root/root usr/share/dia/python/aobjects.py
-rw-r--r-- root/root usr/share/dia/python/aobjects.pyc
-rw-r--r-- root/root usr/share/dia/python/codegen.py
-rw-r--r-- root/root usr/share/dia/python/codegen.pyc
-rw-r--r-- root/root usr/share/dia/python/diasvg.py
-rw-r--r-- root/root usr/share/dia/python/diasvg.pyc
-rw-r--r-- root/root usr/share/dia/python/diasvg_import.py
-rw-r--r-- root/root usr/share/dia/python/diasvg_import.pyc
-rw-r--r-- root/root usr/share/dia/python/dot.py
-rw-r--r-- root/root usr/share/dia/python/dot.pyc
-rw-r--r-- root/root usr/share/dia/python/doxrev.py
-rw-r--r-- root/root usr/share/dia/python/doxrev.pyc
-rw-r--r-- root/root usr/share/dia/python/gtkcons.py
-rw-r--r-- root/root usr/share/dia/python/gtkcons.pyc
-rw-r--r-- root/root usr/share/dia/python/imgmap.py
-rw-r--r-- root/root usr/share/dia/python/imgmap.pyc
-rw-r--r-- root/root usr/share/dia/python/otypes.py
-rw-r--r-- root/root usr/share/dia/python/otypes.pyc
-rw-r--r-- root/root usr/share/dia/python/pydiadoc.py
-rw-r--r-- root/root usr/share/dia/python/pydiadoc.pyc
-rw-r--r-- root/root usr/share/dia/python/scascale.py
-rw-r--r-- root/root usr/share/dia/python/scascale.pyc
-rw-r--r-- root/root usr/share/dia/python/select_by.py
-rw-r--r-- root/root usr/share/dia/python/select_by.pyc
-rw-r--r-- root/root usr/share/dia/python/select_empty.py
-rw-r--r-- root/root usr/share/dia/python/select_empty.pyc
drwxr-xr-x root/root usr/share/dia/shapes/
drwxr-xr-x root/root usr/share/dia/shapes/Assorted/
-rw-r--r-- root/root usr/share/dia/shapes/Assorted/arrow-chevron.png

9
dia/.signature
View File

@ -1,5 +1,8 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF33dH1iXyHHB6zEOWY4e1RbqNTJHkHj9c70KWo87RK6uOqa4p3EhqAoLcY7eKKN1k2g1oE5KOZfk2J3mDxLp5WAM=
SHA256 (Pkgfile) = 8c88ab4c980ab7de708211d187657e7122d908c32e770cbadced5a99d4522c3c
SHA256 (.footprint) = 438c0146b7472cf9d47b4d1681324ce0b3dd9b409a657376d6a19f31be493007
RWSagIOpLGJF3/7zdZzd52Pw369xc56CtBFYk1tdKGmBDKb4+pLUf6+3KB5aFdihYIRo1peswQOdS5e/dwL0I8Vj4Locpg3dZAM=
SHA256 (Pkgfile) = 5c502ed312493a97e267a3a55854dc13d93792e1d2e220425d337559b5f04f3e
SHA256 (.footprint) = e2ee70c88fd77cd4a2432384e10267269fd9f826c77271a2e486418357e4da71
SHA256 (dia-0.97.3.tar.xz) = 22914e48ef48f894bb5143c5efc3d01ab96e0a0cde80de11058d3b4301377d34
SHA256 (dia-0.97.2-underlinking.patch) = e7681b719c8ddf8c099c58ab16d521a570c36b24a8fcbe24309f398af965f1f4
SHA256 (dia-0.97.3-freetype_pkgconfig.patch) = d140a0e17d46b4b944fcd2a5685797c2dd3b4188a7d341c79b058656477d367a
SHA256 (dia-0.97.0-gnome-doc.patch) = 5a0161a8da6991c65eb85cda4fbb00e65d897a13ab17ca2d1924167d316fa7a6

26
dia/Pkgfile
View File

@ -2,28 +2,40 @@
# URL: http://live.gnome.org/Dia/
# Maintainer: Danny Rawlins, crux at romster dot me
# Packager: Younes Hafri, ycrux at club dash internet dot fr
# Depends on: docbook-xsl gtk libart_lgpl xorg-libxdamage
# Depends on: docbook-xsl gtk libart_lgpl python xorg-libxdamage
name=dia
version=0.97.3
release=1
source=(ftp://ftp.gnome.org/pub/gnome/sources/$name/${version%.*}/$name-$version.tar.xz)
source=(ftp://ftp.gnome.org/pub/gnome/sources/$name/${version%.*}/$name-$version.tar.xz
# https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/dia/files
dia-0.97.2-underlinking.patch dia-0.97.3-freetype_pkgconfig.patch
dia-0.97.0-gnome-doc.patch)
build() {
cd $name-$version
# https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/dia
for file in `find -type f -name '*.py'`; do
sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' "$file"
done
sed -i 's#python2\.1#python2 python2.1#' configure
export PYTHON=/usr/bin/python2
patch -Np1 -i $SRC/dia-0.97.2-underlinking.patch
patch -Np1 -i $SRC/dia-0.97.3-freetype_pkgconfig.patch
patch -Np1 -i $SRC/dia-0.97.0-gnome-doc.patch
./configure \
--prefix=/usr \
--mandir=/usr/man \
--disable-nls \
--mandir=/usr/share/man \
--with-cairo \
--with-python \
--with-cairo
--without-hardbooks \
--disable-gnome \
--disable-nls
make
make DESTDIR=$PKG install
/usr/bin/python -mcompileall $PKG
rm -r \
$PKG/usr/share/locale \
$PKG/usr/share/doc \

61
dia/dia-0.97.0-gnome-doc.patch Normal file
View File

@ -0,0 +1,61 @@
From 9d40692b695b30f80b263814bdd351c0dbe67733 Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <eva@gentoo.org>
Date: Mon, 18 May 2009 22:19:35 +0200
Subject: [PATCH] Fix compilation in a gnome environment, gentoo bug #159831
---
configure.in | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/configure.in b/configure.in
index d27ee6e..d9c0bf4 100644
--- a/configure.in
+++ b/configure.in
@@ -110,17 +110,19 @@ if test "$have_libart" = "yes" ; then
fi
AC_MSG_CHECKING([whether GNOME specific code should be used])
-AC_ARG_ENABLE(gnome,[ --enable-gnome enable gnome code],
- GNOME=$enableval, GNOME=no)
-if test "$GNOME" = "yes" ; then
+AC_ARG_ENABLE(gnome,
+ AC_HELP_STRING([--enable-gnome],[enable gnome code]),,
+ enable_gnome=no)
+if test "x$enable_gnome" = "xyes" ; then
GTK_MODULES="$GTK_MODULES libgnome-2.0 libgnomeui-2.0"
AC_DEFINE(GNOME,1,[Define if building with GNOME support])
+ AC_DEFINE(HAVE_GNOME,1,[Define if building with GNOME support])
AC_DEFINE_UNQUOTED(GNOME_ICONDIR, "${prefix}/share/pixmaps", [GNOME icon directory])
- have_gnome=true
+ have_gnome=yes
else
- have_gnome=false
+ have_gnome=no
fi
-AM_CONDITIONAL(HAVE_GNOME, $have_gnome)
+AM_CONDITIONAL(HAVE_GNOME, [test "x$have_gnome" != "xno"])
AC_MSG_RESULT($GNOME)
dnl GTK2: libgnomecanvas-2.0 ?
@@ -129,7 +131,8 @@ PKG_CHECK_MODULES(GTK,$GTK_MODULES)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
-AM_CONDITIONAL(HAVE_BONOBO,false)
+#AM_CONDITIONAL(HAVE_BONOBO,false)
+AM_CONDITIONAL(HAVE_BONOBO,[test "true" = "false"])
dnl Look for Cairo
AC_ARG_WITH(cairo,
@@ -627,7 +630,7 @@ Configuration:
Source code location: ${srcdir}
Compiler: ${CC}
- Gnome support: ${GNOME}
+ Gnome support: ${have_gnome}
Python support: ${with_python}
Libart support (PNG export): ${have_libart}
Cairo support (PNG, PDF, print): ${with_cairo}
--
1.6.3

27
dia/dia-0.97.2-underlinking.patch Normal file
View File

@ -0,0 +1,27 @@
From 2f853bab67b087605a10f544a7df780ac98b8583 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gentoo@mgorny.alt.pl>
Date: Sat, 7 Jul 2012 17:28:59 +0200
Subject: [PATCH] Fix missing linkage with gmodule-2.0.
Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=678761
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=420685
---
configure.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.in b/configure.in
index 72830de..6b7394a 100644
--- a/configure.in
+++ b/configure.in
@@ -55,7 +55,7 @@ AC_SUBST(GMODULE_CFLAGS)
AC_SUBST(GMODULE_LIBS)
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
-GTK_MODULES="gtk+-2.0 >= 2.6.0 glib-2.0 >= 2.6.0 libxml-2.0 gdk-pixbuf-2.0 gthread-2.0"
+GTK_MODULES="gtk+-2.0 >= 2.6.0 glib-2.0 >= 2.6.0 libxml-2.0 gdk-pixbuf-2.0 gthread-2.0 gmodule-2.0"
PKG_CHECK_MODULES(PANGOVERSION, pango >= 1.8.0, ,
AC_MSG_ERROR([Need Pango version 1.8.0 or higher]))
--
1.7.11.1

66
dia/dia-0.97.3-freetype_pkgconfig.patch Normal file
View File

@ -0,0 +1,66 @@
--- dia-0.97.3/configure.in
+++ dia-0.97.3/configure.in
@@ -62,43 +62,26 @@
AC_ARG_WITH(freetype,
[ --without-freetype compile without FreeType support],,with_freetype=yes)
-if test "x$with_freetype" = "xyes"; then
-PKG_CHECK_MODULES(PANGOFT2,pangoft2,have_pangoft2=true,have_pangoft2=false)
-if test "$have_pangoft2" = "true"; then
- dnl On Solaris with Forte C, at least, need to link app/dia with -lfreetype.
- dnl It's not enough that -lpangoft2 implicitly pulls it in.
- have_freetype=false
- AC_CHECK_LIB(freetype,FT_Init_FreeType,have_freetype=true,have_freetype=false,`freetype-config --libs`)
- if test "$have_freetype" = "true"; then
- dnl Need 2.0.9, as a bug was fixed for us there.
- dnl However, freetype-config doesn't give a meaningful version, so we must
- dnl do it like this.
- AC_MSG_CHECKING([if FreeType version is 2.0.9 or higher])
- old_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS `freetype-config --cflags`"
- AC_TRY_CPP([#include <ft2build.h>
-#include FT_FREETYPE_H
-#if (FREETYPE_MAJOR*1000+FREETYPE_MINOR)*1000+FREETYPE_PATCH < 2000009
-#error Freetype version too low.
-#endif
-],
- [AC_MSG_RESULT(yes)
- FREETYPE_LIBS=`freetype-config --libs`
- AC_SUBST(FREETYPE_LIBS)
- FREETYPE_CFLAGS=`freetype-config --cflags`
- AC_SUBST(FREETYPE_CFLAGS)
- GTK_MODULES="$GTK_MODULES pangoft2"
- AC_DEFINE(HAVE_FREETYPE,1,[Define if you have the FreeType2 library])]
- ,
- [AC_MSG_ERROR([Need FreeType library version 2.0.9 or higher])])
- CPPFLAGS="$old_CPPFLAGS"
- else
- AC_MSG_ERROR(Can't find FreeType library)
- fi
-else
- AC_MSG_ERROR(Can't find PangoFT2 library)
-fi
-fi
+AS_IF([test "x$with_freetype" = "xyes"],[
+ dnl freetype2.pc uses the libtool specific version number and not the
+ dnl package version. See
+ dnl https://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/VERSIONS.TXT
+ dnl Let's raise minimum dependency to freetype-2.4.0 because that's the
+ dnl lowest freetype libtool version I could find.
+ dnl freetype-2.4.0 is from July 2010 and should be reasonably old
+ dnl enough.
+ PKG_CHECK_MODULES(FREETYPE, freetype2 >= 11.0.5,
+ [
+ CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
+ AC_DEFINE(HAVE_FREETYPE,1,[Define if you have the FreeType2 library])
+ ],
+ AC_MSG_ERROR([Need FreeType library version 2.4.0 or higher])
+ )
+ PKG_CHECK_MODULES(PANGOFT2,pangoft2,
+ GTK_MODULES="$GTK_MODULES pangoft2",
+ AC_MSG_ERROR(Can't find PangoFT2 library)
+ )
+])
AM_CONDITIONAL(WITH_FREETYPE, test "x$with_freetype" != "xno")
CFLAGS="$FREETYPE_CFLAGS $CFLAGS"