From 64319d3954b31b0965c4dc4f69c44b0ebd7d80fd Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 9 Nov 2015 14:08:13 -0300 Subject: octopi-0.8.0-1.parabola1: updating version --- libre/octopi/PKGBUILD | 162 ++++++++++++++++----------------- libre/octopi/enable-kstatus.patch | 12 +++ libre/octopi/parabola-support.patch | 175 ------------------------------------ libre/octopi/qt55.patch | 12 --- 4 files changed, 93 insertions(+), 268 deletions(-) create mode 100644 libre/octopi/enable-kstatus.patch delete mode 100644 libre/octopi/parabola-support.patch delete mode 100644 libre/octopi/qt55.patch diff --git a/libre/octopi/PKGBUILD b/libre/octopi/PKGBUILD index 1c79d8c04..1679a4413 100644 --- a/libre/octopi/PKGBUILD +++ b/libre/octopi/PKGBUILD @@ -4,73 +4,72 @@ pkgbase=octopi pkgname=('octopi' 'octopi-notifier' 'octopi-repoeditor' 'octopi-cachecleaner') -pkgver=0.7.0 -pkgrel=5.parabola1 +pkgver=0.8.0 +pkgrel=1.parabola1 arch=('i686' 'x86_64') url="https://github.com/aarnt/octopi" license=('GPL2') -makedepends=('qt5-declarative' 'qt4' 'knotifications' 'libnotify') +makedepends=('qt5-declarative' 'knotifications' 'libnotify') source=("https://github.com/aarnt/${pkgname}/archive/v${pkgver}.tar.gz" - 'octopi-repoeditor.desktop' - 'qt55.patch' - 'parabola-support.patch') -sha256sums=('03d15458ebe482e5a9a00e7a3db5676a53886c754b13a7c56e36d75b73f2d496' + 'octopi-repoeditor.desktop' + 'enable-kstatus.patch') +sha256sums=('79ab8a24e3329ab4e5320e03309f44f802336cc00bada0f9a37fae46f5eeb02b' '131f16745df685430db55e54ede6da66aed9b02ca00d6d873a002b2a3e1c90ef' - '459f924eba5bc780cb3a0cb955e9d7c634fe77d7e9f7b1a44d86c827535acbe3' - '08cb93ec3d4bc3d045d7b680d76bef345939c88d5804f8ac37002c2b931420a8') + '81dcbbda0d020607d23f3f8042fa43bfc4318269a55f9327e4995299b59dcb4b') + prepare() { - cd "${srcdir}/${pkgbase}-${pkgver}" + _cpucount=$(grep -c processor /proc/cpuinfo 2>/dev/null) + _jc=$((${_cpucount:-1})) + + cd "${srcdir}/${pkgbase}-${pkgver}" - patch -Np1 -i ../parabola-support.patch + + patch -p1 < ../enable-kstatus.patch +} + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" - patch -p1 < ../qt55.patch -} + qmake-qt5 octopi.pro + make -j $_jc -build() { - _cpucount=$(grep -c processor /proc/cpuinfo 2>/dev/null) - _jc=$((${_cpucount:-1})) - - cd "${srcdir}/${pkgbase}-${pkgver}" - - qmake-qt5 octopi.pro - make -j $_jc - - cd "${srcdir}/${pkgbase}-${pkgver}/notifier/pacmanhelper" - msg "Building pacmanhelper..." - qmake-qt5 pacmanhelper.pro - make -j $_jc - - cd "${srcdir}/${pkgbase}-${pkgver}/notifier/octopi-notifier" - msg "Building octopi-notifier..." - qmake-qt5 octopi-notifier.pro - make -j $_jc - - cd "${srcdir}/${pkgbase}-${pkgver}/repoeditor" - msg "Building octopi-repoeditor..." - qmake-qt5 octopi-repoeditor.pro - make -j $_jc - - cd "${srcdir}/${pkgbase}-${pkgver}/cachecleaner" - msg "Building octopi-cachecleaner..." - qmake-qt5 octopi-cachecleaner.pro - make -j $_jc + cd "${srcdir}/${pkgbase}-${pkgver}/notifier/pacmanhelper" + msg "Building pacmanhelper..." + qmake-qt5 pacmanhelper.pro + make -j $_jc + + cd "${srcdir}/${pkgbase}-${pkgver}/notifier/octopi-notifier" + msg "Building octopi-notifier..." + qmake-qt5 octopi-notifier.pro + make -j $_jc + + cd "${srcdir}/${pkgbase}-${pkgver}/repoeditor" + msg "Building octopi-repoeditor..." + qmake-qt5 octopi-repoeditor.pro + make -j $_jc + + cd "${srcdir}/${pkgbase}-${pkgver}/cachecleaner" + msg "Building octopi-cachecleaner..." + qmake-qt5 octopi-cachecleaner.pro + make -j $_jc } package_octopi() { - pkgdesc="A powerful Pacman frontend using Qt5 libs, without nonfree pacaur and yaourt recommendation and with Parabola support" - install="octopi.install" - depends=('qt5-base' 'qt5-declarative' 'xterm') - optdepends=('kdesu: for KDE' - 'gksu: for XFCE, Gnome, LXDE, Cinnamon' - 'gnome-keyring: for password management' - 'gist: for SysInfo report' - 'octopi-repoeditor: for editing functions' - 'octopi-cachecleaner: for cleaning functions' - 'octopi-notifier: for notifications' - 'pacmanlogviewer: to view pacman log files') - conflicts=('oktopi-git') - - cd "${srcdir}/${pkgbase}-${pkgver}" + pkgdesc="A powerful Pacman frontend using Qt5 libs, without nonfree pacaur and yaourt recommendation" + install=octopi.install + depends=('qt5-declarative' 'xterm') + optdepends=('kdesu: for KDE' + 'gksu: for XFCE, Gnome, LXDE, Cinnamon' + 'gnome-keyring: for password management' + 'gist: for SysInfo report' + 'octopi-repoeditor: for editing functions' + 'octopi-cachecleaner: for cleaning functions' + 'octopi-notifier: for notifications' + 'octopi-notifier-kde4: for notifications on kde' + 'pacmanlogviewer: to view pacman log files') + conflicts=('octopi-git') + + cd "${srcdir}/${pkgbase}-${pkgver}" install -D -m755 "${srcdir}/${pkgbase}-${pkgver}/bin/${pkgname}" "${pkgdir}/usr/bin/${pkgname}" install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" @@ -79,48 +78,49 @@ package_octopi() { install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/resources/images/${pkgname}_red.png" "${pkgdir}/usr/share/icons/${pkgname}_red.png" install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/resources/images/${pkgname}_yellow.png" "${pkgdir}/usr/share/icons/${pkgname}_yellow.png" - #Pacmanhelper service files - install -D -m755 "${srcdir}/${pkgbase}-${pkgver}/notifier/bin/pacmanhelper" "${pkgdir}/usr/lib/octopi/pacmanhelper" + #Pacmanhelper service files + install -D -m755 "${srcdir}/${pkgbase}-${pkgver}/notifier/bin/pacmanhelper" "${pkgdir}/usr/lib/octopi/pacmanhelper" + install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/notifier/pacmanhelper/polkit/org.octopi.pacman.policy" "${pkgdir}/usr/share/polkit-1/actions/org.octopi.pacman.policy" + install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/notifier/pacmanhelper/polkit/org.octopi.pacmanhelper.conf" "${pkgdir}/etc/dbus-1/system.d/org.octopi.pacmanhelper.conf" + install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/notifier/pacmanhelper/polkit/org.octopi.pacmanhelper.xml" "${pkgdir}/usr/share/dbus-1/interfaces/org.octopi.pacmanhelper.xml" + install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/notifier/pacmanhelper/polkit/org.octopi.pacmanhelper.service" "${pkgdir}/usr/share/dbus-1/system-services/org.octopi.pacmanhelper.service" #speedup files install -D -m755 "${srcdir}/${pkgbase}-${pkgver}/speedup/speedup-octopi.sh" "${pkgdir}/usr/bin/speedup-octopi.sh" install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/speedup/${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service" - - install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/notifier/pacmanhelper/polkit/org.octopi.pacman.policy" "${pkgdir}/usr/share/polkit-1/actions/org.octopi.pacman.policy" - install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/notifier/pacmanhelper/polkit/org.octopi.pacmanhelper.conf" "${pkgdir}/etc/dbus-1/system.d/org.octopi.pacmanhelper.conf" - install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/notifier/pacmanhelper/polkit/org.octopi.pacmanhelper.xml" "${pkgdir}/usr/share/dbus-1/interfaces/org.octopi.pacmanhelper.xml" - install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/notifier/pacmanhelper/polkit/org.octopi.pacmanhelper.service" "${pkgdir}/usr/share/dbus-1/system-services/org.octopi.pacmanhelper.service" } package_octopi-notifier() { - pkgdesc="Notifier for Octopi" - depends=('octopi' 'libnotify') - optdepends=('xfce4-notifyd: for notifications in XFCE') - install=octopi.install - conflicts='octopi-notifier-qt4' - replaces='octopi-notifier-qt4' - - #Octopi-notifier file - install -D -m755 "${srcdir}/${pkgbase}-${pkgver}/notifier/bin/octopi-notifier" "${pkgdir}/usr/bin/octopi-notifier" - install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/octopi-notifier.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" - install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/octopi-notifier.desktop" "${pkgdir}/etc/xdg/autostart/octopi-notifier.desktop" + pkgdesc="Notifier for Octopi" + depends=('octopi' 'libnotify') + optdepends=('xfce4-notifyd: for notifications in XFCE') + install=octopi.install + conflicts=('octopi-notifier-qt4' 'octopi-notifier-kde' 'octopi-notifier-kde4') + + #Octopi-notifier files + install -D -m755 "${srcdir}/${pkgbase}-${pkgver}/notifier/bin/octopi-notifier" "${pkgdir}/usr/bin/octopi-notifier" + install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/octopi-notifier.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" + install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/octopi-notifier.desktop" "${pkgdir}/etc/xdg/autostart/${pkgname}.desktop" } package_octopi-repoeditor() { - pkgdesc="Pacman repo editor for Octopi" - install=octopi.install + pkgdesc="Pacman repo editor for Octopi" + install=octopi.install + depends=('qt5-base') - install -D -m755 "${srcdir}/${pkgbase}-${pkgver}/repoeditor/bin/octopi-repoeditor" "${pkgdir}/usr/bin/octopi-repoeditor" - install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" + #Octopi-repoeditor files + install -D -m755 "${srcdir}/${pkgbase}-${pkgver}/repoeditor/bin/octopi-repoeditor" "${pkgdir}/usr/bin/octopi-repoeditor" + install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/resources/images/${pkgbase}_red.png" "${pkgdir}/usr/share/icons/${pkgname}.png" } package_octopi-cachecleaner() { - pkgdesc="Cachecleaner for Octopi" + pkgdesc="Cachecleaner for Octopi" + depends=('qt5-base') - #Octopi-cachecleaner file - install -D -m755 ${srcdir}/${pkgbase}-${pkgver}/cachecleaner/bin/octopi-cachecleaner ${pkgdir}/usr/bin/octopi-cachecleaner - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/cachecleaner/$pkgname.desktop ${pkgdir}/usr/share/applications/$pkgname.desktop + #Octopi-cachecleaner files + install -D -m755 "${srcdir}/${pkgbase}-${pkgver}/cachecleaner/bin/octopi-cachecleaner" "${pkgdir}/usr/bin/octopi-cachecleaner" + install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/cachecleaner/$pkgname.desktop" "${pkgdir}/usr/share/applications/$pkgname.desktop" } # vim: set ts=2 sw=2 ft=sh noet: diff --git a/libre/octopi/enable-kstatus.patch b/libre/octopi/enable-kstatus.patch new file mode 100644 index 000000000..cc88fda68 --- /dev/null +++ b/libre/octopi/enable-kstatus.patch @@ -0,0 +1,12 @@ +diff -Naur octopi-master-current/notifier/octopi-notifier/octopi-notifier.pro octopi-master-current-kstatus/notifier/octopi-notifier/octopi-notifier.pro +--- octopi-master-current/notifier/octopi-notifier/octopi-notifier.pro 2015-08-09 13:12:50.000000000 +0200 ++++ octopi-master-current-kstatus/notifier/octopi-notifier/octopi-notifier.pro 2015-08-14 10:15:02.645977100 +0200 +@@ -7,7 +7,7 @@ + QT += core xml gui network dbus + + # This controls whether octopi-notifier uses KStatusNotifier lib +-#DEFINES += KSTATUS ++DEFINES += KSTATUS + + contains(DEFINES, KSTATUS){ + QT += KNotifications diff --git a/libre/octopi/parabola-support.patch b/libre/octopi/parabola-support.patch deleted file mode 100644 index 77b62be8f..000000000 --- a/libre/octopi/parabola-support.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 0e215b619b32e58089cae01ecf4db5fa79f33664 Mon Sep 17 00:00:00 2001 -From: Alexandre Arnt -Date: Sat, 11 Jul 2015 18:13:51 -0300 -Subject: [PATCH] - Added Parabola GNU/Linux-libre support (thanks to coadde). - ---- - src/mainwindow_news.cpp | 5 +++++ - src/package.cpp | 3 ++- - src/strconstants.h | 15 ++++++++++++++- - src/unixcommand.cpp | 4 ++++ - src/unixcommand.h | 2 +- - src/utils.cpp | 13 ++++++++++++- - -diff --git a/src/mainwindow_news.cpp b/src/mainwindow_news.cpp -index da54e30..e5be94b 100644 ---- a/src/mainwindow_news.cpp -+++ b/src/mainwindow_news.cpp -@@ -83,6 +83,11 @@ void MainWindow::refreshDistroNews(bool searchForLatestNews, bool gotoNewsTab) - writeToTabOutputExt("" + - StrConstants::getSearchingForDistroNews().arg("Netrunner Rolling") + ""); - } -+ else if (gotoNewsTab && distro == ectn_PARABOLA) -+ { -+ writeToTabOutputExt("" + -+ StrConstants::getSearchingForDistroNews().arg("Parabola GNU/Linux-libre") + ""); -+ } - - /* - * Here, we retrieve distro's latest news without -diff --git a/src/package.cpp b/src/package.cpp -index 9815e10..c5014db 100644 ---- a/src/package.cpp -+++ b/src/package.cpp -@@ -1178,7 +1178,8 @@ QStringList Package::getContents(const QString& pkgName, bool isInstalled) - else if (UnixCommand::getLinuxDistro() == ectn_ARCHBANGLINUX || - UnixCommand::getLinuxDistro() == ectn_ARCHLINUX || - UnixCommand::getLinuxDistro() == ectn_KAOS || -- UnixCommand::getLinuxDistro() == ectn_MOOOSLINUX) -+ UnixCommand::getLinuxDistro() == ectn_MOOOSLINUX || -+ UnixCommand::getLinuxDistro() == ectn_PARABOLA) - { - result = UnixCommand::getPackageContentsUsingPkgfile(pkgName); - } -diff --git a/src/strconstants.h b/src/strconstants.h -index 20de4b3..3f6f1ab 100644 ---- a/src/strconstants.h -+++ b/src/strconstants.h -@@ -60,6 +60,9 @@ class StrConstants{ - if (UnixCommand::getLinuxDistro() == ectn_KAOS) - return QLatin1String( "KCP" ); - -+ if (UnixCommand::getLinuxDistro() == ectn_PARABOLA) -+ return QLatin1String( "Custom" ); -+ - return QLatin1String( "AUR" ); - } - -@@ -68,6 +71,8 @@ class StrConstants{ - return QLatin1String( "ccr" ); - else if (UnixCommand::getLinuxDistro() == ectn_KAOS) - return QLatin1String( "kcp" ); -+ else if (UnixCommand::getLinuxDistro() == ectn_PARABOLA) -+ return QLatin1String( "custom" ); - - return QLatin1String( "aur" ); - } -@@ -100,6 +105,8 @@ class StrConstants{ - return QLatin1String( "Ccr" ); - else if (UnixCommand::getLinuxDistro() == ectn_KAOS) - return QLatin1String( "KCP" ); -+ else if (UnixCommand::getLinuxDistro() == ectn_PARABOLA) -+ return QLatin1String( "Custom" ); - - return QLatin1String( "AUR" ); - } -@@ -110,6 +117,8 @@ class StrConstants{ - return QLatin1String( "ccr/" ); - else if (UnixCommand::getLinuxDistro() == ectn_KAOS) - return "kcp/"; -+ else if (UnixCommand::getLinuxDistro() == ectn_PARABOLA) -+ return "custom/"; - - return QLatin1String( "aur/" ); - } -@@ -142,12 +151,16 @@ class StrConstants{ - return QObject::tr("Netrunner Rolling news"); - } - -+ static QString getParabolaNews(){ -+ return QObject::tr("Parabola GNU/Linux-libre news"); -+ } -+ - static QString getNewsErrorMessage(){ - return QObject::tr("No news could be found! Press Ctrl+G to download the latest news."); - } - - static QString getIncompatibleLinuxDistroError(){ -- return QObject::tr("This Linux distro seems to be incompatible with Octopi!"); -+ return QObject::tr("This GNU/Linux distro seems to be incompatible with Octopi!"); - } - - static QString getInternetUnavailableError(){ -diff --git a/src/unixcommand.cpp b/src/unixcommand.cpp -index 5c2d9e9..43e0fbf 100644 ---- a/src/unixcommand.cpp -+++ b/src/unixcommand.cpp -@@ -1036,6 +1036,10 @@ LinuxDistro UnixCommand::getLinuxDistro() - { - ret = ectn_NETRUNNER; - } -+ else if (contents.contains(QRegExp("Parabola GNU/Linux-libre"))) -+ { -+ ret = ectn_PARABOLA; -+ } - else - { - ret = ectn_UNKNOWN; -diff --git a/src/unixcommand.h b/src/unixcommand.h -index 3a33754..1fda5be 100644 ---- a/src/unixcommand.h -+++ b/src/unixcommand.h -@@ -37,7 +37,7 @@ enum CommandExecuting { ectn_NONE, ectn_MIRROR_CHECK, ectn_SYNC_DATABASE, - ectn_RUN_IN_TERMINAL }; - - enum LinuxDistro { ectn_ANTERGOS, ectn_ARCHBANGLINUX, ectn_ARCHBSD, ectn_ARCHLINUX, ectn_CHAKRA, -- ectn_KAOS, ectn_MANJAROLINUX, ectn_MOOOSLINUX, ectn_NETRUNNER, ectn_UNKNOWN }; -+ ectn_KAOS, ectn_MANJAROLINUX, ectn_MOOOSLINUX, ectn_NETRUNNER, ectn_PARABOLA, ectn_UNKNOWN }; - - enum Language { ectn_LANG_ENGLISH, ectn_LANG_USER_DEFINED }; - -diff --git a/src/utils.cpp b/src/utils.cpp -index 30ca38e..2c82811 100644 ---- a/src/utils.cpp -+++ b/src/utils.cpp -@@ -278,6 +278,7 @@ QString utils::retrieveDistroNews(bool searchForLatestNews) - //const QString ctn_MANJARO_LINUX_RSS_URL = "http://manjaro.org/feed/"; - const QString ctn_MANJARO_LINUX_RSS_URL = "https://manjaro.github.io/feed.xml"; - const QString ctn_NETRUNNER_RSS_URL = "http://www.netrunner-os.com/feed/"; -+ const QString ctn_PARABOLA_RSS_URL = "https://www.parabola.nu/feeds/news/"; - - LinuxDistro distro = UnixCommand::getLinuxDistro(); - QString res; -@@ -295,7 +296,7 @@ QString utils::retrieveDistroNews(bool searchForLatestNews) - } - - if(searchForLatestNews && UnixCommand::hasInternetConnection() && distro != ectn_UNKNOWN) -- { -+ { - QString curlCommand = "curl %1 -o %2"; - - if (distro == ectn_ANTERGOS) -@@ -326,6 +327,12 @@ QString utils::retrieveDistroNews(bool searchForLatestNews) - { - curlCommand = curlCommand.arg(ctn_NETRUNNER_RSS_URL).arg(tmpRssPath); - } -+ else if (distro == ectn_PARABOLA) -+ { -+ //Parabola has a certificate which is not "trusted" by default, so we use "curl -k" -+ curlCommand = "curl -k %1 -o %2"; -+ curlCommand = curlCommand.arg(ctn_PARABOLA_RSS_URL).arg(tmpRssPath); -+ } - - if (UnixCommand::runCurlCommand(curlCommand).isEmpty()) - { -@@ -438,6 +445,10 @@ QString utils::parseDistroNews() - { - html = "

" + StrConstants::getNetrunnerNews() + "