switching octopi to a Chakra fork named oktopi

This commit is contained in:
abveritas 2013-03-24 20:24:22 +00:00
parent 417b67611f
commit 7642b02085
10 changed files with 50 additions and 356 deletions

View File

@ -1,56 +0,0 @@
# Maintainer: Anke Boersma <abveritas@chakra-project.org>
pkgname=octopi
pkgver=1.3.1
pkgrel=1
_commit=649b1b5
pkgdesc="This is Octopi, a powerful Pacman frontend using Qt libs"
url="https://octopiproject.wordpress.com/"
arch=('x86_64')
license=('GPL3')
depends=('qt' 'pacman')
categories=('system')
screenshot=('http://octopiproject.files.wordpress.com/2013/03/octopi_013_reinstalling_poppler.png?w=1000&h=')
source=("https://github.com/aarnt/octopi/tarball/master/octopi-${pkgver}.tar.gz"
'octopi.desktop'
'help_en_US.diff'
'main.diff'
'mainwindow_init.diff'
'strconstants.diff'
'unixcommand.diff'
'unixcommand_h.diff'
'launch-konsole-for-updates.patch')
md5sums=('8f7518126df9b267cb68aa583923f517'
'2d9c64cd6402be69d2ee9fde5acc439e'
'09b4271cb0eee3ecc7f4080d145726d9'
'4d0a34c238400699864c1cdccdc4916b'
'98b4dfbd1a80cbed4d078d5e4ec6d03b'
'2cf50990b29b29ff94b53bc8436ec701'
'f7d8652690d135f5b1122d3eede1e31a'
'97dd0784a64a54359183429af1de78db')
build() {
cd "${srcdir}/aarnt-octopi-${_commit}/"
patch -p0 -i ${srcdir}/help_en_US.diff
patch -p0 -i ${srcdir}/main.diff
patch -p0 -i ${srcdir}/mainwindow_init.diff
patch -p0 -i ${srcdir}/strconstants.diff
patch -p0 -i ${srcdir}/unixcommand.diff
patch -p0 -i ${srcdir}/unixcommand_h.diff
patch -p1 -i ${srcdir}/launch-konsole-for-updates.patch
qmake
make
}
package() {
cd "${srcdir}/aarnt-octopi-${_commit}/"
mkdir -p ${pkgdir}/usr/share/icons
install -m 644 -p resources/images/octopi_yellow.png ${pkgdir}/usr/share/icons/octopi.png
mkdir -p ${pkgdir}/usr/bin
cp bin/octopi ${pkgdir}/usr/bin
mkdir -p ${pkgdir}/usr/share/applications
install -m644 -p ${srcdir}/octopi.desktop ${pkgdir}/usr/share/applications
}

View File

@ -1,11 +0,0 @@
--- resources/help/help_en_US.html.orig 2013-03-23 22:06:08.000000000 -0400
+++ resources/help/help_en_US.html 2013-03-24 12:02:15.104950780 -0400
@@ -8,7 +8,7 @@
<ul type="square">
<li><img height="16" width="16" src=":/resources/images/installed.png"> An installed package</li>
<li><img height="16" width="16" src=":/resources/images/unrequired.png"> An installed package (not required by others)</li>
-<li><img height="16" width="16" src=":/resources/images/foreign.png"> A foreign package, installed from AUR</li>
+<li><img height="16" width="16" src=":/resources/images/foreign.png"> A foreign package, installed from CCR</li>
<li><img height="16" width="16" src=":/resources/images/noninstalled.png"> A non installed package</li>
<li><img height="16" width="16" src=":/resources/images/outdated.png"> An outdated package</li>
</ul>

View File

