Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (48c27d9c2da613b75f21392dbdc817faf7dac8da)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (48c27d9c2da613b75f21392dbdc817faf7dac8da)
  • Date: Sun, 25 Mar 2007 13:05:53 -0500

GIT changes to master grimoire by George Sherwood <chat AT sourcemage.org>:

dev/null |binary
gnome2-apps/dia/BUILD | 2 -
gnome2-apps/dia/DETAILS | 4 +-
gnome2-apps/dia/HISTORY | 5 ++
gnome2-apps/dia/dia-0.96-pre9.tar.bz2.sig | 0
gnome2-apps/dia/dia-0.96.tar.bz2.sig |binary
gnome2-apps/dia/svg_import.patch | 52
------------------------------
7 files changed, 8 insertions(+), 55 deletions(-)

New commits:
commit 48c27d9c2da613b75f21392dbdc817faf7dac8da
Author: George Sherwood <chat AT sourcemage.org>
Commit: George Sherwood <chat AT sourcemage.org>

dia: Updated to version 0.96. Updated BUILD with -lpython2.5. Removed
old leftover patch file.

diff --git a/gnome2-apps/dia/BUILD b/gnome2-apps/dia/BUILD
index ceca8e9..83c049e 100755
--- a/gnome2-apps/dia/BUILD
+++ b/gnome2-apps/dia/BUILD
@@ -1,2 +1,2 @@
-PYTHON_LIBS="-lpython2.3" &&
+PYTHON_LIBS="-lpython2.5" &&
default_build
diff --git a/gnome2-apps/dia/DETAILS b/gnome2-apps/dia/DETAILS
index b51cd4a..d3bf2f7 100755
--- a/gnome2-apps/dia/DETAILS
+++ b/gnome2-apps/dia/DETAILS
@@ -1,10 +1,10 @@
SPELL=dia
- VERSION=0.96-pre9
+ VERSION=0.96
BRANCH=`echo ${VERSION}|cut -d - -f 1`
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=${GNOME_URL}/sources/${SPELL}/${BRANCH}/${SOURCE}
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
LICENSE[0]=GPL
WEB_SITE=http://www.gnome.org/projects/dia/
ENTERED=20010922
diff --git a/gnome2-apps/dia/HISTORY b/gnome2-apps/dia/HISTORY
index c081690..4930d1a 100644
--- a/gnome2-apps/dia/HISTORY
+++ b/gnome2-apps/dia/HISTORY
@@ -1,3 +1,8 @@
+2007-03-25 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 0.96
+ * BUILD: Updated to -lpython2.5
+ * svg_import.patch: Removed very old patch
+
2007-03-21 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DEPENDS: added pyxml and libxslt depends

diff --git a/gnome2-apps/dia/dia-0.96-pre9.tar.bz2.sig
b/gnome2-apps/dia/dia-0.96-pre9.tar.bz2.sig
deleted file mode 100644
index fdc3a4b..0000000
Binary files a/gnome2-apps/dia/dia-0.96-pre9.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-apps/dia/dia-0.96.tar.bz2.sig
b/gnome2-apps/dia/dia-0.96.tar.bz2.sig
new file mode 100644
index 0000000..798dfed
Binary files /dev/null and b/gnome2-apps/dia/dia-0.96.tar.bz2.sig differ
diff --git a/gnome2-apps/dia/svg_import.patch
b/gnome2-apps/dia/svg_import.patch
deleted file mode 100644
index 7126dc7..0000000
--- a/gnome2-apps/dia/svg_import.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: plug-ins/python/diasvg_import.py
-===================================================================
---- plug-ins/python/diasvg_import.py (revision 7)
-+++ plug-ins/python/diasvg_import.py (working copy)
-@@ -54,6 +54,10 @@
- return (int(m.group(1)) / 255.0, int(m.group(2)) / 255.0,
int(m.group(2)) / 255.0)
- # any more ugly color definitions not compatible with
pango_color_parse() ?
- return string.strip(s)
-+
-+def eval_secure(s):
-+ return string.translate(s, string.maketrans("\"()", "___"))
-+
- class Object :
- def __init__(self) :
- self.props = {"x" : 0, "y" : 0, "stroke" : "none"}
-@@ -65,7 +69,8 @@
- sp2 = string.split(string.strip(s1), ":")
- if len(sp2) == 2 :
- try :
-- eval("self." + string.replace(sp2[0],
"-", "_") + "(\"" + string.strip(sp2[1]) + "\")")
-+ eval("self." +
eval_secure(string.replace(sp2[0], "-", "_")) +
-+ "(\"" +
eval_secure(string.strip(sp2[1])) + "\")")
- except AttributeError :
- self.props[sp2[0]] =
string.strip(sp2[1])
- def x(self, s) :
-@@ -282,7 +287,7 @@
- def CopyProps(self, dest) :
- # to be used to inherit group props to childs _before_ they
get their own
- for p in self.props.keys() :
-- sf = "dest." + string.replace(p, "-", "_") + "(\"" +
str(self.props[p]) + "\")"
-+ sf = "dest." + eval_secure(string.replace(p, "-",
"_")) + "(\"" + eval_secure(str(self.props[p])) + "\")"
- try : # accessor first
- eval(sf)
- except :
-@@ -561,7 +566,7 @@
- o = Group()
- stack.append(o)
- else :
-- s = string.capitalize(name) + "()"
-+ s = eval_secure(string.capitalize(name)) +
"()"
- try :
- o = eval(s)
- except :
-@@ -575,7 +580,7 @@
- ma = string.replace(a, "-", "_")
- # e.g. xlink:href -> xlink__href
- ma = string.replace(ma, ":", "__")
-- s = "o." + ma + "(\"" + attrs[a] + "\")"
-+ s = "o." + eval_secure(ma) + "(\"" +
eval_secure(attrs[a]) + "\")"
- try :
- eval(s)
- except AttributeError, msg :



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (48c27d9c2da613b75f21392dbdc817faf7dac8da), George Sherwood, 03/25/2007

Archive powered by MHonArc 2.6.24.

Top of Page