Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d2c6c41d7cfcb79bbeece93068a1c06547693e61
commit d2c6c41d7cfcb79bbeece93068a1c06547693e61 Author: Devil505 <devil505li...@gmail.com> Date: Sat Jul 10 21:30:24 2010 +0200 sweethome3d-2.5-1-i686 * version bump * removing patch * added icon diff --git a/source/xapps-extra/sweethome3d/FrugalBuild b/source/xapps-extra/sweethome3d/FrugalBuild index 0695011..ff35195 100644 --- a/source/xapps-extra/sweethome3d/FrugalBuild +++ b/source/xapps-extra/sweethome3d/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 <devil505li...@gmail.com> pkgname=sweethome3d -pkgver=2.0 +pkgver=2.5 pkgrel=1 pkgdesc="An interior design application" url="http://www.sweethome3d.eu/"; @@ -12,13 +12,21 @@ _F_sourceforge_name="SweetHome3D" Finclude sourceforge groups=('xapps-extra') archs=('i686' 'x86_64') -source=($source $pkgname-$pkgver.diff) -sha1sums=('7019ee1b7256e52af9b74bffee2459d93d8b54b6' \ - 'a84d3df7cce8377b548d35130532da9ea1cf4ef1') +source=($source $pkgname.png) +sha1sums=('4c7d5292633ac51b54b48ac0c0055e65c42ccb8b' \ + 'ce77389c4bd49faa3dceb2db2d3cabb124a4d2ea') + +_F_desktop_name="Sweet Home 3D" +_F_desktop_icon="$pkgname.png" +_F_desktop_categories="Office;Java;" build() { Fcd $_F_sourceforge_name-$pkgver - Fpatchall - Fmakeinstall + sed -i 's#"$PROGRAM_DIR"/jre1.6.0_20#/usr/lib/java/jre#g; + 3,8 c\PROGRAM_DIR=/usr/share/sweethome3d' $_F_sourceforge_name + Fexerel $_F_sourceforge_name usr/bin/$pkgname + Fmkdir usr/share/$pkgname/lib + Finstallrel 644 lib/* usr/share/$pkgname/lib + Ficon $pkgname.png + Fdesktop2 } - diff --git a/source/xapps-extra/sweethome3d/sweethome3d-2.0.diff b/source/xapps-extra/sweethome3d/sweethome3d-2.0.diff deleted file mode 100644 index a42ac3d..0000000 --- a/source/xapps-extra/sweethome3d/sweethome3d-2.0.diff +++ /dev/null @@ -1,367 +0,0 @@ -diff -Naur SweetHome3D-2.0~/SweetHome3D SweetHome3D-2.0/SweetHome3D ---- SweetHome3D-2.0~/SweetHome3D 2009-06-15 00:10:33.000000000 -0500 -+++ SweetHome3D-2.0/SweetHome3D 2009-06-15 00:11:58.000000000 -0500 -@@ -1,11 +1,5 @@ - #!/bin/sh - --# Retrieve Sweet Home 3D directory --PROGRAM=`readlink "$0"` --if ["$PROGRAM" = ""]; then -- PROGRAM=$0 --fi --PROGRAM_DIR=`dirname "$PROGRAM"` -+PROGRAM_DIR=/usr/share/java/sweethome3d - --# Run Sweet Home 3D --exec "$PROGRAM_DIR"/jre1.6.0_14/bin/java -classpath "$PROGRAM_DIR"/lib/SweetHome3D.jar:"$PROGRAM_DIR"/lib/Furniture.jar:"$PROGRAM_DIR"/lib/Textures.jar:"$PROGRAM_DIR"/lib/Help.jar:"$PROGRAM_DIR"/lib/Loader3DS1_2u.jar:"$PROGRAM_DIR"/lib/iText-2.1.5.jar:"$PROGRAM_DIR"/lib/freehep-vectorgraphics-svg-2.1.1.jar:"$PROGRAM_DIR"/lib/sunflow-0.07.3b.jar:"$PROGRAM_DIR"/lib/j3dcore.jar:"$PROGRAM_DIR"/lib/j3dutils.jar:"$PROGRAM_DIR"/lib/vecmath.jar:"$PROGRAM_DIR"/jre1.6.0_14/lib/javaws.jar -Djava.library.path="$PROGRAM_DIR"/lib -Xmx1024m com.eteks.sweethome3d.SweetHome3D -open $1 -+exec /usr/lib/java/jre/bin/java -classpath "$PROGRAM_DIR"/SweetHome3D.jar:"$PROGRAM_DIR"/Furniture.jar:"$PROGRAM_DIR"/Textures.jar:"$PROGRAM_DIR"/Help.jar:"$PROGRAM_DIR"/Loader3DS1_2u.jar:"$PROGRAM_DIR"/iText-2.1.5.jar:"$PROGRAM_DIR"/freehep-vectorgraphics-svg-2.1.1.jar:"$PROGRAM_DIR"/sunflow-0.07.3b.jar:"$PROGRAM_DIR"/j3dcore.jar:"$PROGRAM_DIR"/j3dutils.jar:"$PROGRAM_DIR"/vecmath.jar:/usr/lib/java/jre/lib/javaws.jar -Djava.library.path="$PROGRAM_DIR" -Xmx1024m com.eteks.sweethome3d.SweetHome3D -open "$@" -diff -Naur SweetHome3D-1.6~/Makefile SweetHome3D-1.6/Makefile ---- SweetHome3D-1.6~/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ SweetHome3D-1.6/Makefile 2009-01-17 22:12:40.000000000 -0600 -@@ -0,0 +1,22 @@ -+prefix=/usr -+bindir=$(prefix)/bin -+datadir=$(prefix)/share -+ -+install: install-dirs -+ @echo "installing binaries..." -+ @install -m755 SweetHome3D $(DESTDIR)$(bindir)/sweethome3d -+ @echo "installing libraries..." -+ @install -m755 lib/*.so $(DESTDIR)$(datadir)/java/sweethome3d -+ @install -m644 lib/*.jar $(DESTDIR)$(datadir)/java/sweethome3d -+ @echo "installing freedesktop.org files..." -+ @install -m644 sweethome3d.xpm $(DESTDIR)$(datadir)/pixmaps -+ @install -m644 sweethome3d.desktop $(DESTDIR)$(datadir)/applications -+ -+install-dirs: -+ @echo "installing directories under $(DESTDIR)..." -+ @install -d -m755 $(DESTDIR)$(bindir) -+ @install -d -m755 $(DESTDIR)$(datadir)/java/sweethome3d -+ @install -d -m755 $(DESTDIR)$(datadir)/pixmaps -+ @install -d -m755 $(DESTDIR)$(datadir)/applications -+ -+.PHONY: install install-dirs -diff -Naur SweetHome3D-1.6~/sweethome3d.desktop SweetHome3D-1.6/sweethome3d.desktop ---- SweetHome3D-1.6~/sweethome3d.desktop 1969-12-31 18:00:00.000000000 -0600 -+++ SweetHome3D-1.6/sweethome3d.desktop 2009-01-17 22:12:40.000000000 -0600 -@@ -0,0 +1,9 @@ -+[Desktop Entry] -+Version=1.0 -+Type=Application -+Name=Sweet Home 3D -+Comment=An interior design application -+TryExec=/usr/bin/sweethome3d -+Exec=sweethome3d -+Icon=/usr/share/pixmaps/sweethome3d.xpm -+Categories=Office;Java; -diff -Naur SweetHome3D-1.6~/sweethome3d.xpm SweetHome3D-1.6/sweethome3d.xpm ---- SweetHome3D-1.6~/sweethome3d.xpm 1969-12-31 18:00:00.000000000 -0600 -+++ SweetHome3D-1.6/sweethome3d.xpm 2009-01-17 22:12:58.000000000 -0600 -@@ -0,0 +1,307 @@ -+/* XPM */ -+static const char *sweethome3d_xpm[] = { -+"48 48 256 2", -+" c None", -+". c #B1BCC9", -+"+ c #A6883C", -+"@ c #F3F3DB", -+"# c #ACB7C4", -+"$ c #D5E2F2", -+"% c #C8C9B5", -+"& c #EAEAD3", -+"* c #E5F4FF", -+"= c #6E6D6E", -+"- c #272627", -+"; c #383838", -+"> c #A8A8A6", -+", c #CDA94D", -+"' c #FFFFEB", -+") c #957A37", -+"! c #6A696A", -+"~ c #5D5D5D", -+"{ c #747474", -+"] c #D1D1D1", -+"^ c #717070", -+"/ c #838383", -+"( c #B39341", -+"_ c #D7D8C3", -+": c #656565", -+"< c #D0DDED", -+"[ c #B7AC89", -+"} c #FFFFFF", -+"| c #B9C5D3", -+"1 c #775623", -+"2 c #C3C3C2", -+"3 c #FAFAFA", -+"4 c #F5F5F5", -+"5 c #616161", -+"6 c #CECECE", -+"7 c #896228", -+"8 c #F0F0F0", -+"9 c #D9D9D9", -+"0 c #E8E8E8", -+"a c #E1EFFF", -+"b c #9A8B6D", -+"c c #787878", -+"d c #C1B792", -+"e c #EEEEEE", -+"f c #714F1D", -+"g c #B5C0CD", -+"h c #66825D", -+"i c #CEDBEA", -+"j c #BEBEBE", -+"k c #D3D3BE", -+"l c #D4D4D4", -+"m c #E5E5E5", -+"n c #DDDDDE", -+"o c #E1E1E1", -+"p c #9A9B98", -+"q c #434343", -+"r c #C3D0DE", -+"s c #C0CDDC", -+"t c #8B7F5F", -+"u c #C9C9C9", -+"v c #72674A", -+"w c #4C4C4C", -+"x c #BECAD9", -+"y c #7E7E7E", -+"z c #C6D2E1", -+"A c #9BA5B0", -+"B c #554930", -+"C c #E5E5CE", -+"D c #141313", -+"E c #525252", -+"F c #AFB0B0", -+"G c #B7C2D0", -+"H c #A7B2BF", -+"I c #A2ACB7", -+"J c #FFFFE6", -+"K c #D7E5F5", -+"L c #FFFFF1", -+"M c #DED8B5", -+"N c #8D7435", -+"O c #7B652F", -+"P c #815C26", -+"Q c #483917", -+"R c #C9D5E4", -+"S c #F9FAE1", -+"T c #9A8551", -+"U c #372A0D", -+"V c #DAE8F8", -+"W c #F2E5B4", -+"X c #BCC8D6", -+"Y c #A89970", -+"Z c #DFEDFD", -+"` c #BCCBE0", -+" . c #7E8791", -+".. c #EBD594", -+"+. c #BAB7A5", -+"@. c #FBFBFB", -+"#. c #E8C76F", -+"$. c #94772E", -+"%. c #676D76", -+"&. c #97AC90", -+"*. c #DCEAFA", -+"=. c #41464C", -+"-. c #A6A086", -+";. c #9B9EA2", -+">. c #819D7A", -+",. c #5A5240", -+"'. c #626569", -+"). c #898C8B", -+"!. c #66532C", -+"~. c #3E4246", -+"{. c #D4E5FB", -+"]. c #AEB2A2", -+"^. c #545B64", -+"/. c #9B9787", -+"(. c #64686D", -+"_. c #797E84", -+":. c #845919", -+"<. c #364E25", -+"[. c #856E36", -+"}. c #8A6F2B", -+"|. c #484A4F", -+"1. c #CDBF91", -+"2. c #B9C7DB", -+"3. c #D9E7F7", -+"4. c #DFDEC7", -+"5. c #3D6B2C", -+"6. c #625435", -+"7. c #CDDDF3", -+"8. c #8F9296", -+"9. c #5C4518", -+"0. c #EFEFD8", -+"a. c #3D341F", -+"b. c #DCEBFC", -+"c. c #634F20", -+"d. c #7E755C", -+"e. c #FFFFF8", -+"f. c #FCFCE3", -+"g. c #CCD9E8", -+"h. c #F7F8DF", -+"i. c #C6D6EA", -+"j. c #B8C7B3", -+"k. c #5D636A", -+"l. c #DBE7F5", -+"m. c #AEB5BA", -+"n. c #4B5057", -+"o. c #E8EBF1", -+"p. c #686A6E", -+"q. c #F5F5DD", -+"r. c #C5992C", -+"s. c #727579", -+"t. c #74787C", -+"u. c #6E6D60", -+"v. c #EEFDFF", -+"w. c #E4BC52", -+"x. c #B5C4D7", -+"y. c #CBB77A", -+"z. c #D3E0F0", -+"A. c #504C45", -+"B. c #BAB9B9", -+"C. c #BFC3C8", -+"D. c #C3C2B0", -+"E. c #6A6C6F", -+"F. c #4C5C48", -+"G. c #46484C", -+"H. c #6E7278", -+"I. c #DAEBFF", -+"J. c #EBECE2", -+"K. c #7D7C72", -+"L. c #D2C9A3", -+"M. c #846922", -+"N. c #4F4F4F", -+"O. c #CBCBCB", -+"P. c #B2BFD1", -+"Q. c #685E43", -+"R. c #E1E3E8", -+"S. c #3C3C3C", -+"T. c #CACCCF", -+"U. c #E2E2E2", -+"V. c #4F555C", -+"W. c #D1DEEE", -+"X. c #B6BBC1", -+"Y. c #6F6F6F", -+"Z. c #272B33", -+"`. c #C6C6C6", -+" + c #7A7C7F", -+".+ c #CFCFBB", -+"++ c #65635C", -+"@+ c #777676", -+"#+ c #DDF0FF", -+"$+ c #626366", -+"%+ c #B0A482", -+"&+ c #CED0D4", -+"*+ c #FDFDFD", -+"=+ c #FAFBE2", -+"-+ c #676767", -+";+ c #7B7B7B", -+">+ c #B3B9AF", -+",+ c #FFFFFB", -+"'+ c #DDEBFB", -+")+ c #CAD7E7", -+"!+ c #606469", -+"~+ c #585858", -+"{+ c #263729", -+"]+ c #302205", -+"^+ c #494949", -+"/+ c #6B6A6A", -+"(+ c #464646", -+"_+ c #6C6C6C", -+":+ c #5A5A59", -+"<+ c #6B6B6B", -+"[+ c #DAEDFF", -+"}+ c #2D2D2D", -+"|+ c #1F1F1F", -+"1+ c #FFFBE0", -+"2+ c #D8E8FB", -+"3+ c #686868", -+"4+ c #518339", -+"5+ c #7C621F", -+"6+ c #97B36B", -+"7+ c #BC9F54", -+"8+ c #D3D6DD", -+"9+ c #313234", -+"0+ c #D9DCE4", -+"a+ c #D9DCD1", -+"b+ c #F5F8EF", -+"c+ c #D0CDC7", -+"d+ c #F8F6F1", -+"e+ c #40403F", -+"f+ c #AEBBCB", -+"g+ c #E8E7DC", -+"h+ c #C7D8EF", -+"i+ c #737372", -+"j+ c #F7F7F8", -+"k+ c #786137", -+"l+ c #DED3A8", -+"m+ c #646464", -+"n+ c #666266", -+"o+ c #676862", -+"p+ c #545555", -+"q+ c #E7EDE8", -+"r+ c #EBEBEB", -+"s+ c #D8D9DE", -+"t+ c #CCCCCC", -+"u+ c #494943", -+"v+ c #7A7C7B", -+"w+ c #7C7C7C", -+"x+ c #9C8038", -+"y+ c #FFF5C7", -+"z+ c #B5B5B5", -+"A+ c #808077", -+"B+ c #B7B6B9", -+"C+ c #C3A149", -+"D+ c #FAFCE8", -+"E+ c #BFCEE4", -+"F+ c #FDFDE4", -+"G+ c #644F2F", -+" ", -+" (+E ", -+" e+9 t+9 (+ ", -+" m+w+e 9 ] 6 O.U.:+ ", -+" N.z+p ] 9 l }+> 9 0 S. ", -+" ; j+> } `.U.l D D D > U.8 ; ", -+" ! p+} z+3 } } ] o ] |+|+D D D 8 3 F = ", -+" ~+p F 0 } o @.} n n 6 |+|+D D D / 4 } ; ", -+" e+n } } } } } `.4 } n 9 ] |+- |+D |+|+4 j+} E m+ ", -+" ^ e+n } } } } } } } z+e } 0 ] O.- - - }+}+- 8 4 } } 4 :+ ", -+" ~ { } @.} } } } 4 } } B.n } 3 6 `.- - - }+}+}+r+4 } } } { ", -+" ^+F j+e *...@.*+} *+9 } } 2 9 } } j `.- }+}+9+}+(+0 e 3 } } } ;.^+ ", -+" e+p o U.} } } 8 j+j+j+4 u } } n O.} } z+j }+}+}+}+- m+n 0 4 *+} } } } e+ ", -+" : ~+n l r+} } } } 8 8 8 8 e 2 } } 8 u } F B.A N.}+9+}+- _+9 o e 3 } } } } ] 5 ", -+"_+e+u 4 } o } } } } 4 r+r+r+m l j+} *+2 j I I I H A }+- - / ] 9 m 8 j+*...@.j+n ; ", -+" : : u 6 6 } } } } } m .+T l 5 4+4+].H H # # # # # A |+D I `.6 n 0 8 4 j+j+4 8 4 ; ", -+" ! (+9 6 6 } } } } } Y }.N 0+&.F.>.# # f+. . . . . . |+f+# j u l o 0 8 4 4 8 r+0 e w ", -+" ! S.l O.3 } } Y }.) ) ) x+ +v {+B.G G G | | | G G g . f+# X.t+9 n 0 r+r+r+0 m n o e+ ", -+" m+_+S.6 8+[ }.) ) x+x+( ( ` A 5+E+x x s s s s s x X | G . . j t+l n U.m m U.o 9 l l N. ", -+" : /+3+p 5+[.N ) ) ( , + + 2.| x )+d r z z z z z r s x | G g # `.t+l 9 n o n n 9 ] 6 l e+ ", -+" : _+w a.[.N ( , C+, x+x+G x h+y.M 7.i i i i i )+R z r /.. g # j O.] l 9 9 9 l 6 t+] (+N. ", -+" 5 : { G.U x+C+C+x+$.b E+` d 0.@ h.W $ $ $ $ z.W.i g.B ,.| | G P.C.O.t+6 ] ] ] l ;.(+= /+ ", -+" ~ m+Y.! |.x+C+) }.G 2.g 4.& 0.h.F+' _ 2+V 3.3.$ z.z.++%+,.G [.P 9.2 T.u t+t+l (+(+= <+Y. ", -+" ~ 3+c { Q.}.> P.m.L.& 0.& @ f.J ' e...Z Z '+V $ $ r.w.7 P P 1 1 f 9.`.j B.e+i+Y._+/+ ", -+" 5 = c E f+f+[ 4.C & @ =+q.F+J ' L e.M a a '+3.V x.7 7 7 P P 1 f f f (+5 ^ = = /+Y. ", -+" ~ ! i+/ e+d % _ C & @ f.@ f.J ' L L L * a Z V K #+7 7 P P 1 1 f f =.c i+^ = _+/+ ", -+" m+/+c ^ S.% .+.+& @ S ' h.F+' ' L ,++ % a V K W.7 7 P P 1 1 G.~ @+i+^ = _+<+! ", -+" = m+= w+{ ++.+.+_ @ q.F+' q.F+L J.( U m.a 3.K [+7 P P P ,.E ;+...@+{ ^ ^ = /+! _+ ", -+" m+! @+w+e+_ .+_ & @ S ' ' ' d.+ U S.9+a K $ z.f P P g.p...@+@+i+^ = _+! 3+ ", -+" m+= { ;+S._ k _ _ q.J g+x+U ~.~.g v.V $ W.< #+B w y ;+c @+{ ^ Y._+/+-+: ", -+" : = { <+S..+k _ .++ c.u+~.S.* 3.K $ W.< | S.i+y ;+;+...@+{ i+Y.= <+3+p. ", -+" 5 ! ^ { p+].k ].$.c.~+^.A a K $ z.W.$ H S./ y w+;+c @+i+^ = /+! p. ", -+" m+<+^ ^ (+$.U ~.^.V.v.a g.i i i r ; ^ y y w+;+c @+i+^ = _+'. ", -+" m+<+Y.Y.^+=.; < z.*.Z a R z.E p+I (+y w+;+c @+{ ^ = <+Y. ", -+" = 3+<+= p+q g.s x V V '+W.; ~+A )+N.w+;+c @+{ i+Y.(.Y. ", -+" 5 : /+/+~+8.| | X * E.w 8.z X X ~+;+c @+i+^ Y.p. ", -+" 5 -+3+3+(+x | .(+c | $ X s G ~+c { i+^ (. ", -+" m+: : m+^+).(+y ;+~ ~ ~+N.p+N.p+{ ^ (. ", -+" -+m+: m+p+_+c c c 5 m+: : 3+! <+E.Y. ", -+" 5 m+m+5 c @+c c ~ m+m+: -+3+/+ ", -+" ^ 5 5 5 @+...@+@+c ~ 5 m+m+: -+3+ ", -+" 5 5 { { { { ~ 5 5 5 m+~ : ", -+" m+5 /+i+i+^ 5 ~ ~ 5 5 5 m+ ", -+" ~ m+i+^ ^ 5 ~ ~ ~ 5 5 m+ ", -+" = ~ ^ = (. ", -+" Y.(. ", -+" ", -+" "}; diff --git a/source/xapps-extra/sweethome3d/sweethome3d.png b/source/xapps-extra/sweethome3d/sweethome3d.png new file mode 100644 index 0000000..b8e33bb Binary files /dev/null and b/source/xapps-extra/sweethome3d/sweethome3d.png differ _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
