From 85785b2cd2d9bbed042de9334bce7545e5c9f2a7 Mon Sep 17 00:00:00 2001 From: abveritas Date: Tue, 5 Jul 2011 15:05:03 +0000 Subject: [PATCH 1/2] cinstall update, 'find new' properly working again --- tools-pkg-cinstall/PKGBUILD | 17 ++++--- tools-pkg-cinstall/refresh.patch | 79 -------------------------------- 2 files changed, 8 insertions(+), 88 deletions(-) delete mode 100644 tools-pkg-cinstall/refresh.patch diff --git a/tools-pkg-cinstall/PKGBUILD b/tools-pkg-cinstall/PKGBUILD index 14d5b77fd..74d909448 100644 --- a/tools-pkg-cinstall/PKGBUILD +++ b/tools-pkg-cinstall/PKGBUILD @@ -6,8 +6,8 @@ # (c) 2010 Drake Justice pkgname=cinstall -pkgver=0.4.6.5 -pkgrel=3 +pkgver=0.4.6.6 +pkgrel=1 depends=('rsync' 'cbundle') makedepends=('kdelibs' 'qt' 'automoc4' 'libcroco') pkgdesc="Chakra's Bundle manager" @@ -16,23 +16,22 @@ license=('GPL') install=$pkgname.install url="http://chakra-project.org/" -source=("cinstall-$pkgver.tar.xz" 'refresh.patch') -md5sums=('1c5119fbb846ffb25aa1517e4a75e89f' - 'c4e85f9e536fb62f466a535cd5a1dedc') +source=("cinstall-$pkgver.tar.xz") +md5sums=('05c19be50c26a1e6ab686621b6dc54c7') # create tarball: source PKGBUILD && mksource mksource() { - git clone git://gitorious.org/~fritzvantom/chakra/fritzvantoms-cinstall-differentui.git + git clone git://gitorious.org/~fritzvantom/chakra/fritzvantoms-cinstall.git pushd fritzvantoms-cinstall popd - tar -cvJf cinstall-${pkgver}.tar.xz fritzvantoms-cinstall-differentui/* + tar -cvJf cinstall-${pkgver}.tar.xz fritzvantoms-cinstall/* md5sum cinstall-${pkgver}.tar.xz } build() { - cd "${srcdir}/fritzvantoms-cinstall-differentui" - patch -Np1 -i "${srcdir}/refresh.patch" + cd "${srcdir}/fritzvantoms-cinstall" + cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release diff --git a/tools-pkg-cinstall/refresh.patch b/tools-pkg-cinstall/refresh.patch deleted file mode 100644 index 3fded6e7d..000000000 --- a/tools-pkg-cinstall/refresh.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff --git a/src/packageui/bundlemodel.cpp b/src/packageui/bundlemodel.cpp -index d43dd8f..65bc2b7 100644 ---- a/src/packageui/bundlemodel.cpp -+++ b/src/packageui/bundlemodel.cpp -@@ -28,6 +28,8 @@ - #include "utils.h" - - //KDE Includes -+#include -+#include - #include - #include - #include -@@ -35,6 +37,7 @@ - #include - - //Qt Includes -+#include - #include - #include - #include -@@ -42,7 +45,7 @@ - //BundleModel - BundleModel::BundleModel(QObject* parent) - : QSortFilterProxyModel(parent) -- , m_sourceModel(new BundleModelPrivate(this)) -+ , m_sourceModel(new BundleModelPrivate(parent)) - , m_showInstalledOnly(false) - { - setSourceModel(m_sourceModel); -@@ -90,6 +93,8 @@ BundleModelPrivate::BundleModelPrivate(QObject* parent) - , m_currentArch(Utils::getArchitecture()) - , m_process(new QProcess(this)) - { -+ m_xmlGui = qobject_cast(parent); -+ - //needed to use the model with qml - QHash rNames; - rNames.insert(BundleRoles::Name, "name"); -@@ -269,6 +274,7 @@ void BundleModelPrivate::runBundle(const QModelIndex index) - - void BundleModelPrivate::downloadBundle(const int& index) - { -+ m_xmlGui->actionCollection()->action("reload")->setEnabled(false); - QString bundleName = m_info[index].completeName + "-" + m_currentArch; - KUrl url ("http://chakra-project.org/repo/bundles/" + m_currentArch + "/" + bundleName + ".cb"); - -@@ -320,6 +326,7 @@ void BundleModelPrivate::setFinishedPercentage(KJob* job, long unsigned int perc - - void BundleModelPrivate::jobFinished(KJob* job) - { -+ m_xmlGui->actionCollection()->action("reload")->setEnabled(true); - const int index = job->property("index").toInt(); - - //aborted jobs -diff --git a/src/packageui/bundlemodel.h b/src/packageui/bundlemodel.h -index d9d9141..c8ae652 100644 ---- a/src/packageui/bundlemodel.h -+++ b/src/packageui/bundlemodel.h -@@ -24,6 +24,9 @@ - //Project Includes - #include "defines.h" - -+//KDE Includes -+#include -+ - //Qt Includes - #include - #include -@@ -129,7 +132,9 @@ private slots: - void setFinishedPercentage(KJob *job, unsigned long percent); - void jobFinished(KJob *job); - void setSpeed(KJob *job, ulong speed); -+ - private: -+ KXmlGuiWindow *m_xmlGui; - QList m_info; - BundleInfo infoForInstalledBundle(const QString &BundlePath) const; - QHash m_runningJobs; From 380ca716ab5c25ee394a2932f8b23f29e9f0cf46 Mon Sep 17 00:00:00 2001 From: Manuel Date: Wed, 6 Jul 2011 19:56:39 +0000 Subject: [PATCH 2/2] Update kdepin --- kdeedu/PKGBUILD | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/kdeedu/PKGBUILD b/kdeedu/PKGBUILD index 6d7d1e298..72a4f5a54 100644 --- a/kdeedu/PKGBUILD +++ b/kdeedu/PKGBUILD @@ -45,10 +45,8 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'ocaml' 'facile' 'eigen' 'cfitsio' " "kdebase-runtime>=${_kdever}" 'openbabel' 'libqalculate' 'gsl' 'boost' 'indilib' 'r>=2.11.1' 'libspectre' 'python' 'xplanet' 'docbook-xsl' 'avogadro') -source=("$_mirror/${pkgbase}-$_kdever.tar.bz2" - "$_mirror/${pkgbase}-4.6.3.tar.bz2") -md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1` - '259ba3e733fecd145c4389f10bee5ad1') +source=("$_mirror/${pkgbase}-$_kdever.tar.bz2") +md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`) # @@ -90,10 +88,6 @@ package_kdeedu-common() make DESTDIR=${pkgdir} install || return 1 done - # WORKAROUND -> install cmake modules - install -D -m644 $srcdir/${pkgbase}-4.6.3/cmake/modules/FindKDEEdu.cmake \ - $pkgdir/usr/share/apps/cmake/modules/FindKDEEdu.cmake - # include our patches into the package # ls -1 ${startdir}/*.patch &>/dev/null 2>&1 # if [ "$?" = "0" ]; then @@ -372,9 +366,6 @@ package_kdeedu-marble() make DESTDIR=${pkgdir} install || return 1 done - # WORKAROUND -> install cmake modules - install -D -m644 $srcdir/${pkgbase}-4.6.3/cmake/modules/FindMarbleWidget.cmake \ - $pkgdir/usr/share/apps/cmake/modules/FindMarbleWidget.cmake } package_kdeedu-parley()