Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2c6154db5addea1fbac4e124b93cfb8b97f79984
commit 2c6154db5addea1fbac4e124b93cfb8b97f79984
Author: crazy <[EMAIL PROTECTED]>
Date: Tue Apr 29 17:43:32 2008 +0200
inkscape-0.46-1-x86_64
* Version bump
* removed all merged patches
* minore build() fixes
* added poppler and imagemagick to depends
* closes FS#3045
diff --git a/source/xapps-extra/inkscape/BTS-2116.patch
b/source/xapps-extra/inkscape/BTS-2116.patch
deleted file mode 100644
index 32219fc..0000000
--- a/source/xapps-extra/inkscape/BTS-2116.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff -Naur inkscape-0.45.1/configure.ac inkscape-0.45.1-p/configure.ac
---- inkscape-0.45.1/configure.ac 2007-03-20 14:44:13.000000000 +0100
-+++ inkscape-0.45.1-p/configure.ac 2007-06-07 12:23:41.000000000 +0200
-@@ -41,7 +41,6 @@
- AC_LANG(C++)
- AC_ISC_POSIX
- AC_PROG_CXX
--AM_PROG_CC_STDC
- AM_PROG_AS
- AC_HEADER_STDC
-
-diff -Naur inkscape-0.45.1/src/dom/cssparser.h
inkscape-0.45.1-p/src/dom/cssparser.h
---- inkscape-0.45.1/src/dom/cssparser.h 2007-03-13 19:06:21.000000000
+0100
-+++ inkscape-0.45.1-p/src/dom/cssparser.h 2007-06-07 12:23:16.000000000
+0200
-@@ -71,6 +71,7 @@
- */
- virtual bool parseFile(const DOMString &str);
-
-+#include <glib.h>
-
- protected:
-
-diff -Naur inkscape-0.45.1/src/dom/lsimpl.h inkscape-0.45.1-p/src/dom/lsimpl.h
---- inkscape-0.45.1/src/dom/lsimpl.h 2007-03-13 19:06:21.000000000 +0100
-+++ inkscape-0.45.1-p/src/dom/lsimpl.h 2007-06-07 12:23:16.000000000 +0200
-@@ -35,6 +35,7 @@
- #include "events.h"
- #include "traversal.h"
- #include "ls.h"
-+#include <glib.h>
-
-
- #include "xmlreader.h"
-diff -Naur inkscape-0.45.1/src/dom/svg/svgparser.h
inkscape-0.45.1-p/src/dom/svg/svgparser.h
---- inkscape-0.45.1/src/dom/svg/svgparser.h 2007-03-13 19:06:21.000000000
+0100
-+++ inkscape-0.45.1-p/src/dom/svg/svgparser.h 2007-06-07 12:23:16.000000000
+0200
-@@ -43,6 +43,7 @@
- namespace svg
- {
-
-+#include <glib.h>
-
- class SvgParser
- {
-diff -Naur inkscape-0.45.1/src/dom/uri.h inkscape-0.45.1-p/src/dom/uri.h
---- inkscape-0.45.1/src/dom/uri.h 2007-03-13 19:06:21.000000000 +0100
-+++ inkscape-0.45.1-p/src/dom/uri.h 2007-06-07 12:23:16.000000000 +0200
-@@ -34,6 +34,7 @@
-
- #include "dom.h"
-
-+#include <glib.h>
-
- namespace org
- {
-diff -Naur inkscape-0.45.1/src/dom/util/ziptool.h
inkscape-0.45.1-p/src/dom/util/ziptool.h
---- inkscape-0.45.1/src/dom/util/ziptool.h 2007-03-13 19:06:21.000000000
+0100
-+++ inkscape-0.45.1-p/src/dom/util/ziptool.h 2007-06-07 12:23:16.000000000
+0200
-@@ -37,6 +37,7 @@
- #include <vector>
- #include <string>
-
-+#include <glib.h>
-
- //########################################################################
- //# A D L E R 3 2
-diff -Naur inkscape-0.45.1/src/dom/xmlreader.h
inkscape-0.45.1-p/src/dom/xmlreader.h
---- inkscape-0.45.1/src/dom/xmlreader.h 2007-03-13 19:06:21.000000000
+0100
-+++ inkscape-0.45.1-p/src/dom/xmlreader.h 2007-06-07 12:23:16.000000000
+0200
-@@ -41,6 +41,7 @@
- namespace dom
- {
-
-+#include <glib.h>
-
-
- class XmlReader
-diff -Naur inkscape-0.45.1/src/io/inkscapestream.h
inkscape-0.45.1-p/src/io/inkscapestream.h
---- inkscape-0.45.1/src/io/inkscapestream.h 2007-03-13 19:06:22.000000000
+0100
-+++ inkscape-0.45.1-p/src/io/inkscapestream.h 2007-06-07 12:23:16.000000000
+0200
-@@ -13,6 +13,7 @@
-
-
- #include <glibmm.h>
-+#include <glib.h>
-
- namespace Inkscape
- {
diff --git a/source/xapps-extra/inkscape/FrugalBuild
b/source/xapps-extra/inkscape/FrugalBuild
index e189c95..3a021f3 100644
--- a/source/xapps-extra/inkscape/FrugalBuild
+++ b/source/xapps-extra/inkscape/FrugalBuild
@@ -3,29 +3,30 @@
# Contributor: Shrift <[EMAIL PROTECTED]>
pkgname=inkscape
-pkgver=0.45.1
-pkgrel=5
-pkgdesc="A vector illustrator program for GNOME"
+pkgver=0.46
+pkgrel=1
+pkgdesc="A vector illustrator program"
url="http://www.inkscape.org/";
depends=('openssl' 'lcms' 'cairomm' 'libgcc' 'atk' 'gtkmm>=2.10.10-3' 'glibmm'
'freetype2' 'libxcb' \
- 'pango>=1.14.3' 'libgc>=6.4' 'glib2' 'gtkspell' 'popt' 'gtk+2>=2.10.7'
'python>=2.5' 'perl')
+ 'pango>=1.14.3' 'libgc>=7.0' 'glib2' 'gtkspell' 'popt' 'gtk+2>=2.10.7'
'python>=2.5' 'perl' \
+ 'poppler-glib' 'imagemagick')
makedepends=('boost>=1.34.1' 'intltool' 'perl-xml-parser')
-rodepends=('libxml2>=2.6.20' 'pyxml' 'libxslt')
+rodepends=('libxml2>=2.6.20' 'pyxml' 'libxslt' 'lxml')
groups=('xapps-extra')
archs=('i686' 'x86_64')
options=('scriptlet')
Finclude sourceforge
-source=($source bindings-compile-fix.patch BTS-2116.patch)
+source=($source perl5.10.patch)
+sha1sums=('b7c53c6d2bc0de4ff24d4a6bee86359ff11bef27' \
+ '4c36b0e825771ffdfe3c548cb6037ac80c10a60c')
+
+# TODO: java ?!
build()
{
Fcd
Fpatchall
- ## Do not remove gcc 4.2* does funny things with the code without
- export CFLAGS="$CFLAGS -fno-strict-aliasing"
- export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing -Wno-deprecated"
Fautoreconf
- intltoolize -c -f || Fdie
Fmake \
--without-gnome-print \
--with-gnu-ld \
@@ -34,13 +35,12 @@ build()
--with-perl \
--with-python \
--enable-inkboard \
- --with-xft
+ --with-xft \
+ --enable-poppler-cairo \
+ --disable-dependency-tracking
## Debug
## --enable-debug --with-debug
Fmakeinstall
}
-sha1sums=('f3df9eafc0fdfcc5f5024ea4bec4d7c477698380' \
- '85d9b4a7bf718a51efa13eb40fcc01a2d9378734' \
- 'ddcb89e80b8b19c53c0994e9b472026bc1a2d200')
# optimization OK
diff --git a/source/xapps-extra/inkscape/bindings-compile-fix.patch
b/source/xapps-extra/inkscape/bindings-compile-fix.patch
deleted file mode 100644
index 57da2bc..0000000
--- a/source/xapps-extra/inkscape/bindings-compile-fix.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -Naur inkscape-0.44.1/src/extension/script/inkscape_perl_wrap.cpp
inkscape-0.44.1-p/src/extension/script/inkscape_perl_wrap.cpp
---- inkscape-0.44.1/src/extension/script/inkscape_perl_wrap.cpp
2006-09-06 07:42:03.000000000 +0200
-+++ inkscape-0.44.1-p/src/extension/script/inkscape_perl_wrap.cpp
2007-02-04 04:07:25.000000000 +0100
-@@ -776,14 +776,17 @@
- static void _swig_create_magic(CPerlObj *pPerl, SV *sv, const char *name, int
(CPerlObj::*set)(SV *, MAGIC *), int (CPerlObj::*get)(SV *, MAGIC *)) {
- #endif
- MAGIC *mg;
-+ MGVTBL *mgvtbl;
- sv_magic(sv,sv,'U',(char *) name,strlen(name));
- mg = mg_find(sv,'U');
-- mg->mg_virtual = (MGVTBL *) malloc(sizeof(MGVTBL));
-- mg->mg_virtual->svt_get = (SwigMagicFuncHack) get;
-- mg->mg_virtual->svt_set = (SwigMagicFuncHack) set;
-- mg->mg_virtual->svt_len = 0;
-- mg->mg_virtual->svt_clear = 0;
-- mg->mg_virtual->svt_free = 0;
-+ mgvtbl = (MGVTBL *) malloc(sizeof(MGVTBL));
-+ memcpy((void*)mgvtbl, (const void*)mg, sizeof(MGVTBL));
-+ mgvtbl->svt_get = (SwigMagicFuncHack) get;
-+ mgvtbl->svt_set = (SwigMagicFuncHack) set;
-+ mgvtbl->svt_len = 0;
-+ mgvtbl->svt_clear = 0;
-+ mgvtbl->svt_free = 0;
-+ mg->mg_virtual = mgvtbl;
- }
-
-
-diff -Naur inkscape-0.44.1/src/extension/script/inkscape_py_wrap.cpp
inkscape-0.44.1-p/src/extension/script/inkscape_py_wrap.cpp
---- inkscape-0.44.1/src/extension/script/inkscape_py_wrap.cpp 2006-09-06
07:42:03.000000000 +0200
-+++ inkscape-0.44.1-p/src/extension/script/inkscape_py_wrap.cpp
2007-02-04 04:08:14.000000000 +0100
-@@ -802,7 +802,7 @@
- obj = pyobj;
- if (PyCFunction_Check(obj)) {
- /* here we get the method pointer for callbacks */
-- char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
-+ const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
- c = doc ? strstr(doc, "swig_ptr: ") : 0;
- if (c) {
- c += 10;
-@@ -977,11 +977,11 @@
- swig_type_info **types_initial) {
- int i;
- for (i = 0; methods[i].ml_name; ++i) {
-- char *c = methods[i].ml_doc;
-+ const char *c = methods[i].ml_doc;
- if (c && (c = strstr(c, "swig_ptr: "))) {
- int j;
- swig_const_info *ci = 0;
-- char *name = c + 10;
-+ const char *name = c + 10;
- for (j = 0; const_table[j].type; j++) {
- if (strncmp(const_table[j].name, name,
- strlen(const_table[j].name)) == 0) {
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
