From 853444e1ecac5a5188dfd0a3daa02fd35e1287c2 Mon Sep 17 00:00:00 2001 From: Drake Justice Date: Tue, 24 Jan 2012 18:09:35 -0500 Subject: [PATCH] remove launch-tribe.sh and tribe_4.5.patch, deprecated --- tools-pkg-tribe/PKGBUILD | 10 +++------- tools-pkg-tribe/launch-tribe.sh | 2 -- tools-pkg-tribe/tribe_4.5.patch | 23 ----------------------- 3 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 tools-pkg-tribe/launch-tribe.sh delete mode 100644 tools-pkg-tribe/tribe_4.5.patch diff --git a/tools-pkg-tribe/PKGBUILD b/tools-pkg-tribe/PKGBUILD index 4180a9f44..215a3c63f 100644 --- a/tools-pkg-tribe/PKGBUILD +++ b/tools-pkg-tribe/PKGBUILD @@ -23,12 +23,10 @@ replaces=('kdemod-tribe-svn' 'kdemod-tribe') conflicts=('chakra-tribe' 'tribe-svn' 'kdemod-partitionmanager' 'kdemod-tribe' 'kdemod-tribe-debug' 'kdemod-tribe-partitionmanager') options=('!splithdr' '!splitdbg' 'sign') source=("http://chakra.sourceforge.net/sources/tribe/tribe-${pkgver}.tar.xz" - "http://chakra.sourceforge.net/sources/tribe/RELEASE_NOTES_20111218.html" - 'launch-tribe.sh') + "http://chakra.sourceforge.net/sources/tribe/RELEASE_NOTES_20111218.html") md5sums=('843820cff52acf4dae2d05d1d1efcf0c' - '6f325d8647381d5d54f7f3b74aa492eb' - 'e31855da237a2c8029774831b3c04685') + '6f325d8647381d5d54f7f3b74aa492eb') groups=('kde-uninstall') install=tools-tribe.install @@ -77,10 +75,8 @@ package() cd "${srcdir}/${pkgname}-${pkgver}" msg "Make successful, installing..." make DESTDIR=$startdir/pkg install - install -Dm755 ${srcdir}/launch-tribe.sh \ - ${pkgdir}/usr/bin/launch-tribe.sh cp -vf ${srcdir}/RELEASE_NOTES_20111218.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html # remove nasty files find $startdir/pkg/ -name ".git" -type d -exec rm -fr {} + -} \ No newline at end of file +} diff --git a/tools-pkg-tribe/launch-tribe.sh b/tools-pkg-tribe/launch-tribe.sh deleted file mode 100644 index 22872bc8a..000000000 --- a/tools-pkg-tribe/launch-tribe.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -sudo tribe > /tmp/installation.log 2>&1 \ No newline at end of file diff --git a/tools-pkg-tribe/tribe_4.5.patch b/tools-pkg-tribe/tribe_4.5.patch deleted file mode 100644 index d96961688..000000000 --- a/tools-pkg-tribe/tribe_4.5.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- src/pages/localepage.cpp.orig 2010-12-16 21:23:36.873333336 -0500 -+++ src/pages/localepage.cpp 2010-12-16 21:24:04.696666671 -0500 -@@ -149,7 +149,7 @@ bool LocalePage::eventFilter(QObject * o - // if mouse was pressed on the marble widget - if (object == marble && event->type() == QEvent::MouseButtonPress) { - // if an actual place was clicked -- QVector indexes = marble->whichFeatureAt(marble->mapFromGlobal(QCursor::pos())); -+ QVector indexes = marble->model()->whichFeatureAt(marble->mapFromGlobal(QCursor::pos())); - if (!indexes.isEmpty()) { - // check the place against the data, and set the combo box accordingly - QHash::const_iterator it; - ---- src/pages/localepage.cpp.orig 2010-12-18 08:12:39.583334081 -0500 -+++ src/pages/localepage.cpp 2010-12-18 08:13:09.600000747 -0500 -@@ -66,7 +66,7 @@ - marble->setShowCompass(false); - marble->setShowCrosshairs(false); - marble->setShowGrid(false); -- marble->addGeoDataFile(QString(DATA_INSTALL_DIR) + "/marble/data/placemarks/cities.kml"); -+ marble->addPlacemarkFile(QString(DATA_INSTALL_DIR) + "/marble/data/placemarks/cities.kml"); - - QFile fp(QString(CONFIG_INSTALL_PATH) + "/timezones"); -