Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cc78edefe16d51357b690be06c39f492ff4ae4a3
commit cc78edefe16d51357b690be06c39f492ff4ae4a3
Author: crazy <[EMAIL PROTECTED]>
Date: Sun Dec 9 05:03:29 2007 +0100
stellarium-0.9.0-3-i686
* release bump
* fixed depends() in general curl is needed for remote
* things , also boost is just a makedepend
* switched to cmake ( auto* will disappear see INSTALL files )
* removed not needed moc diff
* added an patch to fix *FLAGS
* added missing desktop and icon and a note about for
* janny in FB , once that is in source tarball build() can go away
diff --git a/source/xapps-extra/stellarium/FrugalBuild
b/source/xapps-extra/stellarium/FrugalBuild
index 1d1c82e..272bd06 100644
--- a/source/xapps-extra/stellarium/FrugalBuild
+++ b/source/xapps-extra/stellarium/FrugalBuild
@@ -4,25 +4,30 @@
pkgname=stellarium
pkgver=0.9.0
-pkgrel=2
+pkgrel=3
pkgdesc="A free open source planetarium for your computer."
_F_sourceforge_broken_up2date=1
-Finclude sourceforge
+makedepends=('boost>=1.34.1')
+_F_cmake_confopts="-DCMAKE_CXX_FLAGS=$CXXFLAGS -DCMAKE_C_FLAGS=$CFLAGS"
+Finclude sourceforge cmake
url="http://www.stellarium.org/";
-depends=('sdl_mixer' 'libpng' 'mesa' 'freetype2' 'boost' 'libjpeg'
'libqtopengl')
+depends=('sdl_mixer' 'libpng' 'mesa' 'freetype2' 'libjpeg' 'libqtopengl'
'curl')
license="GPL"
groups=('xapps-extra')
archs=('i686')
-source=($source unused_moc.diff)
+## icon is from there :
+##
http://sourceforge.net/tracker/index.php?func=detail&aid=1154587&group_id=48857&atid=454375
+## janny next release may have an icon in the tarball as well desktop files
+## please check that.
+source=($source $pkgname.png flags.patch)
sha1sums=('696e0fa935b695763ab37c66ec5e189c3e6db9f9' \
- '1858fd653aa91bdf76cae9815819fb9db5c4b35a')
+ 'ab43d03d1e5616b2dadf5a1a0cb4c70e3265167d' \
+ 'b5401b8b028c8417d392588d3b8375da858fd6b9')
build()
{
- Fcd
- ./autogen.sh || return 1
- cp /usr/share/automake/mkinstalldirs . || return 1
- Fbuild --with-qt-dir=/usr
+ CMake_build
+ Ffilerel ../../$pkgname.png /usr/share/pixmaps/$pkgname.png
+ Fdesktop "/usr/bin/$pkgname" "/usr/share/pixmaps/$pkgname.png"
"Education;"
}
-
# optimization OK
diff --git a/source/xapps-extra/stellarium/flags.patch
b/source/xapps-extra/stellarium/flags.patch
new file mode 100644
index 0000000..e338cb6
--- /dev/null
+++ b/source/xapps-extra/stellarium/flags.patch
@@ -0,0 +1,14 @@
+diff -Naur stellarium-0.9.0/CMakeLists.txt stellarium-0.9.0-p/CMakeLists.txt
+--- stellarium-0.9.0/CMakeLists.txt 2007-06-06 10:25:19.000000000 +0200
++++ stellarium-0.9.0-p/CMakeLists.txt 2007-12-09 04:47:11.000000000 +0100
+@@ -16,8 +16,8 @@
+ ENDIF(NOT CMAKE_BUILD_TYPE)
+
+ IF(UNIX AND NOT WIN32)
+- SET(CMAKE_C_FLAGS -Wall) # additional C compile flags
+- SET(CMAKE_CXX_FLAGS -Wall) # additional CPP compile flags
++ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") # additional C compile
flags
++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") # additional CPP compile
flags
+ SET(STLPORT_LIBRARY "")
+ ELSE(UNIX AND NOT WIN32)
+ SET(CMAKE_C_FLAGS "-Wall -fexceptions -fident -mthreads -D_STLP_NO_CUSTOM_IO
-D_STLP_USE_DYNAMIC_LIB -I/home/fchereau/STLport/stlport
-L/home/fchereau/STLport/lib")
diff --git a/source/xapps-extra/stellarium/stellarium.png
b/source/xapps-extra/stellarium/stellarium.png
new file mode 100644
index 0000000..e603356
Binary files /dev/null and b/source/xapps-extra/stellarium/stellarium.png differ
diff --git a/source/xapps-extra/stellarium/unused_moc.diff
b/source/xapps-extra/stellarium/unused_moc.diff
deleted file mode 100644
index f9b3683..0000000
--- a/source/xapps-extra/stellarium/unused_moc.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Naur stellarium-0.9.0.orig/configure.ac stellarium-0.9.0/configure.ac
---- stellarium-0.9.0.orig/configure.ac 2007-06-06 10:25:19.000000000 +0200
-+++ stellarium-0.9.0/configure.ac 2007-07-07 19:07:52.000000000 +0200
-@@ -213,35 +213,6 @@
- }
- EOF
-
--AC_MSG_CHECKING(does moc work?)
--bnv_try_1="moc myqt.h -o moc_myqt.cpp"
--AC_TRY_EVAL(bnv_try_1)
--if test x"$ac_status" != x0; then
-- AC_MSG_ERROR(moc doesn't work)
--fi
--AC_MSG_RESULT(yes)
--AC_MSG_CHECKING(can I compile moc_myqt.cpp?)
--bnv_try_2="$CXX -c $CXXFLAGS -o moc_myqt.o moc_myqt.cpp"
--AC_TRY_EVAL(bnv_try_2)
--if test x"$ac_status" != x0; then
-- AC_MSG_ERROR(couldn't compile moc_myqt.cpp)
--fi
--AC_MSG_RESULT(yes)
--AC_MSG_CHECKING(can I compile myqt.cpp?)
--bnv_try_3="$CXX $QTINC -c $CXXFLAGS -o myqt.o myqt.cpp"
--AC_TRY_EVAL(bnv_try_3)
--if test x"$ac_status" != x0; then
-- AC_MSG_ERROR(couldn't compile myqt.cpp)
--fi
--AC_MSG_RESULT(yes)
--AC_MSG_CHECKING(can I link against QT?)
--nv_try_4="$CXX $LIBS -o myqt myqt.o moc_myqt.o"
--AC_TRY_EVAL(bnv_try_4)
--if test x"$ac_status" != x0; then
-- AC_MSG_ERROR(couldn't link)
--fi
--AC_MSG_RESULT(yes)
--
- AC_MSG_CHECKING(for mkoctfile)
- AC_TRY_EVAL(mkoctfile)
- if test x"$ac_status" != x0; then
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
