gentoo resync : 14.07.2018

3 files changed, 0 insertions, 154 deletions

diff --git a/app-office/dia/files/dia-0.97.0-gnome-doc.patch b/app-office/dia/files/dia-0.97.0-gnome-doc.patch
deleted file mode 100644
index 63e13deaf22f..000000000000
--- a/app-office/dia/files/dia-0.97.0-gnome-doc.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-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
-
diff --git a/app-office/dia/files/dia-0.97.2-underlinking.patch b/app-office/dia/files/dia-0.97.2-underlinking.patch
deleted file mode 100644
index 903e077f23f4..000000000000
--- a/app-office/dia/files/dia-0.97.2-underlinking.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
----
- dia-0.97.2/configure.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dia-0.97.2/configure.in b/dia-0.97.2/configure.in
-index 72830de..6b7394a 100644
---- a/dia-0.97.2/configure.in
-+++ b/dia-0.97.2/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
-
diff --git a/app-office/dia/files/dia-0.97.3-freetype_pkgconfig.patch b/app-office/dia/files/dia-0.97.3-freetype_pkgconfig.patch
deleted file mode 100644
index c48b5ba66fbf..000000000000
--- a/app-office/dia/files/dia-0.97.3-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- 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"