[123886] users/devans/dports/graphics
devans at macports.org
devans at macports.org
Fri Aug 15 12:05:09 PDT 2014
Revision: 123886
https://trac.macports.org/changeset/123886
Author: devans at macports.org
Date: 2014-08-15 12:05:08 -0700 (Fri, 15 Aug 2014)
Log Message:
-----------
inkscape-0.91: rename to inkscape-prerelease, update to version 0.91pre2.
Modified Paths:
--------------
users/devans/dports/graphics/inkscape-prerelease/Portfile
Added Paths:
-----------
users/devans/dports/graphics/inkscape-prerelease/
Removed Paths:
-------------
users/devans/dports/graphics/inkscape-0.91/
users/devans/dports/graphics/inkscape-prerelease/files/patch-revert-r13429.diff
Modified: users/devans/dports/graphics/inkscape-prerelease/Portfile
===================================================================
--- users/devans/dports/graphics/inkscape-0.91/Portfile 2014-08-12 18:12:01 UTC (rev 123692)
+++ users/devans/dports/graphics/inkscape-prerelease/Portfile 2014-08-15 19:05:08 UTC (rev 123886)
@@ -3,10 +3,10 @@
PortSystem 1.0
-name inkscape-0.91
+name inkscape-prerelease
set dname inkscape
conflicts inkscape inkscape-devel inkscape-experimental
-version 0.91
+version 0.91pre2
epoch 1
license GPL-2 LGPL-2.1
maintainers devans
@@ -23,12 +23,12 @@
gradients, node editing, svg-to-png export, \
grouping, and more.
homepage http://www.inkscape.org/
-master_sites https://sourceforge.net/projects/inkscape/files/inkscape/0.91pre1/
+master_sites https://sourceforge.net/projects/inkscape/files/inkscape/${version}/
-distname ${dname}-${version}pre1
+distname ${dname}-${version}
-checksums rmd160 9e953839f090e1423aad437f3bbd3fd2cd791d3d \
- sha256 a37cebf453d9e473845871e4324ca89d4ae93faed19b424c76d5860776c01b81
+checksums rmd160 49fbb632cea3a38dfd5164b93cc9a29c29bc5523 \
+ sha256 79f4facb4140fce09a55daa464399116cae10a4f92c95e8b427875fe56da798b
depends_build port:pkgconfig \
port:autoconf \
@@ -53,8 +53,6 @@
port:libwpg \
port:gtkspell2
-patchfiles patch-revert-r13429.diff
-
post-patch {
xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
}
Deleted: users/devans/dports/graphics/inkscape-prerelease/files/patch-revert-r13429.diff
===================================================================
--- users/devans/dports/graphics/inkscape-0.91/files/patch-revert-r13429.diff 2014-08-12 18:12:01 UTC (rev 123692)
+++ users/devans/dports/graphics/inkscape-prerelease/files/patch-revert-r13429.diff 2014-08-15 19:05:08 UTC (rev 123886)
@@ -1,103 +0,0 @@
-diff -ur src.orig/sp-lpe-item.cpp src/sp-lpe-item.cpp
---- src.orig/sp-lpe-item.cpp 2014-06-24 12:03:08.000000000 -0700
-+++ src/sp-lpe-item.cpp 2014-06-24 12:03:21.000000000 -0700
-@@ -50,6 +50,8 @@
- #include <algorithm>
-
- /* LPEItem base class */
-+static void sp_lpe_item_enable_path_effects(SPLPEItem *lpeitem, bool enable);
-+
- static void lpeobject_ref_modified(SPObject *href, guint flags, SPLPEItem *lpeitem);
-
- static void sp_lpe_item_create_original_path_recursive(SPLPEItem *lpeitem);
-@@ -113,7 +115,7 @@
- this->current_path_effect = NULL;
-
- // Disable the path effects while populating the LPE list
-- enablePathEffects(false);
-+ sp_lpe_item_enable_path_effects(this, false);
-
- // disconnect all modified listeners:
- for ( std::list<sigc::connection>::iterator mod_it = this->lpe_modified_connection_list->begin();
-@@ -166,7 +168,7 @@
- }
- }
-
-- enablePathEffects(true);
-+ sp_lpe_item_enable_path_effects(this, true);
- }
- break;
-
-@@ -407,7 +409,7 @@
- sp_lpe_item_update_patheffect(this, false, true);
-
- // Disable the path effects while preparing the new lpe
-- enablePathEffects(false);
-+ sp_lpe_item_enable_path_effects(this, false);
-
- // Add the new reference to the list of LPE references
- HRefList hreflist;
-@@ -444,7 +446,7 @@
- }
-
- //Enable the path effects now that everything is ready to apply the new path effect
-- enablePathEffects(true);
-+ sp_lpe_item_enable_path_effects(this, true);
-
- // Apply the path effect
- sp_lpe_item_update_patheffect(this, true, true);
-@@ -940,6 +942,24 @@
- return forked;
- }
-
-+// Enable or disable the path effects of the item.
-+// The counter allows nested calls
-+static void sp_lpe_item_enable_path_effects(SPLPEItem *lpeitem, bool enable)
-+{
-+ if (enable) {
-+ lpeitem->path_effects_enabled++;
-+ }
-+ else {
-+ lpeitem->path_effects_enabled--;
-+ }
-+}
-+
-+// Are the path effects enabled on this item ?
-+bool SPLPEItem::pathEffectsEnabled() const
-+{
-+ return path_effects_enabled > 0;
-+}
-+
- /*
- Local Variables:
- mode:c++
-diff -ur src.orig/sp-lpe-item.h src/sp-lpe-item.h
---- src.orig/sp-lpe-item.h 2014-06-24 12:03:08.000000000 -0700
-+++ src/sp-lpe-item.h 2014-06-24 12:03:21.000000000 -0700
-@@ -39,13 +39,11 @@
- typedef std::list<Inkscape::LivePathEffect::LPEObjectReference *> PathEffectList;
-
- class SPLPEItem : public SPItem {
--private:
-- mutable bool path_effects_enabled; // (mutable because preserves logical const-ness)
--
- public:
-- SPLPEItem();
-- virtual ~SPLPEItem();
-+ SPLPEItem();
-+ virtual ~SPLPEItem();
-
-+ int path_effects_enabled;
-
- PathEffectList* path_effect_list;
- std::list<sigc::connection> *lpe_modified_connection_list; // this list contains the connections for listening to lpeobject parameter changes
-@@ -74,8 +72,7 @@
-
- bool performPathEffect(SPCurve *curve);
-
-- void enablePathEffects(bool enable) const { path_effects_enabled = enable; }; // (const because logically const)
-- bool pathEffectsEnabled() const { return path_effects_enabled; };
-+ bool pathEffectsEnabled() const;
- bool hasPathEffect() const;
- bool hasPathEffectOfType(int const type) const;
- bool hasPathEffectRecursive() const;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140815/a8fef30a/attachment.html>
More information about the macports-changes
mailing list