From 905d1eb8458ca5ec6dfc6ed7e184bd520de69266 Mon Sep 17 00:00:00 2001 From: Sibelle Date: Sat, 9 Jul 2011 12:42:11 +0200 Subject: marble 4.6.5-1 maj --- kde/marble/.footprint.x86_64 | 75 +++++--------------------------------------- kde/marble/.md5sum.x86_64 | 1 + kde/marble/Pkgfile | 35 ++++++++++++++++----- 3 files changed, 37 insertions(+), 74 deletions(-) diff --git a/kde/marble/.footprint.x86_64 b/kde/marble/.footprint.x86_64 index 6b991614f..5d55240cb 100644 --- a/kde/marble/.footprint.x86_64 +++ b/kde/marble/.footprint.x86_64 @@ -13,7 +13,6 @@ drwxr-xr-x root/root usr/include/marble/ -rw-r--r-- root/root usr/include/marble/AbstractMarbleGraphicsLayout.h -rw-r--r-- root/root usr/include/marble/AbstractProjection.h -rw-r--r-- root/root usr/include/marble/AbstractWorkerThread.h --rw-r--r-- root/root usr/include/marble/BookmarkManager.h -rw-r--r-- root/root usr/include/marble/ClipPainter.h -rw-r--r-- root/root usr/include/marble/CurrentLocationWidget.h -rw-r--r-- root/root usr/include/marble/DownloadRegionDialog.h @@ -59,17 +58,16 @@ drwxr-xr-x root/root usr/include/marble/ -rw-r--r-- root/root usr/include/marble/LegendWidget.h -rw-r--r-- root/root usr/include/marble/MapThemeManager.h -rw-r--r-- root/root usr/include/marble/MapViewWidget.h --rw-r--r-- root/root usr/include/marble/MapWizard.h -rw-r--r-- root/root usr/include/marble/MarbleAboutDialog.h -rw-r--r-- root/root usr/include/marble/MarbleAbstractRunner.h -rw-r--r-- root/root usr/include/marble/MarbleControlBox.h +-rw-r--r-- root/root usr/include/marble/MarbleDataFacade.h -rw-r--r-- root/root usr/include/marble/MarbleDirs.h -rw-r--r-- root/root usr/include/marble/MarbleGraphicsGridLayout.h -rw-r--r-- root/root usr/include/marble/MarbleGraphicsItem.h -rw-r--r-- root/root usr/include/marble/MarbleMap.h -rw-r--r-- root/root usr/include/marble/MarbleModel.h -rw-r--r-- root/root usr/include/marble/MarbleNavigator.h --rw-r--r-- root/root usr/include/marble/MarbleRunnerManager.h -rw-r--r-- root/root usr/include/marble/MarbleWidget.h -rw-r--r-- root/root usr/include/marble/MarbleWidgetInputHandler.h -rw-r--r-- root/root usr/include/marble/MercatorProjection.h @@ -109,19 +107,16 @@ drwxr-xr-x root/root usr/lib/kde4/plugins/marble/ -rwxr-xr-x root/root usr/lib/kde4/plugins/marble/AprsPlugin.so -rwxr-xr-x root/root usr/lib/kde4/plugins/marble/CompassFloatItem.so -rwxr-xr-x root/root usr/lib/kde4/plugins/marble/CrosshairsPlugin.so --rwxr-xr-x root/root usr/lib/kde4/plugins/marble/EarthquakePlugin.so -rwxr-xr-x root/root usr/lib/kde4/plugins/marble/GosmorePlugin.so -rwxr-xr-x root/root usr/lib/kde4/plugins/marble/GpsdPositionProviderPlugin.so -rwxr-xr-x root/root usr/lib/kde4/plugins/marble/GraticulePlugin.so -rwxr-xr-x root/root usr/lib/kde4/plugins/marble/HostipPlugin.so -rwxr-xr-x root/root usr/lib/kde4/plugins/marble/LatLonPlugin.so -rwxr-xr-x root/root usr/lib/kde4/plugins/marble/LocalDatabasePlugin.so --rwxr-xr-x root/root usr/lib/kde4/plugins/marble/LocalOsmSearchPlugin.so -rwxr-xr-x root/root usr/lib/kde4/plugins/marble/MapScaleFloatItem.so -rwxr-xr-x root/root usr/lib/kde4/plugins/marble/MonavPlugin.so -rwxr-xr-x root/root usr/lib/kde4/plugins/marble/NavigationFloatItem.so -rwxr-xr-x root/root usr/lib/kde4/plugins/marble/NominatimPlugin.so --rwxr-xr-x root/root usr/lib/kde4/plugins/marble/OpenDesktopPlugin.so -rwxr-xr-x root/root usr/lib/kde4/plugins/marble/OpenRouteServicePlugin.so -rwxr-xr-x root/root usr/lib/kde4/plugins/marble/OverviewMap.so -rwxr-xr-x root/root usr/lib/kde4/plugins/marble/Photo.so @@ -131,7 +126,6 @@ drwxr-xr-x root/root usr/lib/kde4/plugins/marble/ -rwxr-xr-x root/root usr/lib/kde4/plugins/marble/RoutingPlugin.so -rwxr-xr-x root/root usr/lib/kde4/plugins/marble/RoutinoPlugin.so -rwxr-xr-x root/root usr/lib/kde4/plugins/marble/StarsPlugin.so --rwxr-xr-x root/root usr/lib/kde4/plugins/marble/SunPlugin.so -rwxr-xr-x root/root usr/lib/kde4/plugins/marble/Weather.so -rwxr-xr-x root/root usr/lib/kde4/plugins/marble/Wikipedia.so -rwxr-xr-x root/root usr/lib/kde4/plugins/marble/YoursPlugin.so @@ -141,9 +135,9 @@ drwxr-xr-x root/root usr/lib/kde4/plugins/marble/org/kde/edu/ drwxr-xr-x root/root usr/lib/kde4/plugins/marble/org/kde/edu/marble/ -rwxr-xr-x root/root usr/lib/kde4/plugins/marble/org/kde/edu/marble/libMarbleDeclarativePlugin.so -rw-r--r-- root/root usr/lib/kde4/plugins/marble/org/kde/edu/marble/qmldir -lrwxrwxrwx root/root usr/lib/libmarblewidget.so -> libmarblewidget.so.12 --rwxr-xr-x root/root usr/lib/libmarblewidget.so.0.12.0 -lrwxrwxrwx root/root usr/lib/libmarblewidget.so.12 -> libmarblewidget.so.0.12.0 +lrwxrwxrwx root/root usr/lib/libmarblewidget.so -> libmarblewidget.so.11 +-rwxr-xr-x root/root usr/lib/libmarblewidget.so.0.11.0 +lrwxrwxrwx root/root usr/lib/libmarblewidget.so.11 -> libmarblewidget.so.0.11.0 drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/applications/ drwxr-xr-x root/root usr/share/applications/kde4/ @@ -155,13 +149,9 @@ drwxr-xr-x root/root usr/share/apps/cmake/modules/ drwxr-xr-x root/root usr/share/apps/marble/ drwxr-xr-x root/root usr/share/apps/marble/data/ -rw-r--r-- root/root usr/share/apps/marble/data/LICENSE.txt -drwxr-xr-x root/root usr/share/apps/marble/data/audio/ --rw-r--r-- root/root usr/share/apps/marble/data/audio/KDE-Sys-App-Positive.ogg --rw-r--r-- root/root usr/share/apps/marble/data/audio/KDE-Sys-List-End.ogg drwxr-xr-x root/root usr/share/apps/marble/data/bitmaps/ -rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/airport.png -rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/annotation.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/bookmark.png -rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/border_1.png -rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/border_2.png -rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/city_1_orange.png @@ -192,7 +182,6 @@ drwxr-xr-x root/root usr/share/apps/marble/data/bitmaps/ -rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/cursor_tr.xpm -rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/default_location.png -rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/earth_apollo.jpg --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/folder.png -rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/hand.png -rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/lake.png -rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/manned_landing.png @@ -202,52 +191,6 @@ drwxr-xr-x root/root usr/share/apps/marble/data/bitmaps/ -rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/ocean.png -rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/osm.png -rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/other.png -drwxr-xr-x root/root usr/share/apps/marble/data/bitmaps/poi/ --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/accommodation_camping.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/accommodation_hostel.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/accommodation_hotel2.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/accommodation_motel.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/accommodation_youth_hostel.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/amenity_library.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/education_college.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/education_school.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/education_university.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/food_bar.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/food_biergarten.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/food_cafe.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/food_fastfood2.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/food_pub.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/food_restaurant.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/health_doctors2.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/health_hospital.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/health_pharmacy.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/money_atm2.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/money_bank2.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/shopping_alcohol.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/shopping_hifi.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/shopping_supermarket.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/tourist_attraction.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/tourist_castle2.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/tourist_cinema.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/tourist_monument.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/tourist_museum.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/tourist_ruin.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/tourist_theatre.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/tourist_theme_park.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/tourist_view_point.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/tourist_zoo.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/transport_aerodrome.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/transport_airport_terminal.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/transport_bus_station.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/transport_bus_stop.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/transport_car_share.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/transport_fuel.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/transport_parking.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/transport_rental_bicycle.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/transport_rental_car.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/transport_taxi_rank.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/transport_train_station.p.16.png --rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/poi/transport_tram_stop.p.16.png -rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/pole_1.png -rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/pole_2.png -rw-r--r-- root/root usr/share/apps/marble/data/bitmaps/river.png @@ -551,10 +494,6 @@ drwxr-xr-x root/root usr/share/apps/marble/data/maps/earth/clouds/0/ drwxr-xr-x root/root usr/share/apps/marble/data/maps/earth/clouds/0/000000/ -rw-r--r-- root/root usr/share/apps/marble/data/maps/earth/clouds/0/000000/000000_000000.jpg -rw-r--r-- root/root usr/share/apps/marble/data/maps/earth/clouds/0/000000/000000_000001.jpg -drwxr-xr-x root/root usr/share/apps/marble/data/maps/earth/hillshading/ -drwxr-xr-x root/root usr/share/apps/marble/data/maps/earth/hillshading/0/ -drwxr-xr-x root/root usr/share/apps/marble/data/maps/earth/hillshading/0/0/ --rw-r--r-- root/root usr/share/apps/marble/data/maps/earth/hillshading/0/0/0.png drwxr-xr-x root/root usr/share/apps/marble/data/maps/earth/openstreetmap/ drwxr-xr-x root/root usr/share/apps/marble/data/maps/earth/openstreetmap/0/ drwxr-xr-x root/root usr/share/apps/marble/data/maps/earth/openstreetmap/0/0/ @@ -828,6 +767,7 @@ drwxr-xr-x root/root usr/share/apps/marble/data/placemarks/ -rw-r--r-- root/root usr/share/apps/marble/data/placemarks/baseplacemarks.cache -rw-r--r-- root/root usr/share/apps/marble/data/placemarks/boundaryplacemarks.cache -rw-r--r-- root/root usr/share/apps/marble/data/placemarks/cityplacemarks.cache +-rw-r--r-- root/root usr/share/apps/marble/data/placemarks/cityplacemarks_large_population.cache -rw-r--r-- root/root usr/share/apps/marble/data/placemarks/elevplacemarks.cache -rw-r--r-- root/root usr/share/apps/marble/data/placemarks/moonlandingsites.cache -rw-r--r-- root/root usr/share/apps/marble/data/placemarks/moonterrain.cache @@ -840,6 +780,7 @@ drwxr-xr-x root/root usr/share/apps/marble/data/svg/ -rw-r--r-- root/root usr/share/apps/marble/data/svg/application-x-marble-gray.png -rw-r--r-- root/root usr/share/apps/marble/data/svg/application-x-marble.png -rw-r--r-- root/root usr/share/apps/marble/data/svg/application-x-marble.svg +-rw-r--r-- root/root usr/share/apps/marble/data/svg/compass.svg -rw-r--r-- root/root usr/share/apps/marble/data/svg/coordinate.svg -rw-r--r-- root/root usr/share/apps/marble/data/svg/lunarmap.svg -rw-r--r-- root/root usr/share/apps/marble/data/svg/marble-logo-32dpi.png @@ -849,7 +790,6 @@ drwxr-xr-x root/root usr/share/apps/marble/data/svg/ -rw-r--r-- root/root usr/share/apps/marble/data/svg/marble-logo.png -rw-r--r-- root/root usr/share/apps/marble/data/svg/marble-logo.svg -rw-r--r-- root/root usr/share/apps/marble/data/svg/sunshine.png --rw-r--r-- root/root usr/share/apps/marble/data/svg/track_turtle.svg -rw-r--r-- root/root usr/share/apps/marble/data/svg/wikipedia.svg -rw-r--r-- root/root usr/share/apps/marble/data/svg/wikipedia_shadow.svg -rw-r--r-- root/root usr/share/apps/marble/data/svg/worldmap.svg @@ -882,8 +822,9 @@ drwxr-xr-x root/root usr/share/apps/marble/data/weather/ -rw-r--r-- root/root usr/share/apps/marble/data/weather/weather-storm.png -rw-r--r-- root/root usr/share/apps/marble/data/weather/wind-arrows.svgz -rw-r--r-- root/root usr/share/apps/marble/marble.knsrc --rw-r--r-- root/root usr/share/apps/marble/marble_part.rc -rw-r--r-- root/root usr/share/apps/marble/marbleui.rc +drwxr-xr-x root/root usr/share/apps/marble_part/ +-rw-r--r-- root/root usr/share/apps/marble_part/marble_part.rc drwxr-xr-x root/root usr/share/config.kcfg/ -rw-r--r-- root/root usr/share/config.kcfg/marble.kcfg drwxr-xr-x root/root usr/share/doc/ diff --git a/kde/marble/.md5sum.x86_64 b/kde/marble/.md5sum.x86_64 index e69de29bb..2272858d4 100644 --- a/kde/marble/.md5sum.x86_64 +++ b/kde/marble/.md5sum.x86_64 @@ -0,0 +1 @@ +44f21523890d8e0fa3d30da2d5c4d082 kdeedu-4.6.5.tar.bz2 diff --git a/kde/marble/Pkgfile b/kde/marble/Pkgfile index 0a3a01414..ad19cb5c3 100644 --- a/kde/marble/Pkgfile +++ b/kde/marble/Pkgfile @@ -2,18 +2,39 @@ # URL: http://edu.kde.org/marble/ # Maintainer: NuTyX core team # Packager: thierryn1 at hispeed dot ch -# Depends on: git, kdelibs, gpsd, qt, cmake, docbook-xsl +# Depends on: git, kdeliibs, gpsd, qt, cmake, docbook-xsl # Run on: kdelibs,gpsd,qt name=marble -version=1.1 -release=3 +version=4.6.5 +release=1 +pkgbase=kdeedu + +source=( ftp://ftp.kde.org/pub/kde/stable/$version/src/kdeedu-$version.tar.bz2) + build() { - git clone git://anongit.kde.org/marble - cd $name - cmake ../$name -DCMAKE_INSTALL_PREFIX=/usr - make + cd $SRC + mkdir build + cd build + cmake ../${pkgbase}-${version} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr + make + + cd $SRC/build/marble make DESTDIR=$PKG install + + cd $SRC/build/marble/doc + make DESTDIR=$PKG install + +# git clone git://anongit.kde.org/marble +# cd $name +# cmake ../$name -DCMAKE_INSTALL_PREFIX=/usr \ +# -DCMAKE_BUILD_TYPE=Release \ +# -DCMAKE_SKIP_RPATH=OFF +# make +# make DESTDIR=$PKG install } -- cgit v1.2.3-70-g09d2