pool/dia
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 98898 from GNOME:Apps

Browse Source 
Pushing G:A

OBS-URL: https://build.opensuse.org/request/show/98898
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dia?expand=0&rev=29
This commit is contained in:
Stephan Kulow 2012-01-05 18:10:30 +00:00 committed by Git OBS Bridge
commit 7b2f7c168c
6 changed files with 85 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dia-0.97.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8dfe8b2c9d87baf29834c8de5e3ec91497c2b17f2b77fb1b867afddf5c429142
size 6836081

3
dia-0.97.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a761478fb98697f71b00d3041d7c267f3db4b94fe33ac07c689cb89c4fe5eae1
size 5507004

52
dia-glib-2.31.patch Normal file
View File

@ -0,0 +1,52 @@
Index: dia-0.97.1/objects/custom/shape_typeinfo.c
===================================================================
--- dia-0.97.1.orig/objects/custom/shape_typeinfo.c
+++ dia-0.97.1/objects/custom/shape_typeinfo.c
@@ -27,7 +27,7 @@
#include "custom_util.h"
#include <string.h>
#include <stdarg.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
#include <glib/gstdio.h>
#include <libxml/parser.h>
Index: dia-0.97.1/plug-ins/pgf/render_pgf.c
===================================================================
--- dia-0.97.1.orig/plug-ins/pgf/render_pgf.c
+++ dia-0.97.1/plug-ins/pgf/render_pgf.c
@@ -61,7 +61,7 @@ TODO:
#endif
#include <errno.h>
-#include <glib/gprintf.h>
+#include <glib.h>
#include <glib/gstdio.h>
#include "intl.h"
Index: dia-0.97.1/tests/test-boundingbox.c
===================================================================
--- dia-0.97.1.orig/tests/test-boundingbox.c
+++ dia-0.97.1/tests/test-boundingbox.c
@@ -28,7 +28,7 @@
#include <glib.h>
#include <glib-object.h>
-#if GLIB_CHECK_VERSION(2,16,0)
+#if GLIB_CHECK_VERSION(2,16,0) && !GLIB_CHECK_VERSION(2,31,0)
#include <glib/gtestutils.h>
#endif
#include "dialib.h"
Index: dia-0.97.1/tests/test-objects.c
===================================================================
--- dia-0.97.1.orig/tests/test-objects.c
+++ dia-0.97.1/tests/test-objects.c
@@ -28,7 +28,7 @@
#include <glib.h>
#include <glib-object.h>
-#if GLIB_CHECK_VERSION(2,16,0)
+#if GLIB_CHECK_VERSION(2,16,0) && !GLIB_CHECK_VERSION(2,31,0)
#include <glib/gtestutils.h>
#endif

46
dia-python-acinclude.patch
View File

@ -1,46 +0,0 @@
--- acinclude.m4.orig 2007-01-06 22:39:36.000000000 +0000
+++ acinclude.m4 2007-06-13 11:52:39.000000000 +0000
@@ -128,7 +128,7 @@
AC_CACHE_CHECK([for $am_display_PYTHON script directory],
[am_cv_python_pythondir],
[am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`])
+ echo "$PYTHON_PREFIX/${py_lib}/python$PYTHON_VERSION/site-packages"`])
AC_SUBST([pythondir], [$am_cv_python_pythondir])
dnl pkgpythondir -- $PACKAGE directory under pythondir. Was
@@ -145,7 +145,7 @@
AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
[am_cv_python_pyexecdir],
[am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
- echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`])
+ echo "${PYTHON_EXEC_PREFIX}/${py_lib}/python${PYTHON_VERSION}/site-packages"`])
AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
@@ -202,6 +202,7 @@
AC_MSG_CHECKING(for headers required to compile python extensions)
dnl deduce PYTHON_INCLUDES
py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+py_lib=`$PYTHON -c "import sys; print sys.lib"`
py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
if test "$py_prefix" != "$py_exec_prefix"; then
@@ -225,7 +226,7 @@
AC_MSG_CHECKING(for libpython${PYTHON_VERSION}.a)
-py_config_dir="$py_prefix/lib/python${PYTHON_VERSION}/config"
+py_config_dir="$py_prefix/$py_lib/python${PYTHON_VERSION}/config"
py_makefile="${py_config_dir}/Makefile"
if test -f "$py_makefile"; then
@@ -235,7 +236,7 @@
py_other_libs=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $py_makefile`
dnl now the actual libpython
- if test -e "${py_config_dir}/libpython${PYTHON_VERSION}.a"; then
+ if test -e "$PYTHON_PREFIX/${py_lib}/libpython${PYTHON_VERSION}.so"; then
PYTHON_LIBS="-L${py_config_dir} -lpython${PYTHON_VERSION} $py_localmodlibs $py_basemodlibs $py_other_libs"
AC_MSG_RESULT(found)
else

19
dia.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Wed Jan 4 09:47:29 UTC 2012 - vuntz@opensuse.org
- Update to version 0.97.2:
+ More colors for SADT.
+ Various bug fixes, including:
- crashes
- fixes to SVG, PNG and Xfig exports
+ Updated translations.
- Add xz BuildRequires because we can't build a package for a
xz-compressed tarball without explicitly specifying that... See
bnc#697467 for more details.
- Drop dia-python-acinclude.patch: fixed upstream.
-------------------------------------------------------------------
Thu Dec 1 21:09:34 UTC 2011 - dimstar@opensuse.org
- Add dia-glib-2.31.patch: Fix build with glib 2.31.
-------------------------------------------------------------------
Fri Sep 30 20:07:54 UTC 2011 - coolo@suse.com

21
dia.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package dia
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,7 +16,6 @@
#
Name: dia
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes
@ -36,27 +35,29 @@ BuildRequires: sgml-skel
BuildRequires: swig
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
License: GPLv2+
Group: Productivity/Graphics/Other
# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
BuildRequires: xz
Requires: ghostscript-fonts-std
Requires: python-gtk
# for xdg-open
Requires: xdg-utils
Summary: A Diagram Creation Program
Version: 0.97.1
Release: 11
Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{version}.tar.bz2
License: GPL-2.0+
Group: Productivity/Graphics/Other
Version: 0.97.2
Release: 0
Source: http://download.gnome.org/sources/dia/0.97/%{name}-%{version}.tar.xz
Source1: font-test-japanese.dia
Source2: font-test-czech.dia
Source3: font-test-german-euro.dia
# PATCH-FIX-OPENSUSE dia-0.92.2-no-strict-aliasing.patch
Patch3: dia-0.92.2-no-strict-aliasing.patch
# PATCH-FIX-UPSTREAM bgo581533 dia-python-acinclude.patch
Patch14: dia-python-acinclude.patch
# PATCH-FIX-OPENSUSE dia-remove-datetime.patch vuntz@novell.com -- Do not put date/time in the compiled binary (needed for build-compare)
Patch17: dia-remove-datetime.patch
# PATCH-FIX-UPSTREAM dia-swig-2x.patch bgo#651127 idoenmez@suse.de -- Support swig 2.x
Patch18: dia-swig-2x.patch
# PATCH-FIX-UPSTREAM dia-glib-2.31.patch bgo#655335 dimstar@opensuse.org -- Fix build with glib 2.31.
Patch19: dia-glib-2.31.patch
Url: http://live.gnome.org/Dia
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Recommends: %{name}-lang
@ -79,9 +80,9 @@ pages).
%setup -q
translation-update-upstream
%patch3
%patch14
%patch17 -p1
%patch18
%patch19 -p1
cp $RPM_SOURCE_DIR/font-test*dia .
%build