@ -1,25 +0,0 @@
From de86e2adf19a28111920abba086ae97ae0e48be6 Mon Sep 17 00:00:00 2001
From: manu tortosa <manutortosa@gmail.com>
Date: Sun, 24 Mar 2013 19:03:09 +0100
Subject: [PATCH 2/2] launch konsole for updates
---
src/mainwindow_transaction.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mainwindow_transaction.cpp b/src/mainwindow_transaction.cpp
index b9af9ae..22da8ce 100644
--- a/src/mainwindow_transaction.cpp
+++ b/src/mainwindow_transaction.cpp
@@ -548,7 +548,7 @@ void MainWindow::doSystemUpgrade(bool syncDatabase)
QString command;
- command = "pacman -Su --noconfirm";
+ command = "konsole -e sudo pacman -Su";
m_unixCommand->executeCommand(command);
m_commandQueued = ectn_NONE;
}
--
1.8.0.2

View File

@ -1,12 +0,0 @@
--- src/main.cpp.orig 2013-03-23 22:06:08.000000000 -0400
+++ src/main.cpp 2013-03-24 13:46:18.064633929 -0400
@@ -31,9 +31,6 @@
ArgumentList *argList = new ArgumentList(argc, argv);
QApplication::setGraphicsSystem(QLatin1String("raster"));
- if (!argList->getSwitch("-style"))
- QApplication::setStyle(new QCleanlooksStyle());
-
QtSingleApplication app( StrConstants::getApplicationName(), argc, argv );
//This sends a message just to awake the socket-based QtSinleApplication engine

View File

