diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-05 11:13:43 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-05 11:13:43 -0300 |
| commit | 58d6937e71aea203f6693a68146018f950922fbc (patch) | |
| tree | 3b53b76f930f60717debca5e0d612eeab0279b39 /extra/kdeedu-marble | |
| parent | d07d53d7af1e9694d9558783841bc2df3124a90f (diff) | |
| parent | f651180e6b1ac9508ec0d1d9b94972de776020a9 (diff) | |
I don't understand gcc/PKGBUILD.mips64el
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/addresses/PKGBUILD
community/chmsee/PKGBUILD
community/coin/PKGBUILD
community/critterding/PKGBUILD
community/distcc/PKGBUILD
community/djview4/PKGBUILD
community/freedroid/PKGBUILD
community/gnumail/PKGBUILD
community/gyachi/PKGBUILD
community/java-oracle/PKGBUILD
community/liboop/PKGBUILD
community/ltris/PKGBUILD
community/nepim/PKGBUILD
community/pantomime/PKGBUILD
community/pyxattr/PKGBUILD
community/soqt/PKGBUILD
community/tilda/PKGBUILD
community/unrealircd/PKGBUILD
community/uqm/PKGBUILD
core/dnsutils/PKGBUILD
core/gcc/PKGBUILD.mips64el
core/vpnc/PKGBUILD
extra/apache/PKGBUILD
extra/bind/PKGBUILD
extra/bzflag/PKGBUILD
extra/ccache/PKGBUILD
extra/claws-mail-extra-plugins/PKGBUILD
extra/clutter-gst/PKGBUILD
extra/cups/PKGBUILD
extra/doxygen/PKGBUILD
extra/fam/PKGBUILD
extra/fcitx/PKGBUILD
extra/gdk-pixbuf2/PKGBUILD
extra/geoip/PKGBUILD
extra/gtk2/PKGBUILD
extra/icedtea-web/PKGBUILD
extra/libffi/PKGBUILD
extra/libfwbuilder/PKGBUILD
extra/libmpd/PKGBUILD
extra/libreoffice/PKGBUILD
extra/mesa/PKGBUILD
extra/pygobject2/PKGBUILD
extra/qt/PKGBUILD
extra/samba/PKGBUILD
extra/wireshark/PKGBUILD
extra/xulrunner/PKGBUILD
multilib-testing/lib32-keyutils/PKGBUILD
multilib-testing/lib32-udev/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-keyutils/PKGBUILD
multilib/lib32-libcups/PKGBUILD
multilib/lib32-qt/PKGBUILD
multilib/wine/PKGBUILD
multilib/wine_gecko/PKGBUILD
testing/dash/PKGBUILD
testing/libssh2/PKGBUILD
Diffstat (limited to 'extra/kdeedu-marble')
| -rw-r--r-- | extra/kdeedu-marble/PKGBUILD | 10 | ||||
| -rw-r--r-- | extra/kdeedu-marble/gpsd3.patch (renamed from extra/kdeedu-marble/gpsd-2.96.patch) | 13 |
2 files changed, 12 insertions, 11 deletions
diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD index c151a9489..57909f255 100644 --- a/extra/kdeedu-marble/PKGBUILD +++ b/extra/kdeedu-marble/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 134137 2011-08-02 08:56:19Z andrea $ +# $Id: PKGBUILD 136263 2011-08-25 08:59:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-marble pkgver=4.7.0 -pkgrel=2 +pkgrel=3 pkgdesc="Desktop Globe" url="http://kde.org/applications/education/marble/" arch=('i686' 'x86_64' 'mips64el') @@ -14,13 +14,13 @@ makedepends=('cmake' 'automoc4' 'gpsd') optdepends=('gpsd: gps support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2" - 'gpsd-2.96.patch') + 'gpsd3.patch') sha1sums=('bbe08a57a33e06fceea3a51aed1406bc71ee02a9' - 'f44dfd3bb384e631d59b93d7dda3413795da8183') + '3916dd6307109d70d0dd538de913c91eede81d78') build() { cd "${srcdir}"/marble-${pkgver} - patch -p1 -i "${srcdir}"/gpsd-2.96.patch + patch -p1 -i "${srcdir}"/gpsd3.patch cd "${srcdir}" mkdir build diff --git a/extra/kdeedu-marble/gpsd-2.96.patch b/extra/kdeedu-marble/gpsd3.patch index e27702181..e11859b0b 100644 --- a/extra/kdeedu-marble/gpsd-2.96.patch +++ b/extra/kdeedu-marble/gpsd3.patch @@ -1,6 +1,7 @@ ---- marble-4.6.80/src/plugins/positionprovider/gpsd/GpsdConnection.cpp -+++ marble-4.6.80/src/plugins/positionprovider/gpsd/GpsdConnection.cpp -@@ -18,6 +18,9 @@ using namespace Marble; +diff -up marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp.orig marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp +--- marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp.orig 2011-05-20 15:34:41.000000000 -0500 ++++ marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp 2011-08-24 13:38:37.050200241 -0500 +@@ -20,6 +20,9 @@ using namespace Marble; GpsdConnection::GpsdConnection( QObject* parent ) : QObject( parent ), @@ -9,8 +10,8 @@ +#endif m_timer( 0 ) { - connect( &m_timer, SIGNAL( timeout() ), this, SLOT( update() ) ); -@@ -26,7 +29,11 @@ GpsdConnection::GpsdConnection( QObject* + m_oldLocale = setlocale( LC_NUMERIC, NULL ); +@@ -35,7 +38,11 @@ GpsdConnection::~GpsdConnection() void GpsdConnection::initialize() { m_timer.stop(); @@ -22,7 +23,7 @@ if ( data ) { m_status = PositionProviderStatusAcquiring; emit statusChanged( m_status ); -@@ -73,8 +80,16 @@ void GpsdConnection::initialize() +@@ -82,8 +89,16 @@ void GpsdConnection::initialize() void GpsdConnection::update() { #if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( PACKET_SET ) |