rpms/inkscape/F-11 inkscape-20090925svn-el5.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 import.log, 1.2, 1.3 inkscape.spec, 1.78, 1.79 sources, 1.26, 1.27 inkscape-20090226svn-oldcairo.patch, 1.1, NONE inkscape-20090227svn-automake.patch, 1.1, NONE
Lubomir Rintel
lkundrak at fedoraproject.org
Fri Sep 25 17:09:47 UTC 2009
- Previous message (by thread): rpms/inkscape/devel import.log, NONE, 1.1 inkscape-20090925svn-el5.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 inkscape.spec, 1.84, 1.85 sources, 1.25, 1.26 inkscape-20090226svn-oldcairo.patch, 1.1, NONE inkscape-20090227svn-automake.patch, 1.1, NONE inkscape-20090508svn-crc32.patch, 1.1, NONE
- Next message (by thread): rpms/inkscape/F-10 inkscape-20090925svn-el5.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 import.log, 1.1, 1.2 inkscape.spec, 1.63, 1.64 sources, 1.19, 1.20 inkscape-20090226svn-oldcairo.patch, 1.1, NONE inkscape-20090227svn-automake.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: lkundrak
Update of /cvs/pkgs/rpms/inkscape/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26594/F-11
Modified Files:
.cvsignore import.log inkscape.spec sources
Added Files:
inkscape-20090925svn-el5.patch
Removed Files:
inkscape-20090226svn-oldcairo.patch
inkscape-20090227svn-automake.patch
Log Message:
Merge from devel
inkscape-20090925svn-el5.patch:
autogen.sh | 10 +++++-----
configure.ac | 2 +-
src/Makefile.am | 5 +++++
src/extension/internal/cairo-ps-out.cpp | 5 +++++
src/widgets/toolbox.cpp | 2 ++
src/xml/rebase-hrefs.cpp | 14 ++++++++++++--
6 files changed, 30 insertions(+), 8 deletions(-)
--- NEW FILE inkscape-20090925svn-el5.patch ---
>From 61ef28dbb939d8a65c17e07834d7e31bae7955f2 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Fri, 25 Sep 2009 15:15:56 +0200
Subject: [PATCH] Make it possible to build Inkscape 0.47 on RHEL 5
This contains various quirks to build against slightly older libraries
and tools. Specifically:
* Automake prior to 1.10 generated incorrect rules to build assembly files
which resulted in object files being placed in wrong directories.
* Configure required giomm-2.4 pkg-config package, which is provided by
recent gtkmm, but not by older one, though giomm-2.4 itself is present
* Cairo prior to 1.5.1 did not define macros for PostScript language
levels.
* GTK prior to 2.12.0 did not provide
gtk_entry_completion_set_inline_selection () function
* GLib prior to version 2.15.1 did not provide mechanisms for parsing
URIs.
---
autogen.sh | 10 +++++-----
configure.ac | 2 +-
src/Makefile.am | 5 +++++
src/extension/internal/cairo-ps-out.cpp | 5 +++++
src/widgets/toolbox.cpp | 2 ++
src/xml/rebase-hrefs.cpp | 13 ++++++++++++-
6 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 6a7c631..5c4e34a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -15,7 +15,7 @@ TEST_TYPE=-f
FILE=inkscape.spec.in
AUTOCONF_REQUIRED_VERSION=2.52
-AUTOMAKE_REQUIRED_VERSION=1.10
+AUTOMAKE_REQUIRED_VERSION=1.9.6
GLIB_REQUIRED_VERSION=2.0.0
INTLTOOL_REQUIRED_VERSION=0.17
@@ -86,9 +86,9 @@ fi
echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
# Prefer earlier versions just so that the earliest supported version gets test coverage by developers.
-if (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then
- AUTOMAKE=automake-1.10
- ACLOCAL=aclocal-1.10
+if (automake-$AUTOMAKE_REQUIRED_VERSION --version) < /dev/null > /dev/null 2>&1; then
+ AUTOMAKE=automake-$AUTOMAKE_REQUIRED_VERSION
+ ACLOCAL=aclocal-$AUTOMAKE_REQUIRED_VERSION
elif (automake --version) < /dev/null > /dev/null 2>&1; then
# Leave unversioned automake for a last resort: it may be a version earlier
# than what we require.
@@ -98,7 +98,7 @@ elif (automake --version) < /dev/null > /dev/null 2>&1; then
ACLOCAL=aclocal
else
echo
- echo " You must have automake 1.10 or newer installed to compile $PROJECT."
+ echo " You must have automake $AUTOMAKE_REQUIRED_VERSION or newer installed to compile $PROJECT."
DIE=1
fi
if test x$AUTOMAKE != x; then
diff --git a/configure.ac b/configure.ac
index fbfa2e5..32ff5a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -649,7 +649,7 @@ if test $cc_vers_major -gt 3; then
else
min_sigc_version=2.0.11
fi
-PKG_CHECK_MODULES(INKSCAPE, gdkmm-2.4 glibmm-2.4 giomm-2.4 gtkmm-2.4 >= 2.10.0 gtk+-2.0 libxml-2.0 >= 2.6.11 libxslt >= 1.0.15 cairo sigc++-2.0 >= $min_sigc_version $ink_spell_pkg gthread-2.0 >= 2.0 libpng >= 1.2 gsl)
+PKG_CHECK_MODULES(INKSCAPE, gdkmm-2.4 glibmm-2.4 gtkmm-2.4 >= 2.10.0 gtk+-2.0 libxml-2.0 >= 2.6.11 libxslt >= 1.0.15 cairo sigc++-2.0 >= $min_sigc_version $ink_spell_pkg gthread-2.0 >= 2.0 libpng >= 1.2 gsl)
# Check for Apple Mac OS X Carbon framework
carbon_ok=no
diff --git a/src/Makefile.am b/src/Makefile.am
index 4d57de8..07339ad 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -284,3 +284,8 @@ dist-hook:
distclean-local:
rm -f cxxtests.xml cxxtests.log
+
+# Work around old Automake bug (fixed in 1.10)
+CCASCOMPILE ?= $(CPPASCOMPILE)
+.S.o:
+ $(CCASCOMPILE) -c -o $@ $<
diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp
index 9ac1932..d3bda7f 100644
--- a/src/extension/internal/cairo-ps-out.cpp
+++ b/src/extension/internal/cairo-ps-out.cpp
@@ -38,6 +38,11 @@
#include "io/sys.h"
+#if CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 5, 1)
+# define CAIRO_PS_LEVEL_2 0
+# define CAIRO_PS_LEVEL_3 1
+#endif
+
namespace Inkscape {
namespace Extension {
namespace Internal {
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 46ad082..5d3cdea 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -6563,7 +6563,9 @@ cbe_add_completion (GtkComboBoxEntry *cbe, GObject *tbl){
gtk_entry_completion_set_model(completion, model);
gtk_entry_completion_set_text_column(completion, 0);
gtk_entry_completion_set_inline_completion(completion, FALSE);
+#if GTK_CHECK_VERSION(2,12,0)
gtk_entry_completion_set_inline_selection(completion, FALSE);
+#endif
gtk_entry_completion_set_popup_completion(completion, TRUE);
gtk_entry_set_completion(entry, completion);
diff --git a/src/xml/rebase-hrefs.cpp b/src/xml/rebase-hrefs.cpp
index c387672..69b2c60 100644
--- a/src/xml/rebase-hrefs.cpp
+++ b/src/xml/rebase-hrefs.cpp
@@ -8,8 +8,12 @@
#include "xml/attribute-record.h"
#include "xml/node.h"
#include <glib/gmem.h>
-#include <glib/gurifuncs.h>
#include <glib/gutils.h>
+#if GLIB_CHECK_VERSION(2,15,1)
+#include <glib/gurifuncs.h>
+#else
+#include <string.h>
+#endif
using Inkscape::XML::AttributeRecord;
@@ -28,6 +32,7 @@ href_needs_rebasing(char const *const href)
* document, rather than referring to the base URI. */
}
+#if GLIB_CHECK_VERSION(2,15,1)
/* Don't change data or http hrefs. */
{
char *const scheme = g_uri_parse_scheme(href);
@@ -42,6 +47,12 @@ href_needs_rebasing(char const *const href)
return false;
}
}
+#else
+ if (href == strstr (href, "http:") ||
+ href == strstr (href, "https:") ||
+ href == strstr (href, "data:"))
+ return false;
+#endif
/* If absolute then keep it as is.
*
--
1.6.2.5
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-11/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore 10 Aug 2009 05:30:04 -0000 1.19
+++ .cvsignore 25 Sep 2009 17:09:46 -0000 1.20
@@ -1 +1 @@
-inkscape.tar.xz
+inkscape.tar.gz
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log 7 Sep 2009 13:55:13 -0000 1.2
+++ import.log 25 Sep 2009 17:09:46 -0000 1.3
@@ -1,2 +1,3 @@
inkscape-0_47-0_15_pre1_20090810svn_fc12:F-11:inkscape-0.47-0.15.pre1.20090810svn.fc12.src.rpm:1249880790
inkscape-0_47-0_16_pre2_20090907svn_fc12:F-11:inkscape-0.47-0.16.pre2.20090907svn.fc12.src.rpm:1252331611
+inkscape-0_47-0_16_pre3_20090925svn_fc12:F-11:inkscape-0.47-0.16.pre3.20090925svn.fc12.src.rpm:1253898554
Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-11/inkscape.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- inkscape.spec 7 Sep 2009 13:55:13 -0000 1.78
+++ inkscape.spec 25 Sep 2009 17:09:46 -0000 1.79
@@ -1,26 +1,19 @@
-%global optflags -O0 -g3 -pipe -Wall -fasynchronous-unwind-tables
-
Name: inkscape
Version: 0.47
-Release: 0.16.pre2.20090907svn%{?dist}
+Release: 0.16.pre3.20090925svn%{?dist}
Summary: Vector-based drawing program using SVG
Group: Applications/Productivity
License: GPLv2+
URL: http://inkscape.sourceforge.net/
#Source0: http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
-# svn export -r22202 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk@22202 inkscape
+# svn export -r22293 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk@22293 inkscape
# tar cf - inkscape |xz -9 -c >inkscape.tar.xz
-# Chuck the SVN snapshot specific blocks when bumping to a release:
-# perl -e 'while (<>) {/^# BEGIN SVN/ .. /^# END SVN/ or print}' <inkscape.spec
-Source0: %{name}.tar.xz
+Source0: %{name}.tar.gz
Patch0: inkscape-20090410svn-uniconv.patch
-Patch2: inkscape-20090226svn-oldcairo.patch
Patch4: inkscape-20090410svn-formats.patch
-# BEGIN SVN SNAPSHOT SPECIFIC
-Patch3: inkscape-20090227svn-automake.patch
-# END SVN SNAPSHOT SPECIFIC
+Patch5: inkscape-20090925svn-el5.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,10 +49,8 @@ BuildRequires: popt-devel
%else
BuildRequires: popt
%endif
-# BEGIN SVN SNAPSHOT SPECIFIC
BuildRequires: autoconf
BuildRequires: automake
-# END SVN SNAPSHOT SPECIFIC
# Incompatible license
BuildConflicts: openssl-devel
@@ -136,11 +127,8 @@ graphics in W3C standard Scalable Vector
%prep
%setup -q -n %{name}
%patch0 -p1 -b .uniconv
-%patch2 -p0 -b .oldcairo
%patch4 -p1 -b .formats
-# BEGIN SVN SNAPSHOT SPECIFIC
-%patch3 -p0 -b .automake
-# END SVN SNAPSHOT SPECIFIC
+%patch5 -p1 -b .el5
# https://bugs.launchpad.net/inkscape/+bug/314381
# A couple of files have executable bits set,
@@ -154,9 +142,7 @@ dos2unix -k -q share/extensions/*.py
%build
-# BEGIN SVN SNAPSHOT SPECIFIC
sh autogen.sh
-# END SVN SNAPSHOT SPECIFIC
%configure \
--with-python \
--with-perl \
@@ -165,7 +151,6 @@ sh autogen.sh
--enable-lcms \
--enable-poppler-cairo \
--disable-dependency-tracking
-# --enable-inkboard \
make %{?_smp_mflags}
@@ -233,6 +218,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre3.20090925svn
+- Move to a later snapshot
+- Drop debugging compiler flags, enable optimizations again
+- Make it build on everything since EL5 again
+
* Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre2.20090907svn
- Move inkview man page to -view subpackage (#515358)
- Add license, etc. to main package
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-11/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources 7 Sep 2009 13:55:13 -0000 1.26
+++ sources 25 Sep 2009 17:09:46 -0000 1.27
@@ -1 +1 @@
-2a5d70e3924f049a5d5b43cd2075cd8c inkscape.tar.xz
+acc22f1af9defbbb7f6759e6810b966a inkscape.tar.gz
--- inkscape-20090226svn-oldcairo.patch DELETED ---
--- inkscape-20090227svn-automake.patch DELETED ---
- Previous message (by thread): rpms/inkscape/devel import.log, NONE, 1.1 inkscape-20090925svn-el5.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 inkscape.spec, 1.84, 1.85 sources, 1.25, 1.26 inkscape-20090226svn-oldcairo.patch, 1.1, NONE inkscape-20090227svn-automake.patch, 1.1, NONE inkscape-20090508svn-crc32.patch, 1.1, NONE
- Next message (by thread): rpms/inkscape/F-10 inkscape-20090925svn-el5.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 import.log, 1.1, 1.2 inkscape.spec, 1.63, 1.64 sources, 1.19, 1.20 inkscape-20090226svn-oldcairo.patch, 1.1, NONE inkscape-20090227svn-automake.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list