@ -1,56 +0,0 @@
--- src/mainwindow_init.cpp.orig 2013-03-23 22:06:08.000000000 -0400
+++ src/mainwindow_init.cpp 2013-03-24 12:46:36.309194524 -0400
@@ -424,7 +424,7 @@
QString MainWindow::retrieveDistroNews(bool searchForLatestNews)
{
const QString ctn_ARCH_LINUX_RSS = "https://www.archlinux.org/feeds/news/";
- const QString ctn_MANJARO_LINUX_RSS = "http://manjaro.org/feed/";
+ const QString ctn_CHAKRA_PROJECT_RSS = "http://chakra-project.org/news/index.php?/feeds/index.rss2";
LinuxDistro distro = UnixCommand::getLinuxDistro();
QString res;
@@ -449,9 +449,9 @@
{
curlCommand = curlCommand.arg(ctn_ARCH_LINUX_RSS).arg(tmpRssPath);
}
- else if (distro == ectn_MANJAROLINUX)
+ else if (distro == ectn_CHAKRAPROJECT)
{
- curlCommand = curlCommand.arg(ctn_MANJARO_LINUX_RSS).arg(tmpRssPath);
+ curlCommand = curlCommand.arg(ctn_CHAKRA_PROJECT_RSS).arg(tmpRssPath);
}
if (UnixCommand::runCurlCommand(curlCommand) == 0)
@@ -540,9 +540,9 @@
{
html = "<p align=\"center\"><h2>" + StrConstants::getArchLinuxNews() + "</h2></p><ul>";
}
- else if (distro == ectn_MANJAROLINUX)
+ else if (distro == ectn_CHAKRAPROJECT)
{
- html = "<p align=\"center\"><h2>" + StrConstants::getManjaroLinuxNews() + "</h2></p><ul>";
+ html = "<p align=\"center\"><h2>" + StrConstants::getChakraProjectNews() + "</h2></p><ul>";
}
QString lastBuildDate;
@@ -596,7 +596,7 @@
else if (eText.tagName() == "link")
{
itemLink = Package::makeURLClickable(eText.text());
- if (UnixCommand::getLinuxDistro() == ectn_MANJAROLINUX) itemLink += "<br>";
+ if (UnixCommand::getLinuxDistro() == ectn_CHAKRAPROJECT) itemLink += "<br>";
}
else if (eText.tagName() == "description")
{
@@ -654,9 +654,9 @@
{
writeToTabOutput("<b>" + StrConstants::getSearchingForArchLinuxNews() + "</b>");
}
- else if (distro == ectn_MANJAROLINUX)
+ else if (distro == ectn_CHAKRAPROJECT)
{
- writeToTabOutput("<b>" + StrConstants::getSearchingForManjaroLinuxNews() + "</b>");
+ writeToTabOutput("<b>" + StrConstants::getSearchingForChakraProjectNews() + "</b>");
}
qApp->processEvents();

View File

@ -1,139 +0,0 @@
[Desktop Entry]
Name=Add/Remove Software
Name[af]=Voeg by/verwyder sagteware
Name[ar]=إضافة وإزالة البرمجيات
Name[as]= / ি
Name[ast]=Amestar/Quitar software
Name[be]=Дадаць/выдаліць апраграмаванне
Name[bg]=Инсталиране/деинсталиране на софтуер
Name[bn]= /
Name[bn_IN]= /
Name[ca]=Afegeix/Suprimeix programari
Name[ca@valencia]=Afig/Suprimeix programari
Name[cs]=Přidat/odebrat software
Name[da]=Tilføj/fjern software
Name[de]=Software hinzufügen/entfernen
Name[el]=Προσθαφαίρεση λογισμικού
Name[en@shaw]=𐑨𐑛/𐑮𐑦𐑥𐑵𐑝 𐑕𐑪𐑓𐑑𐑢𐑺
Name[en_GB]=Add/Remove Software
Name[eo]=Aldoni/forigi instalitan pogramaron
Name[es]=Añadir/Quitar software
Name[et]=Tarkvara lisamine ja eemaldamine
Name[eu]=Gehitu/Kendu softwarea
Name[fa]=افزودن/حذف نرمافزار
Name[fi]=Lisää tai poista ohjelmistoja
Name[fr]=Ajouter/supprimer des logiciels
Name[ga]=Cuir Leis/Bain Bogearraí
Name[gl]=Engadir ou eliminar programas
Name[gu]= /
Name[he]=הוספת/הסרת תכנה
Name[hi]= /
Name[hu]=Szoftver telepítése/eltávolítása
Name[id]=Tambah/Hapus Piranti Lunak
Name[it]=Aggiungi/Rimuovi software
Name[ja]=
Name[kn]= ಿ
Name[ko]= /
Name[lt]=Įdiegti ar šalinti programinę įrangą
Name[lv]=Pievienot/Izņemt programmatūru
Name[mk]=Инсталирај/избриши софтвер
Name[ml]= /
Name[mr]= /
Name[ms]=Menambah/Memadam perisian
Name[nb]=Legg til/fjern programvare
Name[nl]=Software installeren/verwijderen
Name[nn]=Legg til/fjern programvare
Name[or]= /
Name[pa]= /
Name[pl]=Dodanie/usuwanie oprogramowania
Name[pt]=Adicionar/Remover Software
Name[pt_BR]=Adicionar/remover programas
Name[ro]=Adăugare sau ștergere programe
Name[ru]=Установка и удаление программ
Name[sk]=Pridať/odstrániť softvér
Name[sl]=Upravljanje programske opreme
Name[sr]=Додај-уклони програме
Name[sr@latin]=Dodaj-ukloni programe
Name[sv]=Lägg till/Ta bort programvara
Name[ta]= /
Name[te]= ి/ిి
Name[th]=/
Name[tr]=Yazılım Ekle/Kaldır
Name[ug]=يۇمشاق دېتالنى قوش/ئۆچۈر
Name[uk]=Встановлення та вилучення програм
Name[vi]=Thêm/G phn mm
Name[zh_CN]=/
Name[zh_HK]=
Name[zh_TW]=
Comment=Add or remove software installed on the system
Comment[af]=Voeg by of verwyder sagteware geïnstalleer op die stelsel
Comment[ar]=أضف أو أزل البرمجيات المثبتة على النظام
Comment[as]= ি
Comment[ast]=Amestar o quitar software instaláu nel sistema
Comment[be]=Дадаць ці выдаліць апраграмаванне, усталяванае ў сістэме
Comment[bg]=Инсталиране и деинсталиране на софтуер към системата
Comment[bn]=ি
Comment[bn_IN]=ি ি
Comment[ca]=Afegeix o suprimeix programari instal·lat en el sistema
Comment[ca@valencia]=Afig o suprimeix programari instal·lat en el sistema
Comment[cs]=Přidat nebo odebrat software instalovaný v systému
Comment[da]=Tilføj eller fjern software installeret på systemet
Comment[de]=Auf dem System installierte Software aktualisieren oder neue Software hinzufügen
Comment[el]=Προσθαφαίρεση λογισμικού στο σύστημα
Comment[en@shaw]=𐑨𐑛 𐑹 𐑮𐑦𐑥𐑵𐑝 𐑕𐑪𐑓𐑑𐑢𐑺 𐑦𐑯𐑕𐑑𐑷𐑤𐑛 𐑪𐑯 𐑞 𐑕𐑦𐑕𐑑𐑩𐑥
Comment[en_GB]=Add or remove software installed on the system
Comment[eo]=Aldoni aŭ forigi instalitan pogramaron sur via sistemo
Comment[es]=Añadir o quitar software instalado en el sistema
Comment[et]=Arvutisse paigaldatud tarkvara lisamine ja eemaldamine
Comment[eu]=Gehitu edo kendu sisteman instalatutako softwarea
Comment[fa]=حذف یا افزودن نرمافزارهای نصب شده بر روی این سیستم
Comment[fi]=Lisää tai poista järjestelmään asennettuja ohjelmistoja
Comment[fr]=Ajouter ou supprimer des logiciels installés sur le système
Comment[gl]=Engadir e eliminar o software instalado no sistema
Comment[gu]=િ િ
Comment[he]=הוספה או הסרה של יישומי המערכת
Comment[hi]=ि ि
Comment[hu]=Szoftverek rendszerre telepítése vagy eltávolítása
Comment[id]=Tambah atau hapus perangkat lunak yang terpasang pada sistem
Comment[it]=Aggiunge o rimuove software installato sul sistema
Comment[ja]=
Comment[kn]= ಿ ಿಿ
Comment[ko]=
Comment[lt]=Įdiegti ar šalinti sistemoje įdiegtą programinę įrangą
Comment[lv]=Pievienot vai izņemt programmatūru sistēmā
Comment[mk]=Инсталирајте или избришете софтвер на системот
Comment[ml]=ിി ിി ി
Comment[mr]= ि ि
Comment[ms]=Menambah atau memadam perisian yang dipasang pada sistem
Comment[nb]=Legg til eller fjern programvare på systemet
Comment[nl]=Software installeren op, of verwijderen van het systeem
Comment[nn]=Legg til eller fjern programvare som er installert på systemet
Comment[or]= ି ି ି ି
Comment[pa]=ਿ
Comment[pl]=Instalowanie lub usuwanie oprogramowania zainstalowanego w systemie
Comment[pt]=Adicionar ou remover software instalado no sistema
Comment[pt_BR]=Adicione ou remova programas instalados no sistema
Comment[ro]=Adăugați sau ștergeți programe instalate pe sistem
Comment[ru]=Установка и удаление программ, установленных в системе
Comment[sk]=Pridať alebo odstrániť softvér nainštalovaný na systéme
Comment[sl]=Nameščanje in odstranjevanje programske opreme sistema
Comment[sr]=Додајте или уклоните програме инсталиране на овом систему
Comment[sr@latin]=Dodajte ili uklonite programe instalirane na ovom sistemu
Comment[sv]=Lägg till eller ta bort programvara installerad på systemet
Comment[ta]=ிிி ி
Comment[te]= ిి ి ిి
Comment[th]=
Comment[tr]=Sisteminizde yüklü yazılımları ekleyin veya kaldırın
Comment[ug]=سىستېمىڭىزغا ئورنىتىلغان يۇمشاق دېتاللارنى قوشىدۇ ياكى ئۆچۈرىدۇ
Comment[uk]=Встановлення та вилучення програм у системі
Comment[vi]=Thêm hoc g phn mm cài đt trên h thng
Comment[zh_CN]=
Comment[zh_HK]=
Comment[zh_TW]=
Icon=octopi
Exec=octopi
Terminal=false
Type=Application
Categories=System;Tools;
StartupNotify=true

View File

@ -1,32 +0,0 @@
--- src/strconstants.h.orig 2013-03-24 12:00:35.588965813 -0400
+++ src/strconstants.h 2013-03-24 12:48:33.828992616 -0400
@@ -43,15 +43,15 @@
}
static QString getForeignRepositoryName(){
- return "AUR";
+ return "CCR";
}
static QString getArchLinuxNews(){
return QObject::tr("Arch Linux news");
}
- static QString getManjaroLinuxNews(){
- return QObject::tr("Manjaro Linux news");
+ static QString getChakraProjectNews(){
+ return QObject::tr("Chakra-Project news");
}
static QString getNewsErrorMessage(){
@@ -218,8 +218,8 @@
return QObject::tr("Searching for Arch Linux latest news...");
}
- static QString getSearchingForManjaroLinuxNews(){
- return QObject::tr("Searching for Manjaro Linux latest news...");
+ static QString getSearchingForChakraProjectNews(){
+ return QObject::tr("Searching for The Chakra Project latest news...");
}
static QString getOneOutdatedPackage(){

View File

@ -1,14 +0,0 @@
--- src/unixcommand.cpp.orig 2013-03-23 22:06:08.000000000 -0400
+++ src/unixcommand.cpp 2013-03-24 12:22:35.540803826 -0400
@@ -715,9 +715,9 @@
{
return ectn_ARCHLINUX;
}
- else if (contents.contains(QRegExp("Manjaro")))
+ else if (contents.contains(QRegExp("The Chakra-Project")))
{
- return ectn_MANJAROLINUX;
+ return ectn_CHAKRAPROJECT;
}
else
{

View File

@ -1,11 +0,0 @@
--- src/unixcommand.h.orig 2013-03-23 22:06:08.000000000 -0400
+++ src/unixcommand.h 2013-03-24 12:25:45.989211848 -0400
@@ -33,7 +33,7 @@
enum CommandExecuting { ectn_NONE, ectn_SYNC_DATABASE, ectn_SYSTEM_UPGRADE, ectn_INSTALL, ectn_REMOVE };
-enum LinuxDistro { ectn_ARCHLINUX, ectn_MANJAROLINUX, ectn_UNKNOWN };
+enum LinuxDistro { ectn_ARCHLINUX, ectn_CHAKRAPROJECT, ectn_UNKNOWN };
//Forward class declarations.
class QString;

50
oktopi/PKGBUILD Normal file
View File

@ -0,0 +1,50 @@
# Maintainer: Anke Boersma <abveritas@chakra-project.org>
pkgname=oktopi
pkgver=1.3.1
pkgrel=1
pkgdesc="Oktopi, is a fork of octopi,a powerful Pacman frontend using Qt libs"
url="https://octopiproject.wordpress.com/"
arch=('x86_64')
license=('GPL3')
depends=('qt' 'pacman')
conflicts=('octopi')
replaces=('octopi')
categories=('system')
screenshot=('http://octopiproject.files.wordpress.com/2013/03/octopi_013_reinstalling_poppler.png?w=1000&h=')
source=("http://chakra-linux.org/sources/oktopi/oktopi-${pkgver}.tar.xz")
md5sums=('013fafa3487383a204cbe99f938796bb')
# create tarball: source PKGBUILD && mksource
mksource() {
if [ "${1}" = "" ] ; then
git clone git://gitorious.org//chakra/oktopi.git
else
git clone -b git://gitorious.org//chakra/oktopi.git
fi
pushd oktopi
popd
tar -cvJf oktopi-${pkgver}.tar.xz oktopi/*
md5sum oktopi-${pkgver}.tar.xz
}
build() {
cd "${srcdir}/oktopi"
qmake
make
}
package() {
cd "${srcdir}/oktopi"
mkdir -p ${pkgdir}/usr/share/icons
install -m 644 -p resources/images/oktopi_yellow.png ${pkgdir}/usr/share/icons/oktopi.png
mkdir -p ${pkgdir}/usr/bin
cp bin/oktopi ${pkgdir}/usr/bin
mkdir -p ${pkgdir}/usr/share/applications
install -m644 -p oktopi.desktop ${pkgdir}/usr/share/applications
}