rpms/piccolo2d/F-12 piccolo2d-settings.xml, NONE, 1.1 piccolo2d-pswtimage-dispose.patch, NONE, 1.1 fetch-piccolo2d.sh, NONE, 1.1 piccolo2d.spec, NONE, 1.1 piccolo2d-pswtpath-getcenter.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Alexander Kurtakov
akurtakov at fedoraproject.org
Tue Oct 13 18:50:36 UTC 2009
Author: akurtakov
Update of /cvs/pkgs/rpms/piccolo2d/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv318/F-12
Modified Files:
.cvsignore sources
Added Files:
piccolo2d-settings.xml piccolo2d-pswtimage-dispose.patch
fetch-piccolo2d.sh piccolo2d.spec
piccolo2d-pswtpath-getcenter.patch
Log Message:
Initial F-12 build.
--- NEW FILE piccolo2d-settings.xml ---
<settings>
<profiles>
<profile>
<id>JPP</id>
<repositories>
<repository>
<id>internal</id>
<layout>jpp</layout>
<url>__JPP_URL_PLACEHOLDER__</url>
</repository>
<repository>
<id>external</id>
<layout>jpp</layout>
<url>__JAVADIR_PLACEHOLDER__</url>
</repository>
<repository>
<id>local</id>
<layout>jpp</layout>
<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>plugins-internal</id>
<name>plugins-internal</name>
<layout>jpp</layout>
<url>__JPP_URL_PLACEHOLDER__</url>
</pluginRepository>
<pluginRepository>
<id>plugins-external</id>
<name>plugins-external</name>
<layout>jpp</layout>
<url>__JAVADIR_PLACEHOLDER__</url>
</pluginRepository>
<pluginRepository>
<id>plugins-maven</id>
<name>plugins-maven</name>
<layout>jpp</layout>
<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
<activeProfiles>
<activeProfile>JPP</activeProfile>
</activeProfiles>
</settings>
piccolo2d-pswtimage-dispose.patch:
PSWTImage.java | 34 +++++++++++++++++++++++-----------
1 file changed, 23 insertions(+), 11 deletions(-)
--- NEW FILE piccolo2d-pswtimage-dispose.patch ---
--- swt/src/main/java/edu/umd/cs/piccolox/swt/PSWTImage.java.orig 2009-10-12 22:06:51.299870252 +0300
+++ swt/src/main/java/edu/umd/cs/piccolox/swt/PSWTImage.java 2009-10-12 22:09:23.646122459 +0300
@@ -58,27 +58,39 @@ public class PSWTImage extends PNode {
private transient Image image;
- public PSWTImage(final PSWTCanvas canvas) {
+ public PSWTImage(PSWTCanvas canvas) {
+ this(canvas, true);
+ }
+
+ public PSWTImage(PSWTCanvas canvas, final boolean disposeImage) {
super();
-
+
this.canvas = canvas;
canvas.addDisposeListener(new DisposeListener() {
- public void widgetDisposed(final DisposeEvent de) {
- if (image != null) {
+ public void widgetDisposed(DisposeEvent de) {
+ if (image != null && disposeImage) {
image.dispose();
- }
+ }
}
});
}
-
- public PSWTImage(final PSWTCanvas canvas, final Image newImage) {
- this(canvas);
+
+ public PSWTImage(PSWTCanvas canvas, Image newImage) {
+ this(canvas, newImage, true);
+ }
+
+ public PSWTImage(PSWTCanvas canvas, Image newImage, boolean disposeImage) {
+ this(canvas, disposeImage);
setImage(newImage);
}
- public PSWTImage(final PSWTCanvas canvas, final String fileName) {
- this(canvas);
- setImage(fileName);
+ public PSWTImage(PSWTCanvas canvas, String fileName) {
+ this(canvas, fileName, true);
+ }
+
+ public PSWTImage(PSWTCanvas canvas, String fileName, boolean disposeImage) {
+ this(canvas, disposeImage);
+ setImage(fileName);
}
/**
--- NEW FILE fetch-piccolo2d.sh ---
#! /bin/sh
svnrev=702
mkdir temp
cd temp
svn export -r $svnrev http://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk piccolo2d.java
tar cjf piccolo2d-1.3-svn$svnrev.tar.bz2 piccolo2d.java
--- NEW FILE piccolo2d.spec ---
%global svnrev 702
Name: piccolo2d
Version: 1.3
Release: 0.svn%{svnrev}.4%{?dist}
Summary: Structured 2D graphics toolkit
Group: Development/Libraries
License: BSD
URL: http://code.google.com/p/piccolo2d/
# Generated by sh fetch-piccolo2d.sh
Source0: piccolo2d-1.3-svn%{svnrev}.tar.bz2
Source1: fetch-piccolo2d.sh
Source2: %{name}-settings.xml
Patch0: piccolo2d-pswtpath-getcenter.patch
Patch1: piccolo2d-pswtimage-dispose.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: maven-plugin-bundle
BuildRequires: maven2-plugin-install >= 2.0.8
BuildRequires: maven2-plugin-compiler >= 2.0.8
BuildRequires: maven2-plugin-javadoc >= 2.0.8
BuildRequires: maven2-plugin-jar >= 2.0.8
BuildRequires: maven2-plugin-resources >= 2.0.8
BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-doxia-sitetools
BuildRequires: java-1.6.0-openjdk-devel
BuildRequires: eclipse-swt
Requires: eclipse-swt
BuildArch: noarch
%description
A revolutionary way to create robust, full-featured graphical
applications in Java with striking visual effects such
as zooming, animation and multiple representations.
%package javadoc
Group: Documentation
Summary: Javadoc for %{name}
%description javadoc
API documentation for %{name}.
%prep
%setup -q -n piccolo2d.java
%patch0
%patch1
mkdir -p .m2/repository/swt/swt-win32
ln -s %{_libdir}/java/swt.jar .m2/repository/swt/swt-win32.jar
mkdir external_repo
ln -s %{_javadir} external_repo/JPP
cp %{SOURCE2} settings.xml
sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mvn-jpp \
-e \
-s settings.xml \
-Dmaven2.jpp.mode=true \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-Dmaven.test.skip=true \
install javadoc:javadoc
%install
rm -rf %{buildroot}
# jars
install -d -m 0755 %{buildroot}%{_javadir}/%{name}
install -m 644 core/target/*.jar %{buildroot}%{_javadir}/%{name}/
install -m 644 extras/target/*.jar %{buildroot}%{_javadir}/%{name}/
install -m 644 swt/target/*.jar %{buildroot}%{_javadir}/%{name}/
(cd %{buildroot}%{_javadir}/%{name} && for jar in *-%{version}*; \
do ln -sf ${jar} `echo $jar| sed "s|-%{version}-SNAPSHOT||g"`; done)
%add_to_maven_depmap org.piccolo2d piccolo2d-parent %{version} JPP piccolo2d-parent
%add_to_maven_depmap org.piccolo2d piccolo2d-core %{version} JPP piccolo2d-core
%add_to_maven_depmap org.piccolo2d piccolo2d-extras %{version} JPP piccolo2d-extras
%add_to_maven_depmap org.piccolo2d piccolo2d-swt %{version} JPP piccolo2d-swt
# poms
install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
install -pm 644 parent/pom.xml \
%{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-parent.pom
install -pm 644 core/pom.xml \
%{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-core.pom
install -pm 644 extras/pom.xml \
%{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-extras.pom
install -pm 644 swt/pom.xml \
%{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-swt.pom
# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}/core
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}/extras
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}/swt
cp -pr core/target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/core
cp -pr extras/target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/extras
cp -pr swt/target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/swt
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
%post
%update_maven_depmap
%postun
%update_maven_depmap
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-,root,root,-)
%{_javadir}/%{name}
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}/*
%doc license-piccolo.txt
%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
* Tue Oct 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1.3-0.svn702.4
- Skip tests.
* Tue Oct 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1.3-0.svn702.3
- New snapshot.
- Add patches needed by pydev.
* Fri Oct 9 2009 Alexander Kurtakov <akurtako at redhat.com> 1.3-0.svn691.2
- Add %%doc.
* Fri Oct 9 2009 Alexander Kurtakov <akurtako at redhat.com> 1.3-0.svn691.1
- Remove umlgraph patch, no longer needed.
- Make fetch script retrieve exact version.
* Fri Oct 9 2009 Alexander Kurtakov <akurtako at redhat.com> 1.3-0.svn689
- Initial package.
piccolo2d-pswtpath-getcenter.patch:
PSWTPath.java | 9 +++++++++
1 file changed, 9 insertions(+)
--- NEW FILE piccolo2d-pswtpath-getcenter.patch ---
--- swt/src/main/java/edu/umd/cs/piccolox/swt/PSWTPath.java.orig 2009-10-12 21:54:31.056119535 +0300
+++ swt/src/main/java/edu/umd/cs/piccolox/swt/PSWTPath.java 2009-10-12 21:55:49.319128179 +0300
@@ -435,4 +435,13 @@ public class PSWTPath extends PNode {
}
setShape(path);
}
+
+ /**
+ * @author Fabio Zadrozny
+ * @return The center of this object (based on its bounds).
+ */
+ public Point2D getCenter() {
+ PBounds bounds2 = getBoundsReference();
+ return new Point2D.Double(bounds2.x+(bounds2.width/2.0), bounds2.y+(bounds2.height/2.0));
+ }
}
\ No newline at end of file
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/piccolo2d/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 13 Oct 2009 16:28:50 -0000 1.1
+++ .cvsignore 13 Oct 2009 18:50:36 -0000 1.2
@@ -0,0 +1 @@
+piccolo2d-1.3-svn702.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/piccolo2d/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 13 Oct 2009 16:28:50 -0000 1.1
+++ sources 13 Oct 2009 18:50:36 -0000 1.2
@@ -0,0 +1 @@
+4d9d862f37caad158ca0d244cce0399a piccolo2d-1.3-svn702.tar.bz2
More information about the fedora-extras-commits
mailing list